Merge pull request #1449 from hydephp/fancy-serve-command

emmadesilva · web-flow · commit e13e2155659a · 2023-11-11T13:38:44.000+01:00
Fancy serve command cleanup
diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -22,7 +22,10 @@
 class ServeCommand extends Command
 {
     /** @var string */
-    protected $signature = 'serve {--host= : <comment>[default: "localhost"]</comment>}} {--port= : <comment>[default: 8080]</comment>}';
+    protected $signature = 'serve 
+        {--host= : <comment>[default: "localhost"]</comment>}}
+        {--port= : <comment>[default: 8080]</comment>}
+    ';
 
     /** @var string */
     protected $description = 'Start the realtime compiler server.';
diff --git a/packages/realtime-compiler/src/Http/DashboardController.php b/packages/realtime-compiler/src/Http/DashboardController.php
@@ -56,7 +56,10 @@ public function __construct()
     {
         $this->title = config('hyde.name').' - Dashboard';
         $this->request = Request::capture();
-        $this->console = new ConsoleOutput();
+
+        if (((bool) env('HYDE_RC_REQUEST_OUTPUT', false)) === true) {
+            $this->console = new ConsoleOutput();
+        }
 
         $this->loadFlashData();
 
@@ -355,7 +358,7 @@ protected function createPage(): void
             $this->abort($exception->getCode(), $exception->getMessage());
         }
 
-        $this->console->printMessage("Created file '$path'", 'dashboard@createPage');
+        $this->writeToConsole("Created file '$path'", 'dashboard@createPage');
 
         $this->flash('justCreatedPage', RouteKey::fromPage($pageClass, $pageClass::pathToIdentifier($path))->get());
         $this->setJsonResponse(201, "Created file '$path'!");
@@ -510,4 +513,11 @@ protected function hasAsyncHeaders(): bool
     {
         return (getallheaders()['X-RC-Handler'] ?? getallheaders()['x-rc-handler'] ?? null) === 'Async';
     }
+
+    protected function writeToConsole(string $message, string $context = 'dashboard'): void
+    {
+        if (isset($this->console)) {
+            $this->console->printMessage($message, $context);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,10 @@ public function __construct()`
`56`	`56`	`{`
`57`	`57`	`$this->title = config('hyde.name').' - Dashboard';`
`58`	`58`	`$this->request = Request::capture();`
`59`		`- $this->console = new ConsoleOutput();`
	`59`	`+`
	`60`	`+ if (((bool) env('HYDE_RC_REQUEST_OUTPUT', false)) === true) {`
	`61`	`+ $this->console = new ConsoleOutput();`
	`62`	`+ }`
`60`	`63`
`61`	`64`	`$this->loadFlashData();`
`62`	`65`
`@@ -355,7 +358,7 @@ protected function createPage(): void`
`355`	`358`	`$this->abort($exception->getCode(), $exception->getMessage());`
`356`	`359`	`}`
`357`	`360`
`358`		`- $this->console->printMessage("Created file '$path'", 'dashboard@createPage');`
	`361`	`+ $this->writeToConsole("Created file '$path'", 'dashboard@createPage');`
`359`	`362`
`360`	`363`	`$this->flash('justCreatedPage', RouteKey::fromPage($pageClass, $pageClass::pathToIdentifier($path))->get());`
`361`	`364`	`$this->setJsonResponse(201, "Created file '$path'!");`
`@@ -510,4 +513,11 @@ protected function hasAsyncHeaders(): bool`
`510`	`513`	`{`
`511`	`514`	`return (getallheaders()['X-RC-Handler'] ?? getallheaders()['x-rc-handler'] ?? null) === 'Async';`
`512`	`515`	`}`
	`516`	`+`
	`517`	`+ protected function writeToConsole(string $message, string $context = 'dashboard'): void`
	`518`	`+ {`
	`519`	`+ if (isset($this->console)) {`
	`520`	`+ $this->console->printMessage($message, $context);`
	`521`	`+ }`
	`522`	`+ }`
`513`	`523`	`}`