Deleted directory items on S3 container still in Statamic Assets DB after running sync-assets (#511)

* first stab at fixing this

* actually run delete

* fix bad merge

* PINT!

* Implement @ryanmitchell's suggestions with minor fixes.

* PINT!

* one more change to ensure that sub directories are being deleted

* PINT!

* remove dump and add additional folder check

* remove map in favor of better comparison on filesystem

* use blessed Str facade

* recache

---------

Co-authored-by: Ryan Mitchell <[email protected]>

Author: nicbovee

src/Commands/SyncAssets.php

@@ -3,6 +3,7 @@
 namespace Statamic\Eloquent\Commands;
 
 use Illuminate\Console\Command;
+use Statamic\Assets\AssetContainerContents;
 use Statamic\Console\RunsInPlease;
 use Statamic\Contracts\Assets\AssetContainer;
 use Statamic\Eloquent\Assets\AssetModel;
@@ -44,6 +45,12 @@ private function processContainer(AssetContainer $container)
         $this->info("Container: {$container->handle()}");
 
         $this->processFolder($container);
+
+        $contents = app(AssetContainerContents::class);
+
+        $contents->cacheStore()->forget('asset-folder-contents-'.$container->handle());
+
+        $contents->container($container)->directories();
     }
 
     private function processFolder(AssetContainer $container, $folder = '/')
@@ -87,6 +94,45 @@ private function processFolder(AssetContainer $container, $folder = '/')
                 });
             });
 
+        // delete any sub-folders we have a db entry for that no longer exist
+        $filesystemFolders = $contents
+            ->reject(fn ($item) => $item['type'] != 'dir')
+            ->pluck('path');
+
+        // The folder variable is passed with a leading slash. This must be removed
+        // in order to match against the folder column in the database.
+        $folderNoLeadingSlash = Str::chopStart($folder, '/');
+
+        AssetModel::query()
+            ->where('container', $container->handle())
+            ->when(
+                $folder == '/',
+                fn ($query) => $query->where('folder', 'not like', '%/'),
+                fn ($query) => $query->where('folder', 'like', $folderNoLeadingSlash.'/%')
+            )
+            ->select('folder')
+            ->distinct()
+            ->pluck('folder')
+            ->unique()
+            ->each(function ($folder) use ($filesystemFolders, $container) {
+                if ($filesystemFolders->contains(fn ($fsFolder) => Str::startsWith($folder, $fsFolder.'/'))) {
+                    return;
+                }
+
+                $this->error("Deleting assets in {$folder}");
+                AssetModel::query()
+                    ->where('container', $container->handle())
+                    ->where('folder', 'like', $folder)
+                    ->orWhere('folder', 'like', $folder.'/%')
+                    ->chunk(100, function ($assets) {
+                        $assets->each(function ($asset) {
+                            $this->error("Deleting {$asset->path}");
+
+                            $asset->delete();
+                        });
+                    });
+            });
+
         // process any sub-folders of this folder
         $contents
             ->reject(fn ($item) => $item['type'] != 'dir')