🐛 Handle folder prefix correct

Author: ruslansteiger

src/FlysystemCloudinaryAdapter.php

@@ -12,6 +12,7 @@
 use Illuminate\Http\Client\RequestException;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Str;
 use League\Flysystem\Adapter\AbstractAdapter;
 use League\Flysystem\Adapter\Polyfill\NotSupportingVisibilityTrait;
 use League\Flysystem\Config;
@@ -353,10 +354,24 @@ public function listContents($directory = '', $recursive = false): array
         $options = [
             'type' => 'upload',
             'prefix' => $directory,
+            'max_results' => 500,
         ];
 
         try {
-            $responseFiles = $this
+            $options['resource_type'] = 'raw';
+            $responseRawFiles = $this
+                ->cloudinary
+                ->adminApi()
+                ->assets($options);
+
+            $options['resource_type'] = 'image';
+            $responseImageFiles = $this
+                ->cloudinary
+                ->adminApi()
+                ->assets($options);
+
+            $options['resource_type'] = 'video';
+            $responseVideoFiles = $this
                 ->cloudinary
                 ->adminApi()
                 ->assets($options);
@@ -369,22 +384,39 @@ public function listContents($directory = '', $recursive = false): array
             return [];
         }
 
-        event(new FlysystemCloudinaryResponseLog($responseFiles));
+        event(new FlysystemCloudinaryResponseLog($responseRawFiles));
+        event(new FlysystemCloudinaryResponseLog($responseImageFiles));
+        event(new FlysystemCloudinaryResponseLog($responseVideoFiles));
         event(new FlysystemCloudinaryResponseLog($responseDirectories));
 
-        $files = array_map(function (array $resource) {
+        $rawFiles = array_map(function (array $resource) {
+            return $this->normalizeResponse($resource, $resource['public_id']);
+        }, $responseRawFiles->getArrayCopy()['resources']);
+
+        $imageFiles = array_map(function (array $resource) {
+            return $this->normalizeResponse($resource, $resource['public_id']);
+        }, $responseImageFiles->getArrayCopy()['resources']);
+
+        $videoFiles = array_map(function (array $resource) {
             return $this->normalizeResponse($resource, $resource['public_id']);
-        }, $responseFiles->getArrayCopy()['resources']);
+        }, $responseVideoFiles->getArrayCopy()['resources']);
 
         $folders = array_map(function (array $resource) {
+            $path = $this->ensurePrefixedFolderIsRemoved($resource['path']);
+
             return [
                 'type' => 'dir',
-                'path' => $resource['path'],
+                'path' => $path,
                 'name' => $resource['name'],
             ];
         }, $responseDirectories->getArrayCopy()['folders']);
 
-        return [...$files, ...$folders];
+        return [
+            ...$rawFiles,
+            ...$imageFiles,
+            ...$videoFiles,
+            ...$folders,
+        ];
     }
 
     /**
@@ -468,6 +500,19 @@ protected function ensureFolderIsPrefixed(string $path): string
         return $path;
     }
 
+    protected function ensurePrefixedFolderIsRemoved(string $path): string
+    {
+        if (config('flysystem-cloudinary.folder')) {
+            $prefix = config('flysystem-cloudinary.folder') . '/';
+
+            return Str::of($path)
+                ->after($prefix)
+                ->__toString();
+        }
+
+        return $path;
+    }
+
     /**
      * Normalize the object result array.
      *
@@ -480,6 +525,8 @@ protected function normalizeResponse(
         string $path,
         $body = null,
     ): array {
+        $path = $this->ensurePrefixedFolderIsRemoved($path);
+
         return [
             'contents' => $body,
             'etag' => Arr::get($response, 'etag'),

tests/Feature/AdapterTest.php

@@ -207,7 +207,7 @@ public function it_can_delete()
     public function it_can_delete_a_directory()
     {
         $mock = $this->mock(Cloudinary::class, function (MockInterface $mock) {
-            $mock->shouldReceive('adminApi->assets')->once()->andReturn(new ApiResponse([
+            $mock->shouldReceive('adminApi->assets')->times(3)->andReturn(new ApiResponse([
                 'resources' => [],
             ], []));
             $mock->shouldReceive('adminApi->subFolders')->once()->andReturn(new ApiResponse([
@@ -220,7 +220,7 @@ public function it_can_delete_a_directory()
         $bool = $adapter->deleteDir('::path::');
 
         $this->assertTrue($bool);
-        Event::assertDispatched(FlysystemCloudinaryResponseLog::class, 3);
+        Event::assertDispatched(FlysystemCloudinaryResponseLog::class, 5);
     }
 
     /** @test */
@@ -294,7 +294,7 @@ public function it_can_read_stream()
     public function it_can_list_directory_contents()
     {
         $mock = $this->mock(Cloudinary::class, function (MockInterface $mock) {
-            $mock->shouldReceive('adminApi->assets')->once()->andReturn(new ApiResponse([
+            $mock->shouldReceive('adminApi->assets')->times(3)->andReturn(new ApiResponse([
                 'resources' => [],
             ], []));
 
@@ -307,7 +307,7 @@ public function it_can_list_directory_contents()
         $files = $adapter->listContents('::path::');
 
         $this->assertSame([], $files);
-        Event::assertDispatched(FlysystemCloudinaryResponseLog::class, 2);
+        Event::assertDispatched(FlysystemCloudinaryResponseLog::class, 4);
     }
 
     /** @test */