Add playlist and epg reset to queue reset action; rollback m3u processing change

Author: sparkison

app/Filament/Pages/CustomDashboard.php

@@ -23,7 +23,7 @@ protected function getActions(): array
                     Notification::make()
                         ->success()
                         ->title('Queue reset')
-                        ->body('The queue workers have been restarted and any pending jobs flushed. You may need to reset the status of your Playlist or EPG if it\'s stuck in a "Processing" state.')
+                        ->body('The queue workers have been restarted and any pending jobs flushed. You may need to manually sync any Playlists or EPGs that were in progress.')
                         ->duration(10000)
                         ->send();
                 })
@@ -32,8 +32,8 @@ protected function getActions(): array
                 ->requiresConfirmation()
                 ->icon('heroicon-o-exclamation-triangle')
                 ->modalIcon('heroicon-o-exclamation-triangle')
-                ->modalDescription('Resetting the queue will restart the queue workers and flush any pending jobs. You may need to reset the status of your Playlist or EPG if it\'s stuck in a "Processing" state.')
-                ->modalSubmitActionLabel('Yes, reset now')
+                ->modalDescription('Resetting the queue will restart the queue workers and flush any pending jobs. Any syncs or background processes will be stopped and removed. Only perform this action if you are having sync issues.')
+                ->modalSubmitActionLabel('I understand, reset now')
         ];
     }
 }

app/Filament/Pages/Preferences.php

@@ -30,9 +30,6 @@ public function form(Form $form): Form
                                 'left' => 'Left',
                                 'top' => 'Top',
                             ]),
-                        Forms\Components\Toggle::make('show_jobs_navigation')
-                            ->label('Show jobs navigation')
-                            ->helperText('View jobs and job status for background tasks'),
                         Forms\Components\Toggle::make('show_breadcrumbs')
                             ->label('Show breadcrumbs')
                             ->helperText('Show breadcrumbs under the page titles'),

app/Filament/Resources/QueueMonitorResource.php

@@ -2,6 +2,11 @@
 
 namespace App\Jobs;
 
+use App\Enums\EpgStatus;
+use App\Enums\PlaylistStatus;
+use App\Models\Epg;
+use App\Models\EpgMap;
+use App\Models\Playlist;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Support\Facades\Artisan;
@@ -24,7 +29,40 @@ public function __construct()
     public function handle(): void
     {
         try {
+            // Restart the queue and flush any pending jobs
             Artisan::call('app:restart-queue');
+
+            // Reset Playlist and EPGs that were in a processing state
+            Playlist::where('status', PlaylistStatus::Processing)
+                ->orWhere('processing', true)
+                ->update([
+                    'status' => PlaylistStatus::Pending,
+                    'processing' => false,
+                    'progress' => 0,
+                    'channels' => 0,
+                    'synced' => null,
+                    'errors' => null,
+                ]);
+            Epg::where('status', EpgStatus::Processing)
+                ->orWhere('processing', true)
+                ->update([
+                    'status' => EpgStatus::Pending,
+                    'processing' => false,
+                    'progress' => 0,
+                    'synced' => null,
+                    'errors' => null,
+                ]);
+
+            // Update EPG Maps
+            EpgMap::where('status', EpgStatus::Processing)
+                ->orWhere('processing', true)
+                ->update([
+                    'status' => EpgStatus::Failed,
+                    'processing' => false,
+                    'progress' => 0,
+                    'synced' => null,
+                    'errors' => 'The EPG mapping process was interrupted and has been marked as failed.',
+                ]);
         } catch (\Exception $e) {
             // Ignore
         }

app/Jobs/RestartQueue.php

@@ -24,7 +24,6 @@
 use Illuminate\Session\Middleware\StartSession;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
-use \Croustibat\FilamentJobsMonitor\FilamentJobsMonitorPlugin;
 use Filament\Support\Enums\MaxWidth;
 use Hydrat\TableLayoutToggle\TableLayoutTogglePlugin;
 use Devonab\FilamentEasyFooter\EasyFooterPlugin;
@@ -85,8 +84,6 @@ public function panel(Panel $panel): Panel
                 DiscordWidget::class,
             ])
             ->plugins([
-                FilamentJobsMonitorPlugin::make()
-                    ->enableNavigation($settings['show_jobs_navigation'] ?? false),
                 TableLayoutTogglePlugin::make(),
                 EasyFooterPlugin::make()
                     ->withBorder()

app/Providers/Filament/AdminPanelProvider.php

@@ -28,7 +28,7 @@ public function boot(): void
     protected function gate(): void
     {
         Gate::define('viewHorizon', function ($user) {
-            return app()->environment('local');
+            return true;
         });
     }
 }

app/Providers/HorizonServiceProvider.php

@@ -9,7 +9,6 @@ class GeneralSettings extends Settings
 {
     public ?string $navigation_position = 'left';
     public ?bool $show_breadcrumbs = true;
-    public ?bool $show_jobs_navigation = false;
     public ?string $content_width = MaxWidth::ScreenExtraLarge->value;
 
     public ?string $playlist_agent_string = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.13) Gecko/20080311 Firefox/2.0.0.13';

app/Settings/GeneralSettings.php

@@ -3,11 +3,13 @@
     "name": "laravel/laravel",
     "type": "project",
     "description": "The skeleton application for the Laravel framework.",
-    "keywords": ["laravel", "framework"],
+    "keywords": [
+        "laravel",
+        "framework"
+    ],
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "croustibat/filament-jobs-monitor": "^2.5",
         "devonab/filament-easy-footer": "^1.0",
         "dragonmantank/cron-expression": "^3.4",
         "filament/filament": "^3.2",
@@ -18,6 +20,7 @@
         "laravel/octane": "^2.6",
         "laravel/reverb": "^1.0",
         "laravel/tinker": "^2.9",
+        "opcodesio/log-viewer": "^3.15",
         "predis/predis": "^2.3",
         "ryangjchandler/filament-progress-column": "^1.0",
         "sparkison/m3u-parser": "dev-master",