fix: media files -> episodeExists()

assets/styles/app.css

@@ -10,6 +10,9 @@
     h2 {
         font-size: var(--text-xl);
     }
+    .rounded-ms {
+        border-radius: 0.275rem;
+    }
 }
 
 /* Prevent scrolling while dialog is open */

composer.json

@@ -24,6 +24,7 @@
         "php-tmdb/api": "^4.1",
         "predis/predis": "^2.4",
         "runtime/frankenphp-symfony": "^0.2.0",
+        "stof/doctrine-extensions-bundle": "^1.14",
         "symfony/asset": "7.3.*",
         "symfony/console": "7.3.*",
         "symfony/doctrine-messenger": "7.3.*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c519733202d45f8fb3a4f5b8e7dfb95b",
+    "content-hash": "55c76ae7fe5ad6e5c7edbb0150987fc7",
     "packages": [
         {
             "name": "1tomany/rich-bundle",
@@ -117,6 +117,56 @@
             },
             "time": "2025-03-05T09:16:18+00:00"
         },
+        {
+            "name": "behat/transliterator",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Transliterator.git",
+                "reference": "baac5873bac3749887d28ab68e2f74db3a4408af"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/baac5873bac3749887d28ab68e2f74db3a4408af",
+                "reference": "baac5873bac3749887d28ab68e2f74db3a4408af",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "require-dev": {
+                "chuyskywalker/rolling-curl": "^3.1",
+                "php-yaoi/php-yaoi": "^1.0",
+                "phpunit/phpunit": "^8.5.25 || ^9.5.19"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Behat\\Transliterator\\": "src/Behat/Transliterator"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Artistic-1.0"
+            ],
+            "description": "String transliterator",
+            "keywords": [
+                "i18n",
+                "slug",
+                "transliterator"
+            ],
+            "support": {
+                "issues": "https://github.com/Behat/Transliterator/issues",
+                "source": "https://github.com/Behat/Transliterator/tree/v1.5.0"
+            },
+            "abandoned": true,
+            "time": "2022-03-30T09:27:43+00:00"
+        },
         {
             "name": "carbonphp/carbon-doctrine-types",
             "version": "2.1.0",
@@ -1768,6 +1818,136 @@
             ],
             "time": "2024-10-09T13:47:03+00:00"
         },
+        {
+            "name": "gedmo/doctrine-extensions",
+            "version": "v3.20.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine-extensions/DoctrineExtensions.git",
+                "reference": "ea1d37586b8e4bae2a815feb38b177894b12c44c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine-extensions/DoctrineExtensions/zipball/ea1d37586b8e4bae2a815feb38b177894b12c44c",
+                "reference": "ea1d37586b8e4bae2a815feb38b177894b12c44c",
+                "shasum": ""
+            },
+            "require": {
+                "behat/transliterator": "^1.2",
+                "doctrine/collections": "^1.2 || ^2.0",
+                "doctrine/deprecations": "^1.0",
+                "doctrine/event-manager": "^1.2 || ^2.0",
+                "doctrine/persistence": "^2.2 || ^3.0 || ^4.0",
+                "php": "^7.4 || ^8.0",
+                "psr/cache": "^1 || ^2 || ^3",
+                "psr/clock": "^1",
+                "symfony/cache": "^5.4 || ^6.0 || ^7.0"
+            },
+            "conflict": {
+                "doctrine/annotations": "<1.13 || >=3.0",
+                "doctrine/common": "<2.13 || >=4.0",
+                "doctrine/dbal": "<3.7 || >=5.0",
+                "doctrine/mongodb-odm": "<2.3 || >=3.0",
+                "doctrine/orm": "<2.20 || >=3.0 <3.3 || >=4.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^1.13 || ^2.0",
+                "doctrine/cache": "^1.11 || ^2.0",
+                "doctrine/common": "^2.13 || ^3.0",
+                "doctrine/dbal": "^3.7 || ^4.0",
+                "doctrine/doctrine-bundle": "^2.3",
+                "doctrine/mongodb-odm": "^2.3",
+                "doctrine/orm": "^2.20 || ^3.3",
+                "friendsofphp/php-cs-fixer": "^3.70",
+                "nesbot/carbon": "^2.71 || ^3.0",
+                "phpstan/phpstan": "^2.1.1",
+                "phpstan/phpstan-doctrine": "^2.0.1",
+                "phpstan/phpstan-phpunit": "^2.0.3",
+                "phpunit/phpunit": "^9.6",
+                "rector/rector": "^2.0.6",
+                "symfony/console": "^5.4 || ^6.0 || ^7.0",
+                "symfony/doctrine-bridge": "^5.4 || ^6.0 || ^7.0",
+                "symfony/phpunit-bridge": "^6.0 || ^7.0",
+                "symfony/uid": "^5.4 || ^6.0 || ^7.0",
+                "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
+            },
+            "suggest": {
+                "doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM",
+                "doctrine/orm": "to use the extensions with the ORM"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Gedmo\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gediminas Morkevicius",
+                    "email": "gediminas.morkevicius@gmail.com"
+                },
+                {
+                    "name": "Gustavo Falco",
+                    "email": "comfortablynumb84@gmail.com"
+                },
+                {
+                    "name": "David Buchmann",
+                    "email": "david@liip.ch"
+                }
+            ],
+            "description": "Doctrine behavioral extensions",
+            "homepage": "http://gediminasm.org/",
+            "keywords": [
+                "Blameable",
+                "behaviors",
+                "doctrine",
+                "extensions",
+                "gedmo",
+                "loggable",
+                "nestedset",
+                "odm",
+                "orm",
+                "sluggable",
+                "sortable",
+                "timestampable",
+                "translatable",
+                "tree",
+                "uploadable"
+            ],
+            "support": {
+                "docs": "https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc",
+                "issues": "https://github.com/doctrine-extensions/DoctrineExtensions/issues",
+                "source": "https://github.com/doctrine-extensions/DoctrineExtensions/tree/v3.20.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/l3pp4rd",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/mbabker",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phansys",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/stof",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-04-04T17:19:27+00:00"
+        },
         {
             "name": "lcobucci/jwt",
             "version": "5.5.0",
@@ -3401,6 +3581,87 @@
             ],
             "time": "2023-12-12T12:06:11+00:00"
         },
+        {
+            "name": "stof/doctrine-extensions-bundle",
+            "version": "v1.14.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/stof/StofDoctrineExtensionsBundle.git",
+                "reference": "bdf3eb10baeb497ac5985b8f78a6cf55862c2662"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/bdf3eb10baeb497ac5985b8f78a6cf55862c2662",
+                "reference": "bdf3eb10baeb497ac5985b8f78a6cf55862c2662",
+                "shasum": ""
+            },
+            "require": {
+                "gedmo/doctrine-extensions": "^3.20.0",
+                "php": "^8.1",
+                "symfony/cache": "^6.4 || ^7.0",
+                "symfony/config": "^6.4 || ^7.0",
+                "symfony/dependency-injection": "^6.4 || ^7.0",
+                "symfony/event-dispatcher": "^6.4 || ^7.0",
+                "symfony/http-kernel": "^6.4 || ^7.0",
+                "symfony/translation-contracts": "^2.5 || ^3.5"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-deprecation-rules": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpstan/phpstan-symfony": "^2.0",
+                "symfony/mime": "^6.4 || ^7.0",
+                "symfony/phpunit-bridge": "^v6.4.1 || ^7.0.1",
+                "symfony/security-core": "^6.4 || ^7.0"
+            },
+            "suggest": {
+                "doctrine/doctrine-bundle": "to use the ORM extensions",
+                "doctrine/mongodb-odm-bundle": "to use the MongoDB ODM extensions",
+                "symfony/mime": "To use the Mime component integration for Uploadable"
+            },
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Stof\\DoctrineExtensionsBundle\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christophe Coevoet",
+                    "email": "stof@notk.org"
+                }
+            ],
+            "description": "Integration of the gedmo/doctrine-extensions with Symfony",
+            "homepage": "https://github.com/stof/StofDoctrineExtensionsBundle",
+            "keywords": [
+                "behaviors",
+                "doctrine2",
+                "extensions",
+                "gedmo",
+                "loggable",
+                "nestedset",
+                "sluggable",
+                "sortable",
+                "timestampable",
+                "translatable",
+                "tree"
+            ],
+            "support": {
+                "issues": "https://github.com/stof/StofDoctrineExtensionsBundle/issues",
+                "source": "https://github.com/stof/StofDoctrineExtensionsBundle/tree/v1.14.0"
+            },
+            "time": "2025-05-01T08:00:32+00:00"
+        },
         {
             "name": "symfony/asset",
             "version": "v7.3.0",

config/bundles.php

@@ -18,4 +18,5 @@ return [
     Symfony\UX\Turbo\TurboBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
+    Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
 ];

config/packages/stof_doctrine_extensions.yaml

@@ -0,0 +1,7 @@
+# Read the documentation: https://symfony.com/doc/current/bundles/StofDoctrineExtensionsBundle/index.html
+# See the official DoctrineExtensions documentation for more details: https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc
+stof_doctrine_extensions:
+  default_locale: en_US
+  orm:
+    default:
+      timestampable: true

deploy.compose.yml

@@ -6,6 +6,7 @@ services:
     environment:
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
       MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+    tty: true
     deploy:
       replicas: 2
     volumes:

migrations/Version20250610195448.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250610195448 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE download ADD created_at DATETIME NULL, ADD updated_at DATETIME NULL
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE download DROP created_at, DROP updated_at
+        SQL);
+    }
+}

migrations/Version20250610222503.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250610222503 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE monitor ADD parent_id INT DEFAULT NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE monitor ADD CONSTRAINT FK_E1159985727ACA70 FOREIGN KEY (parent_id) REFERENCES monitor (id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_E1159985727ACA70 ON monitor (parent_id)
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE monitor DROP FOREIGN KEY FK_E1159985727ACA70
+        SQL);
+        $this->addSql(<<<'SQL'
+            DROP INDEX IDX_E1159985727ACA70 ON monitor
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE monitor DROP parent_id
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE download CHANGE created_at created_at DATETIME DEFAULT NULL, CHANGE updated_at updated_at DATETIME DEFAULT NULL
+        SQL);
+    }
+}

src/Download/Framework/Entity/Download.php

@@ -3,10 +3,9 @@
 namespace App\Download\Framework\Entity;
 
 use App\Download\Framework\Repository\DownloadRepository;
-use App\Torrentio\Result\ResultFactory;
-use App\Torrentio\Result\TorrentioResult;
 use App\User\Framework\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
+use Gedmo\Timestampable\Traits\TimestampableEntity;
 use Nihilarr\PTN;
 use Symfony\UX\Turbo\Attribute\Broadcast;
 
@@ -14,6 +13,8 @@ use Symfony\UX\Turbo\Attribute\Broadcast;
 #[Broadcast(template: 'broadcast/Download.stream.html.twig')]
 class Download
 {
+    use TimestampableEntity;
+
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column]

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -5,10 +5,13 @@ namespace App\Monitor\Action\Handler;
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Result\MonitorMovieResult;
+use App\Monitor\Action\Result\MonitorTvEpisodeResult;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Service\MonitorOptionEvaluator;
+use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
+use Carbon\Carbon;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use OneToMany\RichBundle\Contract\CommandInterface;
@@ -27,12 +30,26 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
+        private Tmdb $tmdb,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
         $this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler');
         $monitor = $this->monitorRepository->find($command->movieMonitorId);
+
+        $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
+        if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::now()) {
+            $this->logger->info('> [MonitorTvEpisodeHandler] Episode has not aired yet, skipping for now');
+            return new MonitorTvEpisodeResult(
+                status: 'OK',
+                result: [
+                    'message' => 'No change',
+                    'monitor' => $monitor,
+                ]
+            );
+        }
+
         $monitor->setStatus('In Progress');
         $this->monitorRepository->getEntityManager()->flush();
 
@@ -71,7 +88,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
         $this->entityManager->flush();
 
-        return new MonitorMovieResult(
+        return new MonitorTvEpisodeResult(
             status: 'OK',
             result: [
                 'monitor' => $monitor,

src/Monitor/Action/Handler/MonitorTvSeasonHandler.php

@@ -3,9 +3,9 @@
 namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
-use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
-use App\Monitor\Action\Result\MonitorMovieResult;
+use App\Monitor\Action\Command\MonitorTvSeasonCommand;
+use App\Monitor\Action\Result\MonitorTvSeasonResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Service\MediaFiles;
@@ -17,16 +17,14 @@ use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
 
-/** @implements HandlerInterface<MonitorMovieCommand> */
+/** @implements HandlerInterface<MonitorTvSeasonCommand> */
 readonly class MonitorTvSeasonHandler implements HandlerInterface
 {
     public function __construct(
         private MonitorRepository $monitorRepository,
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
-        private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private Tmdb $tmdb,
         private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
@@ -41,33 +39,46 @@ 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());
 
         // Compare against list from TMDB
         $episodesInSeason = Map::from(
-            $this->tmdb->tvDetails($monitor->getTmdbId())
-                ->episodes[$monitor->getSeason()]
+            $this->tmdb->tvDetails($monitor->getTmdbId())->episodes[$monitor->getSeason()]
         )->rekey(fn($episode) => $episode['episode_number']);
         $this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($episodesInSeason) . ' episodes in season ' . $monitor->getSeason() . ' for title: ' . $monitor->getTitle());
 
-        // 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']
-            ]);
+        if ($downloadedEpisodes->count() !== $episodesInSeason->count()) {
+            // Since $monitor has children monitors, set the status
+            // to Active, so it will be re-executed.
+            $monitor->setStatus('Active');
 
-            $this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $monitor->getSeason() . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (null !== $monitorCheck ? 'YES' : 'NO'));
+            // Dispatch Episode commands for each missing Episode
+            foreach ($episodesInSeason as $episode) {
+                // 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;
+                }
 
-            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())
@@ -90,14 +101,34 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
 
         $monitor->setLastSearch(new DateTimeImmutable());
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
-        $monitor->setStatus('Complete');
+
         $this->entityManager->flush();
 
-        return new MonitorMovieResult(
+        return new MonitorTvSeasonResult(
             status: 'OK',
             result: [
                 'monitor' => $monitor,
             ]
         );
     }
+
+    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

@@ -5,7 +5,7 @@ namespace App\Monitor\Action\Handler;
 use Aimeos\Map;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
-use App\Monitor\Action\Result\MonitorTvEpisodeResult;
+use App\Monitor\Action\Result\MonitorTvShowResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Service\MediaFiles;
@@ -17,7 +17,6 @@ use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
 
 /** @implements HandlerInterface<MonitorMovieCommand> */
 readonly class MonitorTvShowHandler implements HandlerInterface
@@ -25,8 +24,8 @@ readonly class MonitorTvShowHandler implements HandlerInterface
     public function __construct(
         private MonitorRepository $monitorRepository,
         private EntityManagerInterface $entityManager,
+        private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
         private MediaFiles $mediaFiles,
-        private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private Tmdb $tmdb,
     ) {}
@@ -39,55 +38,99 @@ 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
+            $this->tmdb->tvDetails($monitor->getTmdbId())->episodes
         )->flat(1);
-        $this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes in season ' . $monitor->getSeason() . ' for title: ' . $monitor->getTitle());
 
-        // Dispatch Episode commands for each missing Episode
-        foreach ($episodesInShow as $episode) {
-            $episodeAlreadyDownloaded = $downloadedEpisodes->find(
-                fn($ep) => $ep->episode === $episode['episode_number'] && $ep->season === $episode['season_number']
-            );
-            $episodeAlreadyDownloaded = !is_null($episodeAlreadyDownloaded);
+        $this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes for title: ' . $monitor->getTitle());
 
-            if (false === $episodeAlreadyDownloaded) {
-                $monitor = (new Monitor())
+        if ($downloadedEpisodes->count() !== $episodesInShow->count()) {
+            // Since $monitor has children monitors, set the status
+            // to Active, so it will be re-executed.
+            $monitor->setStatus('Active');
+
+            // Dispatch Episode commands for each missing Episode
+            foreach ($episodesInShow as $episode) {
+                // 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('tvshow')
+                    ->setMonitorType('tvepisode')
                     ->setSeason($episode['season_number'])
                     ->setEpisode($episode['episode_number'])
                     ->setCreatedAt(new DateTimeImmutable())
                     ->setSearchCount(0)
                     ->setStatus('New');
 
-                $this->monitorRepository->getEntityManager()->persist($monitor);
+                $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
                 $this->monitorRepository->getEntityManager()->flush();
 
-                $command = new MonitorTvEpisodeCommand($monitor->getId());
-                $this->bus->dispatch($command);
-                $this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode() . ' for title: ' . $monitor->getTitle());
+                // 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());
             }
         }
 
         $monitor->setLastSearch(new DateTimeImmutable());
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
-        $monitor->setStatus('Complete');
         $this->entityManager->flush();
 
-        return new MonitorTvEpisodeResult(
+        return new MonitorTvShowResult(
             status: 'OK',
             result: [
                 'monitor' => $monitor,
             ]
         );
     }
+
+    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/Result/MonitorTvSeasonResult.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Monitor\Action\Result;
+
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+class MonitorTvSeasonResult implements ResultInterface
+{
+    public function __construct(
+        public string $status,
+        public array $result,
+    ) {}
+}

src/Monitor/Action/Result/MonitorTvShowResult.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Monitor\Action\Result;
+
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+class MonitorTvShowResult implements ResultInterface
+{
+    public function __construct(
+        public string $status,
+        public array $result,
+    ) {}
+}

src/Monitor/Framework/Entity/Monitor.php

@@ -4,6 +4,8 @@ namespace App\Monitor\Framework\Entity;
 
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\User\Framework\Entity\User;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Ignore;
@@ -56,6 +58,17 @@ class Monitor
     #[ORM\Column(nullable: true)]
     private ?\DateTimeImmutable $downloadedAt = null;
 
+    #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
+    private ?self $parent = null;
+
+    #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')]
+    private Collection $children;
+
+    public function __construct()
+    {
+        $this->children = new ArrayCollection();
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -204,4 +217,46 @@ class Monitor
 
         return $this;
     }
+
+    public function getParent(): ?self
+    {
+        return $this->parent;
+    }
+
+    public function setParent(?self $parent): static
+    {
+        $this->parent = $parent;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, self>
+     */
+    public function getChildren(): Collection
+    {
+        return $this->children;
+    }
+
+    public function addChild(self $child): static
+    {
+        if (!$this->children->contains($child)) {
+            $this->children->add($child);
+            $child->setParent($this);
+        }
+
+        return $this;
+    }
+
+    public function removeChild(self $child): static
+    {
+        if ($this->children->removeElement($child)) {
+            // set the owning side to null (unless already changed)
+            if ($child->getParent() === $this) {
+                $child->setParent(null);
+            }
+        }
+
+        return $this;
+    }
 }

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/Monitor/Service/MediaFiles.php

@@ -152,7 +152,7 @@ class MediaFiles
         foreach ($existingEpisodes as $episode) {
             $ptn = (object) (new PTN())->parse($episode->getFilename());
 
-            if (!property_exists($episode, 'season') || !property_exists($episode, 'episode')) {
+            if (!property_exists($ptn, 'season') || !property_exists($ptn, 'episode')) {
                 continue;
             }
 

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()

symfony.lock

@@ -74,6 +74,18 @@
             "phpstan.dist.neon"
         ]
     },
+    "stof/doctrine-extensions-bundle": {
+        "version": "1.14",
+        "recipe": {
+            "repo": "github.com/symfony/recipes-contrib",
+            "branch": "main",
+            "version": "1.2",
+            "ref": "e805aba9eff5372e2d149a9ff56566769e22819d"
+        },
+        "files": [
+            "config/packages/stof_doctrine_extensions.yaml"
+        ]
+    },
     "symfony/asset-mapper": {
         "version": "7.2",
         "recipe": {

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/DownloadList.html.twig

@@ -3,7 +3,7 @@
 
     {% if this.isWidget == false %}
         <div class="flex flex-row mb-2 justify-end">
-            <twig:DownloadSearch search_path="app_search" placeholder="Find one of your downloads..." />
+            <twig:DownloadSearch search_path="app_search" placeholder="Find {{ type == "complete" ? "a" : "an" }} {{ type }} download..." />
         </div>
     {% endif %}
 

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/DownloadSearch.html.twig

@@ -10,6 +10,9 @@
                          shadow-sm focus:shadow"
                     placeholder="{{ placeholder ?? 'TV Show, Movie...' }}"
             />
+
+            <twig:ux:icon name="codex:loader" height="20" width="20" data-loading-icon-target="icon" data-loading="removeClass(hidden)" class="absolute top-2 right-16 text-orange-500 hidden text-end" />
+
             <button
                     class="absolute top-1 right-1 flex items-center
                     bg-green-600 py-1 px-2  text-center
@@ -17,8 +20,7 @@
                     focus:bg-green-700 active:bg-green-700 hover:bg-green-700
 
                     text-white bg-green-600 text-xs
-                     rounded-sm
-                    bg-opacity-80
+                    rounded-ms bg-opacity-80
 "
                     onclick="return false;"
             >

templates/components/Filter.html.twig

@@ -73,8 +73,7 @@
             {#                        </label>#}
         {% endif %}
         <span {{ stimulus_controller('loading_icon', {total: (results.media.mediaType == "tvshows") ? results.media.episodes[1]|length : 1, count: 0}) }}
-            class="loading-icon"
-        >
+            class="loading-icon">
             <twig:ux:icon name="codex:loader" height="20" width="20" data-loading-icon-target="icon" class="text-end" />
         </span>
     </div>

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>

templates/components/MonitorList.html.twig

@@ -1,7 +1,7 @@
 <div{{ attributes.defaults(stimulus_controller('monitor_list')) }}>
     {% if this.isWidget == false %}
         <div class="flex flex-row mb-2 justify-end">
-            <twig:DownloadSearch search_path="app_search" placeholder="Find one of your monitors..." />
+            <twig:DownloadSearch search_path="app_search" placeholder="Find {{ type == "complete" ? "a" : "an" }} {{ type }} monitor..." />
         </div>
     {% endif %}
     <table id="monitor_list" class="divide-y divide-gray-200 bg-gray-50 overflow-hidden rounded-lg table-auto w-full" {{ turbo_stream_listen('App\\Monitor\\Framework\\Entity\\Monitor') }}>