fix: prevents show & season monitors from completing, forcing them to keep checking for new episodes until removed

src/Monitor/Action/Handler/MonitorTvSeasonHandler.php

@@ -39,6 +39,12 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
         $downloadedEpisodes = $this->mediaFiles
             ->getEpisodes($monitor->getTitle())
             ->map(fn($episode) => (object) (new PTN())->parse($episode))
+            ->filter(fn ($episode) =>
+                property_exists($episode, 'episode')
+                && property_exists($episode, 'season')
+                && null !== $episode->episode
+                && null !== $episode->season
+            )
             ->rekey(fn($episode) => $episode->episode);
         $this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
 
@@ -55,43 +61,42 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
 
             // Dispatch Episode commands for each missing Episode
             foreach ($episodesInSeason as $episode) {
-                $monitorCheck = $this->monitorRepository->findOneBy([
-                    'imdbId' => $monitor->getImdbId(),
-                    'title' => $monitor->getTitle(),
-                    'monitorType' => 'tvepisode',
-                    'season' => $monitor->getSeason(),
-                    'episode' => $episode['episode_number'],
-                    'status' => ['New', 'Active', 'In Progress']
-                ]);
-
-                $this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $monitor->getSeason() . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (null !== $monitorCheck ? 'YES' : 'NO'));
-
-                if (!array_key_exists($episode['episode_number'], $downloadedEpisodes->toArray())
-                    && null === $monitorCheck
-                ) {
-                    $episodeMonitor = (new Monitor())
-                        ->setParent($monitor)
-                        ->setUser($monitor->getUser())
-                        ->setTmdbId($monitor->getTmdbId())
-                        ->setImdbId($monitor->getImdbId())
-                        ->setTitle($monitor->getTitle())
-                        ->setMonitorType('tvepisode')
-                        ->setSeason($monitor->getSeason())
-                        ->setEpisode($episode['episode_number'])
-                        ->setCreatedAt(new DateTimeImmutable())
-                        ->setSearchCount(0)
-                        ->setStatus('New');
-
-                    $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
-                    $this->monitorRepository->getEntityManager()->flush();
-
-                    $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
-                    $this->monitorTvEpisodeHandler->handle($command);
-                    $this->logger->info('> [MonitorTvSeasonHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
+                // Check if the episode is already downloaded
+                $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
+                $this->logger->info('> [MonitorTvSeasonHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
+                if (true === $episodeExists) {
+                    $this->logger->info('> [MonitorTvSeasonHandler] Episode exists for title: ' . $monitor->getTitle() . ', skipping');
+                    continue;
                 }
+
+                // Check for existing monitors
+                $monitorExists = $this->monitorExists($monitor, $episode);
+                $this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $monitorExists ? 'YES' : 'NO'));
+                if (true === $monitorExists) {
+                    $this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for title: ' . $monitor->getTitle() . ', skipping');
+                    continue;
+                }
+
+                $episodeMonitor = (new Monitor())
+                    ->setParent($monitor)
+                    ->setUser($monitor->getUser())
+                    ->setTmdbId($monitor->getTmdbId())
+                    ->setImdbId($monitor->getImdbId())
+                    ->setTitle($monitor->getTitle())
+                    ->setMonitorType('tvepisode')
+                    ->setSeason($monitor->getSeason())
+                    ->setEpisode($episode['episode_number'])
+                    ->setCreatedAt(new DateTimeImmutable())
+                    ->setSearchCount(0)
+                    ->setStatus('New');
+
+                $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
+                $this->monitorRepository->getEntityManager()->flush();
+
+                $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
+                $this->monitorTvEpisodeHandler->handle($command);
+                $this->logger->info('> [MonitorTvSeasonHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
             }
-        } else {
-            $monitor->setStatus('Complete');
         }
 
         $monitor->setLastSearch(new DateTimeImmutable());
@@ -106,4 +111,24 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
             ]
         );
     }
+
+    private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
+    {
+        return $downloadedEpisodes->filter(
+                fn (object $episode) => $episode->episode === $episodeInShow['episode_number']
+                    && $episode->season === $episodeInShow['season_number']
+            )->count() > 0;
+    }
+
+    private function monitorExists(Monitor $monitor, array $episode): bool
+    {
+        return $this->monitorRepository->findOneBy([
+                'imdbId' => $monitor->getImdbId(),
+                'title' => $monitor->getTitle(),
+                'monitorType' => 'tvepisode',
+                'season' => $episode['season_number'],
+                'episode' => $episode['episode_number'],
+                'status' => ['New', 'Active', 'In Progress']
+            ]) !== null;
+    }
 }

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -38,13 +38,21 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         // Check current episodes
         $downloadedEpisodes = $this->mediaFiles
             ->getEpisodes($monitor->getTitle())
-            ->map(fn($episode) => (object) (new PTN())->parse($episode));
+            ->map(fn($episode) => (object) (new PTN())->parse($episode))
+            ->filter(fn ($episode) =>
+                property_exists($episode, 'episode')
+                && property_exists($episode, 'season')
+                && null !== $episode->episode
+                && null !== $episode->season
+            )
+        ;
         $this->logger->info('> [MonitorTvShowHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
 
         // Compare against list from TMDB
         $episodesInShow = Map::from(
             $this->tmdb->tvDetails($monitor->getTmdbId())->episodes
         )->flat(1);
+
         $this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes for title: ' . $monitor->getTitle());
 
         if ($downloadedEpisodes->count() !== $episodesInShow->count()) {
@@ -54,43 +62,44 @@ readonly class MonitorTvShowHandler implements HandlerInterface
 
             // Dispatch Episode commands for each missing Episode
             foreach ($episodesInShow as $episode) {
-                $monitorCheck = $this->monitorRepository->findOneBy([
-                    'imdbId' => $monitor->getImdbId(),
-                    'title' => $monitor->getTitle(),
-                    'monitorType' => 'tvepisode',
-                    'season' => $monitor->getSeason(),
-                    'episode' => $episode['episode_number'],
-                    'status' => ['New', 'Active', 'In Progress']
-                ]);
-
-                $this->logger->info('> [MonitorTvShowHandler] Monitor exists for season ' . $monitor->getSeason() . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (null !== $monitorCheck ? 'YES' : 'NO'));
-
-                if (!array_key_exists($episode['episode_number'], $downloadedEpisodes->toArray())
-                    && null === $monitorCheck
-                ) {
-                    $episodeMonitor = (new Monitor())
-                        ->setParent($monitor)
-                        ->setUser($monitor->getUser())
-                        ->setTmdbId($monitor->getTmdbId())
-                        ->setImdbId($monitor->getImdbId())
-                        ->setTitle($monitor->getTitle())
-                        ->setMonitorType('tvepisode')
-                        ->setSeason($monitor->getSeason())
-                        ->setEpisode($episode['episode_number'])
-                        ->setCreatedAt(new DateTimeImmutable())
-                        ->setSearchCount(0)
-                        ->setStatus('New');
-
-                    $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
-                    $this->monitorRepository->getEntityManager()->flush();
-
-                    $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
-                    $this->monitorTvEpisodeHandler->handle($command);
-                    $this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
+                // Check if the episode is already downloaded
+                $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
+                $this->logger->info('> [MonitorTvShowHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
+                if (true === $episodeExists) {
+                    $this->logger->info('> [MonitorTvShowHandler] Episode exists for title: ' . $monitor->getTitle() . ', skipping');
+                    continue;
                 }
+
+                // Check for existing monitors
+                $monitorExists = $this->monitorExists($monitor, $episode);
+                $this->logger->info('> [MonitorTvShowHandler] Monitor exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $monitorExists ? 'YES' : 'NO'));
+                if (true === $monitorExists) {
+                    $this->logger->info('> [MonitorTvShowHandler] Monitor exists for title: ' . $monitor->getTitle() . ', skipping');
+                    continue;
+                }
+
+                // Create the monitor
+                $episodeMonitor = (new Monitor())
+                    ->setParent($monitor)
+                    ->setUser($monitor->getUser())
+                    ->setTmdbId($monitor->getTmdbId())
+                    ->setImdbId($monitor->getImdbId())
+                    ->setTitle($monitor->getTitle())
+                    ->setMonitorType('tvepisode')
+                    ->setSeason($episode['season_number'])
+                    ->setEpisode($episode['episode_number'])
+                    ->setCreatedAt(new DateTimeImmutable())
+                    ->setSearchCount(0)
+                    ->setStatus('New');
+
+                $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
+                $this->monitorRepository->getEntityManager()->flush();
+
+                // Immediately run the monitor
+                $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
+                $this->monitorTvEpisodeHandler->handle($command);
+                $this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
             }
-        } else {
-            $monitor->setStatus('Complete');
         }
 
         $monitor->setLastSearch(new DateTimeImmutable());
@@ -104,4 +113,24 @@ readonly class MonitorTvShowHandler implements HandlerInterface
             ]
         );
     }
+
+    private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
+    {
+        return $downloadedEpisodes->filter(
+            fn (object $episode) => $episode->episode === $episodeInShow['episode_number']
+                && $episode->season === $episodeInShow['season_number']
+            )->count() > 0;
+    }
+
+    private function monitorExists(Monitor $monitor, array $episode): bool
+    {
+        return $this->monitorRepository->findOneBy([
+                'imdbId' => $monitor->getImdbId(),
+                'title' => $monitor->getTitle(),
+                'monitorType' => 'tvepisode',
+                'season' => $episode['season_number'],
+                'episode' => $episode['episode_number'],
+                'status' => ['New', 'Active', 'In Progress']
+            ]) !== null;
+    }
 }

src/Monitor/Framework/Scheduler/MonitorDispatcher.php

@@ -11,7 +11,7 @@ use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Scheduler\Attribute\AsCronTask;
 
-#[AsCronTask('* * * * *', schedule: 'monitor')]
+#[AsCronTask('0 * * * *', schedule: 'monitor')]
 class MonitorDispatcher
 {
     public function __construct(

src/Twig/Components/MonitorList.php

@@ -48,7 +48,7 @@ final class MonitorList extends AbstractController
         return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
             ->andWhere('m.status IN (:statuses)')
             ->andWhere('(m.title LIKE :term OR m.imdbId LIKE :term OR m.monitorType LIKE :term OR m.status LIKE :term)')
-            ->setParameter('statuses', ['New', 'In Progress'])
+            ->setParameter('statuses', ['New', 'In Progress', 'Active'])
             ->setParameter('term', '%'.$this->term.'%')
             ->orderBy('m.id', 'DESC')
             ->getQuery()

templates/components/Alert.html.twig

@@ -1,7 +1,7 @@
 <li {{ attributes }} id="alert_{{ alert_id }}" class="
   text-white bg-green-950  text-sm min-w-[250px]
   hover:bg-green-900 border border-green-500 px-4 py-3
-  rounded-md z-40"
+  rounded-md"
   role="alert"
 >
     <div class="flex items-center">

templates/components/DownloadListRow.html.twig

@@ -1,4 +1,4 @@
-<tr{{ attributes }} id="ad_download_{{ download.id }}">
+<tr{{ attributes }} class="hover:bg-gray-200" id="ad_download_{{ download.id }}">
     <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 truncate">
         <a href="{{ path('app_search_result', {imdbId: download.imdbId, mediaType: download.mediaType}) }}"
            class="mr-1 hover:underline rounded-md"

templates/components/Header.html.twig

@@ -16,8 +16,8 @@
             </div>
         </div>
     </div>
-    <div {{ turbo_stream_listen(app.session.get('mercure_alert_topic')) }} class="absolute top-10 right-10">
-        <div >
+    <div {{ turbo_stream_listen(app.session.get('mercure_alert_topic')) }} class="fixed z-40 top-10 right-10">
+        <div class="z-40">
             <ul id="alert_list">
             </ul>
         </div>