Fix issues with directory listing not returning all folders (#224)

* Fix issues with directory listing not returning all folders

* Also cache meta exists queries

* StyleCI

* Update meta exists on save

* Don't process subfolder if its the same as folder

* Prevent infinite recursion

* handle dotfile ignoring properly

* Ignore any .meta folders

* Dont info unless we are actually processing it

* Seems we can't rely on getFolders to actually recurse properly, so make our own

* Make sure we dont return lower level folders

Author: ryanmitchell

src/Assets/Asset.php

@@ -6,6 +6,7 @@
 use Illuminate\Support\Facades\Cache;
 use Statamic\Assets\Asset as FileAsset;
 use Statamic\Assets\AssetUploader as Uploader;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Path;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
@@ -71,12 +72,14 @@ public function exists()
 
     public function metaExists()
     {
-        return app('statamic.eloquent.assets.model')::query()
+        return Blink::once('eloquent-asset-meta-exists-'.$this->id(), function () {
+            return app('statamic.eloquent.assets.model')::query()
             ->where([
                 'container' => $this->containerHandle(),
                 'folder' => $this->folder(),
                 'basename' => $this->basename(),
             ])->count() > 0;
+        });
     }
 
     private function metaValue($key)
@@ -130,6 +133,8 @@ public function writeMeta($meta)
         }
 
         $model->save();
+
+        Blink::put('eloquent-asset-meta-exists-'.$this->id(), true);
     }
 
     public function metaPath()

src/Assets/AssetContainerContents.php

@@ -40,13 +40,28 @@ public function directories()
         }
 
         $this->folders = Cache::remember($this->key(), $this->ttl(), function () {
-            return $this->container->disk()->getFolders('/', true)
+            return collect($this->directoryRecurse(''))
                 ->map(fn ($dir) => ['path' => $dir]);
         });
 
         return $this->folders;
     }
 
+    private function directoryRecurse($directory)
+    {
+        $rootFolders = $this->container->disk()->getFolders($directory, false);
+
+        $folders = [];
+        foreach ($rootFolders as $folder) {
+            $folders[] = $folder;
+            if ($subfolders = $this->directoryRecurse($folder)) {
+                $folders = array_merge($folders, $subfolders);
+            }
+        }
+
+        return $folders;
+    }
+
     public function metaFilesIn($folder, $recursive)
     {
         return $this->query()
@@ -67,13 +82,48 @@ public function filteredDirectoriesIn($folder, $recursive)
     {
         $folder = $folder == '/' ? '' : $folder;
 
-        return $this->directories()->filter(function ($dir) use ($folder, $recursive) {
-            if ($folder && ! Str::startsWith($dir, $folder)) {
-                return false;
-            }
-
-            return ! $recursive ? Str::of($dir)->after($folder.'/')->contains('/') == false : true;
-        })->flip();
+        return $this->directories()
+            ->filter(function ($dir) use ($folder) {
+                if ($folder && ! Str::startsWith($dir['path'], $folder)) {
+                    return false;
+                }
+
+                if ($folder == $dir['path']) {
+                    return false;
+                }
+
+                return true;
+            })
+            ->map(function ($dir) {
+                $dirs = [];
+                $tmp = '';
+                foreach (explode('/', $dir['path']) as $dir) {
+                    $tmp .= '/'.$dir;
+                    $dirs[] = substr($tmp, 1);
+                }
+
+                return $dirs;
+            })
+            ->flatten()
+            ->unique()
+            ->filter(function ($dir) use ($folder, $recursive) {
+                if ($folder == $dir || strlen($folder) > strlen($dir)) {
+                    return false;
+                }
+
+                if ($recursive) {
+                    return true;
+                }
+
+                $dir = Str::of($dir);
+                if ($folder) {
+                    $dir = $dir->after($folder.'/');
+                }
+
+                return ! $dir->contains('/');
+            })
+            ->sort()
+            ->flip();
     }
 
     public function save()

src/Commands/SyncAssets.php

@@ -57,12 +57,12 @@ private function processFolder(AssetContainer $container, $folder = '')
 
         // ensure we have an asset for any paths
         $files->each(function ($file) use ($container) {
-            $this->info($file);
-
-            if (Str::startsWith($file, '.')) {
+            if (Str::of($file)->afterLast('/')->startsWith('.')) {
                 return;
             }
 
+            $this->info($file);
+
             $asset = Facades\Asset::make()
                 ->container($container->handle())
                 ->path($file)
@@ -85,8 +85,14 @@ private function processFolder(AssetContainer $container, $folder = '')
 
         // process any sub-folders of this folder
         $container->folders($folder)
-            ->each(function ($folder) use ($container) {
-                $this->processFolder($container, $folder);
+            ->each(function ($subfolder) use ($container, $folder) {
+                if (str_contains($subfolder.'/', '.meta/')) {
+                    return;
+                }
+
+                if ($folder != $subfolder && (strlen($subfolder) > strlen($folder))) {
+                    $this->processFolder($container, $subfolder);
+                }
             });
     }
 }