Default OpenID display name set to standard value

[bookstack] / app / Console / Commands / CleanupImages.php

diff --git a/app/Console/Commands/CleanupImages.php b/app/Console/Commands/CleanupImages.php
index 310a7bb24e44cb978c979065d4ac9de0519c6880..f2e2d9fbd4465a3544e96e54c4649fb54fe81e05 100644 (file)
--- a/app/Console/Commands/CleanupImages.php
+++ b/app/Console/Commands/CleanupImages.php
@@ -2,8 +2,9 @@
 
 namespace BookStack\Console\Commands;
 
 
 namespace BookStack\Console\Commands;
 

-use BookStack\Services\ImageService;
+use BookStack\Uploads\ImageService;

 use Illuminate\Console\Command;
 use Illuminate\Console\Command;

+use Symfony\Component\Console\Output\OutputInterface;

 
 class CleanupImages extends Command
 {
 
 class CleanupImages extends Command
 {


@@ -29,7 +30,7 @@ class CleanupImages extends Command
 
     /**
      * Create a new command instance.
 
     /**
      * Create a new command instance.

-     * @param ImageService $imageService
+     * @param \BookStack\Uploads\ImageService $imageService

      */
     public function __construct(ImageService $imageService)
     {
      */
     public function __construct(ImageService $imageService)
     {


@@ -48,21 +49,37 @@ class CleanupImages extends Command
         $dryRun = $this->option('force') ? false : true;
 
         if (!$dryRun) {
         $dryRun = $this->option('force') ? false : true;
 
         if (!$dryRun) {

-            $proceed = $this->confirm('This operation is destructive and is not guaranteed to be fully accurate. Ensure you have a backup of your images. Are you sure you want to proceed?');
+            $proceed = $this->confirm("This operation is destructive and is not guaranteed to be fully accurate.\nEnsure you have a backup of your images.\nAre you sure you want to proceed?");

             if (!$proceed) {
                 return;
             }
         }
 
             if (!$proceed) {
                 return;
             }
         }
 

-        $deleteCount = $this->imageService->deleteUnusedImages($checkRevisions, ['gallery', 'drawio'], $dryRun);
+        $deleted = $this->imageService->deleteUnusedImages($checkRevisions, $dryRun);
+        $deleteCount = count($deleted);

 
         if ($dryRun) {
             $this->comment('Dry run, No images have been deleted');
             $this->comment($deleteCount . ' images found that would have been deleted');
 
         if ($dryRun) {
             $this->comment('Dry run, No images have been deleted');
             $this->comment($deleteCount . ' images found that would have been deleted');

+            $this->showDeletedImages($deleted);

             $this->comment('Run with -f or --force to perform deletions');
             return;
         }
 
             $this->comment('Run with -f or --force to perform deletions');
             return;
         }
 

+        $this->showDeletedImages($deleted);

         $this->comment($deleteCount . ' images deleted');
     }
         $this->comment($deleteCount . ' images deleted');
     }

+
+    protected function showDeletedImages($paths)
+    {
+        if ($this->getOutput()->getVerbosity() <= OutputInterface::VERBOSITY_NORMAL) {
+            return;
+        }
+        if (count($paths) > 0) {
+            $this->line('Images to delete:');
+        }
+        foreach ($paths as $path) {
+            $this->line($path);
+        }
+    }

 }
 }