fix: monitor checks if episode was released after monitor created

assets/controllers/result_filter_controller.js

@@ -20,7 +20,7 @@ export default class extends Controller {
         "provider": "",
     }
 
-    static outlets = ['movie-results', 'tv-results']
+    static outlets = ['movie-results', 'tv-results', 'tv-episode-list']
     static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'selectAll', 'downloadSelected']
     static values = {
         'media-type': String,
@@ -127,6 +127,10 @@ export default class extends Controller {
         }
     }
 
+    setSeason(event) {
+        this.tvEpisodeListOutlet.setSeason(event.target.value);
+    }
+
     uncheckSelectAllBtn() {
         this.selectAllTarget.checked = false;
     }

assets/controllers/tv_episode_list_controller.js

@@ -0,0 +1,51 @@
+import { Controller } from '@hotwired/stimulus';
+import { getComponent } from '@symfony/ux-live-component';
+
+/*
+* The following line makes this controller "lazy": it won't be downloaded until needed
+* See https://symfony.com/bundles/StimulusBundle/current/index.html#lazy-stimulus-controllers
+*/
+
+/* stimulusFetch: 'lazy' */
+export default class extends Controller {
+
+    async initialize() {
+        this.component = await getComponent(this.element);
+        this.component.on('render:finished', (component) => {
+            console.log(component);
+        });
+    }
+
+    setSeason(season) {
+        this.element.querySelectorAll(".episode-container").forEach(element => element.remove());
+        this.component.set('pageNumber', 1);
+        this.component.set('season', parseInt(season));
+        this.component.render();
+    }
+
+    paginate(event) {
+        this.element.querySelectorAll(".episode-container").forEach(element => element.remove());
+        this.component.action('paginate', {page: event.params.page});
+        this.component.render();
+    }
+
+    connect() {
+        // Called every time the controller is connected to the DOM
+        // (on page load, when it's added to the DOM, moved in the DOM, etc.)
+
+        // Here you can add event listeners on the element or target elements,
+        // add or remove classes, attributes, dispatch custom events, etc.
+        // this.fooTarget.addEventListener('click', this._fooBar)
+    }
+
+    // Add custom controller actions here
+    // fooBar() { this.fooTarget.classList.toggle(this.bazClass) }
+
+    disconnect() {
+        // Called anytime its element is disconnected from the DOM
+        // (on page change, when it's removed from or moved in the DOM, etc.)
+
+        // Here you should remove all event listeners added in "connect()" 
+        // this.fooTarget.removeEventListener('click', this._fooBar)
+    }
+}

assets/controllers/tv_results_controller.js

@@ -18,32 +18,42 @@ export default class extends Controller {
         active: Boolean,
     };
 
-    static targets = ['list', 'count', 'episodeSelector']
+    static targets = ['list', 'count', 'episodeSelector', 'toggleButton', 'listContainer']
     static outlets = ['loading-icon']
 
     options = []
     optionsLoaded = false
+    isOpen = false
 
     async connect() {
         await this.setOptions();
     }
 
     async setOptions() {
-        if (true === this.activeValue && this.optionsLoaded === false) {
+        if (this.optionsLoaded === false) {
             this.optionsLoaded = true;
-            await fetch(`/torrentio/tvshows/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
-                .then(res => res.text())
-                .then(response => {
-                    this.element.innerHTML = response;
-                    this.options = this.element.querySelectorAll('tbody tr');
-                    if (this.options.length > 0) {
-                        this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
-                        this.options[0].querySelector('input[type="checkbox"]').checked = true;
-                    } else {
-                        this.episodeSelectorTarget.disabled = true;
-                    }
-                    this.loadingIconOutlet.increaseCount();
-                });
+            let response;
+
+            try {
+                response = await fetch(`/torrentio/tvshows/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
+            } catch (error) {
+                console.log('There was an error', error);
+            }
+
+            if (response?.ok) {
+                response = await response.text()
+                this.listContainerTarget.innerHTML = response;
+                this.options = this.element.querySelectorAll('tbody tr');
+                if (this.options.length > 0) {
+                    this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
+                    this.options[0].querySelector('input[type="checkbox"]').checked = true;
+                } else {
+                    this.episodeSelectorTarget.disabled = true;
+                }
+                this.loadingIconOutlet.increaseCount();
+            } else {
+                console.log(`HTTP Response Code: ${response?.status}`)
+            }
         }
     }
 
@@ -55,19 +65,13 @@ export default class extends Controller {
     // }
 
     async setActive() {
-        this.activeValue = true;
-        this.element.classList.remove('hidden');
         if (false === this.optionsLoaded) {
             await this.setOptions();
         }
     }
 
     async setInActive() {
-        this.activeValue = false;
-        // if (true === this.hasEpisodeSelectorTarget()) {
         this.episodeSelectorTarget.checked = false;
-        // }
-        this.element.classList.add('hidden');
     }
 
     isActive() {
@@ -85,7 +89,16 @@ export default class extends Controller {
     }
 
     toggleList() {
+        // if (!this.isOpen) {
+        //     this.toggleButtonTarget.classList.add('rotate-180');
+        //     this.toggleButtonTarget.classList.remove('-rotate-180');
+        // } else {
+        //     this.toggleButtonTarget.classList.add('-rotate-180');
+        //     this.toggleButtonTarget.classList.remove('rotate-180');
+        // }
         this.listTarget.classList.toggle('hidden');
+        this.toggleButtonTarget.classList.toggle('rotate-90');
+        this.toggleButtonTarget.classList.toggle('-rotate-90');
     }
 
     download() {

assets/styles/app.css

@@ -10,6 +10,21 @@
     h2 {
         font-size: var(--text-xl);
     }
+    .rounded-ms {
+        border-radius: 0.275rem;
+    }
+}
+
+@layer components {
+    .alert {
+        @apply text-white text-sm min-w-[250px] border px-4 py-3 rounded-md
+    }
+    .alert-success {
+        @apply bg-green-950 hover:bg-green-900 border-green-500
+    }
+    .alert-warning {
+        @apply bg-yellow-500/70 hover:bg-yellow-600 border-yellow-400 text-black
+    }
 }
 
 /* Prevent scrolling while dialog is open */

compose.yml

@@ -23,6 +23,7 @@ services:
       - mercure_config:/config
     tty: true
     environment:
+      TZ: America/Chicago
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
       MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
     depends_on:
@@ -37,7 +38,9 @@ services:
       - $PWD:/app
       - $PWD/var/download:/var/download
     tty: true
-    command: php /app/bin/console messenger:consume async -vv --time-limit=3600 --limit=10
+    environment:
+      TZ: America/Chicago
+    command: php /app/bin/console messenger:consume media_cache -vv --time-limit=3600
 
 
   scheduler:
@@ -45,6 +48,8 @@ services:
     restart: unless-stopped
     volumes:
       - $PWD:/app
+    environment:
+      TZ: America/Chicago
     command: php /app/bin/console messenger:consume scheduler_monitor -vv
     tty: true
 
@@ -55,6 +60,8 @@ services:
       - redis_data:/data
     command: redis-server --maxmemory 512MB
     restart: unless-stopped
+    environment:
+      TZ: America/Chicago
 
 
   database:
@@ -64,6 +71,7 @@ services:
     volumes:
       - mysql:/var/lib/mysql
     environment:
+      TZ: America/Chicago
       MYSQL_DATABASE: app
       MYSQL_USERNAME: app
       MYSQL_PASSWORD: password

composer.json

@@ -4,7 +4,7 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.4",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "1tomany/rich-bundle": "^1.8",
@@ -16,6 +16,7 @@
         "doctrine/doctrine-migrations-bundle": "^3.4",
         "doctrine/orm": "^3.3",
         "dragonmantank/cron-expression": "^3.4",
+        "guzzlehttp/guzzle": "^7.9",
         "league/pipeline": "^1.1",
         "nesbot/carbon": "^3.9",
         "nihilarr/parse-torrent-name": "^0.0.1",
@@ -24,6 +25,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.*",
@@ -56,6 +58,9 @@
             "symfony/flex": true,
             "symfony/runtime": true
         },
+        "platform": {
+            "php": "8.4"
+        },
         "bump-after-update": true,
         "sort-packages": true
     },

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/framework.yaml

@@ -11,7 +11,7 @@ framework:
     trusted_headers: [ 'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port', 'x-forwarded-prefix' ]
 
     session:
-        handler_id: Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler
+        handler_id: '%env(REDIS_HOST)%'
 
     #esi: true
     #fragments: 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

config/packages/twig.yaml

@@ -1,5 +1,8 @@
 twig:
     file_name_pattern: '*.twig'
+    date:
+        format: 'm/d/Y'
+        timezone: '%env(default:app.default.timezone:TZ)%'
 
 when@test:
     twig:

config/services.yaml

@@ -21,6 +21,9 @@ parameters:
     app.cache.adapter.default: 'filesystem'
     app.cache.redis.host.default: 'redis://redis'
 
+    # Various configs
+    app.default.timezone: 'America/Chicago'
+
 services:
     # default configuration for services in *this* file
     _defaults:

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:

docker/app/entrypoint.sh

@@ -9,8 +9,4 @@ sleep $SLEEP_TIME
 php /app/bin/console doctrine:migrations:migrate --no-interaction
 php /app/bin/console db:seed
 
-# Start the media cache warming services
-systemctl --user enable messenger-worker.service
-systemctl --user start messenger-worker.service
-
-frankenphp php-server /etc/frankenphp/Caddyfile
+exec docker-php-entrypoint "$@"

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/Controller/IndexController.php

@@ -3,6 +3,8 @@
 namespace App\Controller;
 
 use App\Download\Framework\Repository\DownloadRepository;
+use App\Monitor\Action\Command\MonitorTvShowCommand;
+use App\Monitor\Action\Handler\MonitorTvShowHandler;
 use App\Tmdb\Tmdb;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
@@ -12,15 +14,13 @@ use Symfony\Component\Routing\Attribute\Route;
 final class IndexController extends AbstractController
 {
     public function __construct(
-        private readonly DownloadRepository $downloadRepository,
         private readonly Tmdb $tmdb,
+        private readonly MonitorTvShowHandler $monitorTvShowHandler,
     ) {}
 
     #[Route('/', name: 'app_index')]
     public function index(Request $request): Response
     {
-        $request->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
-
         return $this->render('index/index.html.twig', [
             'active_downloads' => $this->getUser()->getActiveDownloads(),
             'recent_downloads' => $this->getUser()->getDownloads(),
@@ -28,4 +28,11 @@ final class IndexController extends AbstractController
             'popular_tvshows' => $this->tmdb->popularTvShows(1, 6),
         ]);
     }
+
+    #[Route('/test', name: 'app_test')]
+    public function test()
+    {
+        $result = $this->monitorTvShowHandler->handle(new MonitorTvShowCommand(355));
+        return $this->json($result);
+    }
 }

src/Controller/SearchController.php

@@ -33,13 +33,14 @@ final class SearchController extends AbstractController
         ]);
     }
 
-    #[Route('/result/{mediaType}/{imdbId}', name: 'app_search_result')]
+    #[Route('/result/{mediaType}/{imdbId}/{season}', name: 'app_search_result')]
     public function result(
         GetMediaInfoInput $input,
+        ?int $season = null,
     ): Response {
         $result = $this->getMediaInfoHandler->handle($input->toCommand());
 
-        $this->warmDownloadOptionCache($result->media);
+//        $this->warmDownloadOptionCache($result->media);
 
         return $this->render('search/result.html.twig', [
             'results' => $result,

src/Controller/TorrentioController.php

@@ -6,6 +6,7 @@ use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\Torrentio\Action\Input\GetMovieOptionsInput;
 use App\Torrentio\Action\Input\GetTvShowOptionsInput;
+use App\Torrentio\Exception\TorrentioRateLimitException;
 use App\Util\Broadcaster;
 use Carbon\Carbon;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -52,13 +53,24 @@ final class TorrentioController extends AbstractController
             $input->episode,
         );
 
-//        return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
-//            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $results = $this->getTvShowOptionsHandler->handle($input->toCommand());
-            return $this->render('torrentio/tvshows.html.twig', [
-                'results' => $results,
-            ]);
-//        });
+        try {
+            return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
+                $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+                $results = $this->getTvShowOptionsHandler->handle($input->toCommand());
+                return $this->render('torrentio/tvshows.html.twig', [
+                    'results' => $results,
+                ]);
+            });
+        } catch (TorrentioRateLimitException $exception) {
+            $this->broadcaster->alert('Warning', 'Torrentio has rate limited your requests. Please wait a few minutes before trying again.', 'warning');
+            return $this->render('bare.html.twig',
+                [],
+                new Response('Too many requests',
+                    Response::HTTP_TOO_MANY_REQUESTS,
+                    ['Retry-After' => 4000]
+                )
+            );
+        }
     }
 
     #[Route('/torrentio/tvshows/clear/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_clear_torrentio_tvshows')]

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,42 @@ 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()) {
+            // 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;
+                }
 
-            $this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $monitor->getSeason() . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (null !== $monitorCheck ? 'YES' : 'NO'));
+                // 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())
@@ -88,16 +95,38 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
             }
         }
 
+        // Set the status to Active, so it will be re-executed.
+        $monitor->setStatus('Active');
         $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,11 +5,12 @@ 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;
 use App\Tmdb\Tmdb;
+use Carbon\Carbon;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Nihilarr\PTN;
@@ -17,7 +18,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 +25,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 +39,116 @@ 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())
+        $episodeMonitors = [];
+        if ($downloadedEpisodes->count() !== $episodesInShow->count()) {
+            // Dispatch Episode commands for each missing Episode
+            foreach ($episodesInShow as $episode) {
+                // Only monitor future episodes
+                $episodeInFuture = $this->episodeReleasedAfterMonitorCreated($monitor->getCreatedAt(), $episode);
+                $this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
+                if (false === $episodeInFuture) {
+                    $this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for title: ' . 'for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ', skipping');
+                    continue;
+                }
+
+                // 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());
+                $episodeMonitors[] = $episodeMonitor;
+
+                // 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());
             }
         }
 
+        // Set the status to Active, so it will be re-executed.
+        $monitor->setStatus('Active');
         $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,
+                'new_monitors' => $episodeMonitors,
             ]
         );
     }
+
+    private function episodeReleasedAfterMonitorCreated(string|DateTimeImmutable $monitorStartDate, array $episodeInShow): bool
+    {
+        $monitorStartDate = Carbon::parse($monitorStartDate);
+        $episodeAirDate = Carbon::parse($episodeInShow['air_date']);
+        return $episodeAirDate >= $monitorStartDate;
+    }
+
+    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/Dto/UpcomingEpisode.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Monitor\Dto;
+
+use Carbon\Carbon;
+
+class UpcomingEpisode
+{
+    public function __construct(
+        public string $title,
+        public string $airDate {
+            get => Carbon::parse($this->airDate)->format('m/d/Y');
+        },
+        public string $episodeTitle,
+        public int $episodeNumber,
+    ) {}
+}

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,51 @@ 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;
+    }
+
+    public function isActive(): bool
+    {
+        return in_array($this->status, ['New', 'Active', 'In Progress']);
+    }
 }

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/Search/Action/Command/GetMediaInfoCommand.php

@@ -10,5 +10,6 @@ class GetMediaInfoCommand implements CommandInterface
     public function __construct(
         public string $imdbId,
         public string $mediaType,
+        public ?int $season = null,
     ) {}
 }

src/Search/Action/Handler/GetMediaInfoHandler.php

@@ -20,6 +20,6 @@ class GetMediaInfoHandler implements HandlerInterface
     {
         $media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
 
-        return new GetMediaInfoResult($media);
+        return new GetMediaInfoResult($media, $command->season);
     }
 }

src/Search/Action/Input/GetMediaInfoInput.php

@@ -3,6 +3,7 @@
 namespace App\Search\Action\Input;
 
 use App\Download\Action\Command\DownloadMediaCommand;
+use App\Enum\MediaType;
 use App\Search\Action\Command\GetMediaInfoCommand;
 use OneToMany\RichBundle\Attribute\SourceRoute;
 use OneToMany\RichBundle\Contract\CommandInterface;
@@ -17,10 +18,16 @@ class GetMediaInfoInput implements InputInterface
 
         #[SourceRoute('mediaType')]
         public string $mediaType,
+
+        #[SourceRoute('season', nullify: true)]
+        public ?int $season,
     ) {}
 
     public function toCommand(): CommandInterface
     {
-        return new GetMediaInfoCommand($this->imdbId, $this->mediaType);
+        if ("tvshows" === $this->mediaType  && null === $this->season) {
+            $this->season = 1;
+        }
+        return new GetMediaInfoCommand($this->imdbId, $this->mediaType, $this->season);
     }
 }

src/Search/Action/Result/GetMediaInfoResult.php

@@ -10,5 +10,6 @@ class GetMediaInfoResult implements ResultInterface
 {
     public function __construct(
         public TmdbResult $media,
+        public ?int $season,
     ) {}
 }

src/Search/TvEpisodePaginator.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Search;
+
+use App\Search\Action\Command\GetMediaInfoCommand;
+use App\Search\Action\Handler\GetMediaInfoHandler;
+use App\Search\Action\Result\GetMediaInfoResult;
+use stdClass;
+
+class TvEpisodePaginator
+{
+    /**
+     * @var integer
+     */
+    private $total;
+
+    /**
+     * @var integer
+     */
+    private $lastPage;
+
+    private $items;
+
+    public $limit = 20;
+
+    public $currentPage = 1;
+
+    public function paginate(GetMediaInfoResult $results, int $page = 1, int $limit = 20): static
+    {
+        $this->total = count($results->media->episodes[$results->season]);
+        $this->lastPage = (int) ceil($this->total / $limit);
+        $this->items = array_slice($results->media->episodes[$results->season], ($page - 1) * $limit, $limit);
+        $this->currentPage = $page;
+        $this->limit = $limit;
+
+        return $this;
+    }
+
+    public function getTotal(): int
+    {
+        return $this->total;
+    }
+
+    public function getLastPage(): int
+    {
+        return $this->lastPage;
+    }
+
+    public function getItems()
+    {
+        return $this->items;
+    }
+
+    public function getShowing()
+    {
+        $showingStart = (($this->currentPage - 1) * $this->limit) + 1;
+        $showingEnd = (($this->currentPage - 1) * $this->limit) + $this->limit;
+
+        if ($showingEnd > $this->total) {
+            $showingEnd = $this->total;
+        }
+
+        return sprintf("Showing %d - %d of %d results.", $showingStart, $showingEnd, $this->total);
+    }
+}

src/Tmdb/Tmdb.php

@@ -2,8 +2,10 @@
 
 namespace App\Tmdb;
 
+use Aimeos\Map;
 use App\Enum\MediaType;
 use App\ValueObject\ResultFactory;
+use Carbon\Carbon;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Cache\CacheInterface;
@@ -97,6 +99,16 @@ class Tmdb
             return $this->parseResult($movies[$movie], "movie");
         });
 
+        $movies = Map::from($movies->toArray())->filter(function ($movie) {
+            return $movie !== null
+                && $movie->imdbId !== null
+                && $movie->tmdbId !== null
+                && $movie->title  !== null
+                && $movie->poster !== null
+                && $movie->description !== null
+                && $movie->mediaType !== null;
+        });
+
         $movies = array_values($movies->toArray());
 
         if (null !== $limit) {
@@ -114,6 +126,16 @@ class Tmdb
             return $this->parseResult($movies[$movie], "movie");
         });
 
+        $movies = Map::from($movies->toArray())->filter(function ($movie) {
+            return $movie !== null
+                && $movie->imdbId !== null
+                && $movie->tmdbId !== null
+                && $movie->title  !== null
+                && $movie->poster !== null
+                && $movie->description !== null
+                && $movie->mediaType !== null;
+        });
+
         $movies = array_values($movies->toArray());
 
         if (null !== $limit) {
@@ -188,7 +210,12 @@ class Tmdb
                 continue;
             }
 
-            $series['episodes'][$season['season_number']] = $client->getApi()->getSeason($series['id'], $season['season_number'])['episodes'];
+            $series['episodes'][$season['season_number']] = Map::from(
+                $client->getApi()->getSeason($series['id'], $season['season_number'])['episodes']
+            )->map(function ($data) {
+                $data['poster'] = (null !== $data['still_path']) ? self::POSTER_IMG_PATH . $data['still_path'] : null;
+                return $data;
+            })->toArray();
         }
         return $series;
     }

src/Torrentio/Client/Torrentio.php

@@ -6,21 +6,30 @@ use App\Torrentio\Client\Rule\DownloadOptionFilter\Resolution;
 use App\Torrentio\Client\Rule\RuleEngine;
 use App\Torrentio\Result\ResultFactory;
 use Carbon\Carbon;
+use App\Torrentio\Exception\TorrentioRateLimitException;
+use GuzzleHttp\Client;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 
 class Torrentio
 {
-    private string $baseUrl = 'https://torrentio.strem.fun/providers%253Dyts%252Ceztv%252Crarbg%252C1337x%252Cthepiratebay%252Ckickasstorrents%252Ctorrentgalaxy%252Cmagnetdl%252Chorriblesubs%252Cnyaasi%7Csort%253Dqualitysize%7Cqualityfilter%253D480p%252Cscr%252Ccam%7Crealdebrid={realDebridKey}/stream/movie/{imdbCode}.json';
+    private string $baseUrl = 'https://torrentio.strem.fun/providers%253Dyts%252Ceztv%252Crarbg%252C1337x%252Cthepiratebay%252Ckickasstorrents%252Ctorrentgalaxy%252Cmagnetdl%252Chorriblesubs%252Cnyaasi%7Csort%253Dqualitysize%7Cqualityfilter%253D480p%252Cscr%252Ccam%7Crealdebrid={realDebridKey}/stream/movie';
 
     private string $searchUrl;
 
+    private Client $client;
+
     public function __construct(
         #[Autowire(env: 'REAL_DEBRID_KEY')] private string $realDebridKey,
         private CacheInterface $cache,
+        private LoggerInterface $logger,
     ) {
         $this->searchUrl = str_replace('{realDebridKey}', $this->realDebridKey, $this->baseUrl);
+        $this->client = new Client([
+            'base_uri' => $this->searchUrl,
+        ]);
     }
 
     public function search(string $imdbCode, string $type, array $filter = []): array
@@ -29,11 +38,21 @@ class Torrentio
 
         $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $response = file_get_contents(str_replace('{imdbCode}', $imdbCode, $this->searchUrl));
-            return json_decode(
-                $response,
-                true
-            );
+            try {
+                $response = $this->client->get("$this->searchUrl/$imdbCode.json");
+                return json_decode(
+                    $response->getBody()->getContents(),
+                    true
+                );
+            } catch (\Throwable $exception) {
+                if ($exception->getCode() === 429) {
+                    $this->logger->warning("> [TorrentioClient] Rate limit exceeded");
+                    return null;
+                }
+            }
+
+            $this->logger->error("> [TorrentioClient] Request error: " . $response->getStatusCode() . " - " . $response->getBody()->getContents());
+            return [];
         });
 
         return $this->parse($results, $filter);
@@ -44,13 +63,27 @@ class Torrentio
         $cacheKey = "torrentio.$imdbId.$season.$episode";
         $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbId, $season, $episode) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $response = file_get_contents(str_replace('{imdbCode}', "$imdbId:$season:$episode", $this->searchUrl));
-            return json_decode(
-                $response,
-                true
-            );
+            try {
+                $response = $this->client->get("$this->searchUrl/$imdbId:$season:$episode.json");
+                return json_decode(
+                    $response->getBody()->getContents(),
+                    true
+                );
+            } catch (\Throwable $exception) {
+                if ($exception->getCode() === 429) {
+                    $this->logger->warning("> [TorrentioClient] Rate limit exceeded");
+                    return null;
+                }
+            }
+
+            $this->logger->error("> [TorrentioClient] Request error: " . $response->getStatusCode() . " - " . $response->getBody()->getContents());
+            return [];
         });
 
+        if (null === $results) {
+            throw new TorrentioRateLimitException();
+        }
+
         return $this->parse($results, []);
     }
 

src/Torrentio/Exception/TorrentioRateLimitException.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Torrentio\Exception;
+
+class TorrentioRateLimitException extends \Exception
+{
+    public function __construct()
+    {
+        parent::__construct(sprintf("[TorrentioClient] Rate limit exceeded"));
+    }
+}

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

src/Twig/Components/TvEpisodeList.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Twig\Components;
+
+use App\Search\Action\Command\GetMediaInfoCommand;
+use App\Search\Action\Handler\GetMediaInfoHandler;
+use App\Search\TvEpisodePaginator;
+use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
+use Symfony\UX\LiveComponent\Attribute\LiveProp;
+use Symfony\UX\LiveComponent\DefaultActionTrait;
+
+#[AsLiveComponent]
+final class TvEpisodeList
+{
+    use DefaultActionTrait;
+    use PaginateTrait;
+
+    #[LiveProp(writable: true)]
+    public string $title = "";
+
+    #[LiveProp(writable: true)]
+    public string $imdbId = "";
+
+    #[LiveProp(writable: true)]
+    public string $tmdbId = "";
+
+    #[LiveProp(writable: true)]
+    public int $season = 1;
+
+    public function __construct(
+        private GetMediaInfoHandler $getMediaInfoHandler,
+    ) {}
+
+    public function getEpisodes()
+    {
+        $results = $this->getMediaInfoHandler->handle(new GetMediaInfoCommand($this->imdbId, "tvshows", $this->season));
+        return new TvEpisodePaginator()->paginate($results, $this->pageNumber, $this->perPage);
+    }
+
+    public function setPage(int $page)
+    {
+        $this->pageNumber = $page;
+    }
+}

src/Twig/Components/UpcomingEpisodes.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Twig\Components;
+
+use Aimeos\Map;
+use App\Monitor\Dto\UpcomingEpisode;
+use App\Monitor\Framework\Entity\Monitor;
+use App\Tmdb\Tmdb;
+use Carbon\CarbonImmutable;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+use Tmdb\Model\Tv\Episode;
+
+#[AsTwigComponent]
+final class UpcomingEpisodes extends AbstractController
+{
+    // Get active monitors
+    // Search TMDB for upcoming episodes
+
+
+    public function __construct(
+        private readonly Tmdb $tmdb,
+    ) {}
+
+    public function getUpcomingEpisodes(int $limit = 5): array
+    {
+        $upcomingEpisodes = new Map();
+        $monitors = $this->getMonitors();
+        foreach ($monitors as $monitor) {
+            $upcomingEpisodes->merge($this->getNextEpisodes($monitor));
+        }
+
+        return $upcomingEpisodes->slice(0, $limit)->toArray();
+    }
+
+    private function getMonitors()
+    {
+        $user = $this->getUser();
+        return $user->getMonitors()->filter(
+            fn (Monitor $monitor) => null === $monitor->getParent() && $monitor->isActive()
+        ) ?? [];
+    }
+
+    private function getNextEpisodes(Monitor $monitor): Map
+    {
+        $today = CarbonImmutable::now();
+        $seriesInfo = $this->tmdb->tvDetails($monitor->getTmdbId());
+
+        switch ($monitor->getMonitorType()) {
+            case "tvseason":
+                $episodes = Map::from($seriesInfo->episodes[$monitor->getSeason()])
+                    ->filter(function (array $episode) use ($today) {
+                        $airDate = CarbonImmutable::parse($episode['air_date']);
+                        return $airDate->lte($today);
+                    })
+                ;
+                break;
+            case "tvshows":
+                $episodes = [];
+                foreach ($seriesInfo->episodes as $season => $episodeList) {
+                    $episodes = array_merge($episodes, $episodeList);
+                }
+                $episodes = Map::from($episodes)
+                    ->filter(function (array $episode) use ($today) {
+                        $airDate = CarbonImmutable::parse($episode['air_date']);
+                        return $airDate->gte($today);
+                    })
+                ;
+                break;
+        }
+
+        return $episodes->map(function (array $episode) use ($monitor) {
+            return new UpcomingEpisode(
+                $monitor->getTitle(),
+                $episode['air_date'],
+                $episode['name'],
+                $episode['episode_number'],
+            );
+        });
+    }
+}

src/Twig/Extensions/MonitorExtension.php

@@ -19,6 +19,19 @@ class MonitorExtension
         return $types[$type] ?? '-';
     }
 
+    #[AsTwigFilter('as_download_type')]
+    public function monitorTypeToDownloadType(string $type)
+    {
+        $types = [
+            'tvshows' => 'tvshows',
+            'tvseason' => 'tvshows',
+            'tvepisode' => 'tvshows',
+            'movie' => 'movies',
+        ];
+
+        return $types[$type] ?? '-';
+    }
+
     #[AsTwigFilter('monitor_media_id')]
     public function mediaId(Monitor $monitor)
     {

src/Twig/Extensions/UtilExtension.php

@@ -6,6 +6,7 @@ use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Service\MediaFiles;
 use ChrisUllyott\FileSize;
 use Twig\Attribute\AsTwigFilter;
+use Twig\Attribute\AsTwigFunction;
 
 class UtilExtension
 {
@@ -14,6 +15,21 @@ class UtilExtension
         private readonly MediaFiles $mediaFiles,
     ) {}
 
+    #[AsTwigFunction('uniqid')]
+    public function uniqid(): string
+    {
+        return uniqid();
+    }
+
+    #[AsTwigFilter('truncate')]
+    public function truncate(string $text)
+    {
+        if (strlen($text) > 300) {
+            $text = substr($text, 0, 300) . '...';
+        }
+        return $text;
+    }
+
     #[AsTwigFilter('filesize')]
     public function type(string|int $size)
     {

src/User/Framework/EventListener/LoginSuccessListener.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\User\Framework\EventListener;
+
+use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;
+
+final class LoginSuccessListener
+{
+    public function __construct(
+        private readonly RequestStack $requestStack,
+    ) {}
+
+    #[AsEventListener(event: 'security.authentication.success')]
+    public function setMercureTopics(AuthenticationSuccessEvent $event): void
+    {
+        // Set the unique Mercure topic name for the User's alerts
+        $this->requestStack->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
+    }
+}

src/Util/Broadcaster.php

@@ -17,7 +17,7 @@ readonly class Broadcaster
         private RequestStack $requestStack,
     ) {}
 
-    public function alert(string $title, string $message): void
+    public function alert(string $title, string $message, string $type = "success"): void
     {
         $userAlertTopic = $this->requestStack->getCurrentRequest()->getSession()->get('mercure_alert_topic');
         $update = new Update(
@@ -26,6 +26,7 @@ readonly class Broadcaster
                 'alert_id' => uniqid(),
                 'title' => $title,
                 'message' => $message,
+                'type' => $type,
             ])
         );
         $this->hub->publish($update);

src/Util/Paginator.php

@@ -22,6 +22,8 @@ class Paginator
 
     public $currentPage = 1;
 
+    public $limit = 5;
+
     /**
      * @param QueryBuilder|Query $query
      * @param int $page
@@ -41,6 +43,7 @@ class Paginator
         $this->lastPage = (int) ceil($paginator->count() / $paginator->getQuery()->getMaxResults());
         $this->items = $paginator;
         $this->currentPage = $page;
+        $this->limit = $limit;
 
         return $this;
     }
@@ -59,4 +62,11 @@ class Paginator
     {
         return $this->items;
     }
+
+    public function getShowing()
+    {
+        $showingStart = ($this->currentPage - 1) * $this->limit;
+        $showingEnd = $showingStart + $this->limit;
+        return sprintf("Showing %d - %d of %d results.", $showingStart, $showingEnd, $this->total);
+    }
 }

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": {

tailwind.config.js

@@ -13,6 +13,11 @@ module.exports = {
       "bg-orange-400",
       "bg-blue-600",
       "bg-rose-600",
+      "alert-success",
+      "alert-warning",
+      "min-w-64",
+      "rotate-180",
+      "-rotate-180",
       "transition-opacity",
       "ease-in",
       "duration-700",

templates/broadcast/Alert.stream.html.twig

@@ -1,5 +1,5 @@
 <turbo-stream action="prepend" target="alert_list">
     <template>
-        <twig:Alert :title="title|default('')" :message="message" :alert_id="alert_id" data-controller="alert" />
+        <twig:Alert :title="title|default('')" :message="message" :alert_id="alert_id" type="{{ type|default('success') }}" data-controller="alert" />
     </template>
 </turbo-stream>

templates/components/Alert.html.twig

@@ -1,7 +1,5 @@
-<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"
+<li {{ attributes }} id="alert_{{ alert_id }}"
+    class="alert alert-{{ type|default('success') }}"
   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,7 +1,7 @@
-<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="hover:underline mr-1"
+           class="mr-1 hover:underline rounded-md"
         >
             {{ download.title }}
         </a>
@@ -34,16 +34,16 @@
     </td>
     <td id="action_buttons_{{ download.id }}" class="px-6 py-4 flex flex-row items-center">
         {% if download.status == 'In Progress' and download.progress < 100 %}
-            <button id="pause_{{ download.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'pauseDownload', 'click', {id: download.id}) }}>
+            <button id="pause_{{ download.id }}" class="text-orange-500 hover:text-orange-600 mr-1 self-start" {{ stimulus_action('download_list', 'pauseDownload', 'click', {id: download.id}) }}>
                 <twig:ux:icon name="icon-park-twotone:pause-one" width="16.75px" height="16.75px" class="rounded-full" />
             </button>
         {% elseif download.status == 'Paused' %}
-            <button id="resume_{{ download.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'resumeDownload', 'click', {id: download.id}) }}>
+            <button id="resume_{{ download.id }}" class="text-orange-500 hover:text-orange-600 mr-1 self-start" {{ stimulus_action('download_list', 'resumeDownload', 'click', {id: download.id}) }}>
                 <twig:ux:icon name="icon-park-twotone:play" width="16.75px" height="16.75px" class="rounded-full" />
             </button>
         {% endif %}
 
-        {% set delete_button = component('ux:icon', {name: 'ic:twotone-cancel', height: '17.75px', width: '17.75px', class: 'rounded-full align-middle text-red-600' }) %}
+        {% set delete_button = component('ux:icon', {name: 'ic:twotone-cancel', height: '17.75px', width: '17.75px', class: 'rounded-full align-middle text-red-600 hover:text-red-700' }) %}
         <twig:Modal heading="But wait!" button_text="{{ delete_button }}" submit_action="{{ stimulus_action('download_list', 'deleteDownload', 'click', {id: download.id}) }}" show_cancel show_submit>
             Are you sure you want to delete <span class="font-bold">{{ download.filename }}</span>?
         </twig:Modal>

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

@@ -4,6 +4,7 @@
      data-result-filter-media-type-value="{{ results.media.mediaType }}"
      data-result-filter-movie-results-outlet=".results"
      data-result-filter-tv-results-outlet=".results"
+     data-result-filter-tv-episode-list-outlet=".episode-list"
 >
     <div class="w-full p-4 flex flex-row gap-4 bg-stone-500 text-md text-gray-500 dark:text-gray-50 rounded-lg">
         <label for="resolution">
@@ -58,7 +59,9 @@
             <label for="season">
                 Season
                 <select id="season" name="season" value="1" data-result-filter-target="season" class="px-1 py-0.5 bg-stone-100 text-gray-800 rounded-md"
-                        {{ stimulus_action('result_filter', 'uncheckSelectAllBtn', 'change') }}>
+                        {{ stimulus_action('result_filter', 'setSeason', 'change') }}
+                        {{ stimulus_action('result_filter', 'uncheckSelectAllBtn', 'change') }}
+                >
                     <option selected value="1">1</option>
                     {% for season in range(2, results.media.episodes|length) %}
                         <option value="{{ season }}">{{ season }}</option>
@@ -73,8 +76,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') }}>

templates/components/MonitorListRow.html.twig

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

templates/components/TvEpisodeList.html.twig

@@ -0,0 +1,80 @@
+<div{{ attributes.defaults(stimulus_controller('tv_episode_list')) }}
+        class="episode-list flex flex-col gap-4"
+>
+    <div data-live-id="{{ uniqid() }}" class="episode-container flex flex-col gap-4">
+        {% for episode in this.episodes.items %}
+            <div id="episode_{{ episode['season_number'] }}_{{ episode['episode_number'] }}" class="results"
+                 data-tv-results-loading-icon-outlet=".loading-icon"
+                 data-download-button-outlet=".download-btn"
+                    {{ stimulus_controller('tv_results', {
+                        title: this.title,
+                        tmdbId: this.tmdbId,
+                        imdbId: this.imdbId,
+                        season: episode['season_number'],
+                        episode: episode['episode_number'],
+                        active: 'true',
+                    }) }}
+            >
+                <div class="p-6 flex flex-col gap-6 bg-orange-500 bg-clip-padding backdrop-filter backdrop-blur-md bg-opacity-60 rounded-md">
+                    <div class="flex flex-row gap-4">
+                        {% if episode['poster'] != null %}
+                            <img class="w-64 rounded-lg" src="{{ episode['poster'] }}" />
+                        {% else %}
+                            <div class="w-64 min-w-64 sticky h-[144px] rounded-lg bg-gray-700 flex items-center justify-center">
+                                <twig:ux:icon width="32" name="hugeicons:loading-01" />
+                            </div>
+                        {% endif %}
+                        <div class="flex flex-col gap-4 grow">
+                            <h4 class="text-md font-bold">
+                                {{ episode['episode_number'] }}. {{ episode['name'] }}
+                            </h4>
+                            <p>{{ episode['overview']|truncate }}</p>
+                            <div>
+                                <button class="py-1 px-1.5 mr-1 grow-0 font-bold text-xs bg-green-600 rounded-lg hover:cursor-pointer hover:bg-green-700 text-white"
+                                        {{ stimulus_action('tv-results', 'toggleList', 'click') }}
+                                >
+                                    <span {{ stimulus_target('tv-results', 'count') }}>0</span> results
+                                </button>
+
+                                <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-gray-700 rounded-lg font-normal text-white" title="Air date {{ episode['name'] }}">
+                                    {{ episode['air_date']|date }}
+                                </small>
+                            </div>
+                        </div>
+                        <div class="flex flex-col gap-4 justify-between">
+                            <div class="flex flex-col items-center">
+                                <input type="checkbox"
+                                        {{ stimulus_target('tv-results', 'episodeSelector') }}
+                                />
+                            </div>
+                            <button class="flex flex-col items-end transition-transform duration-300 ease-in-out rotate-90"
+                                    {{ stimulus_target('tv-results', 'toggleButton') }}
+                                    {{ stimulus_action('tv-results', 'toggleList', 'click') }}>
+                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32">
+                                    <path
+                                            fill="none"
+                                            stroke="currentColor"
+                                            stroke-linecap="round"
+                                            stroke-linejoin="round"
+                                            stroke-width="2"
+                                            d="M20 6L10 16l10 10" />
+                                </svg>
+                            </button>
+                        </div>
+                    </div>
+                    <div {{ stimulus_target('tv-results', 'listContainer') }} class="inline-block overflow-hidden rounded-lg">
+
+                    </div>
+                </div>
+            </div>
+        {% endfor %}
+    </div>
+    {% set paginator = this.episodes %}
+    {% include 'partial/tv-episode-list-paginator.html.twig' %}
+</div>
+
+{% macro placeholder(props) %}
+    <span>
+        <twig:ux:icon name="codex:loader" height="40" width="40" data-loading-icon-target="icon" class="text-end" />
+    </span>
+{% endmacro %}

templates/components/UpcomingEpisodes.html.twig

@@ -0,0 +1,11 @@
+<div{{ attributes }}>
+    <ul class="text-white flex flex-col gap-2">
+        {% for episode in this.upcomingEpisodes %}
+            <li class="flex flex-col">
+                <span class="bg-[#f98e44] bg-filter bg-blur-lg bg-opacity-100 text-gray-950 w-full p-[.1rem] pl-[.3rem] rounded-ms">{{ episode.title }}</span>
+                <span>{{ episode.episodeTitle }}</span>
+                <span>{{ episode.airDate }}</span>
+            </li>
+        {% endfor %}
+    </ul>
+</div>

templates/monitor/index.html.twig

@@ -4,15 +4,22 @@
 {% block h2 %}Monitors{% endblock %}
 
 {% block body %}
-    <div class="p-4">
-        <twig:Card title="Active Monitors">
-            <twig:MonitorList :type="'active'" :isWidget="false" :perPage="10"></twig:MonitorList>
-        </twig:Card>
-    </div>
+    <div class="flex flex-row">
+
+        <div class="p-2 flex flex-col gap-4">
+            <twig:Card title="Active Monitors">
+                <twig:MonitorList :type="'active'" :isWidget="false" :perPage="10"></twig:MonitorList>
+            </twig:Card>
+            <twig:Card title="Complete Monitors">
+                <twig:MonitorList :type="'complete'" :isWidget="false" :perPage="10"></twig:MonitorList>
+            </twig:Card>
+        </div>
+
+        <div class="p-2">
+            <twig:Card title="Upcoming Episodes" >
+                <twig:UpcomingEpisodes />
+            </twig:Card>
+        </div>
 
-    <div class="p-4">
-        <twig:Card title="Complete Monitors">
-            <twig:MonitorList :type="'complete'" :isWidget="false" :perPage="10"></twig:MonitorList>
-        </twig:Card>
     </div>
 {% endblock %}

templates/partial/paginator.html.twig

@@ -1,6 +1,6 @@
 {% set _currentPage = paginator.currentPage ?: 1 %}
 {% set _lastPage = paginator.lastPage %}
-{% set _showingPerPage = (_currentPage == _lastPage) ? paginator.total - (this.perPage * (_lastPage - 1))  : paginator.items.query.maxResults %}
+{% set _showingPerPage = (_currentPage == _lastPage) ? paginator.total - (this.perPage * (_lastPage - 1))  : ("query" in paginator.items) ? paginator.items.query.maxResults %}
 
 <p class="text-white mt-1">Showing {{ _showingPerPage }} of {{ paginator.total }} total results</p>
 
@@ -8,75 +8,74 @@
     <nav>
         <ul class="mt-2 flex flex-row justify-content-center gap-1 py-1 text-white text-sm">
             <li class="page-item{{ _currentPage <= 1 ? ' disabled' : '' }}">
-                <a {% if _currentPage > 1 %}
+                <button {% if _currentPage > 1 %}
                    data-action="click->live#action"
                    data-live-action-param="paginate"
                    data-live-page-param="{{ _currentPage - 1 }}"
                    {% endif %}
                    class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
                    aria-label="Previous"
-                   href="#"
+                   
                 >
                     &laquo;
-                </a>
+                </button>
             </li>
             {% set startPage = max(1, _currentPage - 2) %}
             {% set endPage = min(_lastPage, startPage + 4) %}
             {% if startPage > 1 %}
                 <li class="page-item">
-                    <a data-action="click->live#action"
+                    <button data-action="click->live#action"
                        data-live-action-param="paginate"
                        data-live-page-param="{{ "1"|number_format }}"
                        class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
                        aria-label="Next"
-                       href="#"
-                    >1</a>
+                       
+                    >1</button>
                 </li>
                 {% if startPage > 2 %}
                     <li class="page-item disabled">
-                        <span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle">...</span>
+                        <span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle inline-flex items-stretch">...</span>
                     </li>
                 {% endif %}
             {% endif %}
             {% for i in startPage..endPage %}
-                <li class="page-item}">
-                    <a data-action="click->live#action"
+                <li class="page-item">
+                    <button data-action="click->live#action"
                         data-live-action-param="paginate"
                         data-live-page-param="{{ i|number_format }}"
                         class="page-link px-2.5 py-1 rounded-lg bg-orange-500 text-white align-middle"
-                        {% if i == _currentPage %}style="background-color: #fff; color: darkorange; border: 2px solid darkorange;"{% endif %}
-                        href="#"
-                    >{{ i }}</a>
+                        {% if i == _currentPage %}style="background-color: #fff; color: darkorange; font-weight: bold;"{% endif %}
+                    >{{ i }}</button>
                 </li>
             {% endfor %}
             {% if endPage < _lastPage %}
                 {% if endPage < _lastPage - 1 %}
                     <li class="page-item disabled">
-                        <span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle">...</span>
+                        <span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle inline-flex items-stretch">...</span>
                     </li>
                 {% endif %}
                 <li class="page-item">
-                    <a data-action="click->live#action"
+                    <button data-action="click->live#action"
                        data-live-action-param="paginate"
                        data-live-page-param="{{ _lastPage }}"
                        class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
                        aria-label="Next"
-                       href="#"
-                    >{{ _lastPage }}</a>
+                       
+                    >{{ _lastPage }}</button>
                 </li>
             {% endif %}
             <li class="page-item {{ _currentPage >= paginator.lastPage ? ' disabled' : '' }}">
-                <a {% if _currentPage < _lastPage %}
+                <button {% if _currentPage < _lastPage %}
                    data-action="click->live#action"
                    data-live-action-param="paginate"
                    data-live-page-param="{{ _currentPage + 1 }}"
                    {% endif %}
                    class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
                    aria-label="Next"
-                   href="#"
+                   
                 >
                     &raquo;
-                </a>
+                </button>
             </li>
         </ul>
     </nav>

templates/partial/tv-episode-list-paginator.html.twig

@@ -0,0 +1,74 @@
+{% set _currentPage = paginator.currentPage ?: 1 %}
+{% set _lastPage = paginator.lastPage %}
+{% set _showingPerPage = (_currentPage == _lastPage) ? paginator.total - (this.perPage * (_lastPage - 1))  : ("query" in paginator.items) ? paginator.items.query.maxResults %}
+
+<p class="text-white mt-1">{{ paginator.getShowing() }}</p>
+
+{% if paginator.lastPage > 1 %}
+    <nav>
+        <ul class="mt-2 flex flex-row justify-content-center gap-1 py-1 text-white text-sm">
+            <li class="page-item{{ _currentPage <= 1 ? ' disabled' : '' }}">
+                <button
+                    {% if _currentPage > 1 %}
+                       {{ stimulus_action('tv-episode-list', 'paginate', 'click', {page: _currentPage - 1}) }}
+                    {% endif %}
+                    class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
+                    aria-label="Previous"
+                >
+                    &laquo;
+                </button>
+            </li>
+            {% set startPage = max(1, _currentPage - 2) %}
+            {% set endPage = min(_lastPage, startPage + 4) %}
+            {% if startPage > 1 %}
+                <li class="page-item">
+                    <button
+                        {{ stimulus_action('tv-episode-list', 'paginate', 'click', {page: 1}) }}
+                        class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
+                        aria-label="Next"
+                       
+                    >1</button>
+                </li>
+                {% if startPage > 2 %}
+                    <li class="page-item disabled">
+                        <span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle inline-flex items-stretch">...</span>
+                    </li>
+                {% endif %}
+            {% endif %}
+            {% for i in startPage..endPage %}
+                <li class="page-item">
+                    <button 
+                        {{ stimulus_action('tv-episode-list', 'paginate', 'click', {page: i}) }}
+                        class="page-link px-2.5 py-1 rounded-lg bg-orange-500 text-white align-middle"
+                        {% if i == _currentPage %}style="background-color: #fff; color: darkorange; font-weight: bold;"{% endif %}
+                    >{{ i }}</button>
+                </li>
+            {% endfor %}
+            {% if endPage < _lastPage %}
+                {% if endPage < _lastPage - 1 %}
+                    <li class="page-item disabled">
+                        <span class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle inline-flex items-stretch">...</span>
+                    </li>
+                {% endif %}
+                <li class="page-item">
+                    <button
+                        {{ stimulus_action('tv-episode-list', 'paginate', 'click', {page: _lastPage}) }}
+                        class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
+                        aria-label="Next"
+                    >{{ _lastPage }}</button>
+                </li>
+            {% endif %}
+            <li class="page-item {{ _currentPage >= paginator.lastPage ? ' disabled' : '' }}">
+                <button
+                    {% if _currentPage < _lastPage %}
+                        {{ stimulus_action('tv-episode-list', 'paginate', 'click', {page: _currentPage + 1}) }}
+                    {% endif %}
+                    class="page-link px-2.5 py-1 rounded-lg bg-orange-500 align-middle"
+                    aria-label="Next"
+                >
+                    &raquo;
+                </button>
+            </li>
+        </ul>
+    </nav>
+{% endif %}

templates/search/result.html.twig

@@ -118,22 +118,11 @@
                 <div class="results" {{ stimulus_controller('movie_results', {title: results.media.title, tmdbId: results.media.tmdbId, imdbId: results.media.imdbId}) }}>
                 </div>
                 {% elseif "tvshows" == results.media.mediaType %}
-                    {% for season, episodes in results.media.episodes %}
-                        {% set active = (season == '1') ? true : false %}
-                        {% for episode in episodes %}
-                            <div class="results {{ (active == false) ? 'hidden' }}"
-                                 data-tv-results-loading-icon-outlet=".loading-icon"
-                                 data-download-button-outlet=".download-btn"
-                                 {{ stimulus_controller('tv_results', {
-                                    title: results.media.title,
-                                    tmdbId: results.media.tmdbId,
-                                    imdbId: results.media.imdbId,
-                                    season: season,
-                                    episode: episode['episode_number'],
-                                    active: active,
-                            }) }}></div>
-                        {% endfor %}
-                    {% endfor %}
+                    <twig:TvEpisodeList
+                            results="results"
+                        :imdbId="results.media.imdbId" :season="results.season" :perPage="20" :pageNumber="1"
+                        :tmdbId="results.media.tmdbId" :title="results.media.title" loading="defer"
+                    />
                 {% endif %}
             </twig:Card>
         </div>

templates/torrentio/tvshows.html.twig

@@ -1,72 +1 @@
-<div class="p-6 flex flex-col gap-6 bg-orange-500 bg-clip-padding backdrop-filter backdrop-blur-md bg-opacity-60 rounded-md">
-    <div class="flex flex-row gap-4">
-        {% if results.media.poster != null %}
-            <img class="w-64 rounded-lg" src="{{ results.media.poster }}" />
-        {% else %}
-            <div class="w-64 h-[144px] rounded-lg bg-gray-700 flex items-center justify-center">
-                <twig:ux:icon width="32" name="hugeicons:loading-01" />
-            </div>
-        {% endif %}
-        <div class="flex flex-col gap-4 grow">
-            <h4 class="text-md font-bold">
-                {{ results.episode }}. {{ results.media.title }}
-            </h4>
-            <p>{{ results.media.description }}</p>
-            <div>
-                <button class="py-1 px-1.5 mr-1 grow-0 font-bold text-xs bg-green-600 rounded-lg hover:cursor-pointer hover:bg-green-700 text-white"
-                       {{ stimulus_action('tv-results', 'toggleList', 'click') }}
-                >
-                    <span {{ stimulus_target('tv-results', 'count') }}>{{ results.results|length }}</span> results
-                </button>
-
-                {% if results.file != false %}
-                    <span data-controller="popover">
-                        <template data-popover-target="content">
-                            <div data-popover-target="card" class="absolute z-40 p-1 bg-stone-400 p-1 text-black rounded-md m-1 animate-fade">
-                                <p class="font-bold text-sm text-left">Existing file(s) for this episode:</p>
-                                <ul class="list-disc ml-3">
-                                    <li class="font-normal">{{ results.file.realPath|strip_media_path }} &mdash; <strong>{{ results.file.size|filesize }}</strong></li>
-                                </ul>
-                            </div>
-                        </template>
-                        <small
-                            class="py-1 px-1.5 mr-1 grow-0 font-bold bg-blue-600 rounded-lg text-center text-white"
-                            data-action="mouseenter->popover#show mouseleave->popover#hide"
-                        >
-                            exists
-                        </small>
-                    </span>
-                {% endif %}
-
-                {% if results.file == false %}
-                    <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-rose-600 rounded-lg text-white" title="Episode has not been downloaded yet.">
-                        missing
-                    </small>
-                {% endif %}
-
-                <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-gray-700 rounded-lg font-normal text-white" title="Air date {{ results.media.episodeAirDate }}">
-                    {{ results.media.episodeAirDate }}
-                </small>
-{#                <small class="py-1 px-1.5 grow-0 font-bold bg-red-600 hover:bg-red-700 rounded-lg font-normal text-white cursor-pointer" title="Clear cache for {{ results.media.title }}"#}
-{#                       {{ stimulus_action('tv-results', 'clearCache', 'click') }}#}
-{#                >Clear Cache</small>#}
-            </div>
-        </div>
-        <div class="flex flex-col gap-4 justify-between">
-            <div class="flex flex-col items-center">
-                <input type="checkbox"
-                        {{ stimulus_target('tv-results', 'episodeSelector') }}
-                />
-            </div>
-            <button class="flex flex-col items-end"
-                    {{ stimulus_action('tv-results', 'toggleList', 'click') }}>
-                <svg xmlns="http://www.w3.org/2000/svg" width="2em" height="2em" viewBox="0 0 32 32">
-                    <path fill="currentColor" d="m16 10l10 10l-1.4 1.4l-8.6-8.6l-8.6 8.6L6 20z"/>
-                </svg>
-            </button>
-        </div>
-    </div>
-    <div class="inline-block overflow-hidden rounded-lg">
-        {{ include('torrentio/partial/option-table.html.twig', {controller: 'tv-results'}) }}
-    </div>
-</div>
+{{ include('torrentio/partial/option-table.html.twig', {controller: 'tv-results'}) }}