]> source.dussan.org Git - nextcloud-server.git/commitdiff
Migrate verbose messages to inline syntax of writeln() 22938/head
authorMorris Jobke <hey@morrisjobke.de>
Thu, 17 Sep 2020 14:30:33 +0000 (16:30 +0200)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Fri, 18 Sep 2020 11:13:52 +0000 (11:13 +0000)
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
core/Command/Preview/Repair.php

index c04da7ab5320cb3f5815f4dfc3343e815a6d03fc..8c83ce2ebead75238d60c4f66428dc96f89898f7 100644 (file)
@@ -100,8 +100,6 @@ class Repair extends Command {
                        $output->writeln("");
                }
 
-               $verbose = $output->isVerbose();
-
                $instanceId = $this->config->getSystemValueString('instanceid');
 
                $output->writeln("This will migrate all previews from the old preview location to the new one.");
@@ -237,9 +235,7 @@ class Repair extends Command {
                                try {
                                        $this->rootFolder->get("appdata_$instanceId/preview/$newFoldername");
                                } catch (NotFoundException $e) {
-                                       if ($verbose) {
-                                               $section1->writeln("         Create folder preview/$newFoldername");
-                                       }
+                                       $section1->writeln("         Create folder preview/$newFoldername", OutputInterface::VERBOSITY_VERBOSE);
                                        if (!$dryMode) {
                                                $this->rootFolder->newFolder("appdata_$instanceId/preview/$newFoldername");
                                        }
@@ -254,9 +250,7 @@ class Repair extends Command {
                                                $progressBar->advance();
                                                continue;
                                        }
-                                       if ($verbose) {
-                                               $section1->writeln("         Move preview/$name/$previewName to preview/$newFoldername");
-                                       }
+                                       $section1->writeln("         Move preview/$name/$previewName to preview/$newFoldername", OutputInterface::VERBOSITY_VERBOSE);
                                        if (!$dryMode) {
                                                try {
                                                        $preview->move("appdata_$instanceId/preview/$newFoldername/$previewName");
@@ -267,9 +261,7 @@ class Repair extends Command {
                                }
                        }
                        if ($oldPreviewFolder->getDirectoryListing() === []) {
-                               if ($verbose) {
-                                       $section1->writeln("         Delete empty folder preview/$name");
-                               }
+                               $section1->writeln("         Delete empty folder preview/$name", OutputInterface::VERBOSITY_VERBOSE);
                                if (!$dryMode) {
                                        try {
                                                $oldPreviewFolder->delete();