Improved non-interactive command support (pterodactyl#1824)

tim-van-dijkhuizen · web-flow · commit bf6da15fbaf2 · 2020-02-08T13:30:49.000-08:00
The following commands no longer need confirmation when the input is not interactive:

 - server:bulk-power
 - server:reinstall
diff --git a/app/Console/Commands/Server/BulkPowerActionCommand.php b/app/Console/Commands/Server/BulkPowerActionCommand.php
@@ -91,7 +91,7 @@ public function handle()
         }
 
         $count = $this->repository->getServersForPowerActionCount($servers, $nodes);
-        if (! $this->confirm(trans('command/messages.server.power.confirm', ['action' => $action, 'count' => $count]))) {
+        if (! $this->confirm(trans('command/messages.server.power.confirm', ['action' => $action, 'count' => $count])) && $this->input->isInteractive()) {
             return;
         }
 
diff --git a/app/Console/Commands/Server/BulkReinstallActionCommand.php b/app/Console/Commands/Server/BulkReinstallActionCommand.php
@@ -71,7 +71,7 @@ public function handle()
     {
         $servers = $this->getServersToProcess();
 
-        if (! $this->confirm(trans('command/messages.server.reinstall.confirm'))) {
+        if (! $this->confirm(trans('command/messages.server.reinstall.confirm')) && $this->input->isInteractive()) {
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function handle()`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`$count = $this->repository->getServersForPowerActionCount($servers, $nodes);`
`94`		`- if (! $this->confirm(trans('command/messages.server.power.confirm', ['action' => $action, 'count' => $count]))) {`
	`94`	`+ if (! $this->confirm(trans('command/messages.server.power.confirm', ['action' => $action, 'count' => $count])) && $this->input->isInteractive()) {`
`95`	`95`	`return;`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function handle()`
`71`	`71`	`{`
`72`	`72`	`$servers = $this->getServersToProcess();`
`73`	`73`
`74`		`- if (! $this->confirm(trans('command/messages.server.reinstall.confirm'))) {`
	`74`	`+ if (! $this->confirm(trans('command/messages.server.reinstall.confirm')) && $this->input->isInteractive()) {`
`75`	`75`	`return;`
`76`	`76`	`}`
`77`	`77`