feat: media-library:clean make use of media prefix (#3704)

spatie · Sep 2, 2024 · ff589ea · ff589ea
1 parent 5486261
commit ff589ea
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/MediaCollections/Commands/CleanCommand.php b/src/MediaCollections/Commands/CleanCommand.php
@@ -187,15 +187,24 @@ protected function deleteOrphanedDirectories(): void
             throw DiskDoesNotExist::create($diskName);
         }
 
+        $prefix = config('media-library.prefix', '');
+
+        if ($prefix !== '') {
+            $prefix = trim($prefix, '/').'/';
+        }
+
         $mediaIds = $this->mediaRepository->allIds();
 
         /** @var array<int, string> */
-        $directories = $this->fileSystem->disk($diskName)->directories();
+        $directories = $this->fileSystem->disk($diskName)->directories($prefix);
 
         collect($directories)
+            ->map(fn (string $directory) => str_replace($prefix, '', $directory))
             ->filter(fn (string $directory) => is_numeric($directory))
             ->reject(fn (string $directory) => $mediaIds->contains((int) $directory))
-            ->each(function (string $directory) use ($diskName) {
+            ->each(function (string $directory) use ($diskName, $prefix) {
+                $directory = $prefix.$directory;
+
                 if (! $this->isDryRun) {
                     $this->fileSystem->disk($diskName)->deleteDirectory($directory);
                 }