feat: remove progress bar after completion

coding-socks · Jan 21, 2024 · e4ebbcb · e4ebbcb
1 parent c2c9034
commit e4ebbcb
Showing 1 changed file with 35 additions and 4 deletions.
diff --git a/src/Console/Commands/FindMissingTranslationStrings.php b/src/Console/Commands/FindMissingTranslationStrings.php
@@ -2,6 +2,7 @@
 
 namespace CodingSocks\LostInTranslation\Console\Commands;
 
+use Closure;
 use CodingSocks\LostInTranslation\LostInTranslation;
 use CodingSocks\LostInTranslation\NonStringArgumentException;
 use Illuminate\Console\Command;
@@ -10,7 +11,9 @@
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Str;
 use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Finder\SplFileInfo;
 
 class FindMissingTranslationStrings extends Command
 {
@@ -49,7 +52,7 @@ public function handle(LostInTranslation $lit)
         $reported = [];
         $keys = [];
 
-        $this->withProgressBar($files, function ($file) use ($lit, $locale, &$reported, &$keys) {
+        $this->showProgress($files, function (SplFileInfo $file, ProgressBar $bar) use ($lit, $locale, &$reported, &$keys, &$barCopy) {
             $nodes = $lit->findInFile($file);
 
             $translationKeys = $this->resolveFirstArgs($lit, $nodes);
@@ -61,9 +64,7 @@ public function handle(LostInTranslation $lit)
                     $keys[] = $key;
                 }
             }
-        });
-
-        $this->newLine();
+        })->clear();
 
         if ($this->option('sorted')) {
             sort($keys);
@@ -74,6 +75,36 @@ public function handle(LostInTranslation $lit)
         }
     }
 
+    /**
+     * Execute a given callback while advancing a progress bar.
+     *
+     * @param  iterable|int  $totalSteps
+     * @param  \Closure  $callback
+     * @return \Symfony\Component\Console\Helper\ProgressBar
+     */
+    protected function showProgress($totalSteps, Closure $callback)
+    {
+        $bar = $this->output->createProgressBar(
+            is_iterable($totalSteps) ? count($totalSteps) : $totalSteps
+        );
+
+        $bar->start();
+
+        if (is_iterable($totalSteps)) {
+            foreach ($totalSteps as $value) {
+                $callback($value, $bar);
+
+                $bar->advance();
+            }
+        } else {
+            $callback($bar);
+        }
+
+        $bar->finish();
+
+        return $bar;
+    }
+
     /**
      * @param \CodingSocks\LostInTranslation\LostInTranslation $lit
      * @param array $nodes