fix: alert topic id not being set after getting started controller

fix: udpates example compose
fix: broken delete monitor
2025-06-22 16:40:43 -05:00 · 2025-06-22 16:21:04 -05:00 · 2025-06-22 15:50:09 -05:00 · 2025-06-22 15:12:37 -05:00 · 2025-06-22 14:06:01 -05:00 · 2025-06-22 10:08:23 -05:00
25 changed files with 474 additions and 66 deletions
--- a/1
+++ b/1
@@ -3,6 +3,7 @@ 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 \
--- a/assets/controllers/download_button_controller.js
+++ b/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())
--- a/assets/controllers/tv_results_controller.js
+++ b/assets/controllers/tv_results_controller.js
@@ -48,6 +48,7 @@ export default class extends Controller {
                    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();
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,7 @@
        "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",
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "3b0840f4e60d44d341c934f6ca153944",
+    "content-hash": "67e697578f7237f60726c0d93bfed001",
    "packages": [
        {
            "name": "1tomany/rich-bundle",
@@ -285,6 +285,72 @@
            },
            "time": "2021-10-17T22:52:23+00:00"
        },
+        {
+            "name": "clue/stream-filter",
+            "version": "v1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/clue/stream-filter.git",
+                "reference": "049509fef80032cb3f051595029ab75b49a3c2f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/clue/stream-filter/zipball/049509fef80032cb3f051595029ab75b49a3c2f7",
+                "reference": "049509fef80032cb3f051595029ab75b49a3c2f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "Clue\\StreamFilter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering"
+                }
+            ],
+            "description": "A simple and modern approach to stream filtering in PHP",
+            "homepage": "https://github.com/clue/stream-filter",
+            "keywords": [
+                "bucket brigade",
+                "callback",
+                "filter",
+                "php_user_filter",
+                "stream",
+                "stream_filter_append",
+                "stream_filter_register"
+            ],
+            "support": {
+                "issues": "https://github.com/clue/stream-filter/issues",
+                "source": "https://github.com/clue/stream-filter/tree/v1.7.0"
+            },
+            "funding": [
+                {
+                    "url": "https://clue.engineering/support",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-20T15:40:13+00:00"
+        },
        {
            "name": "composer/semver",
            "version": "3.4.3",
@@ -2865,6 +2931,130 @@
            },
            "time": "2024-02-19T18:29:05+00:00"
        },
+        {
+            "name": "php-http/cache-plugin",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/cache-plugin.git",
+                "reference": "5c591e9e04602cec12307e3e1be3abefeb005e29"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/cache-plugin/zipball/5c591e9e04602cec12307e3e1be3abefeb005e29",
+                "reference": "5c591e9e04602cec12307e3e1be3abefeb005e29",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0",
+                "php-http/client-common": "^1.9 || ^2.0",
+                "psr/cache": "^1.0 || ^2.0 || ^3.0",
+                "psr/http-factory-implementation": "^1.0",
+                "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "require-dev": {
+                "nyholm/psr7": "^1.6.1",
+                "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Http\\Client\\Common\\Plugin\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "PSR-6 Cache plugin for HTTPlug",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "cache",
+                "http",
+                "httplug",
+                "plugin"
+            ],
+            "support": {
+                "issues": "https://github.com/php-http/cache-plugin/issues",
+                "source": "https://github.com/php-http/cache-plugin/tree/2.0.1"
+            },
+            "time": "2024-10-02T11:25:38+00:00"
+        },
+        {
+            "name": "php-http/client-common",
+            "version": "2.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/client-common.git",
+                "reference": "0cfe9858ab9d3b213041b947c881d5b19ceeca46"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/client-common/zipball/0cfe9858ab9d3b213041b947c881d5b19ceeca46",
+                "reference": "0cfe9858ab9d3b213041b947c881d5b19ceeca46",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0",
+                "php-http/httplug": "^2.0",
+                "php-http/message": "^1.6",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0 || ^2.0",
+                "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/polyfill-php80": "^1.17"
+            },
+            "require-dev": {
+                "doctrine/instantiator": "^1.1",
+                "guzzlehttp/psr7": "^1.4",
+                "nyholm/psr7": "^1.2",
+                "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1",
+                "phpspec/prophecy": "^1.10.2",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.33 || ^9.6.7"
+            },
+            "suggest": {
+                "ext-json": "To detect JSON responses with the ContentTypePlugin",
+                "ext-libxml": "To detect XML responses with the ContentTypePlugin",
+                "php-http/cache-plugin": "PSR-6 Cache plugin",
+                "php-http/logger-plugin": "PSR-3 Logger plugin",
+                "php-http/stopwatch-plugin": "Symfony Stopwatch plugin"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Http\\Client\\Common\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "Common HTTP Client implementations and tools for HTTPlug",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "client",
+                "common",
+                "http",
+                "httplug"
+            ],
+            "support": {
+                "issues": "https://github.com/php-http/client-common/issues",
+                "source": "https://github.com/php-http/client-common/tree/2.7.2"
+            },
+            "time": "2024-09-24T06:21:48+00:00"
+        },
        {
            "name": "php-http/discovery",
            "version": "1.20.0",
@@ -2944,6 +3134,184 @@
            },
            "time": "2024-10-02T11:20:13+00:00"
        },
+        {
+            "name": "php-http/httplug",
+            "version": "2.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/httplug.git",
+                "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/httplug/zipball/5cad731844891a4c282f3f3e1b582c46839d22f4",
+                "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0",
+                "php-http/promise": "^1.1",
+                "psr/http-client": "^1.0",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "require-dev": {
+                "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0",
+                "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eric GELOEN",
+                    "email": "geloen.eric@gmail.com"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://sagikazarmark.hu"
+                }
+            ],
+            "description": "HTTPlug, the HTTP client abstraction for PHP",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "client",
+                "http"
+            ],
+            "support": {
+                "issues": "https://github.com/php-http/httplug/issues",
+                "source": "https://github.com/php-http/httplug/tree/2.4.1"
+            },
+            "time": "2024-09-23T11:39:58+00:00"
+        },
+        {
+            "name": "php-http/message",
+            "version": "1.16.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/message.git",
+                "reference": "06dd5e8562f84e641bf929bfe699ee0f5ce8080a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/message/zipball/06dd5e8562f84e641bf929bfe699ee0f5ce8080a",
+                "reference": "06dd5e8562f84e641bf929bfe699ee0f5ce8080a",
+                "shasum": ""
+            },
+            "require": {
+                "clue/stream-filter": "^1.5",
+                "php": "^7.2 || ^8.0",
+                "psr/http-message": "^1.1 || ^2.0"
+            },
+            "provide": {
+                "php-http/message-factory-implementation": "1.0"
+            },
+            "require-dev": {
+                "ergebnis/composer-normalize": "^2.6",
+                "ext-zlib": "*",
+                "guzzlehttp/psr7": "^1.0 || ^2.0",
+                "laminas/laminas-diactoros": "^2.0 || ^3.0",
+                "php-http/message-factory": "^1.0.2",
+                "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1",
+                "slim/slim": "^3.0"
+            },
+            "suggest": {
+                "ext-zlib": "Used with compressor/decompressor streams",
+                "guzzlehttp/psr7": "Used with Guzzle PSR-7 Factories",
+                "laminas/laminas-diactoros": "Used with Diactoros Factories",
+                "slim/slim": "Used with Slim Framework PSR-7 implementation"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/filters.php"
+                ],
+                "psr-4": {
+                    "Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "HTTP Message related tools",
+            "homepage": "http://php-http.org",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7"
+            ],
+            "support": {
+                "issues": "https://github.com/php-http/message/issues",
+                "source": "https://github.com/php-http/message/tree/1.16.2"
+            },
+            "time": "2024-10-02T11:34:13+00:00"
+        },
+        {
+            "name": "php-http/promise",
+            "version": "1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/promise.git",
+                "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/promise/zipball/fc85b1fba37c169a69a07ef0d5a8075770cc1f83",
+                "reference": "fc85b1fba37c169a69a07ef0d5a8075770cc1f83",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3",
+                "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Http\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Joel Wurtz",
+                    "email": "joel.wurtz@gmail.com"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "Promise used for asynchronous HTTP requests",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "promise"
+            ],
+            "support": {
+                "issues": "https://github.com/php-http/promise/issues",
+                "source": "https://github.com/php-http/promise/tree/1.3.1"
+            },
+            "time": "2024-03-15T13:55:21+00:00"
+        },
        {
            "name": "php-tmdb/api",
            "version": "4.1.3",
--- a/config/packages/twig.yaml
+++ b/config/packages/twig.yaml
@@ -1,4 +1,6 @@
 twig:
+    globals:
+        version: '%app.version%'
    file_name_pattern: '*.twig'
    date:
        format: 'm/d/Y'
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -22,8 +22,11 @@ parameters:
    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:
--- a/docker/Dockerfile.app
+++ b/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 \
--- a/docker/Dockerfile.scheduler
+++ b/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 \
--- a/docker/Dockerfile.worker
+++ b/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 \
--- a/docs/examples/.env
+++ b/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


--- a/docs/examples/compose.yml
+++ b/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:
--- a/src/Controller/SearchController.php
+++ b/src/Controller/SearchController.php
@@ -40,8 +40,6 @@ final class SearchController extends AbstractController
    ): Response {
        $result = $this->getMediaInfoHandler->handle($input->toCommand());

-//        $this->warmDownloadOptionCache($result->media);
-
        return $this->render('search/result.html.twig', [
            'results' => $result,
            'filter' => [
--- a/src/Download/Action/Input/DownloadMediaInput.php
+++ b/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,
--- a/src/Download/Framework/Controller/ApiController.php
+++ b/src/Download/Framework/Controller/ApiController.php
@@ -11,6 +11,7 @@ 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\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -28,6 +29,13 @@ class ApiController extends AbstractController
    public function download(
        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,
--- a/src/Monitor/Action/Handler/MonitorTvShowHandler.php
+++ b/src/Monitor/Action/Handler/MonitorTvShowHandler.php
@@ -61,10 +61,10 @@ readonly class MonitorTvShowHandler implements HandlerInterface
            // Dispatch Episode commands for each missing Episode
            foreach ($episodesInShow as $episode) {
                // Only monitor future episodes
-                $episodeInFuture = $this->episodeInFuture($episode);
-                $this->logger->info('> [MonitorTvShowHandler] Episode is in future for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
+                $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 not in future for title: ' . 'for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ', skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for title: ' . 'for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ', skipping');
                    continue;
                }

@@ -125,11 +125,11 @@ readonly class MonitorTvShowHandler implements HandlerInterface
        );
    }

-    private function episodeInFuture(array $episodeInShow): bool
+    private function episodeReleasedAfterMonitorCreated(string|DateTimeImmutable $monitorStartDate, array $episodeInShow): bool
    {
-        static $today = Carbon::today();
+        $monitorStartDate = Carbon::parse($monitorStartDate)->setTime(0, 0);
        $episodeAirDate = Carbon::parse($episodeInShow['air_date']);
-        return $episodeAirDate > $today;
+        return $episodeAirDate >= $monitorStartDate;
    }

    private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
--- a/src/Monitor/Framework/Controller/ApiController.php
+++ b/src/Monitor/Framework/Controller/ApiController.php
@@ -2,17 +2,13 @@

 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;

 class ApiController extends AbstractController
@@ -46,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
--- a/src/Tmdb/Tmdb.php
+++ b/src/Tmdb/Tmdb.php
@@ -6,6 +6,8 @@ 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;
@@ -13,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;
@@ -41,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,
    ) {
@@ -72,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());
--- a/src/Torrentio/Client/Torrentio.php
+++ b/src/Torrentio/Client/Torrentio.php
@@ -38,11 +38,21 @@ class Torrentio

        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode) {
            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $response = file_get_contents(str_replace('{imdbCode}', $imdbCode, $this->searchUrl));
-            return json_decode(
-                $response,
-                true
-            );
+            try {
+                $response = $this->client->get("$this->searchUrl/$imdbCode.json");
+                return json_decode(
+                    $response->getBody()->getContents(),
+                    true
+                );
+            } catch (\Throwable $exception) {
+                if ($exception->getCode() === 429) {
+                    $this->logger->warning("> [TorrentioClient] Rate limit exceeded");
+                    return null;
+                }
+            }
+
+            $this->logger->error("> [TorrentioClient] Request error: " . $response->getStatusCode() . " - " . $response->getBody()->getContents());
+            return [];
        });

        return $this->parse($results, $filter);
--- a/src/Twig/Extensions/UtilExtension.php
+++ b/src/Twig/Extensions/UtilExtension.php
@@ -4,7 +4,10 @@ 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;

@@ -45,4 +48,15 @@ class UtilExtension
            $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);
+    }
 }
--- a/src/User/Framework/Controller/Web/RegistrationController.php
+++ b/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');
        }
--- a/templates/components/NavBar.html.twig
+++ b/templates/components/NavBar.html.twig
@@ -38,13 +38,13 @@
        </ul>
    </div>

-    <div class="sticky inset-x-0 bottom-0 border-t border-orange-500">
-        <a href="#" class="nav-foot flex items-center gap-2 p-4 bg-orange-500 hover:bg-opacity-80 bg-clip-padding backdrop-filter backdrop-blur-md bg-opacity-60">
+    <div class="sticky inset-x-0 bottom-0 border-t border-b border-orange-500 bg-orange-500 hover:bg-opacity-80 bg-clip-padding backdrop-filter backdrop-blur-md bg-opacity-60 flex flex-col">
+        <a href="#" class="nav-foot flex items-center gap-2 pt-4 px-4">
            <span class="rounded-full p-2 border-orange-500 border-2">
                <twig:ux:icon name="ri:user-line" width="30" class="text-gray-50"/>
            </span>

-            <div>
+            <div class="flex flex-col text-white">
                <p class="text-xs">
                    {% if app.user.name %}
                    <strong class="block font-medium text-white">{{ app.user.name }}</strong>
@@ -54,5 +54,8 @@
                </p>
            </div>
        </a>
+        <p class="px-4 pt-1 inline-flex justify-center">
+            <small class="text-white text-xs">v{{ version|default('0.0') }}</small>
+        </p>
    </div>
 </nav>
--- a/templates/components/TvEpisodeList.html.twig
+++ b/templates/components/TvEpisodeList.html.twig
@@ -33,7 +33,7 @@
                                <button class="py-1 px-1.5 mr-1 grow-0 font-bold text-xs bg-green-600 rounded-lg hover:cursor-pointer hover:bg-green-700 text-white"
                                        {{ stimulus_action('tv-results', 'toggleList', 'click') }}
                                >
-                                    <span {{ stimulus_target('tv-results', 'count') }}>0</span> results
+                                    <span {{ stimulus_target('tv-results', 'count') }}>-</span> results
                                </button>

                                <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-gray-700 rounded-lg font-normal text-white" title="Air date {{ episode['name'] }}">
--- a/templates/monitor/index.html.twig
+++ b/templates/monitor/index.html.twig
@@ -15,11 +15,5 @@
            </twig:Card>
        </div>

-        <div class="p-2">
-            <twig:Card title="Upcoming Episodes" >
-                <twig:UpcomingEpisodes />
-            </twig:Card>
-        </div>
-
    </div>
 {% endblock %}
--- a/templates/torrentio/partial/option-table.html.twig
+++ b/templates/torrentio/partial/option-table.html.twig
@@ -34,7 +34,7 @@
    </thead>
    <tbody>
    {% for result in results.results %}
-        <tr class="bg-white border-b dark:bg-slate-700 dark:border-gray-600 border-gray-200" data-provider="{{ result.provider }}" data-languages="{{ result.languages|json_encode }}" {% if "tvshows" == results.media.mediaType %} data-season="{{ results.season }} {% endif %}">
+        <tr class="bg-white border-b dark:bg-slate-700 dark:border-gray-600 border-gray-200" data-provider="{{ result.provider }}" data-languages="{{ result.languages|json_encode }}" {% if "tvshows" == results.media.mediaType %} data-season="{{ results.season }}"{% endif %}>
            <td id="size" class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-gray-50">
                {{ result.size }}
            </td>
@@ -60,7 +60,8 @@
                                title: results.media.title,
                                filename: result.filename,
                                mediaType: results.media.mediaType,
-                                imdbId: results.media.imdbId
+                                imdbId: results.media.imdbId,
+                                episodeId: results|episode_id_from_results
                            }) }}
                            {{ stimulus_action('download_button', 'download', 'click') }}
                        >
Author	SHA1	Message	Date
Brock H Caldwell	5938d33c89	fix: alert topic id not being set after getting started controller	2025-06-22 16:40:43 -05:00
Brock H Caldwell	d95ab85415	fix: udpates example compose	2025-06-22 16:21:04 -05:00
Brock H Caldwell	cc39e46bfd	fix: broken delete monitor	2025-06-22 15:50:09 -05:00
Brock H Caldwell	ba092ab3c2	chore: remove line	2025-06-22 15:12:37 -05:00
Brock H Caldwell	774d6f4999	fix: caches tmdb data	2025-06-22 14:06:01 -05:00
Brock H Caldwell	0b56ee937d	fix: removes upcoming episodes component from monitors page	2025-06-22 10:08:23 -05:00
Brock H Caldwell	7b3d57b94a	fix: prepends episode/season number to filename if doesn't exist. should fix monitors repeatedly downloading episodes	2025-06-21 23:26:55 -05:00
Brock H Caldwell	be7b610111	fix: monitor tv -> set monitor create date time to 00:00.00 for comparison to air date	2025-06-20 11:46:11 -05:00
Brock H Caldwell	3e93a7c9c1	fix: un-hardcodes version	2025-06-20 11:29:50 -05:00
Brock H Caldwell	bc78b83f8d	fix: includes version number in worker & scheduler	2025-06-20 11:06:34 -05:00
Brock H Caldwell	c5bcaeb1d4	fix: shows version in nav bar	2025-06-20 11:05:44 -05:00
Brock H Caldwell	e39182ba91	fix: defaults episode count to '-' as an indicator to whether the fetch call has run or not. if there are 0 results after the fetch call, the '-' is updated to '0'	2025-06-20 08:37:35 -05:00
Brock H Caldwell	965b747594	fix: monitor checks if episode was released after monitor created	2025-06-20 08:11:27 -05:00
Brock H Caldwell	937e3c6270	fix: updates monitor to search for episodes that were released after monitor created	2025-06-20 07:34:18 -05:00
Brock H Caldwell	2bb2845ead	fix: torrentio for movies	2025-06-19 23:32:07 -05:00