Make archive command work

Author: unicodeveloper

src/CloudinaryAdapter.php

@@ -68,9 +68,9 @@ public function write($path, $contents, Config $options)
     /**
      * Write a new file using a stream.
      *
-     * @param string $path
-     * @param resource $resource
-     * @param Config $options Config object
+     * @param string    $path
+     * @param resource  $resource
+     * @param Config    $options Config object
      *
      * @return array|false false on failure file meta data on success
      */
@@ -82,10 +82,10 @@ public function writeStream($path, $resource, Config $options)
 
         $fileExtension = pathinfo($publicId, PATHINFO_EXTENSION);
 
-        $newPublicId = $fileExtension ? substr($publicId, 0, -(strlen($fileExtension) + 1)) : $publicId;
+        $newPublicId = $fileExtension ? substr($publicId, 0, - (strlen($fileExtension) + 1)) : $publicId;
 
         $uploadOptions = [
-            'public_id' => $newPublicId,
+            'public_id'     => $newPublicId,
             'resource_type' => $resourceType
         ];
 
@@ -100,9 +100,9 @@ public function writeStream($path, $resource, Config $options)
      * Update a file using a stream.
      * Cloudinary has no specific update method. Overwrite instead.
      *
-     * @param string $path
-     * @param resource $resource
-     * @param Config $options Config object
+     * @param string    $path
+     * @param resource  $resource
+     * @param Config    $options Config object
      *
      * @return array|false false on failure file meta data on success
      */
@@ -123,7 +123,7 @@ public function updateStream($path, $resource, Config $options)
      */
     public function rename($path, $newpath)
     {
-        $pathInfo = pathinfo($path);
+        $pathInfo    = pathinfo($path);
         $newPathInfo = pathinfo($newpath);
 
         $remotePath = ($pathInfo['dirname'] != '.') ? pathInfo['dirname'] . '/' . $pathInfo['filename'] : $pathInfo['filename'];
@@ -181,6 +181,8 @@ public function delete($path)
      * @param string $dirname
      *
      * @return bool
+     *
+     * @throws ApiError
      */
     public function deleteDir($dirname)
     {
@@ -205,6 +207,8 @@ protected function adminApi()
      * @param Config $options
      *
      * @return bool
+     *
+     * @throws ApiError
      */
     public function createDir($dirname, Config $options)
     {
@@ -251,7 +255,7 @@ public function readStream($path)
     {
         $resource = (array)$this->adminApi()->resource($path);
 
-        $stream = fopen($resource['secure_url'], 'r');
+        $stream = fopen($resource['secure_url'], 'rb');
 
         return compact('stream', 'path');
     }
@@ -260,7 +264,7 @@ public function readStream($path)
      * List contents of a directory.
      *
      * @param string $directory
-     * @param bool $recursive
+     * @param bool $hasR          ecursive
      *
      * @return array
      */
@@ -298,15 +302,17 @@ protected function prepareResourceMetadata($resource)
     {
         $resource['type'] = 'file';
         $resource['path'] = $resource['public_id'];
-        $resource = array_merge($resource, $this->prepareSize($resource));
-        $resource = array_merge($resource, $this->prepareTimestamp($resource));
-        $resource = array_merge($resource, $this->prepareMimetype($resource));
+        $resource         = array_merge($resource, $this->prepareSize($resource));
+        $resource         = array_merge($resource, $this->prepareTimestamp($resource));
+        $resource         = array_merge($resource, $this->prepareMimetype($resource));
         return $resource;
     }
 
     /**
      * prepare size response
+     *
      * @param array $resource
+     *
      * @return array
      */
     protected function prepareSize($resource)
@@ -316,8 +322,10 @@ protected function prepareSize($resource)
     }
 
     /**
-     * prepare timestpamp response
+     * prepare timestamp response
+     *
      * @param array $resource
+     *
      * @return array
      */
     protected function prepareTimestamp($resource)
@@ -328,7 +336,9 @@ protected function prepareTimestamp($resource)
 
     /**
      * prepare mimetype response
+     *
      * @param array $resource
+     *
      * @return array
      */
     protected function prepareMimetype($resource)

src/Commands/BackupFilesCommand.php

@@ -2,6 +2,7 @@
 
 namespace Unicodeveloper\Cloudinary\Commands;
 
+use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 use Unicodeveloper\Cloudinary\CloudinaryEngine;

src/Commands/DeleteFilesCommand.php

@@ -2,6 +2,7 @@
 
 namespace Unicodeveloper\Cloudinary\Commands;
 
+use Exception;
 use Illuminate\Console\Command;
 use Unicodeveloper\Cloudinary\CloudinaryEngine;
 

src/Commands/FetchFilesCommand.php

@@ -2,6 +2,7 @@
 
 namespace Unicodeveloper\Cloudinary\Commands;
 
+use Exception;
 use Illuminate\Console\Command;
 use Unicodeveloper\Cloudinary\CloudinaryEngine;
 

src/Commands/GenerateArchiveCommand.php

@@ -2,6 +2,7 @@
 
 namespace Unicodeveloper\Cloudinary\Commands;
 
+use Exception;
 use Illuminate\Console\Command;
 use Unicodeveloper\Cloudinary\CloudinaryEngine;
 
@@ -16,7 +17,9 @@ class GenerateArchiveCommand extends Command
      *
      * @var string
      */
-    protected $signature = "cloudinary:archive {remote-url}";
+    protected $signature = "cloudinary:archive
+        {--tags=* : The tags of the assets you want included in the arhive}
+        {--public_ids=* : The public IDs of the assets you want included in the archive}";
 
     /**
      * The console command description.
@@ -38,27 +41,25 @@ public function handle(CloudinaryEngine $engine)
             return;
         }
 
-        if (is_numeric($this->argument('remote-url'))) {
-            $this->warn('This is a number, not a valid remote file url. Please try again with a valid URL.');
+        if (!$this->option('tags') && !$this->option('public_ids')) {
+            $this->warn(
+                'Please ensure you pass in at least a tag with --tags, or at least a public_id  with --public_ids'
+            );
 
             return;
         }
 
-        if (!filter_var($this->argument('remote-url'), FILTER_VALIDATE_URL)) {
-            $this->warn('Please add a valid remote file url as an argument.');
-
-            return;
-        }
-
-        $remoteUrl = $this->argument('remote-url');
-
-        $this->info('Extracting remote file...');
+        $this->info('Generating Archive...');
 
         try {
-            $engine->uploadFile($remoteUrl);
-            $this->info('Uploading in progress...');
+            $response = $engine->createArchive(
+                [
+                    'tags' => $this->option('tags') ?? null,
+                    'public_ids' => $this->option('public_ids') ?? null
+                ]
+            )['secure_url'];
 
-            $this->info('Upload to Cloudinary completed!');
+            $this->info("Archive: {$response}");
         } catch (Exception $exception) {
             $this->warn("Backup of files to Cloudinary failed because: {$exception->getMessage()}.");
         }

src/Commands/GenerateZipCommand.php

@@ -2,8 +2,8 @@
 
 namespace Unicodeveloper\Cloudinary\Commands;
 
+use Exception;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\File;
 use Unicodeveloper\Cloudinary\CloudinaryEngine;
 
 /**
@@ -33,7 +33,7 @@ class RenameFilesCommand extends Command
      */
     public function handle(CloudinaryEngine $engine)
     {
-        if(! config('cloudinary.cloud_url')) {
+        if (!config('cloudinary.cloud_url')) {
             $this->warn('Please ensure your Cloudinary credentials are set before continuing.');
 
             return;
@@ -42,16 +42,15 @@ public function handle(CloudinaryEngine $engine)
         $fromPublicId = $this->argument('fromPublicId');
         $toPublicId = $this->argument('toPublicId');
 
-        if (! is_string($fromPublicId) || ! is_string($toPublicId)) {
-           $this->warn("Please ensure a valid public Id is passed as an argument.");
+        if (!is_string($fromPublicId) || !is_string($toPublicId)) {
+            $this->warn("Please ensure a valid public Id is passed as an argument.");
 
-           return;
+            return;
         }
 
         $this->info("About to rename {$fromPublicId} file to {$toPublicId} on Cloudinary...");
 
         try {
-
             $engine->rename($fromPublicId, $toPublicId);
 
             $this->info('File renamed successfully on Cloudinary!');

src/Commands/RenameFilesCommand.php

@@ -2,6 +2,7 @@
 
 namespace Unicodeveloper\Cloudinary\Commands;
 
+use Exception;
 use Illuminate\Console\Command;
 use Unicodeveloper\Cloudinary\CloudinaryEngine;