Use defined speedtest server (#7)

alexjustesen · Sep 13, 2022 · bf78bbd · bf78bbd
1 parent c3e3233
commit bf78bbd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/app/Console/Commands/RunSpeedtest.php b/app/Console/Commands/RunSpeedtest.php
@@ -29,7 +29,13 @@ class RunSpeedtest extends Command
      */
     public function handle()
     {
-        ExecSpeedtest::dispatch();
+        $speedtest = [];
+
+        if ($this->argument('server')) {
+            $speedtest = array_merge($speedtest, ['ookla_server_id' => $this->argument('server')]);
+        }
+
+        ExecSpeedtest::dispatch(speedtest: $speedtest);
 
         $this->info('✅  added manual speedtest to the queue');
 

diff --git a/app/Jobs/ExecSpeedtest.php b/app/Jobs/ExecSpeedtest.php
@@ -33,7 +33,19 @@ public function __construct(
      */
     public function handle()
     {
-        $process = new Process(['speedtest', '--accept-license', '--format=json']);
+        $args = [
+            'speedtest',
+            '--accept-license',
+            '--format=json',
+        ];
+
+        if (! blank($this->speedtest)) {
+            if (! blank($this->speedtest['ookla_server_id'])) {
+                $args = array_merge($args, ['--server-id='.$this->speedtest['ookla_server_id']]);
+            }
+        }
+
+        $process = new Process($args);
         $process->run();
 
         if (! $process->isSuccessful()) {