X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/2bd6ba98955bea62be0bedd09cf3a6d20f42c50a..refs/pull/3068/head:/app/Console/Commands/CleanupImages.php diff --git a/app/Console/Commands/CleanupImages.php b/app/Console/Commands/CleanupImages.php index e05508d5e..722150197 100644 --- a/app/Console/Commands/CleanupImages.php +++ b/app/Console/Commands/CleanupImages.php @@ -2,7 +2,7 @@ namespace BookStack\Console\Commands; -use BookStack\Services\ImageService; +use BookStack\Uploads\ImageService; use Illuminate\Console\Command; use Symfony\Component\Console\Output\OutputInterface; @@ -14,8 +14,8 @@ class CleanupImages extends Command * @var string */ protected $signature = 'bookstack:cleanup-images - {--a|all : Include images that are used in page revisions} - {--f|force : Actually run the deletions} + {--a|all : Also delete images that are only used in old revisions} + {--f|force : Actually run the deletions, Defaults to a dry-run} '; /** @@ -25,12 +25,12 @@ class CleanupImages extends Command */ protected $description = 'Cleanup images and drawings'; - protected $imageService; /** * Create a new command instance. - * @param ImageService $imageService + * + * @param \BookStack\Uploads\ImageService $imageService */ public function __construct(ImageService $imageService) { @@ -63,6 +63,7 @@ class CleanupImages extends Command $this->comment($deleteCount . ' images found that would have been deleted'); $this->showDeletedImages($deleted); $this->comment('Run with -f or --force to perform deletions'); + return; } @@ -72,7 +73,9 @@ class CleanupImages extends Command protected function showDeletedImages($paths) { - if ($this->getOutput()->getVerbosity() <= OutputInterface::VERBOSITY_NORMAL) return; + if ($this->getOutput()->getVerbosity() <= OutputInterface::VERBOSITY_NORMAL) { + return; + } if (count($paths) > 0) { $this->line('Images to delete:'); }