fix: stuck monitors

Dockerfile

@@ -1,8 +1,9 @@
-FROM dunglas/frankenphp
+FROM dunglas/frankenphp:php8.4
 
 ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
 ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+ENV APP_VERSION="0.0.1"
 
 RUN install-php-extensions \
 	pdo_mysql \
@@ -11,6 +12,8 @@ RUN install-php-extensions \
 	zip \
 	opcache
 
+RUN apt update && apt install -y wget
+
 HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
 
-COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile
+COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile

assets/bootstrap.js

@@ -1,5 +1,10 @@
 import { startStimulusApp } from '@symfony/stimulus-bundle';
+import Popover from '@stimulus-components/popover'
+import Dialog from '@stimulus-components/dialog'
+import Dropdown from '@stimulus-components/dropdown'
 
 const app = startStimulusApp();
 // register any custom, 3rd party controllers here
-// app.register('some_controller_name', SomeImportedController);
+app.register('popover', Popover);
+app.register('dialog', Dialog);
+app.register('dropdown', Dropdown);

assets/controllers/download_button_controller.js

@@ -12,6 +12,7 @@ export default class extends Controller {
         filename: String,
         mediaType: String,
         imdbId: String,
+        episodeId: String
     }
 
     download() {
@@ -27,6 +28,7 @@ export default class extends Controller {
                 filename: this.filenameValue,
                 mediaType: this.mediaTypeValue,
                 imdbId: this.imdbIdValue,
+                episodeId: this.episodeIdValue
             })
         })
             .then(res => res.json())

assets/controllers/download_list_controller.js

@@ -29,6 +29,18 @@ export default class extends Controller {
         }
     }
 
+    pauseDownload(data) {
+        fetch(`/api/download/${data.params.id}/pause`, {method: 'PATCH'})
+            .then(res => res.json())
+            .then(json => console.debug(json));
+    }
+
+    resumeDownload(data) {
+        fetch(`/api/download/${data.params.id}/resume`, {method: 'PATCH'})
+            .then(res => res.json())
+            .then(json => console.debug(json));
+    }
+
     deleteDownload(data) {
         fetch(`/api/download/${data.params.id}`, {method: 'DELETE'})
             .then(res => res.json())

assets/controllers/hamburger_controller.js

@@ -0,0 +1,48 @@
+import { Controller } from '@hotwired/stimulus';
+
+/*
+* 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 {
+    static outlets = ['navbar']
+
+    initialize() {
+        // Called once when the controller is first instantiated (per element)
+
+        // Here you can initialize variables, create scoped callables for event
+        // listeners, instantiate external libraries, etc.
+        // this._fooBar = this.fooBar.bind(this)
+    }
+
+    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)
+    }
+
+    navbarOutletConnected(outlet) {
+        console.log(outlet)
+    }
+
+    toggleMenu() {
+        console.log(this.navbarOutlet);
+        this.navbarOutlet.toggle();
+    }
+
+    // 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/navbar_controller.js

@@ -17,9 +17,15 @@ export default class extends Controller {
                 link.className = this.activeStyles;
             }
         });
+
+        window.addEventListener("resize", (event) => {
+
+        });
     }
 
-    setActive() {
-
+    toggle() {
+        this.element.parentElement.classList.toggle('hidden');
+        this.element.classList.toggle('fixed');
+        this.element.classList.toggle('z-20');
     }
 }

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,43 @@ 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.countTarget.innerText = 0;
+                    this.episodeSelectorTarget.disabled = true;
+                }
+                this.loadingIconOutlet.increaseCount();
+            } else {
+                console.log(`HTTP Response Code: ${response?.status}`)
+            }
         }
     }
 
@@ -55,19 +66,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 +90,10 @@ export default class extends Controller {
     }
 
     toggleList() {
+        this.listTarget.classList.toggle('options-table');
         this.listTarget.classList.toggle('hidden');
+        this.toggleButtonTarget.classList.toggle('rotate-90');
+        this.toggleButtonTarget.classList.toggle('-rotate-90');
     }
 
     download() {

assets/icons/icon-park-twotone/pause-one.svg

@@ -0,0 +1 @@
+<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 48 48"><defs><mask id="ipTPauseOne0"><g fill="none" stroke="#fff" stroke-linejoin="round" stroke-width="4"><path fill="#555" d="M24 44c11.046 0 20-8.954 20-20S35.046 4 24 4S4 12.954 4 24s8.954 20 20 20Z"/><path stroke-linecap="round" d="M19 18v12m10-12v12"/></g></mask></defs><path fill="currentColor" d="M0 0h48v48H0z" mask="url(#ipTPauseOne0)"/></svg>

assets/icons/icon-park-twotone/play.svg

@@ -0,0 +1 @@
+<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 48 48"><defs><mask id="ipTPlay0"><g fill="#555" stroke="#fff" stroke-linejoin="round" stroke-width="4"><path d="M24 44c11.046 0 20-8.954 20-20S35.046 4 24 4S4 12.954 4 24s8.954 20 20 20Z"/><path d="M20 24v-6.928l6 3.464L32 24l-6 3.464l-6 3.464z"/></g></mask></defs><path fill="currentColor" d="M0 0h48v48H0z" mask="url(#ipTPlay0)"/></svg>

assets/icons/line-md/circle-twotone.svg

@@ -0,0 +1 @@
+<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" fill-opacity="0" stroke="currentColor" stroke-dasharray="64" stroke-dashoffset="64" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12c0 -4.97 4.03 -9 9 -9c4.97 0 9 4.03 9 9c0 4.97 -4.03 9 -9 9c-4.97 0 -9 -4.03 -9 -9Z"><animate fill="freeze" attributeName="fill-opacity" begin="0.6s" dur="0.15s" values="0;0.3"/><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.6s" values="64;0"/></path></svg>

assets/icons/pajamas/hamburger.svg

@@ -0,0 +1 @@
+<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 0 0"><path fill="currentColor" fill-rule="evenodd" d="M0 3.75A.75.75 0 0 1 .75 3h14.5a.75.75 0 0 1 0 1.5H.75A.75.75 0 0 1 0 3.75M0 8a.75.75 0 0 1 .75-.75h14.5a.75.75 0 0 1 0 1.5H.75A.75.75 0 0 1 0 8m.75 3.5a.75.75 0 0 0 0 1.5h14.5a.75.75 0 0 0 0-1.5z" clip-rule="evenodd"/></svg>

assets/styles/app.css

@@ -10,4 +10,80 @@
     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 */
+body:has(dialog[data-dialog-target="dialog"][open]) {
+    overflow: hidden;
+}
+
+/* Customize the dialog backdrop */
+dialog {
+    box-shadow: 0 0 0 100vw rgb(0 0 0 / 0.5);
+}
+
+@keyframes fade-in {
+    0% {
+        opacity: 0;
+    }
+    100% {
+        opacity: 1;
+    }
+}
+
+@keyframes fade-out {
+    0% {
+        opacity: 1;
+    }
+    100% {
+        opacity: 0;
+    }
+}
+
+/* Add animations */
+dialog[data-dialog-target="dialog"][open] {
+    animation: fade-in 200ms forwards;
+}
+
+dialog[data-dialog-target="dialog"][closing] {
+    animation: fade-out 200ms forwards;
+}
+
+.r-tablecell {
+    display: none;
+}
+
+@media screen and (min-width: 768px) {
+    .r-tablecell {
+        display: inline-table;
+    }
+}
+
+.options-table {
+    display: flex;
+
+    :last-child {
+        border-bottom: none;
+    }
+}
+
+@media screen and (min-width: 768px) {
+    .options-table {
+        display: inline-table;
+    }
 }

compose.yml

@@ -18,10 +18,12 @@ services:
     restart: unless-stopped
     volumes:
       - $PWD:/app
+      - $PWD/var/download:/var/download
       - mercure_data:/data
       - mercure_config:/config
     tty: true
     environment:
+      TZ: America/Chicago
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
       MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
     depends_on:
@@ -34,8 +36,11 @@ services:
     restart: unless-stopped
     volumes:
       - $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:
@@ -43,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
 
@@ -53,6 +60,8 @@ services:
       - redis_data:/data
     command: redis-server --maxmemory 512MB
     restart: unless-stopped
+    environment:
+      TZ: America/Chicago
 
 
   database:
@@ -62,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,47 +4,51 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.4",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "1tomany/rich-bundle": "^1.8",
         "aimeos/map": "^3.12",
+        "chrisullyott/php-filesize": "^4.2",
         "doctrine/dbal": "^3",
         "doctrine/doctrine-bundle": "^2.14",
         "doctrine/doctrine-fixtures-bundle": "^4.1",
         "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",
         "nyholm/psr7": "*",
         "p3k/emoji-detector": "^1.2",
+        "php-http/cache-plugin": "^2.0",
         "php-tmdb/api": "^4.1",
         "predis/predis": "^2.4",
         "runtime/frankenphp-symfony": "^0.2.0",
-        "symfony/asset": "7.2.*",
-        "symfony/console": "7.2.*",
-        "symfony/doctrine-messenger": "7.2.*",
-        "symfony/dotenv": "7.2.*",
-        "symfony/filesystem": "7.2.*",
-        "symfony/finder": "7.2.*",
+        "stof/doctrine-extensions-bundle": "^1.14",
+        "symfony/asset": "7.3.*",
+        "symfony/console": "7.3.*",
+        "symfony/doctrine-messenger": "7.3.*",
+        "symfony/dotenv": "7.3.*",
+        "symfony/filesystem": "7.3.*",
+        "symfony/finder": "7.3.*",
         "symfony/flex": "^2",
-        "symfony/form": "7.2.*",
-        "symfony/framework-bundle": "7.2.*",
-        "symfony/ldap": "7.2.*",
+        "symfony/form": "7.3.*",
+        "symfony/framework-bundle": "7.3.*",
+        "symfony/ldap": "7.3.*",
         "symfony/mercure-bundle": "^0.3.9",
-        "symfony/messenger": "7.2.*",
-        "symfony/runtime": "7.2.*",
-        "symfony/scheduler": "7.2.*",
-        "symfony/security-bundle": "7.2.*",
+        "symfony/messenger": "7.3.*",
+        "symfony/runtime": "7.3.*",
+        "symfony/scheduler": "7.3.*",
+        "symfony/security-bundle": "7.3.*",
         "symfony/stimulus-bundle": "^2.24",
-        "symfony/twig-bundle": "7.2.*",
+        "symfony/twig-bundle": "7.3.*",
         "symfony/ux-icons": "^2.24",
         "symfony/ux-live-component": "^2.24",
         "symfony/ux-turbo": "^2.24",
         "symfony/ux-twig-component": "^2.24",
-        "symfony/yaml": "7.2.*",
+        "symfony/yaml": "7.3.*",
         "symfonycasts/tailwind-bundle": "^0.10.0",
         "twig/extra-bundle": "^2.12|^3.0",
         "twig/twig": "^2.12|^3.0"
@@ -55,6 +59,9 @@
             "symfony/flex": true,
             "symfony/runtime": true
         },
+        "platform": {
+            "php": "8.4"
+        },
         "bump-after-update": true,
         "sort-packages": true
     },
@@ -98,13 +105,13 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "7.2.*"
+            "require": "7.3.*"
         }
     },
     "require-dev": {
         "phpstan/phpstan": "^2.1",
         "symfony/maker-bundle": "^1.62",
-        "symfony/stopwatch": "7.2.*",
-        "symfony/web-profiler-bundle": "7.2.*"
+        "symfony/stopwatch": "7.3.*",
+        "symfony/web-profiler-bundle": "7.3.*"
     }
 }

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

@@ -10,10 +10,22 @@ framework:
                 options:
                     use_notify: true
                     check_delayed_interval: 60000
+                    queue_name: default
                 retry_strategy:
                     max_retries: 1
                     multiplier: 1
 
+            media_cache:
+                dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
+                options:
+                    use_notify: true
+                    check_delayed_interval: 60000
+                    queue_name: media_cache
+                retry_strategy:
+                    max_retries: 1
+                    multiplier: 1
+
+
             failed: 'doctrine://default?queue_name=failed'
 
         default_bus: messenger.bus.default
@@ -29,7 +41,7 @@ framework:
             'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
             'App\Monitor\Action\Command\MonitorTvShowCommand': async
             'App\Monitor\Action\Command\MonitorMovieCommand': async
-            'App\Torrentio\Action\Command\GetTvShowOptionsCommand': async
+            'App\Torrentio\Action\Command\GetTvShowOptionsCommand': media_cache
 
 # when@test:
 #    framework:

config/packages/property_info.yaml

@@ -0,0 +1,3 @@
+framework:
+    property_info:
+        with_constructor_extractor: 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,10 @@
 twig:
+    globals:
+        version: '%app.version%'
     file_name_pattern: '*.twig'
+    date:
+        format: 'm/d/Y'
+        timezone: '%env(default:app.default.timezone:TZ)%'
 
 when@test:
     twig:

config/routes.yaml

@@ -29,3 +29,11 @@ controllersMonitor:
     type: attribute
     defaults:
         schemes: ['https']
+
+controllersTorrentio:
+    resource:
+        path: ../src/Torrentio/Framework/Controller
+        namespace: App\Torrentio\Framework\Controller
+    type: attribute
+    defaults:
+        schemes: ['https']

config/services.yaml

@@ -5,9 +5,10 @@
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
     # Media
+    media.base_path: '/var/download'
     media.default_movies_dir: movies
     media.default_tvshows_dir: tvshows
-    media.movies_path: '%env(default:media.default_movies_dir:MOVIES_PATH)%'
+    media.movies_path: '/var/download/%env(default:media.default_movies_dir:MOVIES_PATH)%'
     media.tvshows_path: '/var/download/%env(default:media.default_tvshows_dir:TVSHOWS_PATH)%'
 
     # Mercure
@@ -20,6 +21,12 @@ parameters:
     app.cache.adapter.default: 'filesystem'
     app.cache.redis.host.default: 'redis://redis'
 
+    # Various configs
+    app.default.version: '0.dev'
+    app.default.timezone: 'America/Chicago'
+
+    app.version: '%env(default:app.default.version:APP_VERSION)%'
+
 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/Dockerfile.app

@@ -4,6 +4,9 @@ ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
 ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
+ARG APP_VERSION="0.dev"
+ENV APP_VERSION="${APP_VERSION}"
+
 RUN install-php-extensions \
 	pdo_mysql \
 	gd \

docker/Dockerfile.scheduler

@@ -4,6 +4,9 @@ ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
 ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
+ARG APP_VERSION="0.dev"
+ENV APP_VERSION="${APP_VERSION}"
+
 RUN install-php-extensions \
 	pdo_mysql \
 	gd \

docker/Dockerfile.worker

@@ -4,6 +4,9 @@ ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
 ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
+ARG APP_VERSION="0.dev"
+ENV APP_VERSION="${APP_VERSION}"
+
 RUN install-php-extensions \
 	pdo_mysql \
 	gd \
@@ -11,6 +14,8 @@ RUN install-php-extensions \
 	zip \
 	opcache
 
+RUN apk add --no-cache wget
+
 COPY . /app
 
 ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]

docker/app/Caddyfile

@@ -3,8 +3,6 @@
 
 	frankenphp {
 		{$FRANKENPHP_CONFIG}
-
-
 	}
 }
 

docker/app/messenger-worker@.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Torsearch media cache warming services
+
+[Service]
+ExecStart=php /app/bin/console messenger:consume media_cache --time-limit=3600
+# for Redis, set a custom consumer name for each instance
+Environment="MESSENGER_CONSUMER_NAME=symfony-%n-%i"
+Restart=always
+RestartSec=30
+
+[Install]
+WantedBy=default.target

docs/examples/.env

@@ -27,7 +27,7 @@ DATABASE_URL="mysql://root:password@database:3306/app?serverVersion=10.6.19.2-Ma
 # Popular Movies and TV Shows section.
 #TMDB_API=
 
-REAL_DEBRID_KEY="QYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ"
+REAL_DEBRID_KEY=""
 TMDB_API=eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiI0ZTJjYjJhOGUzOGJhNjdiNjVhOGU1NGM0ZWI1MzhmOCIsIm5iZiI6MTczNzkyNjA0NC41NjQsInN1YiI6IjY3OTZhNTljYzdiMDFiNzJjNzIzZWM5YiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.e8DbNe9qrSBC1y-ANRv-VWBAtls-ZS2r7aNCiI68mpw
 
 

docs/examples/compose.yml

@@ -11,6 +11,13 @@ services:
       - '8006:80'
     env_file:
       - .env
+    volumes:
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
+    environment:
+      TZ: America/Chicago
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
     depends_on:
       database:
         condition: service_healthy
@@ -27,6 +34,8 @@ services:
     volumes:
       - /mnt/media/downloads/movies:/var/download/movies
       - /mnt/media/downloads/tvshows:/var/download/tvshows
+    environment:
+      TZ: America/Chicago
     command: -vvv
     env_file:
       - .env
@@ -43,35 +52,17 @@ services:
   scheduler:
     image: code.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
-      - ./downloads:/var/download
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
     env_file:
       - .env
+    environment:
+      TZ: America/Chicago
     restart: always
     depends_on:
       app:
         condition: service_healthy
 
-  # This container facilitates viewing the progress of downloads
-  # in realtime. It also handles sending alerts and notifications.
-  # The MERCURE_PUBLISHER_JWT key & MERCURE_SUBSCRIBER_JWT_KEY should
-  # match the MERCURE_JWT_SECRET environment variable.
-  mercure:
-    image: dunglas/mercure
-    restart: unless-stopped
-    ports:
-      - "3001:80"
-    environment:
-      SERVER_NAME: ':80'
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_EXTRA_DIRECTIVES: |
-        cors_origins *
-        anonymous
-    command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
-    volumes:
-      - mercure_data:/data
-      - mercure_config:/config
-
   database:
     image: mariadb:10.11.2
     volumes:

importmap.php

@@ -28,4 +28,23 @@ return [
     '@hotwired/turbo' => [
         'version' => '7.3.0',
     ],
+    '@stimulus-components/popover' => [
+        'version' => '7.0.0',
+    ],
+    '@stimulus-components/dialog' => [
+        'version' => '1.0.1',
+    ],
+    '@stimulus-components/dropdown' => [
+        'version' => '3.0.0',
+    ],
+    'stimulus-use' => [
+        'version' => '0.52.2',
+    ],
+    'animate.css' => [
+        'version' => '4.1.1',
+    ],
+    'animate.css/animate.min.css' => [
+        'version' => '4.1.1',
+        'type' => 'css',
+    ],
 ];

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/AlertController.php

@@ -2,34 +2,25 @@
 
 namespace App\Controller;
 
+use App\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
 use Symfony\Component\Routing\Attribute\Route;
-use Twig\Environment;
 
 final class AlertController extends AbstractController
 {
     public function __construct(
-        #[Autowire(service: 'twig')] private readonly Environment $renderer,
-        private readonly HubInterface $hub,
+        private readonly Broadcaster $broadcaster,
     ) {}
 
     #[Route('/alert', name: 'app_alert')]
     public function index(): Response
     {
-        $update = new Update(
-            'alerts',
-            $this->renderer->render('Alert.stream.html.twig', [
-                'alert_id' => 1,
-                'title' => 'Added to queue',
-                'message' => 'This is a testy test!',
-            ])
+        $this->broadcaster->alert(
+            'Added to queue',
+            'This is a testy test!'
         );
 
-        $this->hub->publish($update);
         return $this->json([
             'Success' => 'Published'
         ]);

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,12 +33,12 @@ final class SearchController extends AbstractController
         ]);
     }
 
-    #[Route('/result/{mediaType}/{tmdbId}', 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);
 
         return $this->render('search/result.html.twig', [
             'results' => $result,

src/Download/Action/Command/PauseDownloadCommand.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Download\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+
+/**
+ * @implements CommandInterface<PauseDownloadCommand>
+ */
+class PauseDownloadCommand implements CommandInterface
+{
+    public function __construct(
+        public int $downloadId,
+    ) {}
+}

src/Download/Action/Command/ResumeDownloadCommand.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Download\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+
+/**
+ * @implements CommandInterface<ResumeDownloadCommand>
+ */
+class ResumeDownloadCommand implements CommandInterface
+{
+    public function __construct(
+        public int $downloadId,
+    ) {}
+}

src/Download/Action/Handler/DownloadMediaHandler.php

@@ -38,7 +38,9 @@ readonly class DownloadMediaHandler implements HandlerInterface
         }
 
         try {
-            $this->downloadRepository->updateStatus($download->getId(), 'In Progress');
+            if ($download->getStatus() !== 'Paused') {
+                $this->downloadRepository->updateStatus($download->getId(), 'In Progress');
+            }
 
             $this->downloader->download(
                 $command->mediaType,
@@ -47,7 +49,9 @@ readonly class DownloadMediaHandler implements HandlerInterface
                 $download->getId()
             );
 
-            $this->downloadRepository->updateStatus($download->getId(), 'Complete');
+            if ($download->getStatus() !== 'Paused') {
+                $this->downloadRepository->updateStatus($download->getId(), 'Complete');
+            }
 
         } catch (\Throwable $exception) {
             throw new UnrecoverableMessageHandlingException($exception->getMessage(), 500);

src/Download/Action/Handler/PauseDownloadHandler.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Download\Action\Handler;
+
+use App\Download\Action\Command\PauseDownloadCommand;
+use App\Download\Action\Result\PauseDownloadResult;
+use App\Download\Framework\Entity\Download;
+use App\Download\Framework\Repository\DownloadRepository;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface;
+use Symfony\Contracts\Cache\CacheInterface;
+
+/** @implements HandlerInterface<PauseDownloadCommand, PauseDownloadResult> */
+readonly class PauseDownloadHandler implements HandlerInterface
+{
+    public function __construct(
+        private DownloadRepository $downloadRepository,
+        private CacheInterface $cache,
+    ) {}
+
+    public function handle(CommandInterface $command): ResultInterface
+    {
+        /** @var Download $download */
+        $download = $this->downloadRepository->find($command->downloadId);
+
+        $this->cache->get('download.pause.' . $download->getId(), function () {
+            return true;
+        });
+
+        return new PauseDownloadResult(200, 'Success', $download);
+    }
+}

src/Download/Action/Handler/ResumeDownloadHandler.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Download\Action\Handler;
+
+use App\Download\Action\Command\DownloadMediaCommand;
+use App\Download\Action\Command\ResumeDownloadCommand;
+use App\Download\Action\Result\ResumeDownloadResult;
+use App\Download\Framework\Entity\Download;
+use App\Download\Framework\Repository\DownloadRepository;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+/** @implements HandlerInterface<ResumeDownloadCommand, ResumeDownloadResult> */
+readonly class ResumeDownloadHandler implements HandlerInterface
+{
+    public function __construct(
+        private DownloadRepository $downloadRepository,
+        private MessageBusInterface $messageBus,
+    ) {}
+
+    public function handle(CommandInterface $command): ResultInterface
+    {
+        /** @var Download $download */
+        $download = $this->downloadRepository->find($command->downloadId);
+
+        $this->messageBus->dispatch(new DownloadMediaCommand(
+            $download->getUrl(),
+            $download->getTitle(),
+            $download->getFilename(),
+            $download->getMediaType(),
+            $download->getImdbId(),
+            $download->getUser()->getId(),
+            $download->getId()
+        ));
+
+        return new ResumeDownloadResult(200, 'Success', $download);
+    }
+}

src/Download/Action/Input/DownloadMediaInput.php

@@ -26,6 +26,9 @@ class DownloadMediaInput implements InputInterface
         #[SourceRequest('imdbId')]
         public string $imdbId,
 
+        #[SourceRequest('episodeId', nullify: true)]
+        public ?string $episodeId = null,
+
         public ?int $userId = null,
 
         public ?int $downloadId = null,

src/Download/Action/Input/PauseDownloadInput.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Download\Action\Input;
+
+use App\Download\Action\Command\PauseDownloadCommand;
+use OneToMany\RichBundle\Attribute\SourceRoute;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\InputInterface;
+
+/** @implements InputInterface<PauseDownloadInput, PauseDownloadCommand> */
+class PauseDownloadInput implements InputInterface
+{
+    public function __construct(
+        #[SourceRoute('downloadId')]
+        public int $downloadId,
+    ) {}
+
+    public function toCommand(): CommandInterface
+    {
+        return new PauseDownloadCommand(
+            $this->downloadId,
+        );
+    }
+}

src/Download/Action/Input/ResumeDownloadInput.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Download\Action\Input;
+
+use App\Download\Action\Command\PauseDownloadCommand;
+use OneToMany\RichBundle\Attribute\SourceRoute;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\InputInterface;
+
+/** @implements InputInterface<PauseDownloadInput, PauseDownloadCommand> */
+class ResumeDownloadInput implements InputInterface
+{
+    public function __construct(
+        #[SourceRoute('downloadId')]
+        public int $downloadId,
+    ) {}
+
+    public function toCommand(): CommandInterface
+    {
+        return new PauseDownloadCommand(
+            $this->downloadId,
+        );
+    }
+}

src/Download/Action/Result/PauseDownloadResult.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Download\Action\Result;
+
+use App\Download\Framework\Entity\Download;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/** @implements ResultInterface<PauseDownloadResult> */
+class PauseDownloadResult implements ResultInterface
+{
+    public function __construct(
+        public int $status,
+        public string $message,
+        public Download $download,
+    ) {}
+}

src/Download/Action/Result/ResumeDownloadResult.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Download\Action\Result;
+
+use App\Download\Framework\Entity\Download;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/** @implements ResultInterface<ResumeDownloadResult> */
+class ResumeDownloadResult implements ResultInterface
+{
+    public function __construct(
+        public int $status,
+        public string $message,
+        public Download $download,
+    ) {}
+}

src/Download/Downloader/ProcessDownloader.php

@@ -5,14 +5,21 @@ namespace App\Download\Downloader;
 use App\Download\Framework\Entity\Download;
 use App\Monitor\Service\MediaFiles;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
+use Symfony\Contracts\Cache\CacheInterface;
 
 class ProcessDownloader implements DownloaderInterface
 {
+    /**
+     * @var RedisAdapter $cache
+     */
+
     public function __construct(
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
+        private CacheInterface $cache,
     ) {}
 
     /**
@@ -22,16 +29,23 @@ class ProcessDownloader implements DownloaderInterface
     {
         /** @var Download $downloadEntity */
         $downloadEntity = $this->entityManager->getRepository(Download::class)->find($downloadId);
-        $downloadEntity->setProgress(0);
         $this->entityManager->flush();
 
         $downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
         $path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
 
-        $process = (new Process([
-            'wget',
-            $url
-        ]))->setWorkingDirectory($path);
+        $processArgs = ['wget', $url];
+
+        if ($downloadEntity->getStatus() === 'Paused') {
+            $downloadEntity->setStatus('In Progress');
+            $processArgs = ['wget', '-c', $url];
+        } else {
+            $downloadEntity->setProgress(0);
+        }
+
+        fwrite(STDOUT, implode(" ", $processArgs));
+
+        $process = (new Process($processArgs))->setWorkingDirectory($path);
 
         $process->setTimeout(1800); // 30 min
         $process->setIdleTimeout(600); // 10 min
@@ -41,7 +55,18 @@ class ProcessDownloader implements DownloaderInterface
         try {
             $progress = 0;
             $this->entityManager->flush();
-            $process->wait(function ($type, $buffer) use ($progress, $downloadEntity): void {
+
+            $process->wait(function ($type, $buffer) use ($progress, $downloadEntity, $process): void {
+                // The PauseDownloadHandler will set this to 'true'
+                $doPause = $this->cache->getItem('download.pause.' . $downloadEntity->getId());
+
+                if (true === $doPause->isHit() && true === $doPause->get()) {
+                    $downloadEntity->setStatus('Paused');
+                    $this->cache->deleteItem('download.pause.' . $downloadEntity->getId());
+                    $this->entityManager->flush();
+                    $process->stop();
+                }
+
                 if (Process::ERR === $type) {
                     $pregMatchOutput = [];
                     preg_match('/[\d]+%/', $buffer, $pregMatchOutput);
@@ -56,7 +81,9 @@ class ProcessDownloader implements DownloaderInterface
                 }
                 fwrite(STDOUT, $buffer);
             });
-            $downloadEntity->setProgress(100);
+            if ($downloadEntity->getStatus() !== 'Paused') {
+                $downloadEntity->setProgress(100);
+            }
         } catch (ProcessFailedException $exception) {
             $downloadEntity->setStatus('Failed');
         }

src/Download/Framework/Controller/ApiController.php

@@ -3,14 +3,17 @@
 namespace App\Download\Framework\Controller;
 
 use App\Download\Action\Handler\DeleteDownloadHandler;
+use App\Download\Action\Handler\PauseDownloadHandler;
+use App\Download\Action\Handler\ResumeDownloadHandler;
 use App\Download\Action\Input\DeleteDownloadInput;
 use App\Download\Action\Input\DownloadMediaInput;
+use App\Download\Action\Input\PauseDownloadInput;
+use App\Download\Action\Input\ResumeDownloadInput;
 use App\Download\Framework\Repository\DownloadRepository;
+use App\Util\Broadcaster;
+use Nihilarr\PTN;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
@@ -19,14 +22,20 @@ class ApiController extends AbstractController
     public function __construct(
         private DownloadRepository $downloadRepository,
         private MessageBusInterface $bus,
-        private readonly HubInterface $hub,
+        private readonly Broadcaster $broadcaster,
     ) {}
 
     #[Route('/api/download', name: 'api_download', methods: ['POST'])]
     public function download(
-        Request $request,
         DownloadMediaInput $input,
     ): Response {
+        $ptn = (object) new Ptn()->parse($input->filename);
+        if ($input->mediaType === "tvshows" &&
+            !property_exists($ptn, 'episode') && !property_exists($ptn, 'season')
+        ) {
+            $input->filename = $input->episodeId . '_' . $input->filename;
+        }
+
         $download = $this->downloadRepository->insert(
             $this->getUser(),
             $input->url,
@@ -47,34 +56,53 @@ class ApiController extends AbstractController
             return $this->json(['error' => $exception->getMessage()], Response::HTTP_INTERNAL_SERVER_ERROR);
         }
 
-        $this->hub->publish(new Update(
-            $request->getSession()->get('mercure_alert_topic'),
-            $this->renderView('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => '"' . $input->title . '" added to Queue',
-            ])
-        ));
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: "$input->title added to Queue."
+        );
 
         return $this->json(['status' => 200, 'message' => 'Added to Queue']);
     }
 
     #[Route('/api/download/{downloadId}', name: 'api_download_delete', methods: ['DELETE'])]
     public function deleteDownload(
-        Request $request,
         DeleteDownloadInput $input,
         DeleteDownloadHandler $handler,
     ): Response {
         $result = $handler->handle($input->toCommand());
-        $this->hub->publish(new Update(
-            $request->getSession()->get('mercure_alert_topic'),
-            $this->renderView('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => '"' . $result->download->getTitle() . '" has been deleted.',
-            ])
-        ));
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: "{$result->download->getTitle()} has been deleted.",
+        );
 
         return $this->json(['status' => 200, 'message' => 'Download Deleted']);
     }
+
+    #[Route('/api/download/{downloadId}/pause', name: 'api_download_pause', methods: ['PATCH'])]
+    public function pauseDownload(
+        PauseDownloadInput $input,
+        PauseDownloadHandler $handler,
+    ): Response {
+        $result = $handler->handle($input->toCommand());
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: "{$result->download->getTitle()} has been Paused.",
+        );
+
+        return $this->json(['status' => 200, 'message' => 'Download Paused']);
+    }
+
+    #[Route('/api/download/{downloadId}/resume', name: 'api_download_resume', methods: ['PATCH'])]
+    public function resumeDownload(
+        ResumeDownloadInput $input,
+        ResumeDownloadHandler $handler,
+    ): Response {
+        $result = $handler->handle($input->toCommand());
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: "{$result->download->getTitle()} has been Resumed.",
+        );
+
+        return $this->json(['status' => 200, 'message' => 'Download Resumed']);
+    }
 }

src/Download/Framework/Entity/Download.php

@@ -5,12 +5,16 @@ namespace App\Download\Framework\Entity;
 use App\Download\Framework\Repository\DownloadRepository;
 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;
 
 #[ORM\Entity(repositoryClass: DownloadRepository::class)]
 #[Broadcast(template: 'broadcast/Download.stream.html.twig')]
 class Download
 {
+    use TimestampableEntity;
+
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column]
@@ -162,4 +166,16 @@ class Download
 
         return $this;
     }
+
+    public function getPtn(): object
+    {
+        $ptn = (object) (new PTN())->parse($this->filename);
+
+        if ($this->mediaType === "tvshows") {
+            $ptn->season = str_pad($ptn->season, 2, "0", STR_PAD_LEFT);
+            $ptn->episode = str_pad($ptn->episode, 2, "0", STR_PAD_LEFT);
+        }
+
+        return $ptn;
+    }
 }

src/Download/Framework/Repository/DownloadRepository.php

@@ -25,27 +25,31 @@ class DownloadRepository extends ServiceEntityRepository
         $this->paginator = $paginator;
     }
 
-    public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10): Paginator
+    public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10, string $term = ""): Paginator
     {
         $query = $this->createQueryBuilder('d')
             ->andWhere('d.status IN (:statuses)')
             ->andWhere('d.user = :user')
+            ->andWhere('(d.title LIKE :term OR d.filename LIKE :term OR d.imdbId LIKE :term OR d.status LIKE :term OR d.mediaType LIKE :term)')
             ->orderBy('d.id', 'DESC')
             ->setParameter('statuses', ['Complete'])
             ->setParameter('user', $user)
+            ->setParameter('term', '%' . $term . '%')
             ->getQuery();
 
         return $this->paginator->paginate($query, $pageNumber, $perPage);
     }
 
-    public function getActivePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 5): Paginator
+    public function getActivePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 5, string $term = ""): Paginator
     {
         $query = $this->createQueryBuilder('d')
             ->andWhere('d.status IN (:statuses)')
             ->andWhere('d.user = :user')
+            ->andWhere('(d.title LIKE :term OR d.filename LIKE :term OR d.imdbId LIKE :term OR d.status LIKE :term OR d.mediaType LIKE :term)')
             ->orderBy('d.id', 'ASC')
-            ->setParameter('statuses', ['New', 'In Progress'])
+            ->setParameter('statuses', ['New', 'In Progress', 'Paused'])
             ->setParameter('user', $user)
+            ->setParameter('term', '%' . $term . '%')
             ->getQuery();
 
         return $this->paginator->paginate($query, $pageNumber, $perPage);

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)->setTime(0, 0);
+        $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/Controller/ApiController.php

@@ -2,24 +2,19 @@
 
 namespace App\Monitor\Framework\Controller;
 
-use App\Download\Action\Input\DeleteDownloadInput;
 use App\Monitor\Action\Handler\AddMonitorHandler;
 use App\Monitor\Action\Handler\DeleteMonitorHandler;
 use App\Monitor\Action\Input\AddMonitorInput;
 use App\Monitor\Action\Input\DeleteMonitorInput;
+use App\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
 use Symfony\Component\Routing\Attribute\Route;
-use Twig\Environment;
 
 class ApiController extends AbstractController
 {
     public function __construct(
-        #[Autowire(service: 'twig')]
-        private readonly Environment $renderer,
+        private readonly Broadcaster $broadcaster,
     ) {}
 
     #[Route('/api/monitor', name: 'api_monitor', methods: ['POST'])]
@@ -32,14 +27,10 @@ class ApiController extends AbstractController
         $command->userId = $this->getUser()->getId();
         $response = $handler->handle($command);
 
-        $hub->publish(new Update(
-            'alerts',
-            $this->renderer->render('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => "New monitor added for {$input->title}",
-            ])
-        ));
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: "New monitor added for {$input->title}",
+        );
 
         return $this->json([
             'status' => 200,
@@ -51,19 +42,9 @@ class ApiController extends AbstractController
     public function deleteMonitor(
         DeleteMonitorInput $input,
         DeleteMonitorHandler $handler,
-        HubInterface $hub,
     ) {
         $response = $handler->handle($input->toCommand());
 
-        $hub->publish(new Update(
-            'alerts',
-            $this->renderer->render('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => "New monitor added for {$response->monitor->getTitle()}",
-            ])
-        ));
-
         return $this->json([
             'status' => 200,
             'message' => $response

src/Monitor/Framework/Entity/Monitor.php

@@ -4,6 +4,9 @@ namespace App\Monitor\Framework\Entity;
 
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\User\Framework\Entity\User;
+use Carbon\Carbon;
+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 +59,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;
@@ -135,7 +149,7 @@ class Monitor
 
     public function getLastSearch(): ?\DateTimeInterface
     {
-        return $this->lastSearch;
+        return Carbon::parse($this->lastSearch);
     }
 
     public function setLastSearch(?\DateTimeInterface $lastSearch): static
@@ -204,4 +218,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/Repository/MonitorRepository.php

@@ -21,7 +21,7 @@ class MonitorRepository extends ServiceEntityRepository
         $this->paginator = $paginator;
     }
 
-    public function getUserMonitorsPaginated(UserInterface $user, int $page, int $perPage): Paginator
+    public function getUserMonitorsPaginated(UserInterface $user, int $page, int $perPage, string $searchTerm): Paginator
     {
         $query = $this->createQueryBuilder('m')
             ->andWhere('m.status IN (:statuses)')

src/Monitor/Framework/Scheduler/MonitorDispatcher.php

@@ -7,11 +7,12 @@ use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
 use App\Monitor\Action\Command\MonitorTvSeasonCommand;
 use App\Monitor\Action\Command\MonitorTvShowCommand;
 use App\Monitor\Framework\Repository\MonitorRepository;
+use Carbon\Carbon;
 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(
@@ -23,6 +24,8 @@ class MonitorDispatcher
     public function __invoke() {
         $this->logger->info('[MonitorDispatcher] Executing MonitorDispatcher');
 
+        $this->cleanupStuckMonitors();
+
         $monitorHandlers = [
             'movie' => MonitorMovieCommand::class,
             'tvepisode' => MonitorTvEpisodeCommand::class,
@@ -41,4 +44,16 @@ class MonitorDispatcher
             $this->bus->dispatch(new $command($monitor->getId()));
         }
     }
+
+    private function cleanupStuckMonitors(): void
+    {
+        $monitors = $this->monitorRepository->findBy(['status' => 'In Progress']);
+        foreach ($monitors as $monitor) {
+            // Reset the status to active so it will be executed again
+            if ($monitor->getLastSearch()->diffInHours(Carbon::today()) > 6) {
+                $monitor->setStatus('Active');
+            }
+        }
+        $this->monitorRepository->getEntityManager()->flush();
+    }
 }

src/Monitor/Service/MediaFiles.php

@@ -3,14 +3,19 @@
 namespace App\Monitor\Service;
 
 use Aimeos\Map;
+use App\Download\Framework\Entity\Download;
+use Nihilarr\PTN;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
+use Symfony\Component\Finder\SplFileInfo;
 
 class MediaFiles
 {
     private Finder $finder;
 
+    private string $basePath;
+
     private string $moviesPath;
 
     private string $tvShowsPath;
@@ -18,6 +23,9 @@ class MediaFiles
     private Filesystem $filesystem;
 
     public function __construct(
+        #[Autowire(param: 'media.base_path')]
+        string $basePath,
+
         #[Autowire(param: 'media.movies_path')]
         string $moviesPath,
 
@@ -27,6 +35,7 @@ class MediaFiles
         Filesystem $filesystem,
     ) {
         $this->finder = new Finder();
+        $this->basePath = $basePath;
         $this->moviesPath = $moviesPath;
         $this->tvShowsPath = $tvShowsPath;
         $this->filesystem = $filesystem;
@@ -43,6 +52,11 @@ class MediaFiles
         throw new \Exception(sprintf('A path for media type %s does not exist.', $mediaType));
     }
 
+    public function getBasePath(): string
+    {
+        return $this->basePath;
+    }
+
     public function getMoviesPath(): string
     {
         return $this->moviesPath;
@@ -125,4 +139,85 @@ class MediaFiles
 
         return $path;
     }
+
+    public function episodeExists(string $tvshowTitle, int $seasonNumber, int $episodeNumber)
+    {
+        $existingEpisodes = $this->getEpisodes($tvshowTitle, false);
+
+        if ($existingEpisodes->isEmpty()) {
+            return false;
+        }
+
+        /** @var SplFileInfo $episode */
+        foreach ($existingEpisodes as $episode) {
+            $ptn = (object) (new PTN())->parse($episode->getFilename());
+
+            if (!property_exists($ptn, 'season') || !property_exists($ptn, 'episode')) {
+                continue;
+            }
+
+            if ($ptn->season === $seasonNumber && $ptn->episode === $episodeNumber) {
+                return $episode;
+            }
+        }
+
+        return false;
+    }
+
+    public function movieExists(string $title)
+    {
+        $filepath = $this->moviesPath . DIRECTORY_SEPARATOR . $title;
+        $directoryExists = $this->filesystem->exists($filepath);
+
+        if (false === $directoryExists) {
+            return false;
+        }
+
+        if (false === $this->finder->in($filepath)->files()->hasResults()) {
+            return false;
+        }
+
+        $files = Map::from($this->finder->in($filepath)->files())->filter(function (SplFileInfo $file) {
+            $validExtensions = ['mkv', 'mp4', 'mpeg'];
+            return in_array($file->getExtension(), $validExtensions);
+        })->values();
+
+        if (false === $files->isEmpty()) {
+            return $files[0];
+        }
+
+        return false;
+    }
+
+    public function getDownloadPath(Download $download): string
+    {
+        $basePath = $this->getBasePath();
+
+        if ($download->getMediaType() === 'movies') {
+            $basePath = $this->getMoviesPath();
+            if ($download->getUser()->hasUserPreference('movie_folder')) {
+                $basePath .= DIRECTORY_SEPARATOR . $download->getTitle();
+            }
+        } elseif ($download->getMediaType() === 'tvshows') {
+            $basePath = $this->getTvShowsPath() . DIRECTORY_SEPARATOR . $download->getTitle();
+        }
+
+        $filepath = $basePath . DIRECTORY_SEPARATOR . $download->getFilename();
+
+        if (false === $this->filesystem->exists($filepath)) {
+            throw new \Exception(sprintf('File %s does not exist.', $filepath));
+        }
+
+        return $filepath;
+    }
+
+    public function renameFile(string $oldFile, string $newFile)
+    {
+        $this->filesystem->rename($oldFile, $newFile);
+    }
+
+    public function setFilePermissions(string $filepath, int $permissions)
+    {
+        $this->filesystem->chmod($filepath, $permissions);
+    }
 }

src/Search/Action/Command/GetMediaInfoCommand.php

@@ -8,7 +8,8 @@ use OneToMany\RichBundle\Contract\CommandInterface;
 class GetMediaInfoCommand implements CommandInterface
 {
     public function __construct(
-        public string $tmdbId,
+        public string $imdbId,
         public string $mediaType,
+        public ?int $season = null,
     ) {}
 }

src/Search/Action/Handler/GetMediaInfoHandler.php

@@ -18,8 +18,8 @@ class GetMediaInfoHandler implements HandlerInterface
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $media = $this->tmdb->mediaDetails($command->tmdbId, $command->mediaType);
+        $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;
@@ -12,15 +13,21 @@ use OneToMany\RichBundle\Contract\InputInterface;
 class GetMediaInfoInput implements InputInterface
 {
     public function __construct(
-        #[SourceRoute('tmdbId')]
-        public string $tmdbId,
+        #[SourceRoute('imdbId')]
+        public string $imdbId,
 
         #[SourceRoute('mediaType')]
         public string $mediaType,
+
+        #[SourceRoute('season', nullify: true)]
+        public ?int $season,
     ) {}
 
     public function toCommand(): CommandInterface
     {
-        return new GetMediaInfoCommand($this->tmdbId, $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,12 @@
 
 namespace App\Tmdb;
 
+use Aimeos\Map;
 use App\Enum\MediaType;
 use App\ValueObject\ResultFactory;
+use Carbon\Carbon;
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Cache\CacheInterface;
@@ -11,6 +15,7 @@ use Symfony\Contracts\Cache\ItemInterface;
 use Tmdb\Api\Find;
 use Tmdb\Client;
 use Tmdb\Event\BeforeRequestEvent;
+use Tmdb\Event\Listener\Psr6CachedRequestListener;
 use Tmdb\Event\Listener\Request\AcceptJsonRequestListener;
 use Tmdb\Event\Listener\Request\ApiTokenRequestListener;
 use Tmdb\Event\Listener\Request\ContentTypeJsonRequestListener;
@@ -39,7 +44,7 @@ class Tmdb
     const POSTER_IMG_PATH = "https://image.tmdb.org/t/p/w500";
 
     public function __construct(
-        private readonly CacheInterface $cache,
+        private readonly CacheItemPoolInterface $cache,
         private readonly EventDispatcherInterface $eventDispatcher,
         #[Autowire(env: 'TMDB_API')] string $apiKey,
     ) {
@@ -70,7 +75,13 @@ class Tmdb
         /**
          * Required event listeners and events to be registered with the PSR-14 Event Dispatcher.
          */
-        $requestListener = new RequestListener($this->client->getHttpClient(), $this->eventDispatcher);
+        $requestListener = new Psr6CachedRequestListener(
+            $this->client->getHttpClient(),
+            $this->eventDispatcher,
+            $cache,
+            $this->client->getHttpClient()->getPsr17StreamFactory(),
+            []
+        );
         $this->eventDispatcher->addListener(RequestEvent::class, $requestListener);
 
         $apiTokenListener = new ApiTokenRequestListener($this->client->getToken());
@@ -97,6 +108,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 +135,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) {
@@ -133,9 +164,12 @@ class Tmdb
             if (!$result instanceof Movie && !$result instanceof Tv) {
                 continue;
             }
+
             $results[] = $this->parseResult($result);
         }
 
+        $results = array_filter($results, fn ($result) => null !== $result->imdbId);
+
         return $results;
     }
 
@@ -143,7 +177,16 @@ class Tmdb
     {
         $finder = new Find($this->client);
         $result = $finder->findBy($id, ['external_source' => 'imdb_id']);
-        return $this->parseResult($result);
+
+        if (count($result['movie_results']) > 0) {
+            return $result['movie_results'][0]['id'];
+        } elseif (count($result['tv_results']) > 0) {
+            return $result['tv_results'][0]['id'];
+        } elseif (count($result['tv_episode_results']) > 0) {
+            return $result['tv_episode_results'][0]['show_id'];
+        }
+
+        throw new \Exception("No results found for $id");
     }
 
     public function movieDetails(string $id)
@@ -176,13 +219,20 @@ 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;
     }
 
     public function mediaDetails(string $id, string $type)
     {
+        $id = $this->find($id);
+
         if ($type === "movies") {
             return $this->movieDetails($id);
         } else {

src/Torrentio/Action/Handler/GetMovieOptionsHandler.php

@@ -2,6 +2,7 @@
 
 namespace App\Torrentio\Action\Handler;
 
+use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Result\GetMovieOptionsResult;
 use App\Torrentio\Client\Torrentio;
@@ -14,12 +15,15 @@ class GetMovieOptionsHandler implements HandlerInterface
     public function __construct(
         private readonly Tmdb $tmdb,
         private readonly Torrentio $torrentio,
+        private readonly MediaFiles $mediaFiles
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
+        $media = $this->tmdb->mediaDetails($command->imdbId, 'movies');
         return new GetMovieOptionsResult(
-            media: $this->tmdb->mediaDetails($command->tmdbId, 'movies'),
+            media: $media,
+            file: $this->mediaFiles->movieExists($media->title),
             results: $this->torrentio->search($command->imdbId, 'movies'),
         );
     }

src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php

@@ -2,6 +2,7 @@
 
 namespace App\Torrentio\Action\Handler;
 
+use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
@@ -16,12 +17,18 @@ class GetTvShowOptionsHandler implements HandlerInterface
     public function __construct(
         private readonly Tmdb $tmdb,
         private readonly Torrentio $torrentio,
+        private readonly MediaFiles $mediaFiles,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
+        $media = $this->tmdb->episodeDetails($command->tmdbId, $command->season, $command->episode);
+        $parentShow = $this->tmdb->mediaDetails($command->imdbId, 'tvshows');
+        $file = $this->mediaFiles->episodeExists($parentShow->title, $command->season, $command->episode);
+
         return new GetTvShowOptionsResult(
-            media: $this->tmdb->episodeDetails($command->tmdbId, $command->season, $command->episode),
+            media: $media,
+            file: $file,
             season: $command->season,
             episode: $command->episode,
             results: $this->torrentio->fetchEpisodeResults(

src/Torrentio/Action/Result/GetMovieOptionsResult.php

@@ -9,6 +9,7 @@ class GetMovieOptionsResult implements ResultInterface
 {
     public function __construct(
         public TmdbResult $media,
+        public bool|\SplFileInfo $file,
         public array $results
     ) {}
 }

src/Torrentio/Action/Result/GetTvShowOptionsResult.php

@@ -4,11 +4,13 @@ namespace App\Torrentio\Action\Result;
 
 use App\Tmdb\TmdbResult;
 use OneToMany\RichBundle\Contract\ResultInterface;
+use Symfony\Component\Finder\SplFileInfo;
 
 class GetTvShowOptionsResult implements ResultInterface
 {
     public function __construct(
         public TmdbResult $media,
+        public bool|SplFileInfo $file,
         public string $season,
         public string $episode,
         public array $results

src/Torrentio/Client/Torrentio.php

@@ -6,63 +6,99 @@ 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;
+use Symfony\Contracts\Cache\TagAwareCacheInterface;
 
 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 TagAwareCacheInterface $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
+    public function search(string $imdbCode, string $type, bool $parseResults = true): array
     {
         $cacheKey = "torrentio.{$imdbCode}";
 
-        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode) {
+        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode, $type) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $response = file_get_contents(str_replace('{imdbCode}', $imdbCode, $this->searchUrl));
-            return json_decode(
-                $response,
-                true
-            );
+            $item->tag(['torrentio', $type, $imdbCode]);
+            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);
+        if (true === $parseResults) {
+            return $this->parse($results);
+        }
+
+        return $results;
     }
 
-    public function fetchEpisodeResults(string $imdbId, int $season, int $episode): array
+    public function fetchEpisodeResults(string $imdbId, int $season, int $episode, bool $parseResults = true): array
     {
         $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
-            );
+            $item->tag(['torrentio', 'tvshows', 'torrentio.tvshows', $imdbId, "torrentio.$imdbId", "$imdbId.$season", "torrentio.$imdbId.$season", "$imdbId.$season.$episode", "torrentio.$imdbId.$season.$episode"]);
+            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 [];
         });
 
-        return $this->parse($results, []);
-    }
-
-    public function parse(array $data, array $filter): array
-    {
-        $ruleEngine = new RuleEngine();
-        foreach ($filter as $rule => $value) {
-            if ('resolution' === $rule) {
-                $ruleEngine->addRule(new Resolution($value));
-            }
+        if (null === $results) {
+            throw new TorrentioRateLimitException();
         }
 
+        if (true === $parseResults) {
+            return $this->parse($results);
+        }
+
+        return $results;
+    }
+
+    public function parse(array $data): array
+    {
         $results = [];
         foreach ($data['streams'] as $stream) {
             if (!str_starts_with($stream['url'], "https")) {
@@ -84,9 +120,7 @@ class Torrentio
                 $bingeGroup
             );
 
-            if ($ruleEngine->validateAll($result)) {
-                $results[] = $result;
-            }
+            $results[] = $result;
         }
 
         return $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/Torrentio/Framework/Controller/ApiController.php

@@ -0,0 +1,116 @@
+<?php
+
+namespace App\Torrentio\Framework\Controller;
+
+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\Client\Torrentio;
+use App\Torrentio\Exception\TorrentioRateLimitException;
+use App\Util\Broadcaster;
+use Carbon\Carbon;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Cache\ItemInterface;
+
+final class ApiController extends AbstractController
+{
+    public function __construct(
+        private readonly GetMovieOptionsHandler $getMovieOptionsHandler,
+        private readonly GetTvShowOptionsHandler $getTvShowOptionsHandler,
+        private readonly Broadcaster $broadcaster,
+        private readonly Torrentio $torrentio,
+    ) {}
+
+    #[Route('/api/torrentio/{imdbId}/{season?}/{episode?}', name: 'api_torrentio')]
+    public function api(string $imdbId, ?int $season, ?int $episode): Response
+    {
+        if (null !== $season && null !== $episode) {
+            return $this->json(
+                $this->torrentio->fetchEpisodeResults($imdbId, $season, $episode, false)
+            );
+        }
+        return $this->json(
+            $this->torrentio->search($imdbId, 'movies', false),
+        );
+    }
+
+    #[Route('/torrentio/movies/{tmdbId}/{imdbId}', name: 'app_torrentio_movies')]
+    public function movieOptions(GetMovieOptionsInput $input, CacheInterface $cache): Response
+    {
+        $cacheId = sprintf(
+            "page.torrentio.movies.%s.%s",
+            $input->tmdbId,
+            $input->imdbId
+        );
+
+        return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
+            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+            $results = $this->getMovieOptionsHandler->handle($input->toCommand());
+            return $this->render('torrentio/movies.html.twig', [
+                'results' => $results,
+            ]);
+        });
+    }
+
+    #[Route('/torrentio/tvshows/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_torrentio_tvshows')]
+    public function tvShowOptions(GetTvShowOptionsInput $input, CacheInterface $cache): Response
+    {
+        $cacheId = sprintf(
+            "page.torrentio.tvshows.%s.%s.%s.%s",
+            $input->tmdbId,
+            $input->imdbId,
+            $input->season,
+            $input->episode,
+        );
+
+        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')]
+    public function clearTvShowOptions(GetTvShowOptionsInput $input, CacheInterface $cache, Request $request): Response
+    {
+        $cacheId = sprintf(
+            "page.torrentio.tvshows.%s.%s.%s.%s",
+            $input->tmdbId,
+            $input->imdbId,
+            $input->season,
+            $input->episode,
+        );
+        $cache->delete($cacheId);
+
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: 'Torrentio cache Cleared.'
+        );
+
+        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,
+            ]);
+        });
+    }
+}

src/Torrentio/Framework/Controller/WebController.php

@@ -1,28 +1,27 @@
 <?php
 
-namespace App\Controller;
+namespace App\Torrentio\Framework\Controller;
 
 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;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 
-final class TorrentioController extends AbstractController
+final class WebController extends AbstractController
 {
     public function __construct(
         private readonly GetMovieOptionsHandler $getMovieOptionsHandler,
         private readonly GetTvShowOptionsHandler $getTvShowOptionsHandler,
-        private readonly HubInterface $hub,
-        private readonly \Twig\Environment $renderer,
+        private readonly Broadcaster $broadcaster,
     ) {}
 
     #[Route('/torrentio/movies/{tmdbId}/{imdbId}', name: 'app_torrentio_movies')]
@@ -54,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')]
@@ -75,14 +85,10 @@ final class TorrentioController extends AbstractController
         );
         $cache->delete($cacheId);
 
-        $this->hub->publish(new Update(
-            $request->getSession()->get('mercure_alert_topic'),
-            $this->renderer->render('Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => 'Torrentio cache Cleared.',
-            ])
-        ));
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: 'Torrentio cache Cleared.'
+        );
 
         return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));

src/Twig/Components/DownloadList.php

@@ -18,6 +18,9 @@ final class DownloadList extends AbstractController
 
     use PaginateTrait;
 
+    #[LiveProp(writable: true)]
+    public string $term = "";
+
     #[LiveProp(writable: true)]
     public string $type;
 
@@ -31,9 +34,9 @@ final class DownloadList extends AbstractController
     public function getDownloads()
     {
         if ($this->type === "active") {
-            return $this->downloadRepository->getActivePaginated($this->getUser(), $this->pageNumber, $this->perPage);
+            return $this->downloadRepository->getActivePaginated($this->getUser(), $this->pageNumber, $this->perPage, $this->term);
         } elseif ($this->type === "complete") {
-            return $this->downloadRepository->getCompletePaginated($this->getUser(), $this->pageNumber, $this->perPage);
+            return $this->downloadRepository->getCompletePaginated($this->getUser(), $this->pageNumber, $this->perPage, $this->term);
         }
 
         return [];

src/Twig/Components/DownloadListRow.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Twig\Components;
+
+use App\Download\Framework\Entity\Download;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent]
+final class DownloadListRow
+{
+    public Download $download;
+
+    public bool $isWidget = true;
+}

src/Twig/Components/Modal.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Twig\Components;
+
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent]
+final class Modal
+{
+}

src/Twig/Components/MonitorList.php

@@ -3,6 +3,7 @@
 namespace App\Twig\Components;
 
 use App\Monitor\Framework\Repository\MonitorRepository;
+use Doctrine\ORM\Query\Expr\OrderBy;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\Attribute\LiveAction;
@@ -16,6 +17,12 @@ final class MonitorList extends AbstractController
 
     use PaginateTrait;
 
+    #[LiveProp(writable: true)]
+    public string $term = "";
+
+    #[LiveProp(writable: true)]
+    public string $type;
+
     #[LiveProp(writable: true)]
     public bool $isWidget = true;
 
@@ -24,8 +31,40 @@ final class MonitorList extends AbstractController
     ) {}
 
     #[LiveAction]
-    public function getUserMonitors()
+    public function getMonitors()
     {
-        return $this->monitorRepository->getUserMonitorsPaginated($this->getUser(), $this->pageNumber, $this->perPage);
+        if ($this->type === "active") {
+            return $this->getActiveUserMonitors();
+        } elseif ($this->type === "complete") {
+            return $this->getCompleteUserMonitors();
+        }
+
+        return [];
+    }
+
+    #[LiveAction]
+    public function getActiveUserMonitors()
+    {
+        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', 'Active'])
+            ->setParameter('term', '%'.$this->term.'%')
+            ->orderBy('m.id', 'DESC')
+            ->getQuery()
+        );
+    }
+
+    #[LiveAction]
+    public function getCompleteUserMonitors()
+    {
+        return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
+            ->andWhere('m.status = :status')
+            ->andWhere('(m.title LIKE :term OR m.imdbId LIKE :term OR m.monitorType LIKE :term OR m.status LIKE :term)')
+            ->setParameter('status', 'Complete')
+            ->setParameter('term', '%'.$this->term.'%')
+            ->orderBy('m.id', 'DESC')
+            ->getQuery()
+        );
     }
 }

src/Twig/Components/MonitorListRow.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Twig\Components;
+
+use App\Monitor\Framework\Entity\Monitor;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent]
+final class MonitorListRow
+{
+    public Monitor $monitor;
+}

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

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Twig\Extensions;
+
+use App\Monitor\Framework\Entity\Monitor;
+use Twig\Attribute\AsTwigFilter;
+
+class MonitorExtension
+{
+    #[AsTwigFilter('monitor_type')]
+    public function type(string $type)
+    {
+        $types = [
+            'tvshows' => 'Show',
+            'tvseason' => 'Season',
+            'tvepisode' => 'Episode',
+        ];
+
+        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)
+    {
+        if ($monitor->getMonitorType() === "tvseason") {
+            return "S". str_pad($monitor->getSeason(), 2, "0", STR_PAD_LEFT);
+        }
+
+        if ($monitor->getMonitorType() === "tvepisode") {
+            return "S". str_pad($monitor->getSeason(), 2, "0", STR_PAD_LEFT) .
+                "E". str_pad($monitor->getEpisode(), 2, "0", STR_PAD_LEFT);
+        }
+
+        return "-";
+    }
+}

src/Twig/Extensions/UtilExtension.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Twig\Extensions;
+
+use App\Monitor\Framework\Entity\Monitor;
+use App\Monitor\Service\MediaFiles;
+use App\Torrentio\Action\Result\GetTvShowOptionsResult;
+use App\Torrentio\Result\TorrentioResult;
+use ChrisUllyott\FileSize;
+use Tmdb\Model\Tv\Episode;
+use Twig\Attribute\AsTwigFilter;
+use Twig\Attribute\AsTwigFunction;
+
+class UtilExtension
+{
+
+    public function __construct(
+        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)
+    {
+        return (new FileSize($size))->asAuto();
+    }
+
+    #[AsTwigFilter('strip_media_path')]
+    public function stripMediaPath(string $path)
+    {
+        return str_replace(
+            $this->mediaFiles->getBasePath() . DIRECTORY_SEPARATOR,
+            '',
+            $path
+        );
+    }
+
+    #[AsTwigFilter('episode_id_from_results')]
+    public function episodeId($result): ?string
+    {
+        if (!$result instanceof GetTvShowOptionsResult) {
+            return null;
+        }
+
+        return "S". str_pad($result->season, 2, "0", STR_PAD_LEFT) .
+            "E". str_pad($result->episode, 2, "0", STR_PAD_LEFT);
+    }
+}

src/User/Framework/Controller/Web/PreferencesController.php

@@ -9,23 +9,20 @@ use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
 use App\User\Action\Input\SaveUserDownloadPreferencesInput;
 use App\User\Action\Input\SaveUserMediaPreferencesInput;
 use App\User\Framework\Repository\PreferencesRepository;
+use App\Util\Broadcaster;
 use App\Util\CountryLanguages;
 use App\Util\ProviderList;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
 use Symfony\Component\Routing\Attribute\Route;
 
 class PreferencesController extends AbstractController
 {
     public function __construct(
         private readonly PreferencesRepository $preferencesRepository,
-        private readonly SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler,
-        private readonly HubInterface $hub,
-        private readonly SaveUserDownloadPreferencesHandler $saveUserDownloadPreferencesHandler,
+        private readonly Broadcaster $broadcaster,
     ) {}
+
     #[Route('/user/preferences', 'app_user_preferences', methods: ['GET'])]
     public function mediaPreferences(): Response
     {
@@ -48,25 +45,21 @@ class PreferencesController extends AbstractController
 
     #[Route('/user/preferences/media', 'app_save_media_preferences', methods: ['POST'])]
     public function saveMediaPreferences(
-        Request $request,
         SaveUserMediaPreferencesInput $input,
+        SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler,
     ): Response
     {
-        $this->saveUserMediaPreferencesHandler->handle($input->toCommand());
+        $saveUserMediaPreferencesHandler->handle($input->toCommand());
         $mediaPreferences = $this->getUser()->getMediaPreferences();
         $downloadPreferences = $this->getUser()->getDownloadPreferences();
 
         $languages = CountryLanguages::$languages;
         sort($languages);
 
-        $this->hub->publish(new Update(
-            $request->getSession()->get('mercure_alert_topic'),
-            $this->renderView('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => 'Your media preferences have been saved.',
-            ])
-        ));
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: 'Your media preferences have been saved.'
+        );
 
         return $this->render(
             'user/preferences.html.twig',
@@ -82,24 +75,20 @@ class PreferencesController extends AbstractController
 
     #[Route('/user/preferences/download', 'app_save_download_preferences', methods: ['POST'])]
     public function saveDownloadPreferences(
-        Request $request,
         SaveUserDownloadPreferencesInput $input,
+        SaveUserDownloadPreferencesHandler $saveUserDownloadPreferencesHandler,
     ): Response
     {
-        $downloadPreferences = $this->saveUserDownloadPreferencesHandler->handle($input->toCommand())->downloadPreferences;
+        $downloadPreferences = $saveUserDownloadPreferencesHandler->handle($input->toCommand())->downloadPreferences;
         $mediaPreferences = $this->getUser()->getMediaPreferences();
 
         $languages = CountryLanguages::$languages;
         sort($languages);
 
-        $this->hub->publish(new Update(
-            $request->getSession()->get('mercure_alert_topic'),
-            $this->renderView('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => 'Your download preferences have been saved.',
-            ])
-        ));
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: 'Your download preferences have been saved.'
+        );
 
         return $this->render(
             'user/preferences.html.twig',

src/User/Framework/Controller/Web/RegistrationController.php

@@ -17,13 +17,16 @@ use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
 class RegistrationController extends AbstractController
 {
-    public function __construct(private readonly RegisterUserHandler $registerUserHandler)
+    public function __construct(private readonly RegisterUserHandler $registerUserHandler,
+        private readonly RequestStack $requestStack
+    )
     {
     }
 
@@ -71,6 +74,7 @@ class RegistrationController extends AbstractController
             ));
 
             $security->login($user->user);
+            $this->requestStack->getCurrentRequest()->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
 
             return $this->redirectToRoute('app_index');
         }

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

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Util;
+
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Mercure\HubInterface;
+use Symfony\Component\Mercure\Update;
+use Twig\Environment;
+
+readonly class Broadcaster
+{
+    public function __construct(
+        #[Autowire(service: 'twig')]
+        private Environment $renderer,
+        private HubInterface $hub,
+        private RequestStack $requestStack,
+    ) {}
+
+    public function alert(string $title, string $message, string $type = "success"): void
+    {
+        $userAlertTopic = $this->requestStack->getCurrentRequest()->getSession()->get('mercure_alert_topic');
+        $update = new Update(
+            $userAlertTopic,
+            $this->renderer->render('broadcast/Alert.stream.html.twig', [
+                '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

@@ -2,6 +2,15 @@
     "1tomany/rich-bundle": {
         "version": "v1.8.3"
     },
+    "doctrine/deprecations": {
+        "version": "1.1",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "1.0",
+            "ref": "87424683adc81d7dc305eefec1fced883084aab9"
+        }
+    },
     "doctrine/doctrine-bundle": {
         "version": "2.14",
         "recipe": {
@@ -65,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": {
@@ -169,6 +190,18 @@
             "config/packages/messenger.yaml"
         ]
     },
+    "symfony/property-info": {
+        "version": "7.3",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "7.3",
+            "ref": "dae70df71978ae9226ae915ffd5fad817f5ca1f7"
+        },
+        "files": [
+            "config/packages/property_info.yaml"
+        ]
+    },
     "symfony/routing": {
         "version": "7.2",
         "recipe": {

tailwind.config.js

@@ -4,8 +4,38 @@ module.exports = {
     "./assets/**/*.js",
     "./templates/**/*.html.twig",
   ],
+  safelist: [
+      "bg-blue-300",
+      "bg-orange-300",
+      "bg-fuchsia-300",
+      "bg-green-400",
+      "bg-purple-400",
+      "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",
+      "opacity-100"
+  ],
   theme: {
-    extend: {},
+      extend: {
+          animation: {
+              fade: 'fadeIn .3s ease-in-out',
+          },
+
+          keyframes: {
+              fadeIn: {
+                  from: { opacity: 0 },
+                  to: { opacity: 1 },
+              },
+          },
+      },
   },
   plugins: [],
 }

templates/bare.html.twig

@@ -2,6 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>{% block title %}Welcome!{% endblock %}</title>
         <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>⚫️</text><text y=%221.3em%22 x=%220.2em%22 font-size=%2276%22 fill=%22%23fff%22>sf</text></svg>">
         {% block stylesheets %}

templates/base.html.twig

@@ -2,6 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>{% block title %}Welcome!{% endblock %}</title>
         <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>⚫️</text><text y=%221.3em%22 x=%220.2em%22 font-size=%2276%22 fill=%22%23fff%22>sf</text></svg>">
         {% block stylesheets %}
@@ -13,11 +14,11 @@
         {% endblock %}
     </head>
     <body class="flex flex-col bg-stone-700">
-        <div class="grid grid-cols-6">
-            <div class="col-span-1 h-screen">
+        <div class="grid md:grid-cols-6">
+            <div class="hidden md:block md:col-span-1 md:h-screen">
                 <twig:NavBar />
             </div>
-            <div class="col-span-5 h-screen overflow-y-scroll">
+            <div class="col-span-6 md:col-span-5 h-screen overflow-y-scroll">
                 <twig:Header />
                 <h2 class="px-4 my-2 text-3xl font-bold text-gray-50">{% block h2 %}{% endblock %}</h2>
                 {% block body %}{% endblock %}

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/broadcast/Download.stream.html.twig

@@ -5,38 +5,40 @@
 
     <turbo-stream action="append" target="active_downloads">
         <template>
-            <tr data-download-list-target="download" id="ad_download_{{ entity.id }}">
-                <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
-                    {{ entity.title }}
-                </td>
-                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-50">
-                    {% if entity.progress < 100 %}
-                        <div class="w-[3.25ch] h-[3.25ch] bg-purple-600 rounded-full block text-center table-cell align-middle text-xs text-gray-50">
-                            {{ entity.progress }}
-                        </div>
-                    {% else %}
-                        <twig:StatusBadge color="green" status="Complete" />
-                    {% endif %}
-                </td>
-                <td></td>
-            </tr>
+            <twig:DownloadListRow download="{{ entity }}" />
         </template>
     </turbo-stream>
 {% endblock %}
 
 {% block update %}
     {% if entity.status != "Complete" %}
-        <turbo-stream action="update" target="ad_download_{{ id }}">
+        <turbo-stream action="update" target="download_progress_{{ id }}">
             <template>
-                <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
-                    {{ entity.title }}
-                </td>
-                <td class="px-6 py-4 whitespace-nowrap text-sm text-end text-gray-800 dark:text-gray-50">
-                    <div class="border-2 border-green-700 rounded-md w-full h-6 align-middle overflow-hidden">
-                        <div class="text-green-700 rounded-sm text-bold text-gray-950 text-center bg-green-600 h-5" style="width:{{ entity.progress }}%">{{ entity.progress }}%</div>
-                    </div>
-                </td>
-                <td></td>
+                <div class="text-black text-center rounded-sm text-bold bg-green-300 h-5 relative z-10"
+                     style="width:{{ entity.progress }}%">
+                </div>
+                <div class="absolute text-black text-center"
+                     style="z-index: 400;margin-top: -1.25rem; margin-left: 1.2rem">
+                    {{ entity.progress }}%
+                </div>
+                </div>
+            </template>
+        </turbo-stream>
+        <turbo-stream action="update" target="action_buttons_{{ id }}">
+            <template>
+                {% if entity.status == "In Progress" and entity.progress < 100 %}
+                    <button id="pause_{{ entity.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'pauseDownload', 'click', {id: entity.id}) }}>
+                        <twig:ux:icon name="icon-park-twotone:pause-one" width="16.75px" height="16.75px" class="rounded-full" />
+                    </button>
+                {% elseif entity.status == "Paused" %}
+                    <button id="resume_{{ entity.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'resumeDownload', 'click', {id: entity.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', width: '17.5px', class: 'rounded-full align-middle text-red-600' }) %}
+                <twig:Modal heading="But wait!" button_text="{{ delete_button }}" submit_action="{{ stimulus_action('download_list', 'deleteDownload', 'click', {id: entity.id}) }}" show_cancel show_submit>
+                    Are you sure you want to delete <span class="font-bold">{{ entity.filename }}</span>?
+                </twig:Modal>
             </template>
         </turbo-stream>
     {% else %}
@@ -46,6 +48,9 @@
         <turbo-stream action="remove" target="ad_download_{{ id }}">
         </turbo-stream>
 
+        <turbo-stream action="remove" target="action_buttons_{{ id }}">
+        </turbo-stream>
+
         <turbo-stream action="prepend" target="alert_list">
             <template>
                 <twig:Alert title="Finished downloading" message="{{ entity.title }}" alert_id="{{ entity.id }}" data-controller="alert" />
@@ -54,23 +59,7 @@
 
         <turbo-stream action="prepend" target="complete_downloads">
             <template>
-                <tr  id="ad_download_{{ entity.id }}">
-                    <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
-                        {{ entity.title }}
-                    </td>
-                    <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-50">
-                        <twig:StatusBadge color="green" status="Complete" />
-                    </td>
-                    <td class="px-6 py-4 flex flex-row align-middle justify-center">
-                        <button {{ stimulus_action('download_list', 'deleteDownload', 'click', {id: download.id}) }}>
-                            <twig:ux:icon
-                                    name="ic:twotone-cancel" width="18px"
-                                    class="rounded-full align-middle text-red-600"
-                                    title="Remove {{ download.title }} from download list. This will not delete the file."
-                            />
-                        </button>
-                    </td>
-                </tr>
+                <twig:DownloadListRow download="{{ entity }}" />
             </template>
         </turbo-stream>
     {% endif %}

templates/broadcast/Monitor.stream.html.twig

@@ -3,83 +3,27 @@
     <turbo-stream action="remove" target="active_monitors_no_monitors">
     </turbo-stream>
 
-    <turbo-stream action="append" target="monitors">
+    <turbo-stream action="prepend" target="monitors">
         <template>
-            <tr  id="monitor_{{ entity.id }}">
-                <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-stone-800 min-w-[50ch] max-w-[50ch] truncate">
-                    {{ entity.title }}
-                </td>
-                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
-                    {{ entity.searchCount }}
-                </td>
-                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
-                    {{ entity.createdAt|date('m/d/Y h:i a') }}
-                </td>
-                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
-                    {{ entity.lastSearch|date('m/d/Y h:i a') }}
-                </td>
-                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
-                    {% if entity.status == "New" %}
-                        <twig:StatusBadge color="orange" status="{{ entity.status }}" />
-                    {% elseif entity.status == "In Progress" or entity.status == "Active" %}
-                        <twig:StatusBadge color="purple" status="{{ entity.status }}" />
-                    {% else %}
-                        <twig:StatusBadge color="green" status="{{ entity.status }}" />
-                    {% endif %}
-                </td>
-                <td class="px-6 py-4 flex flex-row align-middle justify-center">
-                    <button {{ stimulus_action('monitor_list', 'deleteMonitor', 'click', {id: entity.id}) }}>
-                        <twig:ux:icon
-                                name="ic:twotone-cancel" width="18px"
-                                class="rounded-full align-middle text-red-600"
-                                title="Remove {{ entity.title }} from your Monitor list."
-                        />
-                    </button>
-                </td>
-            </tr>
+            <twig:MonitorListRow monitor="{{ entity }}" />
         </template>
     </turbo-stream>
 {% endblock %}
 
 {% block update %}
-        <turbo-stream action="prepend" target="monitors">
-            <template>
-                <tr  id="monitor_{{ entity.id }}">
-                    <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-stone-800 min-w-[50ch] max-w-[50ch] truncate">
-                        {{ entity.title }}
-                    </td>
-                    <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
-                        {{ entity.searchCount }}
-                    </td>
-                    <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
-                        {{ entity.createdAt|date('m/d/Y h:i a') }}
-                    </td>
-                    <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
-                        {{ entity.lastSearch|date('m/d/Y h:i a') }}
-                    </td>
-                    <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
-                        {% if entity.status == "New" %}
-                            <twig:StatusBadge color="orange" status="{{ entity.status }}" />
-                        {% elseif entity.status == "In Progress" or entity.status == "Active" %}
-                            <twig:StatusBadge color="purple" status="{{ entity.status }}" />
-                        {% else %}
-                            <twig:StatusBadge color="green" status="{{ entity.status }}" />
-                        {% endif %}
-                    </td>
-                    <td class="px-6 py-4 flex flex-row align-middle justify-center">
-                        <button {{ stimulus_action('monitor_list', 'deleteMonitor', 'click', {id: entity.id}) }}>
-                            <twig:ux:icon
-                                    name="ic:twotone-cancel" width="18px"
-                                    class="rounded-full align-middle text-red-600"
-                                    title="Remove {{ entity.title }} from your Monitor list."
-                            />
-                        </button>
-                    </td>
-                </tr>
-            </template>
-        </turbo-stream>
+    <turbo-stream action="replace" target="monitor_{{ id }}">
+        <template>
+            <twig:MonitorListRow monitor="{{ entity }}" />
+        </template>
+    </turbo-stream>
 {% endblock %}
 
 {% block remove %}
     <turbo-stream action="remove" target="monitor_{{ id }}"></turbo-stream>
+
+    <turbo-stream action="prepend" target="alert_list">
+        <template>
+            <twig:Alert title="Success" message="Your Monitor for '{{ entity.title }}' has been removed." alert_id="monitor_alert_{{ entity.id }}" data-controller="alert" />
+        </template>
+    </turbo-stream>
 {% endblock %}

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