fix: error twig template

.dockerignore

@@ -0,0 +1,15 @@
+.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
+var/download/*

.env

@@ -51,3 +51,14 @@ OIDC_CLIENT_ID="Enter your OIDC client id"
 OIDC_CLIENT_SECRET="Enter your OIDC client secret"
 OIDC_BYPASS_FORM_LOGIN=false
 ###< drenso/symfony-oidc-bundle ###
+
+###> symfony/ntfy-notifier ###
+# NTFY_DSN=ntfy://default/TOPIC
+###< symfony/ntfy-notifier ###
+
+NOTIFICATION_TRANSPORT=
+NTFY_DSN=
+
+###> sentry/sentry-symfony ###
+SENTRY_DSN=
+###< sentry/sentry-symfony ###

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"
-
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
-
-RUN apt update && apt install -y wget
+ENV APP_VERSION="0.0.0-dev"
 
 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/app.js

@@ -18,11 +18,3 @@ var observer = new MutationObserver(function(mutations) {
 });
 
 observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
-
-const ptr = PullToRefresh.init({
-    mainElement: 'body',
-    onRefresh() {
-        window.location.reload();
-    }
-});
-

assets/controllers/monitor_button_controller.js

@@ -13,34 +13,7 @@ export default class extends Controller {
         tmdbId: String,
         imdbId: String,
         title: String,
-    }
-
-    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)
+        season: Number,
     }
 
     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) {
-                data.data.description = data.data.description.substring(0, 107) + "...";
+            console.log(data);
+            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/controllers/upcoming_episodes_controller.js

@@ -0,0 +1,57 @@
+import { Controller } from '@hotwired/stimulus';
+import { Calendar } from '@fullcalendar/core';
+import dayGridPlugin from '@fullcalendar/daygrid';
+import timeGridPlugin from '@fullcalendar/timegrid';
+
+
+/* stimulusFetch: 'lazy' */
+export default class extends Controller {
+    calendar = null;
+
+    initialize() {
+
+    }
+
+    connect() {
+        this.calendar = new Calendar(this.element, {
+            plugins: [ dayGridPlugin, timeGridPlugin ],
+            initialView: 'dayGridMonth',
+            headerToolbar: {
+                left: 'prev,next today',
+                center: 'title',
+                right: 'dayGridMonth,timeGridWeek,timeGridDay'
+            },
+            editable: true, // Allow events to be dragged and resized
+            events: '/api/events', // Symfony route to fetch events
+            eventDrop: function(info) {
+                // Handle event drop (e.g., update event in database via AJAX)
+            },
+            eventResize: function(info) {
+                // Handle event resize (e.g., update event in database via AJAX)
+            }
+        });
+        this.calendar.render();
+        // this.calendar = new Calendar(this.element, {
+        //     plugins: [ dayGridPlugin, timeGridPlugin, listPlugin ],
+        //     initialView: 'dayGridMonth',
+        //     headerToolbar: {
+        //         left: 'prev,next today',
+        //         center: 'title',
+        //         right: 'dayGridMonth,timeGridWeek,listWeek'
+        //     }
+        // });
+        // this.calendar.render();
+        // calendar.render();
+    }
+
+    // Add custom controller actions here
+    // fooBar() { this.fooTarget.classList.toggle(this.bazClass) }
+
+    disconnect() {
+        // Called anytime its element is disconnected from the DOM
+        // (on page change, when it's removed from or moved in the DOM, etc.)
+
+        // Here you should remove all event listeners added in "connect()" 
+        // this.fooTarget.removeEventListener('click', this._fooBar)
+    }
+}

assets/icons/lets-icons/calendar-add-light.svg

@@ -0,0 +1 @@
+<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none" stroke="currentColor"><path d="M19.5 9.5v-.8c0-1.12 0-1.68-.218-2.108a2 2 0 0 0-.874-.874C17.98 5.5 17.42 5.5 16.3 5.5H7.7c-1.12 0-1.68 0-2.108.218a2 2 0 0 0-.874.874C4.5 7.02 4.5 7.58 4.5 8.7v.8m15 0v6.8c0 1.12 0 1.68-.218 2.108a2 2 0 0 1-.874.874c-.428.218-.988.218-2.108.218H7.7c-1.12 0-1.68 0-2.108-.218a2 2 0 0 1-.874-.874C4.5 17.98 4.5 17.42 4.5 16.3V9.5m15 0h-15"/><path stroke-linecap="round" d="M8.5 3.5v4m7-4v4M12 17v-5m2.5 2.5h-5"/></g></svg>

assets/icons/solar/calendar-linear.svg

@@ -0,0 +1 @@
+<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none"><path stroke="currentColor" stroke-width="1.5" d="M2 12c0-3.771 0-5.657 1.172-6.828S6.229 4 10 4h4c3.771 0 5.657 0 6.828 1.172S22 8.229 22 12v2c0 3.771 0 5.657-1.172 6.828S17.771 22 14 22h-4c-3.771 0-5.657 0-6.828-1.172S2 17.771 2 14z"/><path stroke="currentColor" stroke-linecap="round" stroke-width="1.5" d="M7 4V2.5M17 4V2.5M2.5 9h19"/><path fill="currentColor" d="M18 17a1 1 0 1 1-2 0a1 1 0 0 1 2 0m0-4a1 1 0 1 1-2 0a1 1 0 0 1 2 0m-5 4a1 1 0 1 1-2 0a1 1 0 0 1 2 0m0-4a1 1 0 1 1-2 0a1 1 0 0 1 2 0m-5 4a1 1 0 1 1-2 0a1 1 0 0 1 2 0m0-4a1 1 0 1 1-2 0a1 1 0 0 1 2 0"/></g></svg>

assets/styles/app.css

@@ -27,6 +27,11 @@
     }
 }
 
+:root {
+    --fc-border-color: #a65b27;
+    --fc-page-bg-color: #a65b27;
+}
+
 /* Prevent scrolling while dialog is open */
 body:has(dialog[data-dialog-target="dialog"][open]) {
     overflow: hidden;
@@ -137,7 +142,7 @@ dialog[data-dialog-target="dialog"][closing] {
 
 #search .ts-dropdown {
     background: unset;
-    @apply bg-orange-500/80 backdrop-filter backdrop-blur-md text-white border border-orange-500 rounded-md
+    @apply bg-orange-500/80 backdrop-filter backdrop-blur-md text-white border border-orange-500 rounded-md z-20
 }
 
 #search .ts-dropdown .ts-dropdown-content .option.active {
@@ -193,3 +198,11 @@ dialog[data-dialog-target="dialog"][closing] {
 .filter-label {
     @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,22 @@
+# torsearch-app is built from this base
+export APP_FRANKENPHP_TAG=php8.4
+
+#docker buildx build --platform=linux/amd64,linux/arm64 -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 build -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,linux/arm64 -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 build -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
+
+# torsearch-worker-supervisord
+export ALPINE_VERSION=3.22
+
+#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .
+docker build -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .
+docker push code.caldwell.digital/home/torsearch-base-worker-supervisord:latest

compose.yml

@@ -33,7 +33,9 @@ services:
 
 
   worker:
-    build: .
+    build:
+      dockerfile: docker/Dockerfile.worker
+      context: .
     restart: unless-stopped
     volumes:
       - $PWD:/app
@@ -41,18 +43,19 @@ services:
     tty: true
     environment:
       TZ: America/Chicago
-    command: php /app/bin/console messenger:consume async -vv --time-limit=3600
-
 
   scheduler:
-    build: .
+    build:
+      dockerfile: docker/Dockerfile.scheduler
+      context: .
     restart: unless-stopped
     volumes:
       - $PWD:/app
+      - $PWD/var/download:/var/download
+    tty: true
     environment:
       TZ: America/Chicago
-    command: php /app/bin/console messenger:consume scheduler_monitor -vv
-    tty: true
+      WORKER_MONITOR: 2
 
 
   redis:
@@ -88,6 +91,8 @@ services:
     image: adminer
     ports:
       - "8081:8080"
+    environment:
+      ADMINER_DEFAULT_SERVER: database
 
 
 volumes:

composer.json

@@ -25,8 +25,12 @@
         "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",
+        "sentry/sentry-symfony": "^5.6",
+        "spatie/icalendar-generator": "^3.0",
         "spomky-labs/pwa-bundle": "^1.2",
         "stof/doctrine-extensions-bundle": "^1.14",
         "symfony/asset": "7.3.*",
@@ -43,9 +47,16 @@
         "symfony/mailer": "7.3.*",
         "symfony/mercure-bundle": "^0.3.9",
         "symfony/messenger": "7.3.*",
+        "symfony/monolog-bundle": "^3.10",
+        "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": "f4953f7b233a466d94269f35096f3385",
+    "content-hash": "952def2c32d975032ac0061e5aa37319",
     "packages": [
         {
             "name": "1tomany/rich-bundle",
@@ -2552,6 +2552,66 @@
             ],
             "time": "2025-03-27T12:30:47+00:00"
         },
+        {
+            "name": "jean85/pretty-package-versions",
+            "version": "2.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Jean85/pretty-package-versions.git",
+                "reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/4d7aa5dab42e2a76d99559706022885de0e18e1a",
+                "reference": "4d7aa5dab42e2a76d99559706022885de0e18e1a",
+                "shasum": ""
+            },
+            "require": {
+                "composer-runtime-api": "^2.1.0",
+                "php": "^7.4|^8.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.2",
+                "jean85/composer-provided-replaced-stub-package": "^1.0",
+                "phpstan/phpstan": "^2.0",
+                "phpunit/phpunit": "^7.5|^8.5|^9.6",
+                "rector/rector": "^2.0",
+                "vimeo/psalm": "^4.3 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Jean85\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alessandro Lai",
+                    "email": "alessandro.lai85@gmail.com"
+                }
+            ],
+            "description": "A library to get pretty versions strings of installed dependencies",
+            "keywords": [
+                "composer",
+                "package",
+                "release",
+                "versions"
+            ],
+            "support": {
+                "issues": "https://github.com/Jean85/pretty-package-versions/issues",
+                "source": "https://github.com/Jean85/pretty-package-versions/tree/2.1.1"
+            },
+            "time": "2025-03-19T14:43:43+00:00"
+        },
         {
             "name": "lcobucci/jwt",
             "version": "5.5.0",
@@ -2681,6 +2741,109 @@
             },
             "time": "2025-02-06T08:48:15+00:00"
         },
+        {
+            "name": "monolog/monolog",
+            "version": "3.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/monolog.git",
+                "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/10d85740180ecba7896c87e06a166e0c95a0e3b6",
+                "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/log": "^2.0 || ^3.0"
+            },
+            "provide": {
+                "psr/log-implementation": "3.0.0"
+            },
+            "require-dev": {
+                "aws/aws-sdk-php": "^3.0",
+                "doctrine/couchdb": "~1.0@dev",
+                "elasticsearch/elasticsearch": "^7 || ^8",
+                "ext-json": "*",
+                "graylog2/gelf-php": "^1.4.2 || ^2.0",
+                "guzzlehttp/guzzle": "^7.4.5",
+                "guzzlehttp/psr7": "^2.2",
+                "mongodb/mongodb": "^1.8",
+                "php-amqplib/php-amqplib": "~2.4 || ^3",
+                "php-console/php-console": "^3.1.8",
+                "phpstan/phpstan": "^2",
+                "phpstan/phpstan-deprecation-rules": "^2",
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "^10.5.17 || ^11.0.7",
+                "predis/predis": "^1.1 || ^2",
+                "rollbar/rollbar": "^4.0",
+                "ruflin/elastica": "^7 || ^8",
+                "symfony/mailer": "^5.4 || ^6",
+                "symfony/mime": "^5.4 || ^6"
+            },
+            "suggest": {
+                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+                "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
+                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+                "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler",
+                "ext-mbstring": "Allow to work properly with unicode symbols",
+                "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)",
+                "ext-openssl": "Required to send log messages using SSL",
+                "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)",
+                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+                "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
+                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+                "rollbar/rollbar": "Allow sending log messages to Rollbar",
+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Monolog\\": "src/Monolog"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "https://seld.be"
+                }
+            ],
+            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+            "homepage": "https://github.com/Seldaek/monolog",
+            "keywords": [
+                "log",
+                "logging",
+                "psr-3"
+            ],
+            "support": {
+                "issues": "https://github.com/Seldaek/monolog/issues",
+                "source": "https://github.com/Seldaek/monolog/tree/3.9.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Seldaek",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-03-24T10:02:05+00:00"
+        },
         {
             "name": "nesbot/carbon",
             "version": "3.10.0",
@@ -4757,6 +4920,255 @@
             ],
             "time": "2023-12-12T12:06:11+00:00"
         },
+        {
+            "name": "sentry/sentry",
+            "version": "4.17.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/getsentry/sentry-php.git",
+                "reference": "5c696b8de57e841a2bf3b6f6eecfd99acfdda80c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/5c696b8de57e841a2bf3b6f6eecfd99acfdda80c",
+                "reference": "5c696b8de57e841a2bf3b6f6eecfd99acfdda80c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "guzzlehttp/psr7": "^1.8.4|^2.1.1",
+                "jean85/pretty-package-versions": "^1.5|^2.0.4",
+                "php": "^7.2|^8.0",
+                "psr/log": "^1.0|^2.0|^3.0",
+                "symfony/options-resolver": "^4.4.30|^5.0.11|^6.0|^7.0"
+            },
+            "conflict": {
+                "raven/raven": "*"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.4",
+                "guzzlehttp/promises": "^2.0.3",
+                "guzzlehttp/psr7": "^1.8.4|^2.1.1",
+                "monolog/monolog": "^1.6|^2.0|^3.0",
+                "phpbench/phpbench": "^1.0",
+                "phpstan/phpstan": "^1.3",
+                "phpunit/phpunit": "^8.5|^9.6",
+                "vimeo/psalm": "^4.17"
+            },
+            "suggest": {
+                "monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions.php"
+                ],
+                "psr-4": {
+                    "Sentry\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sentry",
+                    "email": "accounts@sentry.io"
+                }
+            ],
+            "description": "PHP SDK for Sentry (http://sentry.io)",
+            "homepage": "http://sentry.io",
+            "keywords": [
+                "crash-reporting",
+                "crash-reports",
+                "error-handler",
+                "error-monitoring",
+                "log",
+                "logging",
+                "profiling",
+                "sentry",
+                "tracing"
+            ],
+            "support": {
+                "issues": "https://github.com/getsentry/sentry-php/issues",
+                "source": "https://github.com/getsentry/sentry-php/tree/4.17.1"
+            },
+            "funding": [
+                {
+                    "url": "https://sentry.io/",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://sentry.io/pricing/",
+                    "type": "custom"
+                }
+            ],
+            "time": "2025-10-23T15:19:24+00:00"
+        },
+        {
+            "name": "sentry/sentry-symfony",
+            "version": "5.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/getsentry/sentry-symfony.git",
+                "reference": "9867751f5091b55d7e3a223f48d88e228132e073"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/getsentry/sentry-symfony/zipball/9867751f5091b55d7e3a223f48d88e228132e073",
+                "reference": "9867751f5091b55d7e3a223f48d88e228132e073",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/psr7": "^2.1.1",
+                "jean85/pretty-package-versions": "^1.5||^2.0",
+                "php": "^7.2||^8.0",
+                "sentry/sentry": "^4.16.0",
+                "symfony/cache-contracts": "^1.1||^2.4||^3.0",
+                "symfony/config": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/console": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/dependency-injection": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/event-dispatcher": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/http-kernel": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/polyfill-php80": "^1.22",
+                "symfony/psr-http-message-bridge": "^1.2||^2.0||^6.4||^7.0"
+            },
+            "require-dev": {
+                "doctrine/dbal": "^2.13||^3.3||^4.0",
+                "doctrine/doctrine-bundle": "^2.6",
+                "friendsofphp/php-cs-fixer": "^2.19||^3.40",
+                "masterminds/html5": "^2.8",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "1.12.5",
+                "phpstan/phpstan-phpunit": "1.4.0",
+                "phpstan/phpstan-symfony": "1.4.10",
+                "phpunit/phpunit": "^8.5.40||^9.6.21",
+                "symfony/browser-kit": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/cache": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/dom-crawler": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/framework-bundle": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/http-client": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/messenger": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/monolog-bundle": "^3.4",
+                "symfony/phpunit-bridge": "^5.2.6||^6.0||^7.0",
+                "symfony/process": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/security-core": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/security-http": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/twig-bundle": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "symfony/yaml": "^4.4.20||^5.0.11||^6.0||^7.0",
+                "vimeo/psalm": "^4.3||^5.16.0"
+            },
+            "suggest": {
+                "doctrine/doctrine-bundle": "Allow distributed tracing of database queries using Sentry.",
+                "monolog/monolog": "Allow sending log messages to Sentry by using the included Monolog handler.",
+                "symfony/cache": "Allow distributed tracing of cache pools using Sentry.",
+                "symfony/twig-bundle": "Allow distributed tracing of Twig template rendering using Sentry."
+            },
+            "type": "symfony-bundle",
+            "autoload": {
+                "files": [
+                    "src/aliases.php"
+                ],
+                "psr-4": {
+                    "Sentry\\SentryBundle\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sentry",
+                    "email": "accounts@sentry.io"
+                }
+            ],
+            "description": "Symfony integration for Sentry (http://getsentry.com)",
+            "homepage": "http://getsentry.com",
+            "keywords": [
+                "errors",
+                "logging",
+                "sentry",
+                "symfony"
+            ],
+            "support": {
+                "issues": "https://github.com/getsentry/sentry-symfony/issues",
+                "source": "https://github.com/getsentry/sentry-symfony/tree/5.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://sentry.io/",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://sentry.io/pricing/",
+                    "type": "custom"
+                }
+            ],
+            "time": "2025-09-24T13:41:01+00:00"
+        },
+        {
+            "name": "spatie/icalendar-generator",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/icalendar-generator.git",
+                "reference": "32797f6e5afa3142d073f38d5f22ab377f4d8f90"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/icalendar-generator/zipball/32797f6e5afa3142d073f38d5f22ab377f4d8f90",
+                "reference": "32797f6e5afa3142d073f38d5f22ab377f4d8f90",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "ext-json": "*",
+                "larapack/dd": "^1.1",
+                "nesbot/carbon": "^3.5",
+                "pestphp/pest": "^2.34",
+                "phpstan/phpstan": "^2.0",
+                "spatie/pest-plugin-snapshots": "^2.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\IcalendarGenerator\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ruben Van Assche",
+                    "email": "ruben@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Build calendars in the iCalendar format",
+            "homepage": "https://github.com/spatie/icalendar-generator",
+            "keywords": [
+                "calendar",
+                "iCalendar",
+                "ical",
+                "ics",
+                "spatie"
+            ],
+            "support": {
+                "issues": "https://github.com/spatie/icalendar-generator/issues",
+                "source": "https://github.com/spatie/icalendar-generator/tree/3.0.0"
+            },
+            "time": "2025-04-17T14:50:03+00:00"
+        },
         {
             "name": "spomky-labs/pki-framework",
             "version": "1.3.0",
@@ -7578,6 +7990,388 @@
             ],
             "time": "2025-02-19T08:51:26+00:00"
         },
+        {
+            "name": "symfony/monolog-bridge",
+            "version": "v7.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/monolog-bridge.git",
+                "reference": "c66a65049c75f3ddf03d73c8c9ed61405779ce47"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/c66a65049c75f3ddf03d73c8c9ed61405779ce47",
+                "reference": "c66a65049c75f3ddf03d73c8c9ed61405779ce47",
+                "shasum": ""
+            },
+            "require": {
+                "monolog/monolog": "^3",
+                "php": ">=8.2",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/service-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/console": "<6.4",
+                "symfony/http-foundation": "<6.4",
+                "symfony/security-core": "<6.4"
+            },
+            "require-dev": {
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/mailer": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/mime": "^6.4|^7.0",
+                "symfony/security-core": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
+            },
+            "type": "symfony-bridge",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Bridge\\Monolog\\": ""
+                },
+                "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 integration for Monolog with various Symfony components",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/monolog-bridge/tree/v7.3.5"
+            },
+            "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-10-14T19:16:15+00:00"
+        },
+        {
+            "name": "symfony/monolog-bundle",
+            "version": "v3.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/monolog-bundle.git",
+                "reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181",
+                "reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181",
+                "shasum": ""
+            },
+            "require": {
+                "monolog/monolog": "^1.25.1 || ^2.0 || ^3.0",
+                "php": ">=7.2.5",
+                "symfony/config": "^5.4 || ^6.0 || ^7.0",
+                "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+                "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
+                "symfony/monolog-bridge": "^5.4 || ^6.0 || ^7.0"
+            },
+            "require-dev": {
+                "symfony/console": "^5.4 || ^6.0 || ^7.0",
+                "symfony/phpunit-bridge": "^6.3 || ^7.0",
+                "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
+            },
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Bundle\\MonologBundle\\": ""
+                },
+                "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": "Symfony MonologBundle",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "log",
+                "logging"
+            ],
+            "support": {
+                "issues": "https://github.com/symfony/monolog-bundle/issues",
+                "source": "https://github.com/symfony/monolog-bundle/tree/v3.10.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-11-06T17:08:13+00:00"
+        },
+        {
+            "name": "symfony/notifier",
+            "version": "v7.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/notifier.git",
+                "reference": "9e68a3266c8b0381f8756022b1c1ba3c0264416e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/notifier/zipball/9e68a3266c8b0381f8756022b1c1ba3c0264416e",
+                "reference": "9e68a3266c8b0381f8756022b1c1ba3c0264416e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "psr/log": "^1|^2|^3"
+            },
+            "conflict": {
+                "symfony/event-dispatcher": "<6.4",
+                "symfony/event-dispatcher-contracts": "<2.5",
+                "symfony/http-client-contracts": "<2.5",
+                "symfony/http-kernel": "<6.4"
+            },
+            "require-dev": {
+                "symfony/event-dispatcher-contracts": "^2.5|^3",
+                "symfony/http-client-contracts": "^2.5|^3",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Notifier\\": ""
+                },
+                "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": "Sends notifications via one or more channels (email, SMS, ...)",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "notification",
+                "notifier"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/notifier/tree/v7.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-05-01T12:12:53+00:00"
+        },
+        {
+            "name": "symfony/ntfy-notifier",
+            "version": "v7.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/ntfy-notifier.git",
+                "reference": "094154ba36eac54078a71076effe46feaec59036"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/ntfy-notifier/zipball/094154ba36eac54078a71076effe46feaec59036",
+                "reference": "094154ba36eac54078a71076effe46feaec59036",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/clock": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/notifier": "^7.3"
+            },
+            "type": "symfony-notifier-bridge",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Notifier\\Bridge\\Ntfy\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mickael Perraud",
+                    "email": "mikaelkael.fr@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Ntfy Notifier Bridge",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "Ntfy",
+                "notifier"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/ntfy-notifier/tree/v7.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "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",
@@ -8499,6 +9293,89 @@
             ],
             "time": "2025-04-04T13:12:05+00:00"
         },
+        {
+            "name": "symfony/psr-http-message-bridge",
+            "version": "v7.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/psr-http-message-bridge.git",
+                "reference": "03f2f72319e7acaf2a9f6fcbe30ef17eec51594f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/03f2f72319e7acaf2a9f6fcbe30ef17eec51594f",
+                "reference": "03f2f72319e7acaf2a9f6fcbe30ef17eec51594f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "psr/http-message": "^1.0|^2.0",
+                "symfony/http-foundation": "^6.4|^7.0"
+            },
+            "conflict": {
+                "php-http/discovery": "<1.15",
+                "symfony/http-kernel": "<6.4"
+            },
+            "require-dev": {
+                "nyholm/psr7": "^1.1",
+                "php-http/discovery": "^1.15",
+                "psr/log": "^1.1.4|^2|^3",
+                "symfony/browser-kit": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/framework-bundle": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0"
+            },
+            "type": "symfony-bridge",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Bridge\\PsrHttpMessage\\": ""
+                },
+                "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": "PSR HTTP message bridge",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr-17",
+                "psr-7"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-26T08:57:56+00:00"
+        },
         {
             "name": "symfony/routing",
             "version": "v7.3.0",

config/bundles.php

@@ -23,4 +23,6 @@ return [
     SymfonyCasts\Bundle\ResetPassword\SymfonyCastsResetPasswordBundle::class => ['all' => true],
     Drenso\OidcBundle\DrensoOidcBundle::class => ['all' => true],
     SpomkyLabs\PwaBundle\SpomkyLabsPwaBundle::class => ['all' => true],
+    Sentry\SentryBundle\SentryBundle::class => ['prod' => true],
+    Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
 ];

config/packages/doctrine.yaml

@@ -41,7 +41,13 @@ doctrine:
                 is_bundle: false
                 dir: '%kernel.project_dir%/src/Monitor/Framework/Entity'
                 prefix: 'App\Monitor\Framework\Entity'
-                alias: Download
+                alias: Monitor
+            EventLog:
+                type: attribute
+                is_bundle: false
+                dir: '%kernel.project_dir%/src/EventLog/Framework/Entity'
+                prefix: 'App\EventLog\Framework\Entity'
+                alias: EventLog
         controller_resolver:
             auto_mapping: false
 

config/packages/messenger.yaml

@@ -15,6 +15,26 @@ framework:
                     max_retries: 1
                     multiplier: 1
 
+            download:
+                dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
+                options:
+                    use_notify: true
+                    check_delayed_interval: 60000
+                    queue_name: download
+                retry_strategy:
+                    max_retries: 3
+                    multiplier: 1
+
+            monitor:
+                dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
+                options:
+                    use_notify: true
+                    check_delayed_interval: 60000
+                    queue_name: monitor
+                retry_strategy:
+                    max_retries: 1
+                    multiplier: 1
+
             media_cache:
                 dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
                 options:
@@ -36,12 +56,12 @@ framework:
         routing:
             # Route your messages to the transports
             # 'App\Message\YourMessage': async
-            'App\Download\Action\Command\DownloadMediaCommand': async
+            'App\Download\Action\Command\DownloadMediaCommand': download
             'App\Download\Action\Command\DownloadSeasonCommand': async
-            'App\Monitor\Action\Command\MonitorTvEpisodeCommand': async
-            'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
-            'App\Monitor\Action\Command\MonitorTvShowCommand': async
-            'App\Monitor\Action\Command\MonitorMovieCommand': async
+            'App\Monitor\Action\Command\MonitorTvEpisodeCommand': monitor
+            'App\Monitor\Action\Command\MonitorTvSeasonCommand': monitor
+            'App\Monitor\Action\Command\MonitorTvShowCommand': monitor
+            'App\Monitor\Action\Command\MonitorMovieCommand': monitor
             'App\Torrentio\Action\Command\GetTvShowOptionsCommand': media_cache
 
 # when@test:

config/packages/monolog.yaml

@@ -0,0 +1,63 @@
+monolog:
+    channels:
+        - deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists
+
+when@dev:
+    monolog:
+        handlers:
+            main:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+                channels: ["!event"]
+            # uncomment to get logging in your browser
+            # you may have to allow bigger header sizes in your Web server configuration
+            #firephp:
+            #    type: firephp
+            #    level: info
+            #chromephp:
+            #    type: chromephp
+            #    level: info
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine", "!console"]
+
+when@test:
+    monolog:
+        handlers:
+            main:
+                type: fingers_crossed
+                action_level: error
+                handler: nested
+                excluded_http_codes: [404, 405]
+                channels: ["!event"]
+            nested:
+                type: stream
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                level: debug
+
+when@prod:
+    monolog:
+        handlers:
+            main:
+                type: fingers_crossed
+                action_level: error
+                handler: nested
+                excluded_http_codes: [404, 405]
+                channels: ["!deprecation"]
+                buffer_size: 50 # How many messages should be saved? Prevent memory leaks
+            nested:
+                type: stream
+                path: php://stderr
+                level: debug
+                formatter: monolog.formatter.json
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine"]
+            deprecation:
+                type: stream
+                channels: [deprecation]
+                path: php://stderr
+                formatter: monolog.formatter.json

config/packages/notifier.yaml

@@ -0,0 +1,13 @@
+framework:
+    notifier:
+        chatter_transports:
+        texter_transports:
+            ntfy: '%notification.ntfy.dsn%'
+        channel_policy:
+            # use chat/slack, chat/telegram, sms/twilio or sms/nexmo
+            urgent: ['email']
+            high: ['email']
+            medium: ['email']
+            low: ['email']
+        admin_recipients:
+            - { email: admin@example.com }

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/packages/sentry.yaml

@@ -0,0 +1,34 @@
+when@prod:
+    sentry:
+        register_error_listener: true # Disables the ErrorListener to avoid duplicated log in sentry
+        register_error_handler: true # Disables the ErrorListener, ExceptionListener and FatalErrorListener integrations of the base PHP SDK
+
+        tracing:
+            enabled: true
+            dbal: # DB queries
+                enabled: true
+            cache: # cache pools
+                enabled: true
+            twig: # templating engine
+                enabled: true
+
+    services:
+        # (Optionally) Configure the breadcrumb handler as a service (needed for the breadcrumb Monolog handler)
+        Sentry\Monolog\BreadcrumbHandler:
+            arguments:
+                - '@Sentry\State\HubInterface'
+                - !php/const Monolog\Logger::INFO # Configures the level of messages to capture as breadcrumbs
+    monolog:
+        handlers:
+            # (Optionally) Register the breadcrumb handler as a Monolog handler
+            sentry_breadcrumbs:
+                type: service
+                name: sentry_breadcrumbs
+                id: Sentry\Monolog\BreadcrumbHandler
+            # Register the handler as a Monolog handler to capture messages as events
+            sentry:
+                type: sentry
+                level: !php/const Monolog\Logger::ERROR # Configures the level of messages to capture as events
+                hub_id: Sentry\State\HubInterface
+                fill_extra_context: true # Enables sending monolog context to Sentry
+                process_psr_3_messages: false # Disables the resolution of PSR-3 placeholders in reported messages

config/routes.yaml

@@ -6,6 +6,14 @@ controllersBase:
     defaults:
         schemes: [ 'https' ]
 
+controllersEventLog:
+    resource:
+        path: ../src/EventLog/Framework/Controller/
+        namespace: App\EventLog\Framework\Controller
+    type: attribute
+    defaults:
+        schemes: [ 'https' ]
+
 controllersLibrary:
     resource:
         path: ../src/Library/Framework/Controller/

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
@@ -44,6 +44,10 @@ parameters:
     auth.oidc.client_secret: '%env(OIDC_CLIENT_SECRET)%'
     auth.oidc.bypass_form_login: '%env(bool:OIDC_BYPASS_FORM_LOGIN)%'
 
+    # Notifications
+    notification.transport: '%env(NOTIFICATION_TRANSPORT)%'
+    notification.ntfy.dsn: '%env(NTFY_DSN)%'
+
 services:
     # default configuration for services in *this* file
     _defaults:

deploy.compose.yml

@@ -2,11 +2,10 @@ 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!'
-    tty: true
     deploy:
       replicas: 2
     volumes:
@@ -14,8 +13,6 @@ services:
       - /mnt/media/downloads/tvshows:/var/download/tvshows
       - mercure_data:/data
       - mercure_config:/config
-    depends_on:
-      - database
 
 
   worker:
@@ -23,8 +20,6 @@ services:
     volumes:
       - /mnt/media/downloads/movies:/var/download/movies
       - /mnt/media/downloads/tvshows:/var/download/tvshows
-    restart: always
-    command: -vv --time-limit=3600 --limit=10
     deploy:
       replicas: 2
     depends_on:
@@ -36,23 +31,10 @@ services:
     volumes:
       - /mnt/media/downloads/movies:/var/download/movies
       - /mnt/media/downloads/tvshows:/var/download/tvshows
-    restart: always
-    command: -vv
     depends_on:
       - app
 
 
-  redis:
-    image: redis:latest
-    volumes:
-      - redis_data:/data
-    command: redis-server --maxmemory 512MB
-    restart: unless-stopped
-
-
 volumes:
-  mysql:
   mercure_config:
   mercure_data:
-  redis_data:
-

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"
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
-
-ARG APP_VERSION="0.dev"
+ARG APP_VERSION="0.0.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,40 @@
+#####
+# This version of Torsearch runs the scheduler, downloader, and worker
+# in a single container. Each process is managerd by supervisord
+# and can be configured via environment variables and more
+# than one of these containers cans till be run.
+#####
+ARG ALPINE_VERSION="3.22"
+FROM alpine:${ALPINE_VERSION} AS build_stage
+
+RUN apk add --no-cache \
+  curl \
+  php84 \
+  php84-ctype \
+  php84-curl \
+  php84-dom \
+  php84-fileinfo \
+  php84-fpm \
+  php84-gd \
+  php84-mbstring \
+  php84-mysqli \
+  php84-opcache \
+  php84-openssl \
+  php84-pdo_mysql \
+  php84-tokenizer \
+  php84-xml \
+  supervisor
+
+RUN ln -s /usr/bin/php84 /usr/bin/php
+
+RUN mkdir -p /etc/supervisor/conf.d
+
+# We start supervisord and supervisord starts
+# respective service in the configuration file.
+ENTRYPOINT ["/app/bin/console", "init:worker"]
+
+# Message transports can be enabled by passing them as command options.
+# Inlcluding a number with the option will start that amount of processes
+# for the transport. Not supplying a number will default to 1.
+# --download --monitor OR --download 2 --monitor
+

docker/Dockerfile.scheduler

@@ -1,21 +1,24 @@
-FROM dunglas/frankenphp:php8.4-alpine
+###
+# This version of Torsearch can run the scheduler, downloader, and
+# worker in one container. Each process is managerd by supervisord
+# and can be configured via environment variables, and more than
+# one of these containers can still be run.
+###
 
-ENV SERVER_NAME=":80"
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+# Default to latest, but should pass in a version
+ARG APP_VERSION="latest"
 
-ARG APP_VERSION="0.dev"
-ENV APP_VERSION="${APP_VERSION}"
+# Set aside the actual app image so we can copy the app from there
+FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS app_image
 
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
+# Start with our base worker image
+FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
 
-COPY . /app
+# Set the APP_VERSION in the image
+ENV APP_VERSION=${APP_VERSION}
 
-ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
+# Copy the actual application code from the previously built app
+COPY --chown=1000:1000 --from=app_image /app /app
 
-HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0
+# To retain backwards compatibility, default to async & download transports
+CMD [ "--monitor" ]

docker/Dockerfile.worker

@@ -1,23 +1,24 @@
-FROM dunglas/frankenphp:php8.4-alpine
+###
+# This version of Torsearch can run the scheduler, downloader, and
+# worker in one container. Each process is managerd by supervisord
+# and can be configured via environment variables, and more than
+# one of these containers can still be run.
+###
 
-ENV SERVER_NAME=":80"
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+# Default to latest, but should pass in a version
+ARG APP_VERSION="latest"
 
-ARG APP_VERSION="0.dev"
-ENV APP_VERSION="${APP_VERSION}"
+# Set aside the actual app image so we can copy the app from there
+FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS app_image
 
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
+# Start with our base worker image
+FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
 
-RUN apk add --no-cache wget
+# Set the APP_VERSION in the image
+ENV APP_VERSION=${APP_VERSION}
 
-COPY . /app
+# Copy the actual application code from the previously built app
+COPY --chown=1000:1000 --from=app_image /app /app
 
-ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]
-
-HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0
+# To retain backwards compatibility, default to async & download transports
+CMD [ "--async", "--download" ]

docker/worker/async.conf

@@ -0,0 +1,10 @@
+[program:torsearch-worker]
+command=/app/bin/console messenger:consume async -vv --time-limit 3600
+numprocs=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

docker/worker/download.conf

@@ -0,0 +1,10 @@
+[program:torsearch-downloader]
+command=/app/bin/console messenger:consume download -vv --time-limit 3600
+numprocs=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

docker/worker/monitor.conf

@@ -0,0 +1,10 @@
+[program:torsearch-scheduler]
+command=/app/bin/console messenger:consume scheduler_monitor monitor -vv --time-limit 21600
+numprocs=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

docker/worker/supervisord.conf

@@ -0,0 +1,5 @@
+[supervisord]
+nodaemon=true
+logfile=/dev/null
+logfile_maxbytes=0
+pidfile=/run/supervisord.pid

migrations/Version20250823173128.php

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

migrations/Version20250831013403.php

@@ -0,0 +1,41 @@
+<?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 IF EXISTS  sessions
+        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 user_preference CHANGE preference_value preference_value VARCHAR(255) DEFAULT NULL
+        SQL);
+    }
+}

migrations/Version20251101194723.php

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

migrations/Version20251101211617.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20251101211617 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'
+            CREATE TABLE event_log (id INT AUTO_INCREMENT NOT NULL, type VARCHAR(255) DEFAULT NULL, message LONGTEXT DEFAULT NULL, context JSON DEFAULT NULL COMMENT '(DC2Type:json)', PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            DROP TABLE event_log
+        SQL);
+    }
+}

migrations/Version20251102004627.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 Version20251102004627 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE event_log ADD user_id INT DEFAULT NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE event_log ADD CONSTRAINT FK_9EF0AD16A76ED395 FOREIGN KEY (user_id) REFERENCES user (id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_9EF0AD16A76ED395 ON event_log (user_id)
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE event_log DROP FOREIGN KEY FK_9EF0AD16A76ED395
+        SQL);
+        $this->addSql(<<<'SQL'
+            DROP INDEX IDX_9EF0AD16A76ED395 ON event_log
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE event_log DROP user_id
+        SQL);
+    }
+}

migrations/Version20251102221034.php

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

psalm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="true"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

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,
 
@@ -38,6 +47,12 @@ final class ConfigResolver
 
         #[Autowire(param: 'auth.oidc.bypass_form_login')]
         private ?bool $authOidcBypassFormLogin = null,
+
+        #[Autowire(param: 'notification.transport')]
+        private ?string $notificationTransport = null,
+
+        #[Autowire(param: 'notification.ntfy.dsn')]
+        private ?string $notificationNtfyDsn = null,
     ) {}
 
     public function validate(): bool
@@ -54,6 +69,12 @@ final class ConfigResolver
             $valid = false;
         }
 
+        if (null !== $this->notificationTransport) {
+            if (null === $this->notificationNtfyDsn || "" === $this->notificationNtfyDsn) {
+                $this->messages[] = "Your NOTIFICATION_TRANSPORT is set to 'ntfy' but you don't have the NTFY_DSN environment variable set.";
+            }
+        }
+
         return $valid;
     }
 
@@ -80,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/InitWorker.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Base\Framework\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Twig\Environment;
+
+class InitWorker extends Command
+{
+    public function __construct(
+        private Environment $twig,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setName('init:worker')
+            ->addOption('async', null, InputOption::VALUE_OPTIONAL, 'Run the async worker.',false)
+            ->addOption('download', null, InputOption::VALUE_OPTIONAL, 'Run the download worker.', false)
+            ->addOption('monitor', null, InputOption::VALUE_OPTIONAL, 'Run the monitor worker.', false)
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $configFile = $this->twig->render("config/supervisord.conf.twig", []);
+
+        if ($this->optionExists($input, $output, 'async')) {
+            $configFile .= $this->twig->render("config/async.conf.twig", [
+                'replicas' => $this->getOptionValue('async', $input),
+            ]) . "\n\n";
+        }
+
+        if ($this->optionExists($input, $output, 'download')) {
+            $configFile .= $this->twig->render("config/download.conf.twig", [
+                'replicas' => $this->getOptionValue('download', $input),
+            ]). "\n\n";
+        }
+
+        if ($this->optionExists($input, $output, 'monitor')) {
+            $configFile .= $this->twig->render("config/monitor.conf.twig", [
+                'replicas' => $this->getOptionValue('monitor', $input),
+            ]). "\n\n";
+        }
+
+        if ("" !== $configFile) {
+            $output->writeln("[init:worker] Writing /etc/supervisor/conf.d/supervisord.conf");
+            file_put_contents("/etc/supervisor/conf.d/supervisord.conf", $configFile);
+
+            $output->writeln("[init:worker] Starting supervisord");
+            shell_exec("/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf");
+            return Command::SUCCESS;
+        }
+
+        $output->writeln("[init:worker] No workers selected. Exiting.");
+        return Command::FAILURE;
+    }
+
+    private function optionExists(InputInterface $input, OutputInterface $output, string $option): bool
+    {
+        if ($input->getOption($option) !== false) {
+            $value = $input->getOption($option) ?? 1;
+            $output->writeln("[init:worker] transport: $option // $value // input var");;
+            return true;
+        }
+
+        $optionKey = 'WORKER_' . strtoupper($option);
+        if (array_key_exists($optionKey, $_SERVER) && $_SERVER[$optionKey] !== null && $_SERVER[$optionKey] !== '') {
+            $output->writeln("[init:worker] transport: $option // $_SERVER[$optionKey] // env var");
+            return true;
+        }
+
+        return false;
+    }
+
+    private function getOptionValue(string $option, InputInterface $input): int
+    {
+        if ($input->getOption($option) !== false) {
+            return $input->getOption($option) ?? 1;
+        }
+
+        $optionKey = 'WORKER_' . strtoupper($option);
+        return $_SERVER[$optionKey];
+    }
+}

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\User\Framework\Entity\User;
+use App\Tmdb\TmdbClient;
 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 MonitorTvShowHandler $monitorTvShowHandler,
+        private readonly TmdbClient $tmdb,
     ) {}
 
     #[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_tvshows' => $this->tmdb->popularTvShows(1, 6),
+            'popular_movies' => $this->tmdb->popularMovies(),
+            'popular_tvshows' => $this->tmdb->popularTvShows(),
         ]);
     }
 
@@ -51,11 +48,9 @@ final class IndexController extends AbstractController
     }
 
     #[Route('/test')]
-    public function monitorTvShow(): Response
+    public function monitorTvShow(MonitorTvShowHandler $handler): Response
     {
-        $this->monitorTvShowHandler->handle(new MonitorTvShowCommand(96));
-        return $this->json([
-            'Success' => 'Monitor added'
-        ]);
+//        $handler->handle(new MonitorTvShowCommand(82));
+        return $this->render('index/test.html.twig', []);
     }
 }

src/Base/Service/Broadcaster.php

@@ -2,33 +2,53 @@
 
 namespace App\Base\Service;
 
+use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Mercure\HubInterface;
 use Symfony\Component\Mercure\Update;
+use Symfony\Component\Notifier\Notification\Notification;
+use Symfony\Component\Notifier\NotifierInterface;
 use Twig\Environment;
 
 readonly class Broadcaster
 {
     public function __construct(
+        #[Autowire(param: 'notification.transport')]
+        private string $notificationTransport,
         #[Autowire(service: 'twig')]
         private Environment $renderer,
         private HubInterface $hub,
         private RequestStack $requestStack,
+        private NotifierInterface $notifier,
+        private LoggerInterface $logger,
     ) {}
 
-    public function alert(string $title, string $message, string $type = "success"): void
+    public function alert(string $title, string $message, string $type = "success", bool $sendPush = false): void
     {
-        $userAlertTopic = $this->requestStack->getCurrentRequest()->getSession()->get('mercure_alert_topic');
-        $update = new Update(
-            $userAlertTopic,
-            $this->renderer->render('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => $title,
-                'message' => $message,
-                'type' => $type,
-            ])
-        );
-        $this->hub->publish($update);
+        try {
+            $userAlertTopic = $this->requestStack->getCurrentRequest()->getSession()->get('mercure_alert_topic');
+            $update = new Update(
+                $userAlertTopic,
+                $this->renderer->render('broadcast/Alert.stream.html.twig', [
+                    'alert_id' => uniqid(),
+                    'title' => $title,
+                    'message' => $message,
+                    'type' => $type,
+                ])
+            );
+            $this->hub->publish($update);
+        } catch (\Throwable $exception) {
+            // ToDo: look for better handling to get message to end user
+        }
+
+        if (true === $sendPush && in_array($this->notificationTransport, ['ntfy'])) {
+            try {
+                $notification = new Notification($title, ['push'])->content($message);
+                $this->notifier->send($notification);
+            } catch (\Throwable $exception) {
+                $this->logger->error('Unable to send push notification: ' . $exception->getMessage());
+            }
+        }
     }
 }

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

@@ -4,17 +4,22 @@ namespace App\Download\Action\Handler;
 
 use App\Download\Action\Command\DeleteDownloadCommand;
 use App\Download\Action\Result\DeleteDownloadResult;
+use App\Download\DownloadEvents;
 use App\Download\Framework\Repository\DownloadRepository;
+use App\EventLog\Action\Command\AddEventLogCommand;
 use App\Library\Action\Command\DeleteMediaFileCommand;
 use App\Library\Action\Handler\DeleteMediaFileHandler;
+use App\Monitor\MonitorEvents;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 /** @implements HandlerInterface<DeleteDownloadCommand, DeleteDownloadResult> */
 readonly class DeleteDownloadHandler implements HandlerInterface
 {
     public function __construct(
+        private MessageBusInterface $bus,
         private DownloadRepository $downloadRepository,
         private DeleteMediaFileHandler $deleteMediaFileHandler,
     ) {}
@@ -31,6 +36,13 @@ readonly class DeleteDownloadHandler implements HandlerInterface
         }
         $this->downloadRepository->delete($command->downloadId);
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $download->getUser(),
+            DownloadEvents::DOWNLOAD_DELETED->type(),
+            DownloadEvents::DOWNLOAD_DELETED->message(),
+            (array) $download
+        ));
+
         return new DeleteDownloadResult(
             status: 200,
             message: 'Success',

src/Download/Action/Handler/DownloadMediaHandler.php

@@ -4,18 +4,22 @@ namespace App\Download\Action\Handler;
 
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Download\Action\Result\DownloadMediaResult;
+use App\Download\DownloadEvents;
 use App\Download\Framework\Repository\DownloadRepository;
 use App\Download\Downloader\DownloaderInterface;
+use App\EventLog\Action\Command\AddEventLogCommand;
 use App\User\Framework\Repository\UserRepository;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 /** @implements HandlerInterface<DownloadMediaCommand, DownloadMediaResult> */
 readonly class DownloadMediaHandler implements HandlerInterface
 {
     public function __construct(
+        private MessageBusInterface $bus,
         private DownloaderInterface $downloader,
         private DownloadRepository $downloadRepository,
         private UserRepository $userRepository,
@@ -23,9 +27,17 @@ readonly class DownloadMediaHandler implements HandlerInterface
 
     public function handle(CommandInterface $command): ResultInterface
     {
+        $user = $this->userRepository->find($command->userId);
+        $this->bus->dispatch(new AddEventLogCommand(
+            $user,
+            DownloadEvents::DOWNLOAD_STARTED->type(),
+            DownloadEvents::DOWNLOAD_STARTED->message(),
+            (array) $command
+        ));
+
         if (null === $command->downloadId) {
             $download = $this->downloadRepository->insert(
-                $this->userRepository->find($command->userId),
+                $user,
                 $command->url,
                 $command->title,
                 $command->filename,
@@ -57,6 +69,12 @@ readonly class DownloadMediaHandler implements HandlerInterface
             throw new UnrecoverableMessageHandlingException($exception->getMessage(), 500);
         }
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $user,
+            DownloadEvents::DOWNLOAD_FINISHED->type(),
+            DownloadEvents::DOWNLOAD_FINISHED->message(),
+            (array) $command
+        ));
         return new DownloadMediaResult(200, "Success.");
     }
 }

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/Download/DownloadEvents.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Download;
+
+enum DownloadEvents
+{
+    case DOWNLOAD_ADDED;
+    case DOWNLOAD_STARTED;
+    case DOWNLOAD_FINISHED;
+    case DOWNLOAD_DELETED;
+    case DOWNLOAD_ERROR;
+
+    public function type(): string
+    {
+        return match ($this) {
+            self::DOWNLOAD_ADDED => 'download_added',
+            self::DOWNLOAD_STARTED => 'download_started',
+            self::DOWNLOAD_FINISHED => 'download_finished',
+            self::DOWNLOAD_DELETED => 'download_deleted',
+            self::DOWNLOAD_ERROR => 'download_error',
+        };
+    }
+
+    public function message(): string
+    {
+        return match ($this) {
+            self::DOWNLOAD_ADDED => 'A new download has been added.',
+            self::DOWNLOAD_STARTED => 'A download has started.',
+            self::DOWNLOAD_FINISHED => 'A download has finished.',
+            self::DOWNLOAD_DELETED => 'A download has been deleted.',
+            self::DOWNLOAD_ERROR => 'A download has encountered an error.',
+        };
+    }
+}

src/Download/Downloader/ProcessDownloader.php

@@ -2,10 +2,14 @@
 
 namespace App\Download\Downloader;
 
+use App\Base\Service\Broadcaster;
 use App\Base\Service\MediaFiles;
+use App\Download\DownloadEvents;
 use App\Download\Framework\Entity\Download;
+use App\EventLog\Action\Command\AddEventLogCommand;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
 use Symfony\Contracts\Cache\CacheInterface;
@@ -16,9 +20,11 @@ class ProcessDownloader implements DownloaderInterface
      * @var RedisAdapter $cache
      */
     public function __construct(
+        private MessageBusInterface $bus,
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
         private CacheInterface $cache,
+        private readonly Broadcaster $broadcaster,
     ) {}
 
     /**
@@ -82,9 +88,16 @@ class ProcessDownloader implements DownloaderInterface
             });
             if ($downloadEntity->getStatus() !== 'Paused') {
                 $downloadEntity->setProgress(100);
+                $this->alertComplete($downloadEntity);
             }
         } catch (ProcessFailedException $exception) {
             $downloadEntity->setStatus('Failed');
+            $this->bus->dispatch(new AddEventLogCommand(
+                $downloadEntity->getUser()->getId(),
+                DownloadEvents::DOWNLOAD_ERROR->type(),
+                DownloadEvents::DOWNLOAD_ERROR->message() . ': ' . $exception->getMessage(),
+                (array) $downloadEntity
+            ));
         }
 
         $this->entityManager->flush();
@@ -105,4 +118,15 @@ class ProcessDownloader implements DownloaderInterface
 
         throw new \Exception("There is no download path for media type: $mediaType");
     }
+
+    private function alertComplete(Download $download): void
+    {
+        if ("tvshows" === $download->getMediaType()) {
+            $message = '"' . $download->getTitle() . '" - ' . $download->getEpisodeId() . ' has finished downloading.';
+        } else {
+            $message = '"' . $download->getTitle() . '" has finished downloading.';
+        }
+
+        $this->broadcaster->alert('Success', $message, sendPush: true);
+    }
 }

src/Download/Framework/Controller/ApiController.php

@@ -11,7 +11,9 @@ use App\Download\Action\Input\DownloadMediaInput;
 use App\Download\Action\Input\DownloadSeasonInput;
 use App\Download\Action\Input\PauseDownloadInput;
 use App\Download\Action\Input\ResumeDownloadInput;
+use App\Download\DownloadEvents;
 use App\Download\Framework\Repository\DownloadRepository;
+use App\EventLog\Action\Command\AddEventLogCommand;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -41,6 +43,13 @@ class ApiController extends AbstractController
         $input->downloadId = $download->getId();
         $input->userId = $this->getUser()->getId();
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $this->getUser(),
+            DownloadEvents::DOWNLOAD_ADDED->type(),
+            DownloadEvents::DOWNLOAD_ADDED->message(),
+            (array) $download
+        ));
+
         try {
             $this->bus->dispatch($input->toCommand());
         } catch (\Throwable $exception) {

src/EventLog/Action/Command/AddEventLogCommand.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\EventLog\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+/** @implements CommandInterface<AddEventLogCommand> */
+class AddEventLogCommand implements CommandInterface
+{
+    public function __construct(
+        public UserInterface $user,
+        public string $type,
+        public string $message,
+        public array $context,
+    ) {}
+}

src/EventLog/Action/Handler/AddEventLogHandler.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\EventLog\Action\Handler;
+
+use App\EventLog\Framework\Repository\EventLogRepository;
+use App\EventLog\Action\Command\AddEventLogCommand;
+use App\EventLog\Action\Result\AddEventLogResult;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/*** @implements HandlerInterface<AddEventLogCommand> */
+class AddEventLogHandler implements HandlerInterface
+{
+    public function __construct(
+        private EventLogRepository $repository,
+    ) {}
+
+    public function handle(CommandInterface $command): ResultInterface
+    {
+        $eventLog = $this->repository->insert(
+            user: $command->user,
+            type: $command->type,
+            message: $command->message,
+            context: $command->context
+        );
+        return new AddEventLogResult($eventLog);
+    }
+}

src/EventLog/Action/Input/AddEventLogInput.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\EventLog\Action\Input;
+
+use App\EventLog\Action\Command\AddEventLogCommand;
+use OneToMany\RichBundle\Attribute\SourceQuery;
+use OneToMany\RichBundle\Attribute\SourceRequest;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\InputInterface;
+
+/** @implements InputInterface<AddEventLogCommand> */
+class AddEventLogInput implements InputInterface
+{
+    public function __construct(
+        #[SourceQuery('type')]
+        #[SourceRequest('type')]
+        public string $type,
+        
+        #[SourceQuery('message')]
+        #[SourceRequest('message')]
+        public string $message,
+        
+        #[SourceQuery('context')]
+        #[SourceRequest('context')]
+        public array $context = []
+    ){}
+
+    public function toCommand(): CommandInterface
+    {
+        return new AddEventLogCommand(
+            $this->type,
+            $this->message,
+            $this->context
+        );
+    }
+}

src/EventLog/Action/Result/AddEventLogResult.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\EventLog\Action\Result;
+
+use App\EventLog\Framework\Entity\EventLog;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/** @implements ResultInterface<AddEventLogResult> */
+class AddEventLogResult implements ResultInterface
+{
+    public function __construct(
+        public EventLog $eventLog,
+    ) {}
+}

src/EventLog/Framework/Controller/EventLogController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\EventLog\Framework\Controller;
+
+use App\Base\Service\Broadcaster;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+
+final class EventLogController extends AbstractController
+{
+    public function __construct(
+        private readonly Broadcaster $broadcaster,
+    ) {}
+
+    #[Route('/alert', name: 'app_alert')]
+    public function index(): Response
+    {
+        $this->broadcaster->alert(
+            'Added to queue',
+            'This is a testy test!'
+        );
+
+        return $this->json([
+            'Success' => 'Published'
+        ]);
+    }
+}

src/EventLog/Framework/Entity/EventLog.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\EventLog\Framework\Entity;
+
+use App\EventLog\Framework\Repository\EventLogRepository;
+use App\User\Framework\Entity\User;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Mapping as ORM;
+use Gedmo\Timestampable\Traits\TimestampableEntity;
+
+#[ORM\Entity(repositoryClass: EventLogRepository::class)]
+class EventLog
+{
+    use TimestampableEntity;
+
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(nullable: true)]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 255, nullable: true)]
+    private ?string $type = null;
+
+    #[ORM\Column(type: Types::TEXT, nullable: true)]
+    private ?string $message = null;
+
+    #[ORM\Column(type: Types::JSON, nullable: true)]
+    private ?array $context = null;
+
+    #[ORM\ManyToOne(inversedBy: 'eventLogs')]
+    private ?User $user = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getType(): ?string
+    {
+        return $this->type;
+    }
+
+    public function setType(?string $type): self
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    public function getMessage(): ?string
+    {
+        return $this->message;
+    }
+
+    public function setMessage(?string $message): self
+    {
+        $this->message = $message;
+        return $this;
+    }
+
+    public function getContext(): ?array
+    {
+        return $this->context;
+    }
+
+    public function setContext(?array $context): self
+    {
+        $this->context = $context;
+        return $this;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(?User $user): static
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+}

src/EventLog/Framework/Repository/EventLogRepository.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\EventLog\Framework\Repository;
+
+use App\EventLog\Framework\Entity\EventLog;
+use App\User\Framework\Entity\User;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<EventLog>
+ */
+class EventLogRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, EventLog::class);
+    }
+
+    public function insert(
+        User $user,
+        string $type,
+        string $message,
+        array $context = []
+    ): EventLog {
+        $eventLog = new EventLog()
+            ->setUser($user)
+            ->setType($type)
+            ->setMessage($message)
+            ->setContext($context);
+        $this->getEntityManager()->persist($eventLog);
+        $this->getEntityManager()->flush();
+        return $eventLog;
+    }
+}

src/Monitor/Action/Handler/AddMonitorHandler.php

@@ -2,20 +2,24 @@
 
 namespace App\Monitor\Action\Handler;
 
+use App\EventLog\Action\Command\AddEventLogCommand;
 use App\Monitor\Action\Command\AddMonitorCommand;
 use App\Monitor\Action\Result\AddMonitorResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Monitor\MonitorEvents;
 use App\User\Framework\Repository\UserRepository;
 use DateTimeImmutable;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 /** @implements HandlerInterface<AddMonitorCommand> */
 readonly class AddMonitorHandler implements HandlerInterface
 {
     public function __construct(
+        private MessageBusInterface $bus,
         private MonitorRepository $movieMonitorRepository,
         private UserRepository $userRepository,
     ) {}
@@ -35,6 +39,13 @@ readonly class AddMonitorHandler implements HandlerInterface
             ->setSearchCount(0)
             ->setStatus('New');
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $user,
+            MonitorEvents::MONITOR_ADDED->type(),
+            MonitorEvents::MONITOR_ADDED->message(),
+            (array) $monitor
+        ));
+
         $this->movieMonitorRepository->getEntityManager()->persist($monitor);
         $this->movieMonitorRepository->getEntityManager()->flush();
 

src/Monitor/Action/Handler/DeleteMonitorHandler.php

@@ -2,22 +2,22 @@
 
 namespace App\Monitor\Action\Handler;
 
-use App\Monitor\Action\Command\AddMonitorCommand;
+use App\Download\DownloadEvents;
+use App\EventLog\Action\Command\AddEventLogCommand;
 use App\Monitor\Action\Command\DeleteMonitorCommand;
-use App\Monitor\Action\Result\AddMonitorResult;
 use App\Monitor\Action\Result\DeleteMonitorResult;
-use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use App\User\Framework\Repository\UserRepository;
-use DateTimeImmutable;
+use App\Monitor\MonitorEvents;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 /** @implements HandlerInterface<DeleteMonitorCommand, DeleteMonitorResult> */
 readonly class DeleteMonitorHandler implements HandlerInterface
 {
     public function __construct(
+        private MessageBusInterface $bus,
         private MonitorRepository $monitorRepository,
     ) {}
 
@@ -27,6 +27,13 @@ readonly class DeleteMonitorHandler implements HandlerInterface
         $this->monitorRepository->getEntityManager()->remove($monitor);
         $this->monitorRepository->getEntityManager()->flush();
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $monitor->getUser(),
+            MonitorEvents::MONITOR_DELETED->type(),
+            MonitorEvents::MONITOR_DELETED->message(),
+            (array) $monitor
+        ));
+
         return new DeleteMonitorResult(
             status: 'OK',
             result: [],

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -5,12 +5,13 @@ namespace App\Monitor\Action\Handler;
 use App\Base\Util\EpisodeId;
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Download\DownloadOptionEvaluator;
-use App\Download\Framework\Entity\Download;
 use App\Download\Framework\Repository\DownloadRepository;
+use App\EventLog\Action\Command\AddEventLogCommand;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Result\MonitorTvEpisodeResult;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use App\Tmdb\Tmdb;
+use App\Monitor\MonitorEvents;
+use App\Tmdb\TmdbClient;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\User\Dto\UserPreferencesFactory;
@@ -33,7 +34,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
-        private Tmdb $tmdb,
+        private TmdbClient $tmdb,
         private DownloadRepository $downloadRepository,
     ) {}
 
@@ -43,8 +44,31 @@ 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());
-            if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::today('UTC')) {
+            $this->bus->dispatch(new AddEventLogCommand(
+                $monitor->getUser(),
+                MonitorEvents::MONITOR_STARTED->type(),
+                MonitorEvents::MONITOR_STARTED->message(),
+                (array) $command
+            ));
+
+            $episodeData = $this->tmdb->tvEpisodeDetails($monitor->getTmdbId(), $monitor->getImdbId(), $monitor->getSeason(), $monitor->getEpisode());
+
+            if (null === $episodeData->airDate || "" === $episodeData->airDate) {
+                $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 (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',
@@ -101,12 +125,25 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
             $this->logger->error('> [MonitorTvEpisodeHandler] ...Exception thrown: ' . $exception->getMessage());
             $this->logger->error($exception->getMessage());
             $monitor->setStatus('Active');
+            $this->bus->dispatch(new AddEventLogCommand(
+                $monitor->getUser(),
+                MonitorEvents::MONITOR_ERROR->type(),
+                MonitorEvents::MONITOR_ERROR->message() . ': ' . $exception->getMessage(),
+                (array) $monitor
+            ));
         }
 
         $monitor->setLastSearch(new DateTimeImmutable());
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
         $this->monitorRepository->getEntityManager()->flush();
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $monitor->getUser(),
+            MonitorEvents::MONITOR_FINISHED->type(),
+            MonitorEvents::MONITOR_FINISHED->message(),
+            (array) $monitor
+        ));
+
         return new MonitorTvEpisodeResult(
             status: 'OK',
             result: [

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,7 +9,8 @@ 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 DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
@@ -28,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
     {
@@ -39,77 +41,77 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         // Check current episodes
         $downloadedEpisodes = $this->mediaFiles
             ->getEpisodes($monitor->getTitle())
-            ->map(fn($episode) => (object) (new PTN())->parse($episode))
-            ->filter(fn ($episode) =>
-                property_exists($episode, 'episode')
+            ->map(fn($episode) => (object)(new PTN())->parse($episode))
+            ->filter(fn($episode) => property_exists($episode, 'episode')
                 && property_exists($episode, 'season')
                 && null !== $episode->episode
                 && null !== $episode->season
-            )
-        ;
+            );
 
         $this->logger->info('> [MonitorTvShowHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
 
         // Compare against list from TMDB
         $episodesInShow = Map::from(
-            $this->tmdb->tvDetails($monitor->getTmdbId())->episodes
-        )->flat(1);
+            $this->tmdb->tvshowDetails($monitor->getImdbId())->episodes
+        )->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
-            foreach ($episodesInShow as $episode) {
-                // Only monitor future episodes
-                $this->logger->info('> [MonitorTvShowHandler] Evaluating "' . $monitor->getTitle() . '", season "' . $episode['season_number'] . '" episode "' . $episode['episode_number'] . '"');
-                $episodeInFuture = $this->episodeReleasedAfterMonitorCreated($monitor->getCreatedAt(), $episode);
-                $this->logger->info('> [MonitorTvShowHandler] ...Released after monitor started? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
-                if (false === $episodeInFuture) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
-                    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'])
-                    ->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');
+        // Dispatch Episode commands for each missing Episode
+        foreach ($episodesInShow as $episode) {
+            /** @var TmdbEpisodeDto $episode */
+            // Only monitor future episodes
+            $this->logger->info('> [MonitorTvShowHandler] Evaluating "' . $monitor->getTitle() . '", season "' . $episode->seasonNumber . '" episode "' . $episode->episodeNumber . '"');
+            $episodeInFuture = $this->episodeReleasedAfterMonitorCreated($monitor->getCreatedAt(), $episode);
+            $this->logger->info('> [MonitorTvShowHandler] ...Released after monitor started? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
+            if (false === $episodeInFuture) {
+                $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                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->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.
@@ -127,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']
-                && $episode->season === $episodeInShow['season_number']
+                fn(object $episode) => $episode->episode === $episodeInShow->episodeNumber
+                    && $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'],
-                'episode' => $episode['episode_number'],
+                'season' => $episode->seasonNumber,
+                '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/ApiController.php

@@ -2,11 +2,13 @@
 
 namespace App\Monitor\Framework\Controller;
 
+use Aimeos\Map;
 use App\Base\Service\Broadcaster;
 use App\Monitor\Action\Handler\AddMonitorHandler;
 use App\Monitor\Action\Handler\DeleteMonitorHandler;
 use App\Monitor\Action\Input\AddMonitorInput;
 use App\Monitor\Action\Input\DeleteMonitorInput;
+use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Framework\Scheduler\MonitorDispatcher;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
@@ -65,4 +67,45 @@ class ApiController extends AbstractController
             'message' => 'Manually dispatched MonitorDispatcher'
         ]);
     }
+
+    #[Route('/api/monitor/upcoming-episodes', name: 'api.monitor.upcoming-episodes', methods: ['GET'])]
+    public function upcomingEpisodes(MonitorRepository $repository): Response
+    {
+        $colors = [
+            'blue' => '#007bff',
+            'indigo' => '#6610f2',
+            'purple' => '#6f42c1',
+            'pink' => '#e83e8c',
+            'red' => '#dc3545',
+            'orange' => '#fd7e14',
+            'yellow' => '#ffc107',
+            'green' => '#28a745',
+            'teal' => '#20c997',
+            'cyan' => '#17a2b8',
+        ];
+
+        $eventColors = [];
+        $monitors = $repository->whereAirDateNotNull();
+        $monitors = Map::from($monitors)->map(function ($monitor) use (&$eventColors, $colors) {
+            if (!array_key_exists($monitor->getImdbId(), $eventColors)) {
+                $eventColors[$monitor->getImdbId()] = $colors[array_rand($colors)];
+            }
+            return [
+                'id' => $monitor->getId(),
+                'title' => $monitor->getTitle() . ' (S' . str_pad($monitor->getSeason(), 2, '0', STR_PAD_LEFT) . 'E' . str_pad($monitor->getEpisode(), 2, '0', STR_PAD_LEFT) . ')',
+                'start' => $monitor->getAirDate()->format('Y-m-d H:i:s'),
+                'groupId' => $monitor->getImdbId(),
+                'allDay' => true,
+                'backgroundColor' => $eventColors[$monitor->getImdbId()],
+                'borderColor' => $eventColors[$monitor->getImdbId()],
+            ];
+        });
+
+        return $this->json([
+            'status' => 200,
+            'data' => [
+                'episodes' => $monitors->toArray(),
+            ]
+        ]);
+    }
 }

src/Monitor/Framework/Controller/CalendarController.php

@@ -0,0 +1,41 @@
+<?php
+
+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
+{
+    #[IsGranted('PUBLIC_ACCESS')]
+    #[Route('/monitors/ical/{email:user}/upcoming-episodes.ics', name: 'app.monitors.ical')]
+    public function icalAction(MonitorRepository $monitorRepository, User $user)
+    {
+        if (false === $user->hasICalEnabled()) {
+            return new Response('Calendar not found.', 404);
+        }
+
+        $calendar = Calendar::create()
+             ->name('Upcoming Episodes')
+             ->refreshInterval(10);
+
+        $monitors = $monitorRepository->whereAirDateNotNull();
+        $calendar->event(Map::from($monitors)->map(function ($monitor) {
+            return new Event($monitor->getTitle())
+                ->startsAt($monitor->getAirDate())
+                ->fullDay();
+        })->toArray());
+
+        return new Response($calendar->get(), 200, [
+            'Content-Type' => 'text/calendar',
+            'Content-Disposition' => 'inline; filename="upcoming-episodes.ics"',
+        ]);
+    }
+}

src/Monitor/Framework/Controller/WebController.php

@@ -28,4 +28,10 @@ class WebController extends AbstractController
     {
         return $this->render('monitor/index.html.twig');
     }
+
+    #[Route('/monitors/upcoming-episodes', name: 'app.monitor.upcoming-episodes', methods: ['GET'])]
+    public function upcomingEpisodes()
+    {
+        return $this->render('monitor/upcoming-episodes.html.twig');
+    }
 }

src/Monitor/Framework/Entity/Monitor.php

@@ -56,6 +56,9 @@ class Monitor
     #[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: true)]
     private ?\DateTimeInterface $lastSearch = null;
 
+    #[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: true)]
+    private ?\DateTime $airDate = null;
+
     #[ORM\Column]
     private ?\DateTimeImmutable $createdAt = null;
 
@@ -65,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()
@@ -257,6 +260,17 @@ class Monitor
         return $this;
     }
 
+    public function getAirDate(): ?\DateTimeInterface
+    {
+        return $this->airDate;
+    }
+
+    public function setAirDate(?\DateTimeInterface $airDate): static
+    {
+        $this->airDate = $airDate;
+        return $this;
+    }
+
     public function removeChild(self $child): static
     {
         if ($this->children->removeElement($child)) {

src/Monitor/Framework/Repository/MonitorRepository.php

@@ -33,4 +33,12 @@ class MonitorRepository extends ServiceEntityRepository
 
         return $this->paginator->paginate($query, $page, $perPage);
     }
+
+    public function whereAirDateNotNull()
+    {
+        $query = $this->createQueryBuilder('m')
+            ->andWhere('m.airDate IS NOT NULL')
+            ->getQuery();
+        return $query->getResult();
+    }
 }

src/Monitor/MonitorEvents.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Monitor;
+
+enum MonitorEvents
+{
+    case MONITOR_ADDED;
+    case MONITOR_STARTED;
+    case MONITOR_FINISHED;
+    case MONITOR_DELETED;
+    case MONITOR_ERROR;
+
+    public function type(): string
+    {
+        return match ($this) {
+            self::MONITOR_ADDED => 'monitor_added',
+            self::MONITOR_STARTED => 'monitor_started',
+            self::MONITOR_FINISHED => 'monitor_finished',
+            self::MONITOR_DELETED => 'monitor_deleted',
+            self::MONITOR_ERROR => 'monitor_error',
+        };
+    }
+
+    public function message(): string
+    {
+        return match ($this) {
+            self::MONITOR_ADDED => 'A new monitor has been added.',
+            self::MONITOR_STARTED => 'A monitor has started.',
+            self::MONITOR_FINISHED => 'A monitor has finished.',
+            self::MONITOR_DELETED => 'A monitor has been deleted',
+            self::MONITOR_ERROR => 'A monitor has encountered an error.',
+        };
+    }
+}

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->findByImdbId($command->term);
+        $result = $this->tmdb->search($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,408 +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
-    {
-        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: (new \DateTime($data['first_air_date']))->format('Y'),
-            mediaType: "tvshows",
-            episodes: $data['episodes'],
-        );
-    }
-
-    private function parseEpisode(array $data, string $posterBasePath): TmdbResult
-    {
-        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: (new \DateTime($data['air_date']))->format('m/d/Y'),
-        );
-    }
-
-    private function parseMovie(array $data, string $posterBasePath): TmdbResult
-    {
-        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: (new \DateTime($data['release_date']))->format('m/d/Y'),
-        );
-    }
-
-
-    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);
-        $parentShow = $this->tmdb->mediaDetails($command->imdbId, 'tvshows');
+        $media = $this->tmdb->tvEpisodeDetails($command->tmdbId, $command->imdbId, $command->season, $command->episode);
+        $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 $media,
+        public TmdbResult|TmdbEpisodeDto $parentShow,
+        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 TagAwareCacheInterface $cache,
-        private LoggerInterface $logger,
-    ) {
-        $this->searchUrl = str_replace('{realDebridKey}', $this->realDebridKey, $this->baseUrl);
-        $this->client = new Client([
-            'base_uri' => $this->searchUrl,
-        ]);
-    }
+        private readonly HttpClient $client,
+    ) {}
 
     public function search(string $imdbCode, string $type, bool $parseResults = true): array
     {
-        $cacheKey = "torrentio.{$imdbCode}";
-
-        $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 [];
-        });
+        $cacheTags = ['torrentio', $type, $imdbCode];
+        $results = $this->client->get($imdbCode, $cacheTags);
 
         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";
-        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbId, $season, $episode) {
-            $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 [];
-        });
+        $cacheTags = ['torrentio', 'tvshows', 'torrentio.tvshows', $imdbId, "torrentio.$imdbId", "$imdbId.$season", "torrentio.$imdbId.$season", "$imdbId.$season.$episode", "torrentio.$imdbId.$season.$episode"];
+        $results = $this->client->get("$imdbId:$season:$episode", $cacheTags);
 
         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;