wip

Author: duncanmcclean

src/Generator.php

@@ -224,10 +224,8 @@ protected function compileTasksResults(array $results)
 
         return [
             'count' => count($this->earlyTaskErrors) + $results->sum('count'),
-//            'warnings' => $results->flatMap->warnings,
-            'warnings' => 0,
-//            'errors' => collect($this->earlyTaskErrors)->merge($results->flatMap->errors),
-            'errors' => collect(),
+            'warnings' => $results->flatMap->warnings,
+            'errors' => collect($this->earlyTaskErrors)->merge($results->flatMap->errors),
         ];
     }
 
@@ -286,7 +284,7 @@ protected function makeContentGenerationClosures($pages, $request)
 
                     $request->setPage($page);
 
-                    $this->outputProgress($page->url(), '<fg=blue;options=bold>GENERATING</>');
+                    $this->writeGeneratingLine($page->url());
 
                     try {
                         $generated = $page->generate($request);
@@ -295,8 +293,7 @@ protected function makeContentGenerationClosures($pages, $request)
                             return $e->consoleMessage();
                         }
 
-                        // Clear line, then output FAILED status with newline
-                        $this->clearLine();
+                        $this->clearCurrentLine();
                         Partyline::outputComponents()->twoColumnDetail($page->url(), '<fg=red;options=bold>FAILED</>');
 
                         $errors[] = $e->consoleMessage();
@@ -314,8 +311,7 @@ protected function makeContentGenerationClosures($pages, $request)
                         $warnings[] = $generated->consoleMessage();
                     }
 
-                    // Clear line, then output SUCCESS status with newline
-                    $this->clearLine();
+                    $this->clearCurrentLine();
                     Partyline::outputComponents()->twoColumnDetail($page->url(), '<fg=green;options=bold>SUCCESS</>');
 
                     Blink::flush();
@@ -335,8 +331,8 @@ protected function outputTasksResults()
         Partyline::newLine();
         Partyline::outputComponents()->success("Generated {$successCount} content files");
 
-//        $results['warnings']->each(fn ($warning) => Partyline::outputComponents()->warn($warning));
-//        $results['errors']->each(fn ($error) => Partyline::outputComponents()->error($error));
+        $results['warnings']->each(fn ($warning) => Partyline::outputComponents()->warn($warning));
+        $results['errors']->each(fn ($error) => Partyline::outputComponents()->error($error));
     }
 
     protected function outputSummary()
@@ -345,13 +341,13 @@ protected function outputSummary()
 
         $total = $this->taskResults['count'];
 
-//        if ($errors = count($this->taskResults['errors'])) {
-//            Partyline::outputComponents()->warn("{$errors}/{$total} pages not generated");
-//        }
-//
-//        if ($warnings = count($this->taskResults['warnings'])) {
-//            Partyline::outputComponents()->warn("{$warnings}/{$total} pages generated with warnings");
-//        }
+        if ($errors = count($this->taskResults['errors'])) {
+            Partyline::outputComponents()->warn("{$errors}/{$total} pages not generated");
+        }
+
+        if ($warnings = count($this->taskResults['warnings'])) {
+            Partyline::outputComponents()->warn("{$warnings}/{$total} pages generated with warnings");
+        }
     }
 
     protected function entries()
@@ -515,51 +511,23 @@ protected function getToStringFormat(): string|\Closure|null
     }
 
     /**
-     * Output a two-column detail line without a trailing newline.
-     * This allows the line to be overwritten later.
+     * Outputs a "Generating" line to the terminal. Very similar output-wise to Laravel's
+     * ->twoColumnDetail() method, but it allows for replacing the line later, for
+     * success/error statuses.
      */
-    protected function outputProgress(string $first, string $second): void
-    {
-        // Extract the text from color tags
-        preg_match('/<fg=([^;>]+);options=bold>([^<]+)<\/>/', $second, $matches);
-        $color = $matches[1] ?? 'white';
-        $text = $matches[2] ?? $second;
-
-        // ANSI color codes
-        $colors = [
-            'blue' => "\033[34;1m",
-            'green' => "\033[32;1m",
-            'red' => "\033[31;1m",
-            'reset' => "\033[0m",
-            'gray' => "\033[90m",
-        ];
+    private function writeGeneratingLine(string $url): void
+    {
+        $dotsLen = max(1, 150 - strlen($url) - strlen('GENERATING') - 6);
 
-        // Format: "  first .......... STATUS"
-        // The actual visible width calculation
-        $firstLen = strlen($first);
-        $textLen = strlen($text);
-
-        // Calculate dots to match twoColumnDetail width
-        // Subtract a bit more to account for spacing and ensure alignment
-        $dotsLen = max(1, 150 - $firstLen - $textLen - 6);
-
-        $line = sprintf("  %s %s%s%s %s%s%s",
-            $first,
-            $colors['gray'],
-            str_repeat('.', $dotsLen),
-            $colors['reset'],
-            $colors[$color] ?? '',
-            $text,
-            $colors['reset']
+        $line = sprintf("  %s \033[90m%s\033[0m \033[34;1mGENERATING\033[0m",
+            $url,
+            str_repeat('.', $dotsLen)
         );
 
         fwrite(STDERR, $line);
     }
 
-    /**
-     * Clear the current line
-     */
-    protected function clearLine(): void
+    private function clearCurrentLine(): void
     {
         fwrite(STDERR, "\r\x1B[2K");
     }