fix: rekeys season list

.dockerignore

@@ -0,0 +1,14 @@
+.git
+.idea
+.phpunit.cache
+.php-cs-fixer.cache
+.env.test
+.gitignore
+bolt.db
+bash
+build.xml
+deploy.compose.yml
+phpstan.dist.neon
+phpunit.dist.xml
+nomad.deploy.hcl
+deployment.properties

Dockerfile

@@ -1,19 +1,10 @@
-FROM dunglas/frankenphp:php8.4
+FROM code.caldwell.digital/home/torsearch-base: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"
+ENV APP_VERSION="0.0.0-dev"
-
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
-
-RUN apt update && apt install -y wget
 
 HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
 
-COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile
+COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile

assets/controllers/monitor_button_controller.js

@@ -13,34 +13,7 @@ export default class extends Controller {
         tmdbId: String,
         imdbId: String,
         title: String,
-    }
+        season: Number,
-
-    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)
-    }
-
-    // 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)
     }
 
     toggle() {
@@ -53,34 +26,13 @@ export default class extends Controller {
             imdbId: this.imdbIdValue,
             title: this.titleValue,
             monitorType: 'tvshows',
+            season: this.seasonValue
         });
         if (this.hasDialogOutlet) {
             this.dialogOutlet.close();
         }
     }
 
-    async monitorSeason() {
-        await this.makeMonitor({
-            tmdbId: this.tmdbIdValue,
-            imdbId: this.imdbIdValue,
-            title: this.titleValue,
-            monitorType: 'tvseason',
-            season: this.resultFilterOutlet.activeFilter['season'],
-        });
-    }
-
-    async monitorEpisode() {
-        // ToDo: figure out how to set episode
-        await this.makeMonitor({
-            tmdbId: this.tmdbIdValue,
-            imdbId: this.imdbIdValue,
-            title: this.titleValue,
-            monitorType: 'tvepisode',
-            season: this.resultFilterOutlet.activeFilter['season'],
-            episode: '',
-        });
-    }
-
     async makeMonitor(body) {
         const response = await fetch('/api/monitor', {
             method: 'POST',
@@ -90,7 +42,6 @@ export default class extends Controller {
             },
             body: JSON.stringify(body)
         });
-
         return await response.json();
     }
 }

assets/controllers/movie_results_controller.js

@@ -13,7 +13,6 @@ export default class extends Controller {
     };
 
     static targets = ['list']
-    static outlets = ['loading-icon']
 
     options = []
     optionsLoaded = false
@@ -28,7 +27,6 @@ export default class extends Controller {
         this.options = this.element.querySelectorAll('tbody tr');
         this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
         this.resultCountEl.innerText = this.options.length;
-        this.loadingIconOutlet.toggleIcon();
         document.dispatchEvent(new CustomEvent('optionsLoaded', {detail: {options: this.options}}));
     }
 }

assets/controllers/result_filter_controller.js

@@ -22,7 +22,7 @@ export default class extends Controller {
     defaultOptions = '<option value="-">-</option>';
 
     static outlets = ['tv-episode-list']
-    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'loadingIcon', 'selectAll', 'downloadSelected']
+    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'selectAll', 'downloadSelected', 'currentSeason']
     static values = {
         'imdbId': String,
         'media-type': String,
@@ -32,7 +32,6 @@ export default class extends Controller {
 
     async connect() {
         await this.setInitialFilter();
-        this.setTimerToStopLoadingIcon();
         this.element.filterResults = this.filter.bind(this);
         document.addEventListener('optionsLoaded', this.loadOptions.bind(this));
     }
@@ -48,10 +47,6 @@ export default class extends Controller {
         }
     }
 
-    setTimerToStopLoadingIcon() {
-        setTimeout(() => this.loadingIconTarget.hideIcon(), 10000);
-    }
-
     // Event is fired from movies/tvshows controllers to populate this data
     async loadOptions({detail: { options }}) {
         await options.forEach((option) => {
@@ -99,7 +94,9 @@ export default class extends Controller {
     }
 
     setSeason(event) {
+        console.log('hurrrr');
         this.tvEpisodeListOutlet.setSeason(event.target.value);
+        this.currentSeasonTarget.innerText = event.target.value;
     }
 
     downloadSeason() {

assets/controllers/search_bar_controller.js

@@ -38,21 +38,21 @@ export default class extends Controller {
             return `
             <span data-controller="loading-icon" data-loading-icon-total-value="52" data-loading-icon-count-value="20" class="loading-icon">
                 <svg viewBox="0 0 24 24" fill="currentColor" height="20" width="20" data-loading-icon-target="icon" class="text-end" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M12 6.99998C9.1747 6.99987 6.99997 9.24998 7 12C7.00003 14.55 9.02119 17 12 17C14.7712 17 17 14.75 17 12"><animateTransform attributeName="transform" attributeType="XML" dur="560ms" from="0,12,12" repeatCount="indefinite" to="360,12,12" type="rotate"></animateTransform></path></svg>
-            </span>
+            </span>`;
-`;
         }
         event.detail.options.render.option = (data, escape) => {
-            if (data.data.description.length > 60) {
+            console.log(data);
-                data.data.description = data.data.description.substring(0, 107) + "...";
+            if (data.data.overview.length > 60) {
+                data.data.overview = data.data.overview.substring(0, 107) + "...";
             }
+
             return `<div class="flex flex-row">
                         <img src="${data.data.poster}" class="w-16 rounded-md">
                         <div class="p-2 flex flex-col">
                             <h2>${data.data.title}</h2>
-                            <p class="max-w-[60ch] text-wrap">${data.data.description}</p>
+                            <p class="max-w-[60ch] text-wrap">${data.data.overview}</p>
                         </div>
-                    </div>
+                    </div>`;
-`
         }
     }
 

assets/controllers/tv_results_controller.js

@@ -19,7 +19,6 @@ export default class extends Controller {
     };
 
     static targets = ['list', 'count', 'episodeSelector',]
-    static outlets = ['loading-icon']
 
     options = []
 
@@ -35,6 +34,5 @@ export default class extends Controller {
             this.countTarget.innerText = 0;
             this.episodeSelectorTarget.disabled = true;
         }
-        this.loadingIconOutlet.increaseCount();
     }
 }

assets/styles/app.css

@@ -199,6 +199,10 @@ dialog[data-dialog-target="dialog"][closing] {
     @apply flex flex-col gap-1 justify-between;
 }
 
+/** FullCalendar **/
+#upcoming_episodes_calendar .fc-event-main .fc-event-title-container {
+    cursor: pointer !important;
+}
 .fc-col-header-cell {
     @apply bg-orange-500/60 text-white;
 }

bash/build_base.sh

@@ -0,0 +1,14 @@
+# torsearch-app is built from this base
+export APP_FRANKENPHP_TAG=php8.4
+
+docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" .
+docker push code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG}
+docker push code.caldwell.digital/home/torsearch-base:latest
+
+# torsearch-worker & torsearch-scheduler are built from this base
+export WORKER_FRANKENPHP_TAG=php8.4-alpine
+
+docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" .
+docker push code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG}
+docker push code.caldwell.digital/home/torsearch-base-worker:latest
+

compose.yml

@@ -33,7 +33,11 @@ services:
 
 
   worker:
-    build: .
+    build:
+      dockerfile: docker/Dockerfile.base.worker
+      context: .
+      args:
+        FRANKENPHP_TAG: php8.4-alpine
     restart: unless-stopped
     volumes:
       - $PWD:/app
@@ -41,11 +45,15 @@ services:
     tty: true
     environment:
       TZ: America/Chicago
-    command: php /app/bin/console messenger:consume async -vv --time-limit=3600
+    command: php /app/bin/console messenger:consume async --time-limit=3600 -vv
 
 
   scheduler:
-    build: .
+    build:
+      dockerfile: docker/Dockerfile.base.worker
+      context: .
+      args:
+        FRANKENPHP_TAG: php8.4-alpine
     restart: unless-stopped
     volumes:
       - $PWD:/app

composer.json

@@ -25,6 +25,8 @@
         "p3k/emoji-detector": "^1.2",
         "php-http/cache-plugin": "^2.0",
         "php-tmdb/api": "^4.1",
+        "phpdocumentor/reflection-docblock": "^5.6",
+        "phpstan/phpdoc-parser": "^2.1",
         "predis/predis": "^2.4",
         "runtime/frankenphp-symfony": "^0.2.0",
         "spatie/icalendar-generator": "^3.0",
@@ -46,9 +48,13 @@
         "symfony/messenger": "7.3.*",
         "symfony/notifier": "7.3.*",
         "symfony/ntfy-notifier": "7.3.*",
+        "symfony/object-mapper": "7.3.*",
+        "symfony/property-access": "7.3.*",
+        "symfony/property-info": "7.3.*",
         "symfony/runtime": "7.3.*",
         "symfony/scheduler": "7.3.*",
         "symfony/security-bundle": "7.3.*",
+        "symfony/serializer": "7.3.*",
         "symfony/stimulus-bundle": "^2.24",
         "symfony/twig-bundle": "7.3.*",
         "symfony/ux-autocomplete": "^2.27",

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": "9ffd10f98137e8975de2c04ac2412ed5",
+    "content-hash": "e055bbbbe5836c92bb147b6dbb1d1d46",
     "packages": [
         {
             "name": "1tomany/rich-bundle",
@@ -7783,6 +7783,79 @@
             ],
             "time": "2025-02-13T10:27:54+00:00"
         },
+        {
+            "name": "symfony/object-mapper",
+            "version": "v7.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/object-mapper.git",
+                "reference": "f7f9833d9fcc8361239c1dae5495aa9e43ece0b5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/object-mapper/zipball/f7f9833d9fcc8361239c1dae5495aa9e43ece0b5",
+                "reference": "f7f9833d9fcc8361239c1dae5495aa9e43ece0b5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "psr/container": "^2.0"
+            },
+            "conflict": {
+                "symfony/property-access": "<7.2"
+            },
+            "require-dev": {
+                "symfony/property-access": "^7.2",
+                "symfony/var-exporter": "^7.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\ObjectMapper\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides a way to map an object to another object",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/object-mapper/tree/v7.3.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-13T14:03:15+00:00"
+        },
         {
             "name": "symfony/options-resolver",
             "version": "v7.3.0",

config/packages/security.yaml

@@ -45,6 +45,7 @@ security:
     # Easy way to control access for large sections of your site
     # Note: Only the *first* access control that matches will be used
     access_control:
+        - { path: ^/monitors/ical/, roles: PUBLIC_ACCESS }
         - { path: ^/reset-password, roles: PUBLIC_ACCESS }
         - { path: ^/getting-started, roles: PUBLIC_ACCESS }
         - { path: ^/register, roles: PUBLIC_ACCESS }

config/services.yaml

@@ -32,7 +32,7 @@ parameters:
     app.cache.redis.host.default: 'redis://redis'
 
     # Various configs
-    app.default.version: '0.dev'
+    app.default.version: '0.0.0-dev'
     app.default.timezone: 'America/Chicago'
 
     # Auth

deploy.compose.yml

@@ -2,7 +2,7 @@ services:
   app:
     image: registry.caldwell.digital/home/torsearch-app:${TAG}
     ports:
-      - '8001:80'
+      - "${SWARM_PORT}:80"
     environment:
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
       MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
@@ -15,10 +15,6 @@ services:
       - mercure_config:/config
     depends_on:
       - database
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "tcp://192.168.1.197:12202"
 
 
   worker:
@@ -32,10 +28,6 @@ services:
       replicas: 2
     depends_on:
       - app
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "tcp://192.168.1.197:12203"
 
 
   scheduler:
@@ -47,11 +39,6 @@ services:
     command: -vv
     depends_on:
       - app
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "tcp://192.168.1.197:12204"
-
 
 
   redis:

deployment.properties

@@ -10,6 +10,7 @@ templates
 var
 vendor
 build.xml
+.git
 .env
 .env.local
 composer.json

docker/Dockerfile.app

@@ -1,19 +1,8 @@
-FROM dunglas/frankenphp
+FROM code.caldwell.digital/home/torsearch-base:php8.4
 
-ENV SERVER_NAME=":80"
+ARG APP_VERSION="0.0.0-dev"
-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 \
-	intl \
-	zip \
-	opcache
-
 COPY . /app
 COPY --chmod=775 docker/app/entrypoint.sh /usr/local/bin/docker-entrypoint
 COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile

docker/Dockerfile.base.app

@@ -0,0 +1,14 @@
+ARG FRANKENPHP_TAG
+
+FROM dunglas/frankenphp:${FRANKENPHP_TAG}
+
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache

docker/Dockerfile.base.worker

@@ -0,0 +1,19 @@
+ARG FRANKENPHP_TAG
+
+FROM dunglas/frankenphp:${FRANKENPHP_TAG}
+
+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 \
+	intl \
+	zip \
+	opcache
+
+RUN apk add --no-cache wget

docker/Dockerfile.scheduler

@@ -1,19 +1,8 @@
-FROM dunglas/frankenphp:php8.4-alpine
+FROM code.caldwell.digital/home/torsearch-base-worker:php8.4-alpine
 
-ENV SERVER_NAME=":80"
+ARG APP_VERSION="0.0.0-dev"
-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 \
-	intl \
-	zip \
-	opcache
-
 COPY . /app
 
 ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]

docker/Dockerfile.worker

@@ -1,21 +1,8 @@
-FROM dunglas/frankenphp:php8.4-alpine
+FROM code.caldwell.digital/home/torsearch-base-worker:php8.4-alpine
 
-ENV SERVER_NAME=":80"
+ARG APP_VERSION="0.0.0-dev"
-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 \
-	intl \
-	zip \
-	opcache
-
-RUN apk add --no-cache wget
-
 COPY . /app
 
 ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]

migrations/Version20250831013403.php

@@ -0,0 +1,47 @@
+<?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 Version20250831013403 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'
+            DROP TABLE sessions
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE download CHANGE created_at created_at DATETIME NOT NULL, CHANGE updated_at updated_at DATETIME NOT NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE user_preference CHANGE preference_value preference_value VARCHAR(1024) DEFAULT NULL
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            CREATE TABLE sessions (sess_id VARBINARY(128) NOT NULL, sess_data LONGBLOB NOT NULL, sess_lifetime INT UNSIGNED NOT NULL, sess_time INT UNSIGNED NOT NULL, INDEX sess_lifetime_idx (sess_lifetime), PRIMARY KEY(sess_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_bin` ENGINE = InnoDB COMMENT = '' 
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE download CHANGE created_at created_at DATETIME DEFAULT NULL, CHANGE updated_at updated_at DATETIME DEFAULT NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE user_preference CHANGE preference_value preference_value VARCHAR(255) DEFAULT NULL
+        SQL);
+    }
+}

src/Base/ConfigResolver.php

@@ -2,16 +2,25 @@
 
 namespace App\Base;
 
+use App\Base\Dto\AppVersionDto;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 final class ConfigResolver
 {
+    const SEMVER_REGEX = '/^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/';
+
     private array $messages = [];
 
     public function __construct(
+        private readonly DenormalizerInterface $denormalizer,
+
         #[Autowire(param: 'app.url')]
         private readonly ?string $appUrl = null,
 
+        #[Autowire(param: 'app.version')]
+        private readonly ?string $appVersion = null,
+
         #[Autowire(param: 'app.debrid.real_debrid.key')]
         private readonly ?string $realDebridApiKey = null,
 
@@ -92,6 +101,13 @@ final class ConfigResolver
         return $this->authOidcBypassFormLogin;
     }
 
+    public function getAppVersion(): AppVersionDto
+    {
+        $matches = [];
+        preg_match(self::SEMVER_REGEX, $this->appVersion, $matches);
+        return $this->denormalizer->denormalize($matches, AppVersionDto::class);
+    }
+
     public function getAuthConfig(): array
     {
         return [

src/Base/Dto/AppVersionDto.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Base\Dto;
+
+use Symfony\Component\Serializer\Attribute\SerializedPath;
+
+class AppVersionDto
+{
+    #[SerializedPath('[1]')]
+    public string|int $major = 0;
+    #[SerializedPath('[2]')]
+    public string|int $minor = 0;
+    #[SerializedPath('[3]')]
+    public string|int $patch = 0;
+    #[SerializedPath('[4]')]
+    public ?string $pre = null;
+    #[SerializedPath('[5]')]
+    public ?string $build = null;
+
+    public function __toString()
+    {
+        return 'v' . $this->major . '.' . $this->minor . '.' . $this->patch . ($this->pre ? '-' . $this->pre : '') . ($this->build ? '+' . $this->build : '');
+    }
+}

src/Base/Enum/MediaType.php

@@ -6,4 +6,5 @@ enum MediaType: string
 {
     case Movie = 'movies';
     case TvShow = 'tvshows';
+    case TvEpisode = 'tvepisode';
 }

src/Base/Framework/Command/SeedDatabaseCommand.php

@@ -135,6 +135,13 @@ class SeedDatabaseCommand extends Command
                 'enabled' => true,
                 'type' => 'download'
             ],
+            [
+                'id' => 'enable_ical_up_ep',
+                'name' => 'Enable a publicly available iCal calendar?',
+                'description' => 'Enable a publicly accessible iCal URL for your upcoming episodes.',
+                'enabled' => false,
+                'type' => 'calendar'
+            ],
         ];
     }
 }

src/Base/Framework/Controller/IndexController.php

@@ -4,32 +4,29 @@ namespace App\Base\Framework\Controller;
 
 use App\Monitor\Action\Command\MonitorTvShowCommand;
 use App\Monitor\Action\Handler\MonitorTvShowHandler;
-use App\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
-use App\User\Framework\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Mime\Email;
 use Symfony\Component\Routing\Attribute\Route;
 
 final class IndexController extends AbstractController
 {
     public function __construct(
-        private readonly Tmdb $tmdb,
+        private readonly TmdbClient $tmdb,
-        private readonly MonitorTvShowHandler $monitorTvShowHandler,
     ) {}
 
     #[Route('/', name: 'app_index')]
     public function index(Request $request): Response
     {
-        /** @var User $user */
-        $user = $this->getUser();
         return $this->render('index/index.html.twig', [
             'active_downloads' => $this->getUser()->getActiveDownloads(),
             'recent_downloads' => $this->getUser()->getDownloads(),
-            'popular_movies' => $this->tmdb->popularMovies(1, 6),
+            'popular_movies' => $this->tmdb->popularMovies(),
-            'popular_tvshows' => $this->tmdb->popularTvShows(1, 6),
+            'popular_tvshows' => $this->tmdb->popularTvShows(),
         ]);
     }
 
@@ -51,8 +48,9 @@ final class IndexController extends AbstractController
     }
 
     #[Route('/test')]
-    public function monitorTvShow(): Response
+    public function monitorTvShow(MonitorTvShowHandler $handler): Response
     {
+//        $handler->handle(new MonitorTvShowCommand(82));
         return $this->render('index/test.html.twig', []);
     }
 }

src/Base/Util/ImdbMatcher.php

@@ -6,6 +6,6 @@ class ImdbMatcher
 {
     public static function isMatch(string $imdbId): bool
     {
-        return preg_match('/^tt\d{7}$/', $imdbId);
+        return preg_match('/^tt\d{7,20}$/', $imdbId);
     }
 }

src/Download/Action/Handler/DownloadSeasonHandler.php

@@ -3,13 +3,14 @@
 namespace App\Download\Action\Handler;
 
 use Aimeos\Map;
+use App\Base\Enum\MediaType;
 use App\Base\Service\MediaFiles;
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Download\Action\Command\DownloadSeasonCommand;
 use App\Download\Action\Result\DownloadMediaResult;
 use App\Download\Action\Result\DownloadSeasonResult;
 use App\Download\DownloadOptionEvaluator;
-use App\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\User\Dto\UserPreferencesFactory;
@@ -27,7 +28,7 @@ readonly class DownloadSeasonHandler implements HandlerInterface
     public function __construct(
         private MediaFiles $mediaFiles,
         private LoggerInterface $logger,
-        private Tmdb $tmdb,
+        private TmdbClient $tmdb,
         private MessageBusInterface $bus,
         private DownloadOptionEvaluator $downloadOptionEvaluator,
         private GetTvShowOptionsHandler $getTvShowOptionsHandler,
@@ -36,7 +37,8 @@ readonly class DownloadSeasonHandler implements HandlerInterface
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $series = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
+        $series = $this->tmdb->tvshowDetails($command->imdbId);
+
         $this->logger->info('> [DownloadTvSeasonHandler] Executing DownloadTvSeasonHandler for "' . $series->title . '" season ' . $command->season);
 
         $episodesInSeason = Map::from($series->episodes[$command->season]);

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -9,7 +9,7 @@ use App\Download\Framework\Repository\DownloadRepository;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Result\MonitorTvEpisodeResult;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use App\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\User\Dto\UserPreferencesFactory;
@@ -32,7 +32,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
-        private Tmdb $tmdb,
+        private TmdbClient $tmdb,
         private DownloadRepository $downloadRepository,
     ) {}
 
@@ -42,13 +42,24 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
             $monitor = $this->monitorRepository->find($command->movieMonitorId);
             $this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler for ' . $monitor->getTitle() . ' season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode());
 
-            $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
+            $episodeData = $this->tmdb->tvEpisodeDetails($monitor->getTmdbId(), $monitor->getImdbId(), $monitor->getSeason(), $monitor->getEpisode());
 
-            if (null === $monitor->getAirDate() && null !== $episodeData->episodeAirDate && "" !== $episodeData->episodeAirDate) {
+            if (null === $episodeData->airDate || "" === $episodeData->airDate) {
-                $monitor->setAirDate(Carbon::parse($episodeData->episodeAirDate));
+                $this->logger->info('> [MonitorTvEpisodeHandler] ...Episode does not have an air date, skipping for now');
+                return new MonitorTvEpisodeResult(
+                    status: 'OK',
+                    result: [
+                        'message' => 'No change',
+                        'monitor' => $monitor,
+                    ]
+                );
             }
 
-            if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::today('UTC')) {
+            if (null === $monitor->getAirDate()) {
+                $monitor->setAirDate(Carbon::parse($episodeData->airDate));
+            }
+
+            if (Carbon::createFromTimestamp($episodeData->airDate) > Carbon::today('UTC')) {
                 $this->logger->info('> [MonitorTvEpisodeHandler] ...Episode has not aired yet, skipping for now');
                 return new MonitorTvEpisodeResult(
                     status: 'OK',

src/Monitor/Action/Handler/MonitorTvSeasonHandler.php

@@ -9,7 +9,7 @@ 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\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use App\Base\Util\PTN;
@@ -26,7 +26,7 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
         private LoggerInterface $logger,
-        private Tmdb $tmdb,
+        private TmdbClient $tmdb,
         private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
     ) {}
 
@@ -50,7 +50,7 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
 
         // Compare against list from TMDB
         $episodesInSeason = Map::from(
-            $this->tmdb->tvDetails($monitor->getTmdbId())->episodes[$monitor->getSeason()]
+            $this->tmdb->tvshowDetails($monitor->getImdbId())->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());
 

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -9,9 +9,9 @@ use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
 use App\Monitor\Action\Result\MonitorTvShowResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use App\Tmdb\Tmdb;
+use App\Tmdb\Dto\TmdbEpisodeDto;
+use App\Tmdb\TmdbClient;
 use Carbon\Carbon;
-use Carbon\CarbonImmutable;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use App\Base\Util\PTN;
@@ -29,8 +29,9 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
         private MediaFiles $mediaFiles,
         private LoggerInterface $logger,
-        private Tmdb $tmdb,
+        private TmdbClient $tmdb,
-    ) {}
+    ) {
+    }
 
     public function handle(CommandInterface $command): ResultInterface
     {
@@ -40,78 +41,77 @@ 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) =>
+            ->filter(fn($episode) => property_exists($episode, '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->tvshowDetails($monitor->getImdbId())->episodes
-        )->flat(1);
+        )->flat(1)
+            ->filter(fn(TmdbEpisodeDto $episode) => $episode->seasonNumber >= $monitor->getSeason())
+            ->values();
 
         $this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes for title: ' . $monitor->getTitle());
 
         $episodeMonitors = [];
-        if ($downloadedEpisodes->count() !== $episodesInShow->count()) {
+        // Dispatch Episode commands for each missing Episode
-            // Dispatch Episode commands for each missing Episode
+        foreach ($episodesInShow as $episode) {
-            foreach ($episodesInShow as $episode) {
+            /** @var TmdbEpisodeDto $episode */
-                // Only monitor future episodes
+            // Only monitor future episodes
-                $this->logger->info('> [MonitorTvShowHandler] Evaluating "' . $monitor->getTitle() . '", season "' . $episode['season_number'] . '" episode "' . $episode['episode_number'] . '"');
+            $this->logger->info('> [MonitorTvShowHandler] Evaluating "' . $monitor->getTitle() . '", season "' . $episode->seasonNumber . '" episode "' . $episode->episodeNumber . '"');
-                $episodeInFuture = $this->episodeReleasedAfterMonitorCreated($monitor->getCreatedAt(), $episode);
+            $episodeInFuture = $this->episodeReleasedAfterMonitorCreated($monitor->getCreatedAt(), $episode);
-                $this->logger->info('> [MonitorTvShowHandler] ...Released after monitor started? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
+            $this->logger->info('> [MonitorTvShowHandler] ...Released after monitor started? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
-                if (false === $episodeInFuture) {
+            if (false === $episodeInFuture) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
-                    continue;
+                continue;
-                }
-
-                // Check if the episode is already downloaded
-                $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
-                $this->logger->info('> [MonitorTvShowHandler] ...Episode exists? ' . (true === $episodeExists ? 'YES' : 'NO'));
-                if (true === $episodeExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
-                    continue;
-                }
-
-                // Check for existing monitors
-                $monitorExists = $this->monitorExists($monitor, $episode);
-                $this->logger->info('> [MonitorTvShowHandler] ...Monitor exists? ' . (true === $monitorExists ? 'YES' : 'NO'));
-                if (true === $monitorExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
-                    continue;
-                }
-
-                // Create the monitor
-                $episodeMonitor = (new Monitor())
-                    ->setParent($monitor)
-                    ->setUser($monitor->getUser())
-                    ->setTmdbId($monitor->getTmdbId())
-                    ->setImdbId($monitor->getImdbId())
-                    ->setTitle($monitor->getTitle())
-                    ->setMonitorType('tvepisode')
-                    ->setSeason($episode['season_number'])
-                    ->setEpisode($episode['episode_number'])
-                    ->setAirDate($episode['air_date'] !== null && $episode['air_date'] !== "" ? Carbon::parse($episode['air_date']) : null)
-                    ->setCreatedAt(new DateTimeImmutable())
-                    ->setSearchCount(0)
-                    ->setStatus('New');
-
-                $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
-                $this->monitorRepository->getEntityManager()->flush();
-
-                $episodeMonitors[] = $episodeMonitor;
-
-                // Immediately run the monitor
-                $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
-                $this->monitorTvEpisodeHandler->handle($command);
-                $this->logger->info('> [MonitorTvShowHandler] ...Dispatching MonitorTvEpisodeCommand');
             }
+
+            // Check if the episode is already downloaded
+            $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
+            $this->logger->info('> [MonitorTvShowHandler] ...Episode exists? ' . (true === $episodeExists ? 'YES' : 'NO'));
+            if (true === $episodeExists) {
+                $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                continue;
+            }
+
+            // Check for existing monitors
+            $monitorExists = $this->monitorExists($monitor, $episode);
+            $this->logger->info('> [MonitorTvShowHandler] ...Monitor exists? ' . (true === $monitorExists ? 'YES' : 'NO'));
+            if (true === $monitorExists) {
+                $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                continue;
+            }
+
+            // Create the monitor
+            $episodeMonitor = (new Monitor())
+                ->setParent($monitor)
+                ->setUser($monitor->getUser())
+                ->setTmdbId($monitor->getTmdbId())
+                ->setImdbId($monitor->getImdbId())
+                ->setTitle($monitor->getTitle())
+                ->setMonitorType('tvepisode')
+                ->setSeason($episode->seasonNumber)
+                ->setEpisode($episode->episodeNumber)
+                ->setAirDate($episode->airDate !== null && $episode->airDate !== "" ? Carbon::parse($episode->airDate) : null)
+                ->setCreatedAt(new DateTimeImmutable())
+                ->setSearchCount(0)
+                ->setStatus('New');
+
+            $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
+            $this->monitorRepository->getEntityManager()->flush();
+
+            $episodeMonitors[] = $episodeMonitor;
+
+            // Immediately run the monitor
+            $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
+            $this->monitorTvEpisodeHandler->handle($command);
+            $this->logger->info('> [MonitorTvShowHandler] ...Dispatching MonitorTvEpisodeCommand');
         }
 
         // Set the status to Active, so it will be re-executed.
@@ -129,29 +129,31 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         );
     }
 
-    private function episodeReleasedAfterMonitorCreated(string|DateTimeImmutable $monitorStartDate, array $episodeInShow): bool
+    private function episodeReleasedAfterMonitorCreated(
-    {
+        string|DateTimeImmutable $monitorStartDate,
+        TmdbEpisodeDto $episodeInShow
+    ): bool {
         $monitorStartDate = Carbon::parse($monitorStartDate)->setTime(0, 0);
-        $episodeAirDate = Carbon::parse($episodeInShow['air_date']);
+        $episodeAirDate = Carbon::parse($episodeInShow->airDate);
         return $episodeAirDate >= $monitorStartDate;
     }
 
-    private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
+    private function episodeExists(TmdbEpisodeDto $episodeInShow, Map $downloadedEpisodes): bool
     {
         return $downloadedEpisodes->filter(
-            fn (object $episode) => $episode->episode === $episodeInShow['episode_number']
+                fn(object $episode) => $episode->episode === $episodeInShow->episodeNumber
-                && $episode->season === $episodeInShow['season_number']
+                    && $episode->season === $episodeInShow->seasonNumber
             )->count() > 0;
     }
 
-    private function monitorExists(Monitor $monitor, array $episode): bool
+    private function monitorExists(Monitor $monitor, TmdbEpisodeDto $episode): bool
     {
         return $this->monitorRepository->findOneBy([
                 'imdbId' => $monitor->getImdbId(),
                 'title' => $monitor->getTitle(),
                 'monitorType' => 'tvepisode',
-                'season' => $episode['season_number'],
+                'season' => $episode->seasonNumber,
-                'episode' => $episode['episode_number'],
+                'episode' => $episode->episodeNumber,
                 'status' => ['New', 'Active', 'In Progress']
             ]) !== null;
     }

src/Monitor/Dto/UpcomingEpisode.php

@@ -1,17 +0,0 @@
-<?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/CalendarController.php

@@ -4,30 +4,38 @@ namespace App\Monitor\Framework\Controller;
 
 use Aimeos\Map;
 use App\Monitor\Framework\Repository\MonitorRepository;
+use App\User\Framework\Entity\User;
 use Spatie\IcalendarGenerator\Components\Calendar;
 use Spatie\IcalendarGenerator\Components\Event;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 class CalendarController extends AbstractController
 {
-    #[Route('/monitors/ical.ics', name: 'app.monitors.ical')]
+    #[IsGranted('PUBLIC_ACCESS')]
-    public function icalAction(MonitorRepository $monitorRepository)
+    #[Route('/monitors/ical/{email:user}/upcoming-episodes.ics', name: 'app.monitors.ical')]
+    public function icalAction(MonitorRepository $monitorRepository, User $user)
     {
-        $calendar = new Calendar();
+        if (false === $user->hasICalEnabled()) {
+            return new Response('Calendar not found.', 404);
+        }
+
+        $calendar = Calendar::create()
+             ->name('Upcoming Episodes')
+             ->refreshInterval(10);
+
         $monitors = $monitorRepository->whereAirDateNotNull();
-        $events = Map::from($monitors)->map(function ($monitor) {
+        $calendar->event(Map::from($monitors)->map(function ($monitor) {
             return new Event($monitor->getTitle())
                 ->startsAt($monitor->getAirDate())
-                ->withoutTimezone()
+                ->fullDay();
-                ->fullDay()
+        })->toArray());
-                ;
+
-        });
-        $calendar->event($events->toArray());
         return new Response($calendar->get(), 200, [
             'Content-Type' => 'text/calendar',
-            'Content-Disposition' => 'attachment; filename="upcoming-episodes.ics"',
+            'Content-Disposition' => 'inline; filename="upcoming-episodes.ics"',
         ]);
     }
 }

src/Monitor/Framework/Entity/Monitor.php

@@ -68,7 +68,7 @@ class Monitor
     #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
     private ?self $parent = null;
 
-    #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')]
+    #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent', cascade: ['remove'])]
     private Collection $children;
 
     public function __construct()

src/Search/Action/Handler/GetMediaInfoHandler.php

@@ -2,9 +2,11 @@
 
 namespace App\Search\Action\Handler;
 
+use App\Base\Enum\MediaType;
 use App\Search\Action\Command\GetMediaInfoCommand;
 use App\Search\Action\Result\GetMediaInfoResult;
-use App\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
+use App\Tmdb\TmdbResult;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -13,13 +15,30 @@ use OneToMany\RichBundle\Contract\ResultInterface;
 class GetMediaInfoHandler implements HandlerInterface
 {
     public function __construct(
-        private readonly Tmdb $tmdb,
+        private readonly TmdbClient $tmdb,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
+        $handlers = [
+            MediaType::Movie->value => 'getMovieDetails',
+            MediaType::TvShow->value => 'getTvshowDetails',
+        ];
+        $handler = $handlers[$command->mediaType];
+        $media = $this->$handler($command);
+        $relatedMedia = $this->tmdb->relatedMedia($media->tmdbId, $command->mediaType);
 
-        return new GetMediaInfoResult($media, $command->season, $command->episode);
+        return new GetMediaInfoResult($media, $relatedMedia, $command->season, $command->episode);
+    }
+
+    private function getMovieDetails(CommandInterface $command): TmdbResult
+    {
+        return $this->tmdb->movieDetails($command->imdbId);
+    }
+
+    private function getTvshowDetails(CommandInterface $command): TmdbResult
+    {
+        $media = $this->tmdb->tvshowDetails($command->imdbId);
+        return $media;
     }
 }

src/Search/Action/Handler/SearchHandler.php

@@ -2,10 +2,10 @@
 
 namespace App\Search\Action\Handler;
 
-use App\Base\Util\ImdbMatcher;
 use App\Search\Action\Result\RedirectToMediaResult;
 use App\Search\Action\Result\SearchResult;
-use App\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
+use App\Tmdb\TmdbResult;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -14,13 +14,13 @@ use OneToMany\RichBundle\Contract\ResultInterface;
 class SearchHandler implements HandlerInterface
 {
     public function __construct(
-        private Tmdb $tmdb,
+        private TmdbClient $tmdb,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        if (ImdbMatcher::isMatch($command->term)) {
+        $result = $this->tmdb->search($command->term);
-            $result = $this->tmdb->findByImdbId($command->term);
+        if ($result instanceof TmdbResult) {
             return new RedirectToMediaResult(
                 imdbId: $result->imdbId,
                 mediaType: $result->mediaType,

src/Search/Action/Result/GetMediaInfoResult.php

@@ -2,6 +2,7 @@
 
 namespace App\Search\Action\Result;
 
+use Aimeos\Map;
 use App\Tmdb\TmdbResult;
 use OneToMany\RichBundle\Contract\ResultInterface;
 
@@ -10,6 +11,7 @@ class GetMediaInfoResult implements ResultInterface
 {
     public function __construct(
         public TmdbResult $media,
+        public Map|array $relatedMedia,
         public ?int $season,
         public ?int $episode,
     ) {}

src/Search/Action/Result/SearchResult.php

@@ -2,6 +2,7 @@
 
 namespace App\Search\Action\Result;
 
+use Aimeos\Map;
 use OneToMany\RichBundle\Contract\ResultInterface;
 
 /** @implements ResultInterface<SearchResult> */
@@ -9,6 +10,6 @@ class SearchResult implements ResultInterface
 {
     public function __construct(
         public string $term = "",
-        public array $results = []
+        public Map|array $results = [],
     ) {}
 }

src/Search/Framework/Controller/WebController.php

@@ -7,9 +7,6 @@ use App\Search\Action\Handler\SearchHandler;
 use App\Search\Action\Input\GetMediaInfoInput;
 use App\Search\Action\Input\SearchInput;
 use App\Search\Action\Result\RedirectToMediaResult;
-use App\Tmdb\TmdbResult;
-use App\Torrentio\Action\Command\GetMovieOptionsCommand;
-use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;

src/Tmdb/Dto/CastMemberDto.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Tmdb\Dto;
+
+use Symfony\Component\Serializer\Attribute\SerializedPath;
+
+class CastMemberDto
+{
+
+    public function __construct(
+        #[SerializedPath('[name]')]
+        public string $name,
+    ) {}
+
+    public function __toString(): string
+    {
+        return $this->name;
+    }
+}

src/Tmdb/Dto/CrewMemberDto.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Tmdb\Dto;
+
+use Symfony\Component\Serializer\Attribute\SerializedPath;
+
+class CrewMemberDto
+{
+    public function __construct(
+        #[SerializedPath('[name]')]
+        public string $name,
+    ) {}
+
+    public function __toString(): string
+    {
+        return $this->name;
+    }
+}

src/Tmdb/Dto/GenreDto.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Tmdb\Dto;
+
+use Symfony\Component\Serializer\Attribute\SerializedPath;
+
+class GenreDto
+{
+    public function __construct(
+        public int $id,
+        public string $name,
+    ) {}
+
+    public function __toString(): string
+    {
+        return $this->name;
+    }
+}

src/Tmdb/Dto/TmdbEpisodeDto.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Tmdb\Dto;
+
+use App\Base\Enum\MediaType;
+use Symfony\Component\Serializer\Attribute\SerializedPath;
+
+class TmdbEpisodeDto
+{
+    public function __construct(
+        #[SerializedPath('[id]')]
+        public ?int $tmdbId = null,
+        #[SerializedPath('[show_id]')]
+        public ?int $tmdbShowId = null,
+        public ?string $mediaType = MediaType::TvShow->value,
+        public ?string $imdbId = null,
+        public ?string $name = null,
+        #[SerializedPath('[air_date]')]
+        public ?string $airDate = null,
+        #[SerializedPath('[overview]')]
+        public ?string $description = null,
+        public ?string $poster = null,
+        public ?int $runtime = 0,
+        #[SerializedPath('[season_number]')]
+        public ?int $seasonNumber = 0,
+        #[SerializedPath('[episode_number]')]
+        public ?int $episodeNumber = 0,
+    ) {}
+}

src/Tmdb/Framework/Controller/ApiController.php

@@ -3,7 +3,7 @@
 namespace App\Tmdb\Framework\Controller;
 
 use App\Base\Util\ImdbMatcher;
-use App\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
 use App\Tmdb\TmdbResult;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
@@ -13,7 +13,7 @@ use Symfony\Component\Routing\Attribute\Route;
 class ApiController extends AbstractController
 {
     #[Route('/api/tmdb/ajax-search', name: 'api_tmdb_ajax_search', methods: ['GET'])]
-    public function test(Tmdb $tmdb, Request $request): Response
+    public function test(TmdbClient $tmdb, Request $request): Response
     {
         $results = [];
 
@@ -22,7 +22,7 @@ class ApiController extends AbstractController
 
         if (null !== $term) {
             if (ImdbMatcher::isMatch($term)) {
-                $tmdbResult = $tmdb->findByImdbId($term);
+                $tmdbResult = $tmdb->search($term);
                 $results = [
                     [
                         'data' => $tmdbResult,

src/Tmdb/Framework/Serializer/TmdbMovieResultDenormalizer.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Tmdb\Framework\Serializer;
+
+use App\Base\Enum\MediaType;
+use App\Tmdb\TmdbResult;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class TmdbMovieResultDenormalizer extends TmdbResultDenormalizer implements DenormalizerInterface
+{
+    const POSTER_IMG_PATH = "https://image.tmdb.org/t/p/w500";
+
+    public function __construct(
+        #[Autowire(service: 'serializer.normalizer.object')]
+        private readonly NormalizerInterface $normalizer,
+    ) {
+        parent::__construct($normalizer);
+    }
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): TmdbResult|array|null
+    {
+        /** @var TmdbResult $result */
+        $result = parent::denormalize($data, TmdbResult::class, $format, $context);
+
+        if (array_key_exists('release_date', $data) && !in_array($data['release_date'], ['', null,])) {
+            $airDate = (new \DateTime($data['release_date']));
+        } else {
+            $airDate = null;
+        }
+
+        $result->title = $data['original_title'];
+        $result->premiereDate = $airDate;
+        $result->poster = (null !== $data['poster_path']) ? self::POSTER_IMG_PATH . $data['poster_path'] : null;
+        $result->year = (null !== $airDate) ? $airDate->format('Y') : null;
+        $result->mediaType = MediaType::Movie->value;
+        return $result;
+    }
+
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
+        return array_key_exists('media_type', $context) &&
+            $context['media_type'] === MediaType::Movie->value;
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            TmdbResult::class => false,
+        ];
+    }
+}

src/Tmdb/Framework/Serializer/TmdbResultDenormalizer.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Tmdb\Framework\Serializer;
+
+use Aimeos\Map;
+use App\Base\Enum\MediaType;
+use App\Tmdb\Dto\CastMemberDto;
+use App\Tmdb\Dto\CrewMemberDto;
+use App\Tmdb\Dto\GenreDto;
+use App\Tmdb\TmdbResult;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class TmdbResultDenormalizer implements DenormalizerInterface
+{
+    const POSTER_IMG_PATH = "https://image.tmdb.org/t/p/w500";
+
+    public function __construct(
+        #[Autowire(service: 'serializer.normalizer.object')]
+        private readonly NormalizerInterface $normalizer,
+    ) {}
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): TmdbResult|array|null
+    {
+        $result = $this->normalizer->denormalize($data, TmdbResult::class, $format, $context);
+        $result->stars = $this->getStars($data);
+        $result->directors = $this->getDirectors($data);
+        $result->producers = $this->getProducers($data);
+        $result->creators = $this->getCreators($data);
+        return $result;
+    }
+
+    protected function getStars(array $data): ?array
+    {
+        if (!array_key_exists('credits', $data)) {
+            return null;
+        }
+        return Map::from($data['credits']['cast'])
+            ->slice(0, 3)
+            ->map(fn($item) => $this->normalizer->denormalize($item, CastMemberDto::class))
+            ->toArray();
+    }
+
+    protected function getDirectors(array $data): ?array
+    {
+        if (!array_key_exists('credits', $data)) {
+            return null;
+        }
+        return Map::from($data['credits']['crew'])
+            ->filter(fn($item) => $item['job'] === 'Director')
+            ->slice(0, 3)
+            ->map(fn($item) => $this->normalizer->denormalize($item, CrewMemberDto::class))
+            ->toArray();
+    }
+
+    public function getCreators(array $data): ?array
+    {
+        if (!array_key_exists('credits', $data)) {
+            return null;
+        }
+        return Map::from($data['credits']['crew'])
+            ->filter(fn($item) => $item['job'] === 'Creator')
+            ->map(fn($item) => $this->normalizer->denormalize($item, CrewMemberDto::class))
+            ->toArray();
+    }
+
+    public function getProducers(array $data): ?array
+    {
+        if (!array_key_exists('credits', $data)) {
+            return null;
+        }
+        return Map::from($data['credits']['crew'])
+            ->filter(fn($item) => $item['job'] === 'Producer')
+            ->map(fn($item) => $this->normalizer->denormalize($item, CrewMemberDto::class))
+            ->toArray();
+    }
+
+    public function getGenres(array $data, MediaType $mediaType): ?array
+    {
+        if (array_key_exists('genres', $data)) {
+            return null;
+        }
+
+        return Map::from($data['genres'])
+            ->map(fn($item) => $this->normalizer->denormalize($item, GenreDto::class))
+            ->toArray();
+    }
+
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
+        return !array_key_exists('media_type', $context);
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            TmdbResult::class => false,
+        ];
+    }
+}

src/Tmdb/Framework/Serializer/TmdbTvEpisodeResultDenormalizer.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Tmdb\Framework\Serializer;
+
+use App\Base\Enum\MediaType;
+use App\Tmdb\Dto\TmdbEpisodeDto;
+use App\Tmdb\TmdbResult;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class TmdbTvEpisodeResultDenormalizer implements DenormalizerInterface
+{
+    public function __construct(
+        #[Autowire(service: 'serializer.normalizer.object')]
+        private readonly NormalizerInterface $normalizer,
+    ) {}
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): TmdbResult|TmdbEpisodeDto|array|null
+    {
+        /** @var TmdbEpisodeDto $result */
+        $result = $this->normalizer->denormalize($data, TmdbEpisodeDto::class, $format, $context);
+        return $result;
+    }
+
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
+        return array_key_exists('media_type', $context) &&
+            $context['media_type'] === MediaType::TvEpisode->value;
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            TmdbResult::class => false,
+        ];
+    }
+}

src/Tmdb/Framework/Serializer/TmdbTvShowResultDenormalizer.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Tmdb\Framework\Serializer;
+
+use App\Base\Enum\MediaType;
+use App\Tmdb\TmdbResult;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class TmdbTvShowResultDenormalizer extends TmdbResultDenormalizer implements DenormalizerInterface
+{
+    public function __construct(
+        #[Autowire(service: 'serializer.normalizer.object')]
+        private readonly NormalizerInterface $normalizer,
+    ) {
+        parent::__construct($normalizer);
+    }
+
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): TmdbResult|array|null
+    {
+        /** @var TmdbResult $result */
+        $result = parent::denormalize($data, TmdbResult::class, $format, $context);
+
+        if (!in_array($data['first_air_date'], ['', null,])) {
+            $airDate =  (new \DateTime($data['first_air_date']));
+        } else {
+            $airDate = null;
+        }
+
+        if (array_key_exists('seasons', $data)) {
+            $result->numberSeasons = count($data['seasons']);
+        }
+
+        $result->title = $data['original_name'];
+        $result->premiereDate = $airDate;
+        $result->poster = (null !== $data['poster_path']) ? self::POSTER_IMG_PATH . $data['poster_path'] : null;
+        $result->year = (null !== $airDate) ? $airDate->format('Y') : null;
+        $result->mediaType = MediaType::TvShow->value;
+
+        if (is_array($result->episodes)) {
+            $result->latestSeason = array_key_last($result->episodes);
+        }
+
+        return $result;
+    }
+
+    public function supportsDenormalization(
+        mixed $data,
+        string $type,
+        ?string $format = null,
+        array $context = []
+    ): bool {
+        return array_key_exists('media_type', $context) &&
+            $context['media_type'] === MediaType::TvShow->value;
+    }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            TmdbResult::class => false,
+        ];
+    }
+}

src/Tmdb/Tmdb.php

@@ -1,423 +0,0 @@
-<?php
-
-namespace App\Tmdb;
-
-use Aimeos\Map;
-use App\Base\Enum\MediaType;
-use App\ValueObject\ResultFactory;
-use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-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;
-use Tmdb\Event\Listener\Request\UserAgentRequestListener;
-use Tmdb\Event\RequestEvent;
-use Tmdb\Model\Movie;
-use Tmdb\Model\Search\SearchQuery\KeywordSearchQuery;
-use Tmdb\Model\Tv;
-use Tmdb\Repository\MovieRepository;
-use Tmdb\Repository\SearchRepository;
-use Tmdb\Repository\TvEpisodeRepository;
-use Tmdb\Repository\TvRepository;
-use Tmdb\Repository\TvSeasonRepository;
-use Tmdb\Token\Api\ApiToken;
-use Tmdb\Token\Api\BearerToken;
-
-class Tmdb
-{
-    protected Client $client;
-
-    protected MovieRepository $movieRepository;
-
-    protected TvRepository $tvRepository;
-
-    const POSTER_IMG_PATH = "https://image.tmdb.org/t/p/w500";
-
-    public function __construct(
-        private readonly CacheItemPoolInterface $cache,
-        private readonly EventDispatcherInterface $eventDispatcher,
-        #[Autowire(env: 'TMDB_API')] string $apiKey,
-    ) {
-        $this->client = new Client(
-            [
-                /** @var ApiToken|BearerToken */
-                'api_token' => new BearerToken($apiKey),
-                'secure' => true,
-                'base_uri' => Client::TMDB_URI,
-                'event_dispatcher' => [
-                    'adapter' => $this->eventDispatcher,
-                ],
-                // We make use of PSR-17 and PSR-18 auto discovery to automatically guess these, but preferably set these explicitly.
-                'http' => [
-                    'client' => null,
-                    'request_factory' => null,
-                    'response_factory' => null,
-                    'stream_factory' => null,
-                    'uri_factory' => null,
-                ],
-                'hydration' => [
-                    'event_listener_handles_hydration' => false,
-                    'only_for_specified_models' => []
-                ]
-            ]
-        );
-
-        /**
-         * Required event listeners and events to be registered with the PSR-14 Event Dispatcher.
-         */
-        $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());
-        $this->eventDispatcher->addListener(BeforeRequestEvent::class, $apiTokenListener);
-
-        $acceptJsonListener = new AcceptJsonRequestListener();
-        $this->eventDispatcher->addListener(BeforeRequestEvent::class, $acceptJsonListener);
-
-        $jsonContentTypeListener = new ContentTypeJsonRequestListener();
-        $this->eventDispatcher->addListener(BeforeRequestEvent::class, $jsonContentTypeListener);
-
-        $userAgentListener = new UserAgentRequestListener();
-        $this->eventDispatcher->addListener(BeforeRequestEvent::class, $userAgentListener);
-
-        $this->movieRepository = new MovieRepository($this->client);
-        $this->tvRepository = new TvRepository($this->client);
-    }
-
-    public function popularMovies(int $page = 1, ?int $limit = null)
-    {
-        $movies = $this->movieRepository->getPopular(['page' => $page]);
-
-        $movies = $movies->map(function ($movie) use ($movies) {
-            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) {
-            $movies = array_slice($movies, 0, $limit);
-        }
-
-        return $movies;
-    }
-
-    public function popularTvShows(int $page = 1, ?int $limit = null)
-    {
-        $movies = $this->tvRepository->getPopular(['page' => $page]);
-
-        $movies = $movies->map(function ($movie) use ($movies) {
-            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) {
-            $movies = array_slice($movies, 0, $limit);
-        }
-
-        return $movies;
-    }
-
-    public function search(string $term, int $page = 1)
-    {
-        $searchRepository = new SearchRepository($this->client);
-        $searchResults = $searchRepository->searchMulti($term, new KeywordSearchQuery(['page' => $page]));
-
-        $results = [];
-        foreach ($searchResults as $result) {
-            if (!$result instanceof Movie && !$result instanceof Tv) {
-                continue;
-            }
-
-            $results[] = $this->parseResult($result);
-        }
-
-        $results = array_filter($results, fn ($result) => null !== $result->imdbId);
-
-        return $results;
-    }
-
-    public function find(string $id)
-    {
-        $finder = new Find($this->client);
-        $result = $finder->findBy($id, ['external_source' => 'imdb_id']);
-
-        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 findByImdbId(string $imdbId)
-    {
-        $finder = new Find($this->client);
-        $result = $finder->findBy($imdbId, ['external_source' => 'imdb_id']);
-
-        if (count($result['movie_results']) > 0) {
-            $result = $result['movie_results'][0];
-            $mediaType = MediaType::Movie->value;
-        } elseif (count($result['tv_results']) > 0) {
-            $result = $result['tv_results'][0];
-            $mediaType = MediaType::TvShow->value;
-        } elseif (count($result['tv_episode_results']) > 0) {
-            $result = $result['tv_episode_results'][0];
-            $mediaType = MediaType::TvShow->value;
-        }
-
-        $result['media_type'] = $mediaType;
-        $result = $this->mediaDetails($imdbId, $result['media_type']);
-
-        return $result;
-    }
-
-    public function movieDetails(string $id)
-    {
-        $client = new MovieRepository($this->client);
-        $details = $client->getApi()->getMovie($id, ['append_to_response' => 'external_ids']);
-        return $this->parseResult($details, "movie");
-    }
-
-    public function tvDetails(string $id)
-    {
-        $client = new TvRepository($this->client);
-        $details = $client->getApi()->getTvshow($id, ['append_to_response' => 'external_ids,seasons']);
-        $details = $this->getEpisodesFromSeries($details);
-        return $this->parseResult($details, "tvshow");
-    }
-
-    public function episodeDetails(string $id, string $season, string $episode)
-    {
-        $client = new TvEpisodeRepository($this->client);
-        $result = $client->getApi()->getEpisode($id, $season, $episode, ['append_to_response' => 'external_ids']);
-        return $this->parseResult($result, "episode");
-    }
-
-    public function getEpisodesFromSeries(array $series)
-    {
-        $client = new TvSeasonRepository($this->client);
-        foreach ($series['seasons'] as $season) {
-            if ($season['episode_count'] <= 0 || $season['name'] === 'Specials') {
-                continue;
-            }
-
-            $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 {
-            return $this->tvDetails($id);
-        }
-    }
-
-    private function parseResult($result, $mediaType = null)
-    {
-        if (is_array($result)) {
-            return $this->parseFromArray($result, $mediaType);
-        } else {
-            return $this->parseFromObject($result);
-        }
-    }
-
-    private function parseFromArray($data, $mediaType)
-    {
-        if (null === $mediaType) {
-            throw new \Exception("A media type must be set when parsing from an array.");
-        }
-
-        if ($mediaType === 'movie') {
-            $result = $this->parseMovie($data, self::POSTER_IMG_PATH);
-        } elseif ($mediaType === 'tvshow') {
-            $result = $this->parseTvShow($data, self::POSTER_IMG_PATH);
-        } elseif ($mediaType === 'episode') {
-            $result = $this->parseEpisode($data, self::POSTER_IMG_PATH);
-        }
-
-        return $result;
-    }
-
-    private function parseTvShow(array $data, string $posterBasePath): TmdbResult
-    {
-        if (!in_array($data['first_air_date'], ['', null,])) {
-            $airDate = (new \DateTime($data['first_air_date']))->format('Y-m-d');
-        } else {
-            $airDate = null;
-        }
-        return new TmdbResult(
-            imdbId: $data['external_ids']['imdb_id'],
-            tmdbId: $data['id'],
-            title: $data['name'],
-            poster: (null !== $data['poster_path']) ? $posterBasePath . $data['poster_path'] : null,
-            description: $data['overview'],
-            year: $airDate,
-            mediaType: "tvshows",
-            episodes: $data['episodes'],
-        );
-    }
-
-    private function parseEpisode(array $data, string $posterBasePath): TmdbResult
-    {
-        if (!in_array($data['air_date'], ['', null,])) {
-            $airDate = (new \DateTime($data['air_date']))->format('Y-m-d');
-        } else {
-            $airDate = null;
-        }
-        return new TmdbResult(
-            imdbId: $data['external_ids']['imdb_id'],
-            tmdbId: $data['id'],
-            title: $data['name'],
-            poster: (null !== $data['still_path']) ? $posterBasePath . $data['still_path'] : null,
-            description: $data['overview'],
-            year: (new \DateTime($data['air_date']))->format('Y'),
-            mediaType: "tvshows",
-            episodes: null,
-            episodeAirDate: $airDate,
-        );
-    }
-
-    private function parseMovie(array $data, string $posterBasePath): TmdbResult
-    {
-        if (!in_array($data['release_date'], ['', null,])) {
-            $airDate = (new \DateTime($data['release_date']))->format('Y-m-d');
-        } else {
-            $airDate = null;
-        }
-        return new TmdbResult(
-            imdbId: $data['external_ids']['imdb_id'],
-            tmdbId: $data['id'],
-            title: $data['title'],
-            poster: (null !== $data['poster_path']) ? $posterBasePath . $data['poster_path'] : null,
-            description: $data['overview'],
-            year: (new \DateTime($data['release_date']))->format('Y'),
-            mediaType: "movies",
-            episodeAirDate: $airDate,
-        );
-    }
-
-
-    private function parseFromObject($result): TmdbResult
-    {
-            $mediaType = $result instanceof Movie ? MediaType::Movie->value : MediaType::TvShow->value;
-            $tmdbResult = new TmdbResult();
-            $tmdbResult->mediaType = $mediaType;
-            $tmdbResult->tmdbId = $result->getId();
-            $tmdbResult->imdbId = $this->getImdbId($result->getId(), $mediaType);
-            $tmdbResult->title = $this->getTitle($result, $mediaType);
-            $tmdbResult->poster = self::POSTER_IMG_PATH . $result->getPosterImage();
-            $tmdbResult->year = $this->getReleaseDate($result, $mediaType);
-            $tmdbResult->description = $result->getOverview();
-            return $tmdbResult;
-    }
-
-    public function getImdbId(string $tmdbId, $mediaType)
-    {
-        $externalIds = $this->cache->get("tmdb.externalIds.{$tmdbId}",
-            function (ItemInterface $item) use ($tmdbId, $mediaType) {
-                switch (MediaType::tryFrom($mediaType)->value) {
-                    case MediaType::Movie->value:
-                        return $this->movieRepository->getExternalIds($tmdbId);
-                    case MediaType::TvShow->value:
-                        return $this->tvRepository->getExternalIds($tmdbId);
-                    default:
-                        return null;
-                }
-        });
-
-        if (null === $externalIds) {
-            return null;
-        }
-
-        return $externalIds->getImdbId() !== "" ? $externalIds->getImdbId() : "null";
-    }
-
-    public function getImages($tmdbId, $mediaType)
-    {
-        return $this->cache->get("tmdb.images.{$tmdbId}",
-            function (ItemInterface $item) use ($tmdbId, $mediaType) {
-                switch (MediaType::tryFrom($mediaType)->value) {
-                    case MediaType::Movie->value:
-                        return $this->movieRepository->getImages($tmdbId);
-                    case MediaType::TvShow->value:
-                        return $this->tvRepository->getImages($tmdbId);
-                    default:
-                        return null;
-                }
-        });
-    }
-
-    private function getReleaseDate($result, $mediaType): string
-    {
-        switch (MediaType::tryFrom($mediaType)->value) {
-            case MediaType::Movie->value:
-                return ($result->getReleaseDate() instanceof \DateTime)
-                    ? $result->getReleaseDate()->format('Y')
-                    : $result->getReleaseDate();
-            case MediaType::TvShow->value:
-                return ($result->getFirstAirDate() instanceof \DateTime)
-                    ? $result->getFirstAirDate()->format('Y')
-                    : $result->getFirstAirDate();
-            default:
-                return "";
-        }
-    }
-
-    private function getTitle($result, $mediaType): string
-    {
-        switch (MediaType::tryFrom($mediaType)->value) {
-            case MediaType::Movie->value:
-                return $result->getTitle();
-            case MediaType::TvShow->value:
-                return $result->getName();
-            default:
-                return "";
-        }
-    }
-}

src/Tmdb/TmdbClient.php

@@ -0,0 +1,276 @@
+<?php
+
+namespace App\Tmdb;
+
+use Aimeos\Map;
+use App\Base\Enum\MediaType;
+use App\Base\Util\ImdbMatcher;
+use App\Tmdb\Dto\TmdbEpisodeDto;
+use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+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;
+use Tmdb\Event\Listener\Request\UserAgentRequestListener;
+use Tmdb\Event\RequestEvent;
+use Tmdb\Repository\MovieRepository;
+use Tmdb\Repository\SearchRepository;
+use Tmdb\Repository\TvEpisodeRepository;
+use Tmdb\Repository\TvRepository;
+use Tmdb\Repository\TvSeasonRepository;
+use Tmdb\Token\Api\ApiToken;
+use Tmdb\Token\Api\BearerToken;
+
+class TmdbClient
+{
+    const POSTER_IMG_PATH = "https://image.tmdb.org/t/p/w500";
+
+    protected Client $client;
+    protected MovieRepository $movieRepository;
+    protected TvRepository $tvRepository;
+    protected TvSeasonRepository $tvSeasonRepository;
+    protected TvEpisodeRepository $tvEpisodeRepository;
+    protected SearchRepository $searchRepository;
+
+    protected array $mediaTypeMap = [
+        MediaType::Movie->value => MediaType::Movie->value,
+        MediaType::TvShow->value => MediaType::TvShow->value,
+        MediaType::TvEpisode->value => MediaType::TvEpisode->value,
+        'movie' => 'movies',
+        'tv' => 'tvshows',
+    ];
+
+    protected $repos = [];
+
+    public function __construct(
+        private readonly SerializerInterface $serializer,
+        private readonly CacheItemPoolInterface $cache,
+        private readonly EventDispatcherInterface $eventDispatcher,
+        #[Autowire(env: 'TMDB_API')] string $apiKey,
+    ) {
+        $this->client = new Client(
+            [
+                /** @var ApiToken|BearerToken */
+                'api_token' => new BearerToken($apiKey),
+                'secure' => true,
+                'base_uri' => Client::TMDB_URI,
+                'event_dispatcher' => [
+                    'adapter' => $this->eventDispatcher,
+                ],
+                // We make use of PSR-17 and PSR-18 auto discovery to automatically guess these, but preferably set these explicitly.
+                'http' => [
+                    'client' => null,
+                    'request_factory' => null,
+                    'response_factory' => null,
+                    'stream_factory' => null,
+                    'uri_factory' => null,
+                ],
+                'hydration' => [
+                    'event_listener_handles_hydration' => false,
+                    'only_for_specified_models' => []
+                ]
+            ]
+        );
+
+        /**
+         * Required event listeners and events to be registered with the PSR-14 Event Dispatcher.
+         */
+        $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());
+        $this->eventDispatcher->addListener(BeforeRequestEvent::class, $apiTokenListener);
+
+        $acceptJsonListener = new AcceptJsonRequestListener();
+        $this->eventDispatcher->addListener(BeforeRequestEvent::class, $acceptJsonListener);
+
+        $jsonContentTypeListener = new ContentTypeJsonRequestListener();
+        $this->eventDispatcher->addListener(BeforeRequestEvent::class, $jsonContentTypeListener);
+
+        $userAgentListener = new UserAgentRequestListener();
+        $this->eventDispatcher->addListener(BeforeRequestEvent::class, $userAgentListener);
+
+        $this->movieRepository = new MovieRepository($this->client);
+        $this->tvRepository = new TvRepository($this->client);
+        $this->tvSeasonRepository = new TvSeasonRepository($this->client);
+        $this->tvEpisodeRepository = new TvEpisodeRepository($this->client);
+        $this->searchRepository = new SearchRepository($this->client);
+        $this->repos = [
+            MediaType::Movie->value => $this->movieRepository,
+            MediaType::TvShow->value => $this->tvRepository,
+            MediaType::TvEpisode->value => $this->tvEpisodeRepository,
+        ];
+    }
+
+    public function search(string $term): TmdbResult|Map
+    {
+        if (ImdbMatcher::isMatch($term)) {
+            $handlers = [
+                'movie' => 'movieDetails',
+                'tvshow' => 'tvshowDetails',
+            ];
+            $data = $this->findByImdbId($term);
+            $handler = $handlers[$data['media_type']];
+            return $this->$handler($term);
+        }
+        $results = $this->searchRepository->getApi()->searchMulti($term);
+        return $this->parseListOfResults($results);
+    }
+
+    public function movieDetails(string $imdbId): ?TmdbResult
+    {
+        $tmdbId = $this->findByImdbId($imdbId)['id'];
+        return $this->parseResult(
+            $this->movieRepository->getApi()->getMovie($tmdbId, ['append_to_response' => 'external_ids,credits']),
+            MediaType::Movie->value,
+            $imdbId
+        );
+    }
+
+    public function tvshowDetails(string $imdbId): ?TmdbResult
+    {
+        $tmdbId = $this->findByImdbId($imdbId)['id'];
+        $media = $this->tvRepository->getApi()->getTvShow($tmdbId, ['append_to_response' => 'external_ids,credits']);
+
+        $media['seasons'] = Map::from($media['seasons'])->filter(function ($data) {
+            return $data['season_number'] !== 0 &&
+                strtolower($data['name']) !== 'specials' &&
+                $data['episode_count'] > 0;
+        })->map(function ($data) use ($media) {
+            return $this->tvSeasonDetails($media['id'], $data['season_number'])['episodes'];
+        })->rekey(function ($data) use ($media) {
+            return $data[1]['season_number'];
+        })->toArray();
+
+        return $this->parseResult(
+            $media,
+            MediaType::TvShow->value,
+            $imdbId
+        );
+    }
+
+    public function tvSeasonDetails(string $tmdbId, int $season): array
+    {
+        $result = $this->tvSeasonRepository->getApi()->getSeason($tmdbId, $season, ['append_to_response' => 'external_ids,credits']);
+        $result['episodes'] = Map::from($result['episodes'])->map(function ($data) {
+            $data['still_path'] = self::POSTER_IMG_PATH . $data['still_path'];
+            $data['poster'] = $data['still_path'];
+            return $data;
+        })->rekey(fn ($data) => $data['episode_number'])->toArray();
+        return $result;
+    }
+
+    public function tvEpisodeDetails(string $tmdbId, string $showImdbId, int $season, int $episode): TmdbResult|TmdbEpisodeDto|null
+    {
+        $result = $this->tvEpisodeRepository->getApi()->getEpisode($tmdbId, $season, $episode, ['append_to_response' => 'external_ids,credits']);
+        return $this->parseResult(
+            $result,
+            MediaType::TvEpisode->value,
+            $showImdbId
+        );
+    }
+
+    public function relatedMedia(string $tmdbId, string $mediaType, int $resultCount = 6): Map
+    {
+        $results = $this->repos[$mediaType]->getApi()->getRecommendations($tmdbId, ['append_to_response' => 'external_ids']);
+        return $this->parseListOfResults(
+            $results,
+            $resultCount
+        );
+    }
+
+    public function popularMovies(int $resultCount = 6): Map
+    {
+        $results = $this->movieRepository->getApi()->getPopular();
+        $results['results'] = Map::from($results['results'])->map(function ($result) {
+            $result['media_type'] = MediaType::Movie->value;
+            return $result;
+        });
+        return $this->parseListOfResults(
+            $results,
+            $resultCount
+        );
+    }
+
+    public function popularTvShows(int $resultCount = 6): Map
+    {
+        $results = $this->tvRepository->getApi()->getPopular();
+        $results['results'] = Map::from($results['results'])->map(function ($result) {
+            $result['media_type'] = MediaType::TvShow->value;
+            return $result;
+        });
+        return $this->parseListOfResults(
+            $results,
+            $resultCount
+        );
+    }
+
+    private function getExternalIds(int $tmdbId, string $mediaType): ?array
+    {
+        if (!array_key_exists($mediaType, $this->repos) ||
+            !in_array($mediaType, [MediaType::Movie->value, MediaType::TvShow->value])) {
+            return [];
+        }
+        return $this->repos[$mediaType]->getApi()->getExternalIds($tmdbId);
+    }
+
+    private function findByImdbId(string $imdbId): array
+    {
+        $finder = new Find($this->client);
+        $result = $finder->findBy($imdbId, ['external_source' => 'imdb_id']);
+
+        if (count($result['movie_results']) > 0) {
+            return $result['movie_results'][0];
+        } elseif (count($result['tv_results']) > 0) {
+            return $result['tv_results'][0];
+        } elseif (count($result['tv_episode_results']) > 0) {
+            return $result['tv_episode_results'][0];
+        }
+
+        throw new \Exception("No results found for $imdbId");
+    }
+
+    private function parseResult(array $data, string $mediaType, string $imdbId): TmdbResult|TmdbEpisodeDto
+    {
+        if (!array_key_exists('external_ids', $data)) {
+            $data['external_ids'] = ['imdb_id' => $imdbId];
+        }
+        return $this->serializer->denormalize($data, TmdbResult::class, context: ['media_type' => $mediaType]);
+    }
+
+    private function parseListOfResults(array $data, ?int $resultCount = null): Map
+    {
+        $results = Map::from($data['results'])->filter(function ($result) {
+            return array_key_exists('media_type', $result) &&
+                in_array($result['media_type'], array_keys($this->mediaTypeMap));
+        })->map(function ($result) {
+            $result['external_ids'] = $this->getExternalIds($result['id'], $this->mediaTypeMap[$result['media_type']]);
+            return $result;
+        })->filter(function ($result) {
+            return array_key_exists('id', $result) &&
+                array_key_exists('imdb_id', $result['external_ids']) &&
+                $result['external_ids']['imdb_id'] !== null &&
+                $result['external_ids']['imdb_id'] !== "";
+        })->map(function ($result) {
+            return $this->serializer->denormalize($result, TmdbResult::class, context: ['media_type' => $this->mediaTypeMap[$result['media_type']]]);
+        });
+
+        if (null !== $resultCount) {
+            $results = $results->slice(0, $resultCount);
+        }
+
+        return $results;
+    }
+}

src/Tmdb/TmdbResult.php

@@ -2,17 +2,60 @@
 
 namespace App\Tmdb;
 
+use App\Base\Enum\MediaType;
+use App\Tmdb\Dto\CastMemberDto;
+use App\Tmdb\Dto\CrewMemberDto;
+use App\Tmdb\Dto\GenreDto;
+use App\Tmdb\Dto\TmdbEpisodeDto;
+use Symfony\Component\Serializer\Attribute\Context;
+use Symfony\Component\Serializer\Attribute\SerializedPath;
+
 class TmdbResult
 {
+    /**
+     * @param string|null $imdbId
+     * @param int|null $tmdbId
+     * @param string|null $title
+     * @param string|null $description
+     * @param string|null $poster
+     * @param \DateTimeInterface|null $premiereDate
+     * @param string|null $year
+     * @param string|null $mediaType
+     * @param array<TmdbEpisodeDto[]>|null $episodes
+     * @param string|null $episodeAirDate
+     * @param GenreDto[]|null $genres
+     * @param CastMemberDto[]|null $stars
+     * @param CrewMemberDto[]|null $directors
+     * @param CrewMemberDto[]|null $creators
+     * @param CrewMemberDto[]|null $producers
+     * @param int|null $runtime
+     * @param int|null $numberSeasons
+     */
     public function __construct(
+        #[SerializedPath('[external_ids][imdb_id]')]
         public ?string $imdbId = "",
-        public ?string $tmdbId = "",
+        #[SerializedPath('[id]')]
+        public ?int $tmdbId = null,
         public ?string $title = "",
-        public ?string $poster = "",
+        #[SerializedPath('[overview]')]
         public ?string $description = "",
-        public ?string $year = "",
+        public ?string $poster = "",
+        public ?\DateTimeInterface $premiereDate = null,
+        public ?string $year = null,
         public ?string $mediaType = "",
+        #[Context(denormalizationContext: [
+            'media_type' => MediaType::TvEpisode->value
+        ])]
+        #[SerializedPath('[seasons]')]
         public ?array $episodes = null,
         public ?string $episodeAirDate = null,
+        public ?array $genres = null,
+        public ?array $stars = null,
+        public ?array $directors = null,
+        public ?array $creators = null,
+        public ?array $producers = null,
+        public ?int $runtime = null,
+        public ?int $numberSeasons = null,
+        public ?int $latestSeason = null,
     ) {}
 }

src/Torrentio/Action/Handler/GetMovieOptionsHandler.php

@@ -3,7 +3,7 @@
 namespace App\Torrentio\Action\Handler;
 
 use App\Base\Service\MediaFiles;
-use App\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
 use App\Torrentio\Action\Result\GetMovieOptionsResult;
 use App\Torrentio\Client\Torrentio;
 use OneToMany\RichBundle\Contract\CommandInterface;
@@ -13,14 +13,14 @@ use OneToMany\RichBundle\Contract\ResultInterface;
 class GetMovieOptionsHandler implements HandlerInterface
 {
     public function __construct(
-        private readonly Tmdb $tmdb,
+        private readonly TmdbClient $tmdb,
         private readonly Torrentio $torrentio,
         private readonly MediaFiles $mediaFiles
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $media = $this->tmdb->mediaDetails($command->imdbId, 'movies');
+        $media = $this->tmdb->movieDetails($command->imdbId);
         return new GetMovieOptionsResult(
             media: $media,
             file: $this->mediaFiles->movieExists($media->title),

src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php

@@ -2,9 +2,10 @@
 
 namespace App\Torrentio\Action\Handler;
 
+use App\Base\Enum\MediaType;
 use App\Base\Service\MediaFiles;
 use App\Library\Dto\MediaFileDto;
-use App\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
 use App\Torrentio\Client\Torrentio;
@@ -16,15 +17,15 @@ use OneToMany\RichBundle\Contract\ResultInterface;
 class GetTvShowOptionsHandler implements HandlerInterface
 {
     public function __construct(
-        private readonly Tmdb $tmdb,
+        private readonly TmdbClient $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);
+        $media = $this->tmdb->tvEpisodeDetails($command->tmdbId, $command->imdbId, $command->season, $command->episode);
-        $parentShow = $this->tmdb->mediaDetails($command->imdbId, 'tvshows');
+        $parentShow = $this->tmdb->tvshowDetails($command->imdbId);
         $file = $this->mediaFiles->episodeExists($parentShow->title, $command->season, $command->episode);
 
         return new GetTvShowOptionsResult(

src/Torrentio/Action/Result/GetTvShowOptionsResult.php

@@ -3,14 +3,15 @@
 namespace App\Torrentio\Action\Result;
 
 use App\Library\Dto\MediaFileDto;
+use App\Tmdb\Dto\TmdbEpisodeDto;
 use App\Tmdb\TmdbResult;
 use OneToMany\RichBundle\Contract\ResultInterface;
 
 class GetTvShowOptionsResult implements ResultInterface
 {
     public function __construct(
-        public TmdbResult $parentShow,
+        public TmdbResult|TmdbEpisodeDto $parentShow,
-        public TmdbResult $media,
+        public TmdbResult|TmdbEpisodeDto $media,
         public MediaFileDto|false $file,
         public string $season,
         public string $episode,

src/Torrentio/Client/HttpClient.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Torrentio\Client;
+
+use Carbon\Carbon;
+use GuzzleHttp\Client as GuzzleClient;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Contracts\Cache\ItemInterface;
+use Symfony\Contracts\Cache\TagAwareCacheInterface;
+
+class HttpClient
+{
+    private GuzzleClient $client;
+
+    private string $baseUrl = 'https://torrentio.strem.fun/realdebrid=%s/';
+
+    public function __construct(
+        #[Autowire(env: 'REAL_DEBRID_KEY')] private string $realDebridKey,
+        private TagAwareCacheInterface $cache,
+        private LoggerInterface $logger,
+    ) {
+        $this->client = new GuzzleClient([
+            'base_uri' => sprintf($this->baseUrl, $this->realDebridKey),
+        ]);
+    }
+
+    public function get(string $imdbId, array $cacheTags = []): array
+    {
+        $cacheKey = str_replace(":", ".", "torrentio.{$imdbId}");
+
+        return $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbId, $cacheTags) {
+            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+            if (count($cacheTags) > 0) {
+                $item->tag($cacheTags);
+            }
+            try {
+                $response = $this->client->get("stream/movie/$imdbId.json");
+                return json_decode(
+                    $response->getBody()->getContents(),
+                    true
+                );
+            } catch (\Throwable $exception) {
+                dd($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 [];
+        });
+    }
+}

src/Torrentio/Client/Torrentio.php

@@ -2,62 +2,22 @@
 
 namespace App\Torrentio\Client;
 
-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\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';
-
-    private string $searchUrl;
-
-    private Client $client;
-
     public function __construct(
-        #[Autowire(env: 'REAL_DEBRID_KEY')] private string $realDebridKey,
+        private readonly HttpClient $client,
-        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, bool $parseResults = true): array
     {
-        $cacheKey = "torrentio.{$imdbCode}";
+        $cacheTags = ['torrentio', $type, $imdbCode];
-
+        $results = $this->client->get($imdbCode, $cacheTags);
-        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode, $type) {
-            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $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 [];
-        });
 
         if (true === $parseResults) {
-            return $this->parse($results);
+            return $this->parse($results, $imdbCode);
         }
 
         return $results;
@@ -65,39 +25,21 @@ class Torrentio
 
     public function fetchEpisodeResults(string $imdbId, int $season, int $episode, bool $parseResults = true): array
     {
-        $cacheKey = "torrentio.$imdbId.$season.$episode";
+        $cacheTags = ['torrentio', 'tvshows', 'torrentio.tvshows', $imdbId, "torrentio.$imdbId", "$imdbId.$season", "torrentio.$imdbId.$season", "$imdbId.$season.$episode", "torrentio.$imdbId.$season.$episode"];
-        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbId, $season, $episode) {
+        $results = $this->client->get("$imdbId:$season:$episode", $cacheTags);
-            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $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 [];
-        });
 
         if (null === $results) {
             throw new TorrentioRateLimitException();
         }
 
         if (true === $parseResults) {
-            return $this->parse($results);
+            return $this->parse($results, $imdbId);
         }
 
         return $results;
     }
 
-    public function parse(array $data): array
+    public function parse(array $data, string $imdbId): array
     {
         $results = [];
         foreach ($data['streams'] as $stream) {
@@ -117,7 +59,8 @@ class Torrentio
             $result = ResultFactory::map(
                 $stream['url'],
                 $stream['title'],
-                $bingeGroup
+                $bingeGroup,
+                $imdbId
             );
 
             $results[] = $result;

src/Torrentio/Result/ResultFactory.php

@@ -18,7 +18,8 @@ class ResultFactory
     public static function map(
         string $url,
         string $title,
-        string $bingeGroup = "-"
+        string $bingeGroup = "-",
+        string $imdbId = "-",
     ) {
         $ptn = (object) (new PTN())->parse($title);
         return new TorrentioResult(
@@ -40,7 +41,8 @@ class ResultFactory
             self::setLanguages($title),
             self::setLanguageFlags($title),
             false,
-            uniqid()
+            uniqid(),
+            $imdbId,
         );
     }
 

src/Torrentio/Result/TorrentioResult.php

@@ -23,6 +23,7 @@ class TorrentioResult
         public ?array $languages = [],
         public ?string $languageFlags = "-",
         public ?bool $selected = false,
-        public ?string $localId = "-"
+        public ?string $localId = "-",
+        public ?string $imdbId = "-",
     ) {}
 }

src/Twig/Components/TvEpisodeList.php

@@ -49,7 +49,6 @@ final class  TvEpisodeList
         }
 
         $this->reloadCount++;
-
         return new TvEpisodePaginator()->paginate($results, $this->pageNumber, $this->perPage);
     }
 

src/Twig/Components/UpcomingEpisodes.php

@@ -1,81 +0,0 @@
-<?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/UtilExtension.php

@@ -2,10 +2,13 @@
 
 namespace App\Twig\Extensions;
 
+use App\Base\ConfigResolver;
+use App\Base\Dto\AppVersionDto;
 use App\Base\Service\MediaFiles;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
 use App\Twig\Dto\EpisodeIdDto;
 use ChrisUllyott\FileSize;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Twig\Attribute\AsTwigFilter;
 use Twig\Attribute\AsTwigFunction;
 
@@ -13,9 +16,16 @@ class UtilExtension
 {
 
     public function __construct(
+        private readonly ConfigResolver $config,
         private readonly MediaFiles $mediaFiles,
     ) {}
 
+    #[AsTwigFunction('app_version')]
+    public function app_version(): AppVersionDto
+    {
+        return $this->config->getAppVersion();
+    }
+
     #[AsTwigFunction('uniqid')]
     public function uniqid(): string
     {

src/User/Action/Command/SaveUserCalendarPreferencesCommand.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\User\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+
+/** @implements CommandInterface<SaveUserMediaPreferencesCommand> */
+class SaveUserCalendarPreferencesCommand implements CommandInterface
+{
+    public function __construct(
+        public string $enable_ical_up_ep,
+    ) {}
+}

src/User/Action/Handler/SaveUserCalendarPreferencesHandler.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\User\Action\Handler;
+
+use App\User\Action\Command\SaveUserMediaPreferencesCommand;
+use App\User\Action\Result\SaveUserDownloadPreferencesResult;
+use App\User\Action\Result\SaveUserMediaPreferencesResult;
+use App\User\Framework\Entity\User;
+use App\User\Framework\Entity\UserPreference;
+use App\User\Framework\Repository\PreferencesRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use OneToMany\RichBundle\Contract\CommandInterface as C;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface as R;
+use Symfony\Bundle\SecurityBundle\Security;
+
+/** @implements HandlerInterface<SaveUserMediaPreferencesCommand> */
+class SaveUserCalendarPreferencesHandler implements HandlerInterface
+{
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+        private readonly PreferencesRepository $preferenceRepository,
+        private readonly Security $token,
+    ) {}
+
+    public function handle(C $command): R
+    {
+        /** @var User $user */
+        $user = $this->token->getUser();
+
+        foreach ($command as $preference => $value) {
+            if ($user->hasUserPreference($preference)) {
+                $user->updateUserPreference($preference, $value);
+                $this->entityManager->flush();
+                continue;
+            }
+
+            $preference = $this->preferenceRepository->find($preference);
+
+            $user->addUserPreference(
+                (new UserPreference())
+                    ->setUser($user)
+                    ->setPreference($preference)
+                    ->setPreferenceValue($value)
+            );
+        }
+
+        $this->entityManager->flush();
+
+        return new SaveUserDownloadPreferencesResult($user->getDownloadPreferences());
+    }
+}

src/User/Action/Input/SaveUserCalendarPreferencesInput.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\User\Action\Input;
+
+use App\User\Action\Command\SaveUserCalendarPreferencesCommand;
+use App\User\Action\Command\SaveUserDownloadPreferencesCommand;
+use OneToMany\RichBundle\Attribute\SourceRequest;
+use OneToMany\RichBundle\Attribute\SourceSecurity;
+use OneToMany\RichBundle\Contract\CommandInterface as C;
+use OneToMany\RichBundle\Contract\InputInterface;
+
+/** @implements InputInterface<SaveUserDownloadPreferencesInput, SaveUserDownloadPreferencesCommand> */
+class SaveUserCalendarPreferencesInput implements InputInterface
+{
+    public function __construct(
+        #[SourceSecurity]
+        public mixed $userId,
+
+        #[SourceRequest('enable_ical_up_ep', nullify: true)]
+        public bool $enableIcalUpcomingEpisodes,
+    ) {}
+
+    public function toCommand(): C
+    {
+        return new SaveUserCalendarPreferencesCommand(
+            $this->enableIcalUpcomingEpisodes,
+        );
+    }
+}

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

@@ -6,8 +6,10 @@ namespace App\User\Framework\Controller\Web;
 
 use App\Base\Service\Broadcaster;
 use App\User\Action\Command\SaveUserMediaPreferencesCommand;
+use App\User\Action\Handler\SaveUserCalendarPreferencesHandler;
 use App\User\Action\Handler\SaveUserDownloadPreferencesHandler;
 use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
+use App\User\Action\Input\SaveUserCalendarPreferencesInput;
 use App\User\Action\Input\SaveUserDownloadPreferencesInput;
 use App\User\Action\Input\SaveUserMediaPreferencesInput;
 use App\User\Database\CountryLanguages;
@@ -33,15 +35,15 @@ class PreferencesController extends AbstractController
     public function mediaPreferences(): Response
     {
         $downloadPreferences = $this->getUser()->getDownloadPreferences();
+        $calendarPreferences = $this->getUser()->getCalendarPreferences();
         $formData = (array) UserPreferencesFactory::createFromUser($this->getUser());
         $form = $this->createForm(UserMediaPreferencesForm::class, $formData);
 
-//        dd($form);
-
         return $this->render(
             'user/preferences.html.twig',
             [
                 'downloadPreferences' => $downloadPreferences,
+                'calendarPreferences' => $calendarPreferences,
                 'preferences_form' => $form,
             ]
         );
@@ -54,8 +56,8 @@ class PreferencesController extends AbstractController
     ): Response
     {
         $downloadPreferences = $this->getUser()->getDownloadPreferences();
+        $calendarPreferences = $this->getUser()->getCalendarPreferences();
         $form = $this->createForm(UserMediaPreferencesForm::class);
-
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
@@ -69,6 +71,7 @@ class PreferencesController extends AbstractController
             'user/preferences.html.twig',
             [
                 'downloadPreferences' => $downloadPreferences,
+                'calendarPreferences' => $calendarPreferences,
                 'preferences_form' => $form,
             ]
         );
@@ -81,6 +84,7 @@ class PreferencesController extends AbstractController
     ): Response
     {
         $downloadPreferences = $this->getUser()->getDownloadPreferences();
+        $calendarPreferences = $this->getUser()->getCalendarPreferences();
         $formData = (array) UserPreferencesFactory::createFromUser($this->getUser());
         $form = $this->createForm(UserMediaPreferencesForm::class, $formData);
 
@@ -95,6 +99,34 @@ class PreferencesController extends AbstractController
             'user/preferences.html.twig',
             [
                 'downloadPreferences' => $downloadPreferences,
+                'calendarPreferences' => $calendarPreferences,
+                'preferences_form' => $form,
+            ]
+        );
+    }
+
+    #[Route('/user/preferences/calendar', 'app.save.calendar-preferences', methods: ['POST'])]
+    public function saveCalendarPreferences(
+        SaveUserCalendarPreferencesInput $input,
+        SaveUserCalendarPreferencesHandler $handler,
+    ): Response
+    {
+        $calendarPreferences = $this->getUser()->getCalendarPreferences();
+        $formData = (array) UserPreferencesFactory::createFromUser($this->getUser());
+        $form = $this->createForm(UserMediaPreferencesForm::class, $formData);
+
+        $handler->handle($input->toCommand());
+
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: 'Your calendar preferences have been saved.'
+        );
+
+        return $this->render(
+            'user/preferences.html.twig',
+            [
+                'downloadPreferences' => $this->getUser()->getDownloadPreferences(),
+                'calendarPreferences' => $calendarPreferences,
                 'preferences_form' => $form,
             ]
         );

src/User/Framework/Entity/User.php

@@ -327,4 +327,19 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
         }
         return [];
     }
+
+    public function getCalendarPreferences(): array
+    {
+        return Map::from($this->userPreferences)
+            ->rekey(fn(UserPreference $userPreference) => $userPreference->getPreference()->getId())
+            ->filter(fn(UserPreference $userPreference) => $userPreference->getPreference()->getType() === 'calendar')
+            ->toArray()
+            ;
+    }
+
+    public function hasICalEnabled(): bool
+    {
+        return $this->hasUserPreference('enable_ical_up_ep') &&
+            (bool) $this->getUserPreference('enable_ical_up_ep')->getPreferenceValue() === true;
+    }
 }

templates/bare.html.twig

@@ -20,7 +20,7 @@
             {% block body %}{% endblock %}
             <div class="mt-2 inline-flex gap-4 justify-between text-white">
                 <a class="text-sm" href="{{ path('app_login') }}">Sign In</a>
-                <span class="text-sm">v{{ version }}</span>
+                <span class="text-sm">{{ app_version() }}</span>
             </div>
         </div>
     </body>

templates/components/Filter.html.twig

@@ -39,15 +39,9 @@
         </div>
     {{ form_end(preferences_form) }}
 
-    <div class="flex flex-col md:flex-row justify-between">
+    <div class="flex flex-col-reverse md:flex-row justify-between">
-        <span
-                {{ stimulus_target('result-filter', 'loadingIcon') }}
-                {{ stimulus_controller('loading_icon', {total: (results.media.mediaType == "tvshows") ? results.media.episodes[1]|length : 1, count: 0}) }}
-            class="loading-icon">
-            <twig:ux:icon name="codex:loader" height="20" width="20" data-loading-icon-target="icon" class="text-end" />
-        </span>
-
         {% if results.media.mediaType == "tvshows" %}
+            <p class="ml-2 mt-3 md:[margin-top:unset] md:self-center">Season <span data-result-filter-target="currentSeason" class="current-season">{{ results.season }}</span></p>
             <div class="flex flex-row gap-2 justify-end px-8">
                 <twig:Modal heading="Back up a sec!" button_text="Download Season" submit_action="{{ stimulus_action('result_filter', 'downloadSeason', 'click')|stimulus_action('dialog', 'close') }}" button_class="px-1.5 py-1 border border-green-500 bg-green-800/60 rounded-ms text-sm font-semibold" show_cancel show_submit>
                     Downloading an entire season this way will use the filter from your

templates/components/Header.html.twig

@@ -5,7 +5,7 @@
             <twig:SearchBar />
             <div class="md:flex md:items-center md:gap-12">
                 <nav aria-label="Global" class="md:block">
-                    <ul class="flex items-center gap-6 text-sm">
+                    <ul class="ml-4 flex items-end md:items-center md:gap-6 text-sm">
                         <li>
                             <a href="{{ path('app.monitor.upcoming-episodes') }}" data-turbo="false" title="View upcoming episodes of the shows you're subscribed to.">
                                 <twig:ux:icon name="solar:calendar-linear" width="25px" class="text-orange-500" />

templates/components/MonitorList.html.twig

@@ -47,7 +47,7 @@
             {% endfor %}
             {% if this.isWidget and this.monitors.items|length > 5 %}
                 <tr  id="monitor_view_all">
-                    <td colspan="100%" class="py-2 whitespace-nowrap bg-gray-400 dark:bg-gray-700 uppercase text-xs font-medium text-center text-black dark:text-white min-w-[50ch] max-w-[50ch] truncate">
+                    <td colspan="100%" class="py-2 whitespace-nowrap bg-orange-500/80 uppercase text-xs font-medium text-center truncate dark:text-black">
                         <a href="{{ path('app_monitors') }}">View All Monitors</a>
                     </td>
                 </tr>

templates/components/MonitorListRow.html.twig

@@ -14,18 +14,10 @@
 >
     <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-stone-800 truncate">
         <a href="{{ path('app_search_result', {imdbId: monitor.imdbId, mediaType: monitor.monitorType|as_download_type}) }}"
-           class="mr-1 hover:underline rounded-md"
+           class="mr-1 hover:underline rounded-md">
-        >
+            {% set episodeIdDto = extract_from_episode_id(monitor|monitor_media_id) %}
-
+            {% set routeParams = {imdbId: monitor.imdbId, mediaType: monitor.monitorType|as_download_type, season: episodeIdDto.season} %}
-            {% if monitor.monitorType == "movies" %}
+            <a href="{{ path('app_search_result', routeParams) }}"
-                {% set routeParams = {imdbId: monitor.imdbId, mediaType: monitor.monitorType} %}
-                {% set route = path('app_search_result', routeParams) %}
-            {% else %}
-                {% set episodeIdDto = extract_from_episode_id(monitor|monitor_media_id) %}
-                {% set routeParams = {imdbId: monitor.imdbId, mediaType: monitor.monitorType, season: episodeIdDto.season, episode: episodeIdDto.episode} %}
-                {% set route = path('app_search_result', routeParams) ~ "#" ~ episode_anchor(episodeIdDto.season, episodeIdDto.episode) %}
-            {% endif %}
-            <a href="{{ route }}"
                class="mr-1 hover:underline rounded-md max-w-[10ch] md:max-w-[unset] truncate dark:text-white">
                 {{ monitor.title }}
             </a>

templates/components/NavBar.html.twig

@@ -55,7 +55,7 @@
             </div>
         </a>
         <p class="px-4 pt-1 inline-flex justify-center">
-            <small class="text-white text-xs">v{{ version|default('0.0') }}</small>
+            <small class="text-white text-xs">{{ app_version() }}</small>
         </p>
     </div>
 </nav>

templates/components/TvEpisodeList.html.twig

@@ -2,24 +2,24 @@
         class="episode-list flex flex-col gap-4"
 >
     <div data-live-id="{{ uniqid() }}" class="episode-container flex flex-col gap-4">
+        {% if this.getEpisodes().items != null %}
         {% for episode in this.getEpisodes().items %}
-            <episode-container id="{{ episode_anchor(episode['season_number'], episode['episode_number']) }}" class="results"
+            <episode-container id="{{ episode_anchor(episode.seasonNumber, episode.episodeNumber) }}" class="results"
                  show-title="{{ this.title }}"
-                 data-tv-results-loading-icon-outlet=".loading-icon"
                  data-download-button-outlet=".download-btn"
                     {{ stimulus_controller('tv_results', {
                         title: this.title,
                         tmdbId: this.tmdbId,
                         imdbId: this.imdbId,
-                        season: episode['season_number'],
+                        season: episode.seasonNumber,
-                        episode: episode['episode_number'],
+                        episode: episode.episodeNumber,
                         active: 'true',
                     }) }}
             >
                     <div class="p-4 md:p-6 flex flex-col gap-6 bg-orange-500/60 bg-clip-padding backdrop-filter backdrop-blur-md rounded-md">
                         <div class="flex flex-col md:flex-row gap-4">
-                            {% if episode['poster'] != null %}
+                            {% if "jpg" in episode.poster %}
-                                <img class="w-full md:w-64 rounded-lg" src="{{ episode['poster'] }}" />
+                                <img class="w-full md:w-64 rounded-lg" src="{{ episode.poster }}" />
                             {% else %}
                                 <div class="w-full md:w-64 min-w-64 sticky h-[144px] rounded-lg bg-gray-700 flex items-center justify-center">
                                     <twig:ux:icon width="32" name="hugeicons:loading-01" />
@@ -27,28 +27,28 @@
                             {% endif %}
                             <div class="flex flex-col gap-4 grow">
                                 <h4 class="text-md font-bold">
-                                    {{ episode['episode_number'] }}. {{ episode['name'] }}
+                                    {{ episode.episodeNumber }}. {{ episode.name }}
                                 </h4>
-                                <p>{{ episode['overview']|truncate }}</p>
+                                <p>{{ episode.description|truncate }}</p>
-                                <div>
+                                <div class="text-xs font-bold">
-                                    <button class="results-count-badge 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" title="Click to expand the results table for season {{ episode['season_number'] }} episode {{ episode['episode_number'] }}.">
+                                    <button class="results-count-badge py-1 px-1.5 mr-1 grow-0 bg-green-600 rounded-lg hover:cursor-pointer hover:bg-green-700 text-white" title="Click to expand the results table for season {{ episode.seasonNumber }} episode {{ episode.episodeNumber }}.">
-                                        <span class="results-count-number" {{ stimulus_target('tv-results', 'count') }}>-</span> results
+                                        <span class="results-count-number" {{ 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='"{{ episode['name'] }}" aired on {{ episode['air_date']|date(null, 'UTC') }}.'>
+                                    <span class="py-1 px-1.5 mr-1 grow-0 bg-gray-700 rounded-lg text-white" title='"{{ episode.name }}" aired on {{ episode.airDate|date(null, 'UTC') }}.'>
-                                        {{ episode['air_date']|date(null, 'UTC') }}
+                                        {{ episode.airDate|date(null, 'UTC') }}
-                                    </small>
+                                    </span>
 
-                                    <twig:Turbo:Frame id="meb_{{ this.imdbId }}_{{ episode_id(episode['season_number'], episode['episode_number']) }}" src="{{ path('api.library.search', {
+                                    <twig:Turbo:Frame id="meb_{{ this.imdbId }}_{{ episode_id(episode.seasonNumber, episode.episodeNumber) }}" src="{{ path('api.library.search', {
                                         title: this.title,
-                                        season: episode['season_number'],
+                                        season: episode.seasonNumber,
-                                        episode: episode['episode_number'],
+                                        episode: episode.episodeNumber,
                                         block: 'media_exists_badge',
-                                        target: "meb_" ~ this.imdbId ~"_" ~ episode_id(episode['season_number'], episode['episode_number'])
+                                        target: "meb_" ~ this.imdbId ~"_" ~ episode_id(episode.seasonNumber, episode.episodeNumber)
                                     }) }}">
-                                        <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-rose-600 rounded-lg text-white" title="Episode has not been downloaded yet.">
+                                        <span class="py-1 px-1.5 mr-1 grow-0 bg-rose-600 rounded-lg text-white" title="Episode has not been downloaded yet.">
                                             missing
-                                        </small>
+                                        </span>
                                     </twig:Turbo:Frame>
                                 </div>
                             </div>
@@ -58,7 +58,7 @@
                                             {{ stimulus_target('tv-results', 'episodeSelector') }}
                                     />
                                 </div>
-                                <button class="dropdown-button flex flex-col items-end transition-transform duration-300 ease-in-out rotate-90" title="Click to expand the results table for season {{ episode['season_number'] }} episode {{ episode['episode_number'] }}.">
+                                <button class="dropdown-button flex flex-col items-end transition-transform duration-300 ease-in-out rotate-90" title="Click to expand the results table for season {{ episode.seasonNumber }} episode {{ episode.episodeNumber }}.">
                                     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32">
                                         <path
                                                 fill="none"
@@ -72,18 +72,21 @@
                             </div>
                         </div>
                         <div class="results-container inline-block overflow-hidden rounded-lg hidden">
-                            <twig:Turbo:Frame id="results_{{ episode_id(episode['season_number'], episode['episode_number']) }}" src="{{ path('app_torrentio_tvshows', {
+                            <twig:Turbo:Frame loading="lazy" id="results_{{ episode_id(episode.seasonNumber, episode.episodeNumber) }}" src="{{ path('app_torrentio_tvshows', {
                                 tmdbId: this.tmdbId,
                                 imdbId: this.imdbId,
-                                season: episode['season_number'],
+                                season: episode.seasonNumber,
-                                episode: episode['episode_number'],
+                                episode: episode.episodeNumber,
-                                target: 'results_' ~ episode_id(episode['season_number'], episode['episode_number']),
+                                target: 'results_' ~ episode_id(episode.seasonNumber, episode.episodeNumber),
                                 block: 'tvshow_results'
-                            }) }}" />
+                            }) }}">
+                                <twig:ux:icon name="codex:loader" height="20" width="20" data-loading-icon-target="icon" class="text-end" />
+                            </twig:Turbo:Frame>
                         </div>
                     </div>
             </episode-container>
         {% endfor %}
+        {% endif %}
     </div>
     {% set paginator = this.episodes %}
     {% include 'partial/tv-episode-list-paginator.html.twig' %}

templates/monitor/upcoming-episodes.html.twig

@@ -3,7 +3,7 @@
 {% block h2 %}Upcoming Episodes{% endblock %}
 
 {% block action_buttons %}
-    <a href="{{ path('app.monitor.upcoming-episodes') }}"
+    <a href="{{ path('app.monitor.upcoming-episodes') }}" data-turbo="false"
        class="h-6 bg-orange-500/80 hover:bg-orange-600/80 px-2 text-white rounded-ms text-sm font-semibold">
         Upcoming Episodes
     </a>
@@ -16,10 +16,10 @@
 
     <div class="p-4">
         <twig:Card title="Upcoming episodes of shows your monitoring">
-            <a href="{{ path('app.monitors.ical') }}" title="Subscribe to the 'Upcoming Episodes' calendar via iCal. Click to export the events to a .ics file or copy the link and use it to subscribe in a calendar app that supports iCal/ics calendars." class="mb-2 self-end dark:text-white decoration-underline">
+            <a href="{{ path('app.monitors.ical', {email: app.user.email}) }}" title="Subscribe to the 'Upcoming Episodes' calendar via iCal. Click to export the events to a .ics file or copy the link and use it to subscribe in a calendar app that supports iCal/ics calendars." class="mb-2 self-end dark:text-white decoration-underline">
                 <twig:ux:icon name="lets-icons:calendar-add-light" width="24" class="text-orange-500" />
             </a>
-            <div id="calendar" class="text-white">
+            <div id="upcoming_episodes_calendar" class="text-white">
             </div>
         </twig:Card>
     </div>
@@ -33,15 +33,22 @@
             }
         }
         document.addEventListener('DOMContentLoaded', async function() {
+            const modal = document.getElementById('previewModal');
             let data = await fetch('/api/monitor/upcoming-episodes');
             data = (await data.json())['data'];
 
-            const calendarEl = document.getElementById('calendar');
+            const calendarEl = document.getElementById('upcoming_episodes_calendar');
             const calendar = new FullCalendar.Calendar(calendarEl, {
                 initialView: getView(),
                 events: data['episodes'],
                 windowResize: function(arg) {
                     this.changeView(getView());
+                },
+                eventClick: function (data) {
+                    modal.display({
+                        heading: data.event.title,
+                        content: `<p>${data.event.startStr}</p>`
+                    })
                 }
             });
             calendar.render();

templates/search/fragments.html.twig

@@ -12,20 +12,20 @@
                     </ul>
                 </div>
             </template>
-            <small
+            <span
                     class="py-1 px-1.5 mr-1 grow-0 font-bold bg-blue-600 rounded-lg text-center text-white"
                     data-action="mouseenter->popover#show mouseleave->popover#hide"
             >
                 exists
-            </small>
+            </span>
         </span>
             {% endif %}
 
             {% if result.exists == false %}
-                <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-rose-600 rounded-lg text-white"
+                <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-rose-600 rounded-lg text-white"
                        title="Media has not been downloaded yet.">
                     missing
-                </small>
+                </span>
             {% endif %}
         </template>
     </turbo-stream>

templates/search/result.html.twig

@@ -2,16 +2,17 @@
 
 {% block title %}{{ results.media.title }} — Download Options — Torsearch{% endblock %}
 
+{% block h2 %}Media Results{% endblock %}
+
 {% block body %}
     <div class="p-4 flex flex-col grow gap-4">
-        <h2 class="mb-2 text-3xl font-bold text-gray-50">Media Results</h2>
         <div class="flex flex-row w-full gap-2">
             <twig:Card title="" class="w-full" contentClass="flex flex-col gap-4 justify-between w-full text-gray-50">
                 <div class="p-2 md:p-4 flex flex-col md:flex-row gap-6">
                     {% if results.media.poster != null %}
-                        <img class="w-full md:w-40 rounded-lg" src="{{ results.media.poster }}" />
+                        <img class="w-full md:w-[12.5rem] rounded-lg" src="{{ results.media.poster }}" />
                     {% else %}
-                        <div class="w-full md:w-40 h-[144px] rounded-lg bg-gray-700 flex items-center justify-center">
+                        <div class="w-full md:w-[12.5rem] h-[144px] rounded-lg bg-gray-700 flex items-center justify-center">
                             <twig:ux:icon width="24" name="hugeicons:loading-01" />
                         </div>
                     {% endif %}
@@ -27,6 +28,7 @@
                                 tmdbId: results.media.tmdbId,
                                 imdbId: results.media.imdbId,
                                 title: results.media.title,
+                                season: results.media.latestSeason,
                             })}}
                                 data-monitor-button-result-filter-outlet="#filter"
                                 data-monitor-button-dialog-outlet=".monitor-modal"
@@ -50,29 +52,70 @@
 
                         </div>
 
-                        <p class="text-gray-50">
+                        <p class="text-gray-50 mb-4">
                             {{ results.media.description }}
                         </p>
 
+                        <div>
+                            {% if results.media.stars != null %}
+                                <strong>Starring</strong>: {{ results.media.stars|join(', ') }} <br />
+                            {% endif %}
+
+                            {% if results.media.directors != null %}
+                                <strong>Directors</strong>: {{ results.media.directors|join(', ') }} <br />
+                            {% endif %}
+
+                            {% if results.media.producers != null %}
+                                <strong>Producers</strong>: {{ results.media.producers|join(', ') }} <br />
+                            {% endif %}
+
+                            {% if results.media.creators != null %}
+                                <strong>Creators</strong>: {{ results.media.creators|join(', ') }} <br />
+                            {% endif %}
+
+                            {% if results.media.genres != null %}
+                                <div id="genres" class="text-gray-50 my-4">
+                                    {% for genre in results.media.genres %}
+                                        <small class="px-2 py-1 border border-orange-500 rounded-full">{{ genre }}</small>
+                                    {% endfor %}
+                                </div>
+                            {% endif %}
+                        </div>
+
+                        {% if results.media.mediaType == "tvshows" %}
+                        <div class="flex flex-row justify-start items-end grow text-xs">
+                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold text-xs bg-orange-500 rounded-lg text-white">
+                                <span>{{ results.media.numberSeasons }}</span> season(s)
+                            </span>
+                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-sky-700 rounded-lg text-white" title='"{{ results.media.title }}" first aired on {{ results.media.premiereDate|date(null, 'UTC') }}.'>
+                                {{ results.media.premiereDate|date(null, 'UTC') }}
+                            </span>
+                        </div>
+                        {% endif %}
+
                         {% if "movies" == results.media.mediaType %}
-                        <div class="flex flex-row justify-start items-end grow">
+                        <div class="flex flex-row justify-start items-end grow text-xs">
                             <span class="results-count-badge 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">
                                 <span class="results-count-number" id="movie_results_count">-</span> results
                             </span>
 
-                            <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-gray-700 rounded-lg font-normal text-white" title="Release date {{ results.media.episodeAirDate }}">
-                                {{ results.media.episodeAirDate|date(null, 'UTC') }}
-                            </small>
-
                             <twig:Turbo:Frame id="meb_{{ results.media.imdbId }}" src="{{ path('api.library.search', {
                                 title: results.media.title,
                                 block: 'media_exists_badge',
                                 target: "meb_" ~ results.media.imdbId
                             }) }}">
-                                <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-rose-600 rounded-lg text-white" title="Movie has not been downloaded yet.">
+                                <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-rose-600 rounded-lg text-white" title="Movie has not been downloaded yet.">
                                     missing
-                                </small>
+                                </span>
                             </twig:Turbo:Frame>
+
+                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-sky-700 rounded-lg text-white" title="Release date {{ results.media.episodeAirDate }}">
+                                {{ results.media.premiereDate|date('n/j/Y', 'UTC') }}
+                            </span>
+
+                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-orange-500 rounded-lg text-white" title="This movie has a runtime of {{ results.media.runtime }} minutes.">
+                                {{ results.media.runtime }} minutes
+                            </span>
                         </div>
                         {% endif %}
                     </div>
@@ -83,24 +126,46 @@
                 {% if "movies" == results.media.mediaType %}
                 <movie-container class="results"
                      {{ stimulus_controller('movie_results', {title: results.media.title, tmdbId: results.media.tmdbId, imdbId: results.media.imdbId}) }}
-                     data-movie-results-loading-icon-outlet=".loading-icon"
                 >
                     <twig:Turbo:Frame id="movie_results_frame" src="{{ path('app_torrentio_movies', {
                         tmdbId: results.media.tmdbId,
                         imdbId: results.media.imdbId,
                         target: 'movie_results_frame',
                         block: 'movie_results'
-                    }) }}" />
+                    }) }}">
+                        <twig:ux:icon name="codex:loader" height="20" width="20" data-loading-icon-target="icon" class="text-end" title="Loading download options for {{ results.media.title }}" />
+                    </twig:Turbo:Frame>
                 </movie-container>
                 {% elseif "tvshows" == results.media.mediaType %}
                     <twig:TvEpisodeList
                             results="results"
-                        :imdbId="results.media.imdbId" :season="results.season" :perPage="20" :pageNumber="1"
+                            loading="defer"
-                        :tmdbId="results.media.tmdbId" :title="results.media.title" loading="defer" :episodeNumber="results.episode"
+                            :imdbId="results.media.imdbId"
+                            :season="results.season"
+                            :perPage="20"
+                            :pageNumber="1"
+                            :tmdbId="results.media.tmdbId"
+                            :title="results.media.title"
+                            :episodeNumber="results.episode"
                     />
                 {% endif %}
             </twig:Card>
         </div>
+
+        <twig:Card title="Related Media" contentClass="flex flex-col gap-4 text-white">
+            <div class="grid grid-cols-2 gap-4 md:flex flex-col md:flex-row justify-between w-full">
+                {% for media in results.relatedMedia %}
+                    <twig:Poster imdbId="{{ media.imdbId }}"
+                                 tmdbId="{{ media.tmdbId }}"
+                                 title="{{ media.title }}"
+                                 description="{{ media.description }}"
+                                 image="{{ media.poster }}"
+                                 year="{{ media.year }}"
+                                 mediaType="{{ media.mediaType }}"
+                    />
+                {% endfor %}
+            </div>
+        </twig:Card>
     </div>
     <style>
         html,

templates/torrentio/partial/option-table.html.twig

@@ -52,7 +52,7 @@
             provider="{{ result.provider }}"
             languages="{{ result.languages|json_encode }}"
             media-type="{{ results.media.mediaType }}"
-            imdb-id="{{ results.media.imdbId }}"
+            imdb-id="{{ result.imdbId }}"
             filename="{{ result.filename }}"
             data-local-id="{{ result.localId }}"
             {% if "tvshows" == results.media.mediaType %}

templates/user/preferences.html.twig

@@ -36,4 +36,25 @@
         </form>
     </twig:Card>
 </div>
+
+<div class="p-4 flex flex-col md:flex-row gap-2">
+    <twig:Card title="Calendar Preferences" class="w-full">
+        <p class="text-gray-50 mb-4">Manage your Upcoming Episodes calendar.</p>
+        <form id="calendar_preferences" class="flex flex-col" name="calendar_preferences" method="post" action="{{ path('app.save.calendar-preferences') }}">
+            <div class="flex flex-col gap-2">
+                <div class="flex flex-row gap-2 mb-1">
+                    <input type="hidden" name="enable_ical_up_ep" id="enable_ical_up_ep_hidden" value="0" />
+                    <input type="checkbox" name="enable_ical_up_ep" id="enable_ical_up_ep" value="1" {{ calendarPreferences['enable_ical_up_ep'].getPreferenceValue() == true ? 'checked' }} />
+                    <label class="text-gray-50" for="enable_ical_up_ep">Enable a publicly available iCal calendar?</label>
+                </div>
+                <small class="text-gray-50 mb-4">Enabling the iCal calendar will allow you to subscribe from iCal
+                    supporting clients. This endpoint will be publicly available with no authentication required.
+                    Disabling this option will disable the calendar and public endpoint for your user.
+                    This will not affect the calendar within the app.
+                </small>
+            </div>
+            <button class="px-1.5 py-1 max-w-20 rounded-md bg-green-600 text-white" type="submit">Submit</button>
+        </form>
+    </twig:Card>
+</div>
 {% endblock %}

tests/Monitor/MonitorTvShowHandlerTest.php

@@ -9,7 +9,7 @@ use App\Monitor\Action\Handler\MonitorTvShowHandler;
 use App\Monitor\Action\Result\MonitorTvShowResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use App\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -22,7 +22,7 @@ class MonitorTvShowHandlerTest extends TestCase
     private MonitorTvEpisodeHandler $episodeHandler;
     private MediaFiles $mediaFiles;
     private LoggerInterface $logger;
-    private Tmdb $tmdb;
+    private TmdbClient $tmdb;
 
     protected function setUp(): void
     {
@@ -31,7 +31,7 @@ class MonitorTvShowHandlerTest extends TestCase
         $this->episodeHandler = $this->createMock(MonitorTvEpisodeHandler::class);
         $this->mediaFiles = $this->createMock(MediaFiles::class);
         $this->logger = $this->createMock(LoggerInterface::class);
-        $this->tmdb = $this->createMock(Tmdb::class);
+        $this->tmdb = $this->createMock(TmdbClient::class);
 
         $this->handler = new MonitorTvShowHandler(
             $this->monitorRepository,