Add and boot Cloudinary Driver

Author: unicodeveloper

src/CloudinaryAdapter.php

@@ -62,14 +62,20 @@ public function writeStream($path, $resource, Config $options)
 
         $resourceType = $options->has('resource_type') ? $options->get('resource_type') : 'auto';
 
+        $fileExtension = pathinfo($publicId, PATHINFO_EXTENSION);
+
+        $newPublicId = $fileExtension ? substr($publicId, 0, - (strlen($fileExtension) + 1)) : $publicId;
+
         $uploadOptions = [
-            'public_id' => $publicId,
+            'public_id' => $newPublicId,
             'resource_type' => $resourceType
-        ]
+        ];
 
         $resourceMetadata = stream_get_meta_data($resource);
 
-        return $this->uploadApi()->upload($resourceMetadata['uri'], $uploadOptions)
+        $result = resolve(CloudinaryEngine::class)->upload($resourceMetadata['uri'], $uploadOptions);
+
+        return $result;
     }
 
 
@@ -119,9 +125,9 @@ public function rename($path, $newpath)
         $pathInfo = pathinfo($path);
         $newPathInfo = pathinfo($newpath);
 
-        $remotePath = $pathInfo['dirname'] != '.') ? pathInfo['dirname'] . '/' . $pathInfo['filename'] : $pathInfo['filename'];
+        $remotePath = ($pathInfo['dirname'] != '.') ? pathInfo['dirname'] . '/' . $pathInfo['filename'] : $pathInfo['filename'];
 
-        $remoteNewPath = $pathInfo['dirname'] != '.') ? $newPathInfo['dirname'] . '/' . $newPathInfo['filename'] : $newPathInfo['filename'];
+        $remoteNewPath = ($pathInfo['dirname'] != '.') ? $newPathInfo['dirname'] . '/' . $newPathInfo['filename'] : $newPathInfo['filename'];
 
         $result = $this->uploadApi()->rename($remotePath, $remoteNewPath);
 
@@ -195,13 +201,7 @@ public function createDir($dirname, Config $options)
      */
     public function has($path)
     {
-        try {
-            $this->adminApi()->resource($path);
-        } catch (Exception $e) {
-            return false;
-        }
-
-        return true;
+        return file_exists($path);
     }
 
     /**
@@ -275,7 +275,7 @@ public function listContents($directory = '', $hasRecursive = false)
      */
     public function getMetadata($path)
     {
-        return $this->prepareResourceMetadata($this->getResource($path));
+       return $this->prepareResourceMetadata($this->getResource($path));
     }
 
     /**

src/CloudinaryServiceProvider.php

@@ -34,10 +34,7 @@ public function boot()
         $this->bootComponents();
         $this->bootCommands();
         $this->bootPublishing();
-
-        Storage::extend('cloudinary', function () {
-            return new Filesystem(new CloudinaryAdapter(config('cloudinary.cloud_url')));
-        });
+        $this->bootCloudinaryDriver();
     }
 
     /**
@@ -54,7 +51,7 @@ public function register()
     }
 
 
-    public function bootCommands()
+    protected function bootCommands()
     {
         /**
         * Register Laravel Cloudinary Artisan commands
@@ -151,4 +148,13 @@ protected function bootMacros()
             return $engine->uploadFile($this->getRealPath(), ['folder' => $folder, 'public_id' => $publicId]);
         });
     }
+
+    protected function bootCloudinaryDriver()
+    {
+        $this->app['config']['filesystems.disks.cloudinary'] = ['driver' => 'cloudinary'];
+
+        Storage::extend('cloudinary', function ($app, $config) {
+            return new Filesystem(new CloudinaryAdapter(config('cloudinary.cloud_url')));
+        });
+    }
 }