From 35f1dae5e366c976a414c418daf9abac6eaa741d Mon Sep 17 00:00:00 2001 From: salam Date: Thu, 19 Feb 2026 14:10:20 +0100 Subject: [PATCH] SupervisorMaker new --- app/Actions/SupervisorMaker.php | 34 +++++++++++-------- .../Supervisors/Tables/SupervisorsTable.php | 1 + supervisor/betsapi/p6_bet365_.ini | 4 --- .../logifuture_colombia/p16_odds_soccer.ini | 4 --- .../p17_odds_basketball.ini | 4 --- .../p18_odds_ice_hockey.ini | 4 --- .../logifuture_colombia/p19_odds_tennis.ini | 4 --- .../logifuture_nigera/p12_odds_soccer.ini | 4 --- .../logifuture_nigera/p13_odds_basketball.ini | 4 --- .../logifuture_nigera/p14_odds_ice_hockey.ini | 4 --- .../logifuture_nigera/p15_odds_tennis.ini | 4 --- supervisor/magloo_kenia/p11_odds_.ini | 4 --- supervisor/magloo_nigeria/p9_odds_.ini | 4 --- .../txodds/p20_odds_basketball_0_10.ini | 4 --- .../txodds/p21_odds_ice_hockey_0_10.ini | 4 --- supervisor/txodds/p22_odds_tennis_0_10.ini | 4 --- supervisor/txodds/p2_odds_soccer_0_10.ini | 4 --- 17 files changed, 21 insertions(+), 74 deletions(-) delete mode 100755 supervisor/betsapi/p6_bet365_.ini delete mode 100755 supervisor/logifuture_colombia/p16_odds_soccer.ini delete mode 100755 supervisor/logifuture_colombia/p17_odds_basketball.ini delete mode 100755 supervisor/logifuture_colombia/p18_odds_ice_hockey.ini delete mode 100755 supervisor/logifuture_colombia/p19_odds_tennis.ini delete mode 100755 supervisor/logifuture_nigera/p12_odds_soccer.ini delete mode 100755 supervisor/logifuture_nigera/p13_odds_basketball.ini delete mode 100755 supervisor/logifuture_nigera/p14_odds_ice_hockey.ini delete mode 100755 supervisor/logifuture_nigera/p15_odds_tennis.ini delete mode 100755 supervisor/magloo_kenia/p11_odds_.ini delete mode 100755 supervisor/magloo_nigeria/p9_odds_.ini delete mode 100755 supervisor/txodds/p20_odds_basketball_0_10.ini delete mode 100755 supervisor/txodds/p21_odds_ice_hockey_0_10.ini delete mode 100755 supervisor/txodds/p22_odds_tennis_0_10.ini delete mode 100755 supervisor/txodds/p2_odds_soccer_0_10.ini diff --git a/app/Actions/SupervisorMaker.php b/app/Actions/SupervisorMaker.php index 3264586c..55a8b9e9 100644 --- a/app/Actions/SupervisorMaker.php +++ b/app/Actions/SupervisorMaker.php @@ -4,6 +4,7 @@ namespace App\Actions; use App\Models\Supervisor; use App\Utilities\Notice; +use Illuminate\Filesystem\Filesystem; class SupervisorMaker { @@ -15,23 +16,32 @@ class SupervisorMaker { $supervisors = Supervisor::all(); + $path = base_path().'/supervisor/nuh'; + + if (! is_dir($path)) { + mkdir($path, 0777); + } + + $file = new Filesystem; + $file->cleanDirectory($path); + foreach ($supervisors as $supervisor) { - $dirname = self::fix_string($supervisor->provider->name); - - $path = base_path().'/supervisor/'.strtolower($dirname); - - if (! is_dir($path)) { - mkdir($path, 0777); + $parts = []; + $parts[] = 'p'.$supervisor->id; + $parts[] = $supervisor->sport->name ?? 'all'; + $parts[] = self::fix_string($supervisor->provider->name); + if ($supervisor->name) { + $parts[] = self::fix_string($supervisor->name); } - $sport = self::fix_string($supervisor->sport?->name) ?? 'all'; - $process = 'p'.$supervisor->id.'_'.self::fix_string($supervisor->name).'_'.$sport; if ($supervisor->days_to) { - $process .= '_'.$supervisor->days_from; - $process .= '_'.$supervisor->days_to; + $parts[] = 'day'.$supervisor->days_from; + $parts[] = 'day'.$supervisor->days_to; } + $process = strtolower(implode('_', $parts)); + $content = '[program:'.$process.']'.PHP_EOL; if ($supervisor->commandline_options != '') { $content .= 'command=/usr/bin/php '.base_path().'/artisan nuh '.$supervisor->id.' '.$supervisor->commandline_options.PHP_EOL; @@ -45,10 +55,6 @@ class SupervisorMaker if ($supervisor->is_active && $supervisor->is_supervisor) { file_put_contents($file, $content); chmod($file, 0777); - } else { - if (is_file($file)) { - unlink($file); - } } } diff --git a/app/Filament/Resources/Supervisors/Tables/SupervisorsTable.php b/app/Filament/Resources/Supervisors/Tables/SupervisorsTable.php index 0d4b90c1..b5307543 100644 --- a/app/Filament/Resources/Supervisors/Tables/SupervisorsTable.php +++ b/app/Filament/Resources/Supervisors/Tables/SupervisorsTable.php @@ -137,6 +137,7 @@ class SupervisorsTable }), TextInputColumn::make('sleep')->prefix('Seep'), TextInputColumn::make('commandline_options')->prefix('Bash') + ->tooltip('command used in supervisor script') ->hidden(function (ListSupervisors $livewire) { return $livewire->tableFilters['provider_id']['value'] == 8; }), diff --git a/supervisor/betsapi/p6_bet365_.ini b/supervisor/betsapi/p6_bet365_.ini deleted file mode 100755 index f93890c0..00000000 --- a/supervisor/betsapi/p6_bet365_.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p6_bet365_] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 6 -autostart=true -autorestart=true diff --git a/supervisor/logifuture_colombia/p16_odds_soccer.ini b/supervisor/logifuture_colombia/p16_odds_soccer.ini deleted file mode 100755 index 94375c22..00000000 --- a/supervisor/logifuture_colombia/p16_odds_soccer.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p16_odds_soccer] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 16 -autostart=true -autorestart=true diff --git a/supervisor/logifuture_colombia/p17_odds_basketball.ini b/supervisor/logifuture_colombia/p17_odds_basketball.ini deleted file mode 100755 index 7984bf5f..00000000 --- a/supervisor/logifuture_colombia/p17_odds_basketball.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p17_odds_basketball] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 17 -autostart=true -autorestart=true diff --git a/supervisor/logifuture_colombia/p18_odds_ice_hockey.ini b/supervisor/logifuture_colombia/p18_odds_ice_hockey.ini deleted file mode 100755 index 6af4c78b..00000000 --- a/supervisor/logifuture_colombia/p18_odds_ice_hockey.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p18_odds_ice_hockey] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 18 -autostart=true -autorestart=true diff --git a/supervisor/logifuture_colombia/p19_odds_tennis.ini b/supervisor/logifuture_colombia/p19_odds_tennis.ini deleted file mode 100755 index 8f5bd711..00000000 --- a/supervisor/logifuture_colombia/p19_odds_tennis.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p19_odds_tennis] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 19 -autostart=true -autorestart=true diff --git a/supervisor/logifuture_nigera/p12_odds_soccer.ini b/supervisor/logifuture_nigera/p12_odds_soccer.ini deleted file mode 100755 index cdc71b38..00000000 --- a/supervisor/logifuture_nigera/p12_odds_soccer.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p12_odds_soccer] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 12 -autostart=true -autorestart=true diff --git a/supervisor/logifuture_nigera/p13_odds_basketball.ini b/supervisor/logifuture_nigera/p13_odds_basketball.ini deleted file mode 100755 index f30e38f8..00000000 --- a/supervisor/logifuture_nigera/p13_odds_basketball.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p13_odds_basketball] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 13 -autostart=true -autorestart=true diff --git a/supervisor/logifuture_nigera/p14_odds_ice_hockey.ini b/supervisor/logifuture_nigera/p14_odds_ice_hockey.ini deleted file mode 100755 index 4ef53d59..00000000 --- a/supervisor/logifuture_nigera/p14_odds_ice_hockey.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p14_odds_ice_hockey] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 14 -autostart=true -autorestart=true diff --git a/supervisor/logifuture_nigera/p15_odds_tennis.ini b/supervisor/logifuture_nigera/p15_odds_tennis.ini deleted file mode 100755 index ae0d7582..00000000 --- a/supervisor/logifuture_nigera/p15_odds_tennis.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p15_odds_tennis] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 15 -autostart=true -autorestart=true diff --git a/supervisor/magloo_kenia/p11_odds_.ini b/supervisor/magloo_kenia/p11_odds_.ini deleted file mode 100755 index 5c3d7f46..00000000 --- a/supervisor/magloo_kenia/p11_odds_.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p11_odds_] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 11 -autostart=true -autorestart=true diff --git a/supervisor/magloo_nigeria/p9_odds_.ini b/supervisor/magloo_nigeria/p9_odds_.ini deleted file mode 100755 index b6445659..00000000 --- a/supervisor/magloo_nigeria/p9_odds_.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p9_odds_] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 9 -autostart=true -autorestart=true diff --git a/supervisor/txodds/p20_odds_basketball_0_10.ini b/supervisor/txodds/p20_odds_basketball_0_10.ini deleted file mode 100755 index bdc9a615..00000000 --- a/supervisor/txodds/p20_odds_basketball_0_10.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p20_odds_basketball_0_10] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 20 -autostart=true -autorestart=true diff --git a/supervisor/txodds/p21_odds_ice_hockey_0_10.ini b/supervisor/txodds/p21_odds_ice_hockey_0_10.ini deleted file mode 100755 index dd6f78fb..00000000 --- a/supervisor/txodds/p21_odds_ice_hockey_0_10.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p21_odds_ice_hockey_0_10] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 21 -autostart=true -autorestart=true diff --git a/supervisor/txodds/p22_odds_tennis_0_10.ini b/supervisor/txodds/p22_odds_tennis_0_10.ini deleted file mode 100755 index 18d0f1f1..00000000 --- a/supervisor/txodds/p22_odds_tennis_0_10.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p22_odds_tennis_0_10] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 22 -autostart=true -autorestart=true diff --git a/supervisor/txodds/p2_odds_soccer_0_10.ini b/supervisor/txodds/p2_odds_soccer_0_10.ini deleted file mode 100755 index d9857943..00000000 --- a/supervisor/txodds/p2_odds_soccer_0_10.ini +++ /dev/null @@ -1,4 +0,0 @@ -[program:p2_odds_soccer_0_10] -command=/usr/bin/php /Users/salam/Sites/nuhodds_fi4/artisan nuh 2 -autostart=true -autorestart=true