wip: apparently torrentio doesn't need configuration

.dockerignore

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

Dockerfile

@@ -1,10 +1,19 @@
-FROM code.caldwell.digital/home/torsearch-base:php8.4
+FROM dunglas/frankenphp:php8.4
 
 ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
 ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
-ENV APP_VERSION="0.0.0-dev"
+ENV APP_VERSION="0.0.1"
+
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
+
+RUN apt update && apt install -y wget
 
 HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
 
-COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile
+COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile

assets/controllers/monitor_button_controller.js

@@ -13,7 +13,34 @@ export default class extends Controller {
         tmdbId: String,
         imdbId: String,
         title: String,
-        season: Number,
+    }
+
+    initialize() {
+        // Called once when the controller is first instantiated (per element)
+
+        // Here you can initialize variables, create scoped callables for event
+        // listeners, instantiate external libraries, etc.
+        // this._fooBar = this.fooBar.bind(this)
+    }
+
+    connect() {
+        // Called every time the controller is connected to the DOM
+        // (on page load, when it's added to the DOM, moved in the DOM, etc.)
+
+        // Here you can add event listeners on the element or target elements,
+        // add or remove classes, attributes, dispatch custom events, etc.
+        // this.fooTarget.addEventListener('click', this._fooBar)
+    }
+
+    // Add custom controller actions here
+    // fooBar() { this.fooTarget.classList.toggle(this.bazClass) }
+
+    disconnect() {
+        // Called anytime its element is disconnected from the DOM
+        // (on page change, when it's removed from or moved in the DOM, etc.)
+
+        // Here you should remove all event listeners added in "connect()" 
+        // this.fooTarget.removeEventListener('click', this._fooBar)
     }
 
     toggle() {
@@ -26,13 +53,34 @@ 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',
@@ -42,6 +90,7 @@ export default class extends Controller {
             },
             body: JSON.stringify(body)
         });
+
         return await response.json();
     }
 }

assets/controllers/movie_results_controller.js

@@ -13,6 +13,7 @@ export default class extends Controller {
     };
 
     static targets = ['list']
+    static outlets = ['loading-icon']
 
     options = []
     optionsLoaded = false
@@ -27,6 +28,7 @@ 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', 'selectAll', 'downloadSelected', 'currentSeason']
+    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'loadingIcon', 'selectAll', 'downloadSelected']
     static values = {
         'imdbId': String,
         'media-type': String,
@@ -32,6 +32,7 @@ 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));
     }
@@ -47,6 +48,10 @@ 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) => {
@@ -94,9 +99,7 @@ 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) => {
-            console.log(data);
-            if (data.data.overview.length > 60) {
-                data.data.overview = data.data.overview.substring(0, 107) + "...";
+            if (data.data.description.length > 60) {
+                data.data.description = data.data.description.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.overview}</p>
+                            <p class="max-w-[60ch] text-wrap">${data.data.description}</p>
                         </div>
-                    </div>`;
+                    </div>
+`
         }
     }
 

assets/controllers/tv_results_controller.js

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

assets/styles/app.css

@@ -168,6 +168,7 @@ dialog[data-dialog-target="dialog"][closing] {
     background: transparent;
 }
 
+form[name="torrentio_preferences_form"],
 #filter {
     .ts-wrapper {
         box-shadow: none !important;
@@ -199,10 +200,6 @@ dialog[data-dialog-target="dialog"][closing] {
     @apply flex flex-col gap-1 justify-between;
 }
 
-/** FullCalendar **/
-#upcoming_episodes_calendar .fc-event-main .fc-event-title-container {
-    cursor: pointer !important;
-}
 .fc-col-header-cell {
     @apply bg-orange-500/60 text-white;
 }

bash/build_base.sh

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

composer.json

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

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c133ccd27ac6a41256bdc69129c16546",
+    "content-hash": "9ffd10f98137e8975de2c04ac2412ed5",
     "packages": [
         {
             "name": "1tomany/rich-bundle",
@@ -7783,79 +7783,6 @@
             ],
             "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",
@@ -13398,7 +13325,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
@@ -13406,7 +13333,7 @@
         "ext-ctype": "*",
         "ext-iconv": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.4"
     },

config/packages/doctrine.yaml

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

config/packages/messenger.yaml

@@ -15,26 +15,6 @@ 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:
@@ -56,12 +36,12 @@ framework:
         routing:
             # Route your messages to the transports
             # 'App\Message\YourMessage': async
-            'App\Download\Action\Command\DownloadMediaCommand': download
+            'App\Download\Action\Command\DownloadMediaCommand': async
             'App\Download\Action\Command\DownloadSeasonCommand': 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\Monitor\Action\Command\MonitorTvEpisodeCommand': async
+            'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
+            'App\Monitor\Action\Command\MonitorTvShowCommand': async
+            'App\Monitor\Action\Command\MonitorMovieCommand': async
             'App\Torrentio\Action\Command\GetTvShowOptionsCommand': media_cache
 
 # when@test:

config/routes.yaml

@@ -6,14 +6,6 @@ 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.0.0-dev'
+    app.default.version: '0.dev'
     app.default.timezone: 'America/Chicago'
 
     # Auth

deploy.compose.yml

@@ -2,7 +2,7 @@ services:
   app:
     image: registry.caldwell.digital/home/torsearch-app:${TAG}
     ports:
-      - "${SWARM_PORT}:80"
+      - '8001:80'
     environment:
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
       MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
@@ -13,6 +13,12 @@ services:
       - /mnt/media/downloads/tvshows:/var/download/tvshows
       - mercure_data:/data
       - mercure_config:/config
+    depends_on:
+      - database
+    logging:
+      driver: "gelf"
+      options:
+        gelf-address: "tcp://192.168.1.197:12202"
 
 
   worker:
@@ -20,10 +26,16 @@ 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:
       - app
+    logging:
+      driver: "gelf"
+      options:
+        gelf-address: "tcp://192.168.1.197:12203"
 
 
   scheduler:
@@ -31,10 +43,28 @@ services:
     volumes:
       - /mnt/media/downloads/movies:/var/download/movies
       - /mnt/media/downloads/tvshows:/var/download/tvshows
+    restart: always
+    command: -vv
     depends_on:
       - app
+    logging:
+      driver: "gelf"
+      options:
+        gelf-address: "tcp://192.168.1.197:12204"
+
+
+
+  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,7 +10,6 @@ templates
 var
 vendor
 build.xml
-.git
 .env
 .env.local
 composer.json

docker/Dockerfile.app

@@ -1,8 +1,19 @@
-FROM code.caldwell.digital/home/torsearch-base:php8.4
+FROM dunglas/frankenphp
 
-ARG APP_VERSION="0.0.0-dev"
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+
+ARG APP_VERSION="0.dev"
 ENV APP_VERSION="${APP_VERSION}"
 
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
+
 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

@@ -1,14 +0,0 @@
-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

@@ -1,35 +0,0 @@
-#####
-# 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-curl \
-  php84-fileinfo \
-  php84-gd \
-  php84-mbstring \
-  php84-mysqli \
-  php84-opcache \
-  php84-openssl \
-  php84-pdo_mysql \
-  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,7 @@
-###
-# 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.
-###
+ARG APP_VERSION
 
-# Default to latest, but should pass in a version
-ARG APP_VERSION="latest"
+FROM code.caldwell.digital/torsearch/torsearch-app:${APP_VERSION}
 
-# Start with our base worker image
-FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
 
-# Set the APP_VERSION in the image
-ENV APP_VERSION=${APP_VERSION}
-
-# Copy the actual application code from the previously built app
-COPY --chown=1000:1000 ./ /app
-
-# To retain backwards compatibility, default to async & download transports
-CMD [ "--async", "--download" ]
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0

docker/Dockerfile.worker

@@ -1,21 +1,23 @@
-###
-# 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.
-###
+FROM dunglas/frankenphp:php8.4-alpine
 
-# Default to latest, but should pass in a version
-ARG APP_VERSION="latest"
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-# Start with our base worker image
-FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
+ARG APP_VERSION="0.dev"
+ENV APP_VERSION="${APP_VERSION}"
 
-# Set the APP_VERSION in the image
-ENV APP_VERSION=${APP_VERSION}
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
 
-# Copy the actual application code from the previously built app
-COPY --chown=1000:1000 ./ /app
+RUN apk add --no-cache wget
 
-# To retain backwards compatibility, default to async & download transports
-CMD [ "--async", "--download" ]
+COPY . /app
+
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]
+
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0

docker/worker/async.conf

@@ -1,10 +0,0 @@
-[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

@@ -1,10 +0,0 @@
-[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

@@ -1,10 +0,0 @@
-[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

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

migrations/Version20250831013403.php

@@ -21,7 +21,10 @@ final class Version20250831013403 extends AbstractMigration
     {
         // this up() migration is auto-generated, please modify it to your needs
         $this->addSql(<<<'SQL'
-            DROP TABLE IF EXISTS  sessions
+            DROP TABLE sessions
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE download CHANGE created_at created_at DATETIME NOT NULL, CHANGE updated_at updated_at DATETIME NOT NULL
         SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE user_preference CHANGE preference_value preference_value VARCHAR(1024) DEFAULT NULL
@@ -34,6 +37,9 @@ final class Version20250831013403 extends AbstractMigration
         $this->addSql(<<<'SQL'
             CREATE TABLE sessions (sess_id VARBINARY(128) NOT NULL, sess_data LONGBLOB NOT NULL, sess_lifetime INT UNSIGNED NOT NULL, sess_time INT UNSIGNED NOT NULL, INDEX sess_lifetime_idx (sess_lifetime), PRIMARY KEY(sess_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_bin` ENGINE = InnoDB COMMENT = '' 
         SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE download CHANGE created_at created_at DATETIME DEFAULT NULL, CHANGE updated_at updated_at DATETIME DEFAULT NULL
+        SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE user_preference CHANGE preference_value preference_value VARCHAR(255) DEFAULT NULL
         SQL);

migrations/Version20251101194723.php

@@ -1,35 +0,0 @@
-<?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

@@ -1,35 +0,0 @@
-<?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

@@ -1,47 +0,0 @@
-<?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

@@ -1,35 +0,0 @@
-<?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

@@ -1,17 +0,0 @@
-<?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,25 +2,16 @@
 
 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,
 
@@ -101,13 +92,6 @@ 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

@@ -1,24 +0,0 @@
-<?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,5 +6,4 @@ enum MediaType: string
 {
     case Movie = 'movies';
     case TvShow = 'tvshows';
-    case TvEpisode = 'tvepisode';
 }

src/Base/Framework/Command/InitWorker.php

@@ -1,90 +0,0 @@
-<?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

@@ -4,7 +4,6 @@ namespace App\Base\Framework\Command;
 
 use App\User\Framework\Entity\Preference;
 use App\User\Framework\Entity\UserPreference;
-use App\User\Framework\Repository\PreferenceOptionRepository;
 use App\User\Framework\Repository\PreferencesRepository;
 use App\User\Framework\Repository\UserRepository;
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -139,9 +138,16 @@ class SeedDatabaseCommand extends Command
                 '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,
+                'enabled' => true,
                 'type' => 'calendar'
             ],
+            [
+                'id' => 'torrentio_url',
+                'name' => 'A custom Torrentio URL',
+                'description' => 'If you want to use a custom Torrentio URL, enter it here. Otherwise, leave it blank to use the one provided as an environment variable.',
+                'enabled' => true,
+                'type' => 'torrentio'
+            ],
         ];
     }
 }

src/Base/Framework/Controller/IndexController.php

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

src/Base/Util/ImdbMatcher.php

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

src/Download/Action/Handler/DeleteDownloadHandler.php

@@ -4,22 +4,17 @@ 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,
     ) {}
@@ -36,13 +31,6 @@ 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,22 +4,18 @@ 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,
@@ -27,17 +23,9 @@ 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(
-                $user,
+                $this->userRepository->find($command->userId),
                 $command->url,
                 $command->title,
                 $command->filename,
@@ -69,12 +57,6 @@ 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,14 +3,13 @@
 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\TmdbClient;
+use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\User\Dto\UserPreferencesFactory;
@@ -28,7 +27,7 @@ readonly class DownloadSeasonHandler implements HandlerInterface
     public function __construct(
         private MediaFiles $mediaFiles,
         private LoggerInterface $logger,
-        private TmdbClient $tmdb,
+        private Tmdb $tmdb,
         private MessageBusInterface $bus,
         private DownloadOptionEvaluator $downloadOptionEvaluator,
         private GetTvShowOptionsHandler $getTvShowOptionsHandler,
@@ -37,8 +36,7 @@ readonly class DownloadSeasonHandler implements HandlerInterface
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $series = $this->tmdb->tvshowDetails($command->imdbId);
-
+        $series = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
         $this->logger->info('> [DownloadTvSeasonHandler] Executing DownloadTvSeasonHandler for "' . $series->title . '" season ' . $command->season);
 
         $episodesInSeason = Map::from($series->episodes[$command->season]);

src/Download/DownloadEvents.php

@@ -1,34 +0,0 @@
-<?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

@@ -4,12 +4,9 @@ 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;
@@ -20,7 +17,6 @@ class ProcessDownloader implements DownloaderInterface
      * @var RedisAdapter $cache
      */
     public function __construct(
-        private MessageBusInterface $bus,
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
         private CacheInterface $cache,
@@ -92,12 +88,6 @@ class ProcessDownloader implements DownloaderInterface
             }
         } 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();

src/Download/Framework/Controller/ApiController.php

@@ -11,9 +11,7 @@ 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;
@@ -43,13 +41,6 @@ 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

@@ -1,17 +0,0 @@
-<?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

@@ -1,29 +0,0 @@
-<?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

@@ -1,36 +0,0 @@
-<?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

@@ -1,14 +0,0 @@
-<?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

@@ -1,28 +0,0 @@
-<?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

@@ -1,82 +0,0 @@
-<?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

@@ -1,35 +0,0 @@
-<?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,24 +2,20 @@
 
 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,
     ) {}
@@ -39,13 +35,6 @@ 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\Download\DownloadEvents;
-use App\EventLog\Action\Command\AddEventLogCommand;
+use App\Monitor\Action\Command\AddMonitorCommand;
 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\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<DeleteMonitorCommand, DeleteMonitorResult> */
 readonly class DeleteMonitorHandler implements HandlerInterface
 {
     public function __construct(
-        private MessageBusInterface $bus,
         private MonitorRepository $monitorRepository,
     ) {}
 
@@ -27,13 +27,6 @@ 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

@@ -6,12 +6,10 @@ use App\Base\Util\EpisodeId;
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Download\DownloadOptionEvaluator;
 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\Monitor\MonitorEvents;
-use App\Tmdb\TmdbClient;
+use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\User\Dto\UserPreferencesFactory;
@@ -34,7 +32,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
-        private TmdbClient $tmdb,
+        private Tmdb $tmdb,
         private DownloadRepository $downloadRepository,
     ) {}
 
@@ -44,31 +42,13 @@ 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());
 
-            $this->bus->dispatch(new AddEventLogCommand(
-                $monitor->getUser(),
-                MonitorEvents::MONITOR_STARTED->type(),
-                MonitorEvents::MONITOR_STARTED->message(),
-                (array) $command
-            ));
+            $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
 
-            $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() && null !== $episodeData->episodeAirDate && "" !== $episodeData->episodeAirDate) {
+                $monitor->setAirDate(Carbon::parse($episodeData->episodeAirDate));
             }
 
-            if (null === $monitor->getAirDate()) {
-                $monitor->setAirDate(Carbon::parse($episodeData->airDate));
-            }
-
-            if (Carbon::createFromTimestamp($episodeData->airDate) > Carbon::today('UTC')) {
+            if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::today('UTC')) {
                 $this->logger->info('> [MonitorTvEpisodeHandler] ...Episode has not aired yet, skipping for now');
                 return new MonitorTvEpisodeResult(
                     status: 'OK',
@@ -125,25 +105,12 @@ 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\TmdbClient;
+use App\Tmdb\Tmdb;
 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 TmdbClient $tmdb,
+        private Tmdb $tmdb,
         private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
     ) {}
 
@@ -50,7 +50,7 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
 
         // Compare against list from TMDB
         $episodesInSeason = Map::from(
-            $this->tmdb->tvshowDetails($monitor->getImdbId())->episodes[$monitor->getSeason()]
+            $this->tmdb->tvDetails($monitor->getTmdbId())->episodes[$monitor->getSeason()]
         )->rekey(fn($episode) => $episode['episode_number']);
         $this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($episodesInSeason) . ' episodes in season ' . $monitor->getSeason() . ' for title: ' . $monitor->getTitle());
 

src/Monitor/Action/Handler/MonitorTvShowHandler.php

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

src/Monitor/Framework/Entity/Monitor.php

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

src/Monitor/MonitorEvents.php

@@ -1,34 +0,0 @@
-<?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,11 +2,9 @@
 
 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\TmdbClient;
-use App\Tmdb\TmdbResult;
+use App\Tmdb\Tmdb;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -15,30 +13,14 @@ use OneToMany\RichBundle\Contract\ResultInterface;
 class GetMediaInfoHandler implements HandlerInterface
 {
     public function __construct(
-        private readonly TmdbClient $tmdb,
+        private readonly Tmdb $tmdb,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $handlers = [
-            MediaType::Movie->value => 'getMovieDetails',
-            MediaType::TvShow->value => 'getTvshowDetails',
-        ];
-        $handler = $handlers[$command->mediaType];
-        $media = $this->$handler($command);
+        $media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
         $relatedMedia = $this->tmdb->relatedMedia($media->tmdbId, $command->mediaType);
 
         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\TmdbClient;
-use App\Tmdb\TmdbResult;
+use App\Tmdb\Tmdb;
 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 TmdbClient $tmdb,
+        private Tmdb $tmdb,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $result = $this->tmdb->search($command->term);
-        if ($result instanceof TmdbResult) {
+        if (ImdbMatcher::isMatch($command->term)) {
+            $result = $this->tmdb->findByImdbId($command->term);
             return new RedirectToMediaResult(
                 imdbId: $result->imdbId,
                 mediaType: $result->mediaType,

src/Search/Action/Result/GetMediaInfoResult.php

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

src/Search/Action/Result/SearchResult.php

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

src/Tmdb/Dto/CastMemberDto.php

@@ -1,19 +0,0 @@
-<?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

@@ -1,18 +0,0 @@
-<?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

@@ -1,18 +0,0 @@
-<?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

@@ -1,29 +0,0 @@
-<?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\TmdbClient;
+use App\Tmdb\Tmdb;
 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(TmdbClient $tmdb, Request $request): Response
+    public function test(Tmdb $tmdb, Request $request): Response
     {
         $results = [];
 
@@ -22,7 +22,7 @@ class ApiController extends AbstractController
 
         if (null !== $term) {
             if (ImdbMatcher::isMatch($term)) {
-                $tmdbResult = $tmdb->search($term);
+                $tmdbResult = $tmdb->findByImdbId($term);
                 $results = [
                     [
                         'data' => $tmdbResult,

src/Tmdb/Framework/Serializer/TmdbMovieResultDenormalizer.php

@@ -1,57 +0,0 @@
-<?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

@@ -1,105 +0,0 @@
-<?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

@@ -1,42 +0,0 @@
-<?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

@@ -1,64 +0,0 @@
-<?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

@@ -0,0 +1,438 @@
+<?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 relatedMedia(string $tmdbId, string $mediaType, int $maxResults = 6)
+    {
+        $repos = [
+            'movies' => $this->movieRepository,
+            'tvshows' => $this->tvRepository,
+        ];
+
+        $results = $repos[$mediaType]->getRecommendations($tmdbId);
+        return Map::from(array_values($results->toArray()))
+            ->slice(0, 6)
+            ->map(function ($result) use ($mediaType) {
+                return $this->parseResult($result, $mediaType);
+            })->toArray();
+    }
+
+    public function mediaDetails(string $id, string $type)
+    {
+        $id = $this->find($id);
+
+        if ($type === "movies") {
+            return $this->movieDetails($id);
+        } else {
+            return $this->tvDetails($id);
+        }
+    }
+
+    private function parseResult($result, $mediaType = null)
+    {
+        if (is_array($result)) {
+            return $this->parseFromArray($result, $mediaType);
+        } else {
+            return $this->parseFromObject($result);
+        }
+    }
+
+    private function parseFromArray($data, $mediaType)
+    {
+        if (null === $mediaType) {
+            throw new \Exception("A media type must be set when parsing from an array.");
+        }
+
+        if ($mediaType === 'movie') {
+            $result = $this->parseMovie($data, self::POSTER_IMG_PATH);
+        } elseif ($mediaType === 'tvshow') {
+            $result = $this->parseTvShow($data, self::POSTER_IMG_PATH);
+        } elseif ($mediaType === 'episode') {
+            $result = $this->parseEpisode($data, self::POSTER_IMG_PATH);
+        }
+
+        return $result;
+    }
+
+    private function parseTvShow(array $data, string $posterBasePath): TmdbResult
+    {
+        if (!in_array($data['first_air_date'], ['', null,])) {
+            $airDate = (new \DateTime($data['first_air_date']))->format('Y-m-d');
+        } else {
+            $airDate = null;
+        }
+        return new TmdbResult(
+            imdbId: $data['external_ids']['imdb_id'],
+            tmdbId: $data['id'],
+            title: $data['name'],
+            poster: (null !== $data['poster_path']) ? $posterBasePath . $data['poster_path'] : null,
+            description: $data['overview'],
+            year: $airDate,
+            mediaType: "tvshows",
+            episodes: $data['episodes'],
+        );
+    }
+
+    private function parseEpisode(array $data, string $posterBasePath): TmdbResult
+    {
+        if (!in_array($data['air_date'], ['', null,])) {
+            $airDate = (new \DateTime($data['air_date']))->format('Y-m-d');
+        } else {
+            $airDate = null;
+        }
+        return new TmdbResult(
+            imdbId: $data['external_ids']['imdb_id'],
+            tmdbId: $data['id'],
+            title: $data['name'],
+            poster: (null !== $data['still_path']) ? $posterBasePath . $data['still_path'] : null,
+            description: $data['overview'],
+            year: (new \DateTime($data['air_date']))->format('Y'),
+            mediaType: "tvshows",
+            episodes: null,
+            episodeAirDate: $airDate,
+        );
+    }
+
+    private function parseMovie(array $data, string $posterBasePath): TmdbResult
+    {
+        if (!in_array($data['release_date'], ['', null,])) {
+            $airDate = (new \DateTime($data['release_date']))->format('Y-m-d');
+        } else {
+            $airDate = null;
+        }
+        return new TmdbResult(
+            imdbId: $data['external_ids']['imdb_id'],
+            tmdbId: $data['id'],
+            title: $data['title'],
+            poster: (null !== $data['poster_path']) ? $posterBasePath . $data['poster_path'] : null,
+            description: $data['overview'],
+            year: (new \DateTime($data['release_date']))->format('Y'),
+            mediaType: "movies",
+            episodeAirDate: $airDate,
+        );
+    }
+
+
+    private function parseFromObject($result): TmdbResult
+    {
+            $mediaType = $result instanceof Movie ? MediaType::Movie->value : MediaType::TvShow->value;
+            $tmdbResult = new TmdbResult();
+            $tmdbResult->mediaType = $mediaType;
+            $tmdbResult->tmdbId = $result->getId();
+            $tmdbResult->imdbId = $this->getImdbId($result->getId(), $mediaType);
+            $tmdbResult->title = $this->getTitle($result, $mediaType);
+            $tmdbResult->poster = self::POSTER_IMG_PATH . $result->getPosterImage();
+            $tmdbResult->year = $this->getReleaseDate($result, $mediaType);
+            $tmdbResult->description = $result->getOverview();
+            return $tmdbResult;
+    }
+
+    public function getImdbId(string $tmdbId, $mediaType)
+    {
+        $externalIds = $this->cache->get("tmdb.externalIds.{$tmdbId}",
+            function (ItemInterface $item) use ($tmdbId, $mediaType) {
+                switch (MediaType::tryFrom($mediaType)->value) {
+                    case MediaType::Movie->value:
+                        return $this->movieRepository->getExternalIds($tmdbId);
+                    case MediaType::TvShow->value:
+                        return $this->tvRepository->getExternalIds($tmdbId);
+                    default:
+                        return null;
+                }
+        });
+
+        if (null === $externalIds) {
+            return null;
+        }
+
+        return $externalIds->getImdbId() !== "" ? $externalIds->getImdbId() : "null";
+    }
+
+    public function getImages($tmdbId, $mediaType)
+    {
+        return $this->cache->get("tmdb.images.{$tmdbId}",
+            function (ItemInterface $item) use ($tmdbId, $mediaType) {
+                switch (MediaType::tryFrom($mediaType)->value) {
+                    case MediaType::Movie->value:
+                        return $this->movieRepository->getImages($tmdbId);
+                    case MediaType::TvShow->value:
+                        return $this->tvRepository->getImages($tmdbId);
+                    default:
+                        return null;
+                }
+        });
+    }
+
+    private function getReleaseDate($result, $mediaType): string
+    {
+        switch (MediaType::tryFrom($mediaType)->value) {
+            case MediaType::Movie->value:
+                return ($result->getReleaseDate() instanceof \DateTime)
+                    ? $result->getReleaseDate()->format('Y')
+                    : $result->getReleaseDate();
+            case MediaType::TvShow->value:
+                return ($result->getFirstAirDate() instanceof \DateTime)
+                    ? $result->getFirstAirDate()->format('Y')
+                    : $result->getFirstAirDate();
+            default:
+                return "";
+        }
+    }
+
+    private function getTitle($result, $mediaType): string
+    {
+        switch (MediaType::tryFrom($mediaType)->value) {
+            case MediaType::Movie->value:
+                return $result->getTitle();
+            case MediaType::TvShow->value:
+                return $result->getName();
+            default:
+                return "";
+        }
+    }
+}

src/Tmdb/TmdbClient.php

@@ -1,276 +0,0 @@
-<?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,60 +2,17 @@
 
 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 = "",
-        #[SerializedPath('[id]')]
-        public ?int $tmdbId = null,
+        public ?string $tmdbId = "",
         public ?string $title = "",
-        #[SerializedPath('[overview]')]
-        public ?string $description = "",
         public ?string $poster = "",
-        public ?\DateTimeInterface $premiereDate = null,
-        public ?string $year = null,
+        public ?string $description = "",
+        public ?string $year = "",
         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\TmdbClient;
+use App\Tmdb\Tmdb;
 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 TmdbClient $tmdb,
+        private readonly Tmdb $tmdb,
         private readonly Torrentio $torrentio,
         private readonly MediaFiles $mediaFiles
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $media = $this->tmdb->movieDetails($command->imdbId);
+        $media = $this->tmdb->mediaDetails($command->imdbId, 'movies');
         return new GetMovieOptionsResult(
             media: $media,
             file: $this->mediaFiles->movieExists($media->title),

src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php

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

src/Torrentio/Action/Result/GetTvShowOptionsResult.php

@@ -3,15 +3,14 @@
 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|TmdbEpisodeDto $parentShow,
-        public TmdbResult|TmdbEpisodeDto $media,
+        public TmdbResult $parentShow,
+        public TmdbResult $media,
         public MediaFileDto|false $file,
         public string $season,
         public string $episode,

src/Torrentio/Client/HttpClient.php

@@ -1,55 +0,0 @@
-<?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,22 +2,71 @@
 
 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\Bundle\SecurityBundle\Security;
+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/realdebrid={realDebridKey}/stream/movie';
+
+    private string $searchUrl;
+
+    private Client $client;
+
     public function __construct(
-        private readonly HttpClient $client,
-    ) {}
+        #[Autowire(env: 'REAL_DEBRID_KEY')] private string $realDebridKey,
+        private TagAwareCacheInterface $cache,
+        private LoggerInterface $logger,
+        private Security $security,
+    ) {
+//        $this->searchUrl = str_replace('{realDebridKey}', $this->realDebridKey, $this->baseUrl);
+        $user = $this->security->getUser();
+        $this->searchUrl = $user->getUserPreference('torrentio_url')->getPreferenceValue() . '/stream/movie';
+
+//        dd($this->searchUrl);
+
+
+        $this->client = new Client([
+            'base_uri' => $this->searchUrl,
+        ]);
+    }
 
     public function search(string $imdbCode, string $type, bool $parseResults = true): array
     {
-        $cacheTags = ['torrentio', $type, $imdbCode];
-        $results = $this->client->get($imdbCode, $cacheTags);
+        $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");
+                $results = json_decode(
+                    $response->getBody()->getContents(),
+                    true
+                );
+//                dd($results);
+            } catch (\Throwable $exception) {
+                if ($exception->getCode() === 429) {
+                    $this->logger->warning("> [TorrentioClient] Rate limit exceeded");
+                    throw $exception;
+                }
+            }
+
+            $this->logger->error("> [TorrentioClient] Request error: " . $response->getStatusCode() . " - " . $response->getBody()->getContents());
+//            return [];
+//        });
 
         if (true === $parseResults) {
-            return $this->parse($results, $imdbCode);
+            return $this->parse($results);
         }
 
         return $results;
@@ -25,21 +74,39 @@ class Torrentio
 
     public function fetchEpisodeResults(string $imdbId, int $season, int $episode, bool $parseResults = true): array
     {
-        $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);
+//        $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");
+                $results = json_decode(
+                    $response->getBody()->getContents(),
+                    true
+                );
+            } catch (\Throwable $exception) {
+                if ($exception->getCode() === 429) {
+                    $this->logger->warning("> [TorrentioClient] Rate limit exceeded");
+                    throw $exception;
+                }
+            }
+
+            $this->logger->error("> [TorrentioClient] Request error: " . $response->getStatusCode() . " - " . $response->getBody()->getContents());
+//            return [];
+//        });
 
         if (null === $results) {
             throw new TorrentioRateLimitException();
         }
 
         if (true === $parseResults) {
-            return $this->parse($results, $imdbId);
+            return $this->parse($results);
         }
 
         return $results;
     }
 
-    public function parse(array $data, string $imdbId): array
+    public function parse(array $data): array
     {
         $results = [];
         foreach ($data['streams'] as $stream) {
@@ -59,8 +126,7 @@ class Torrentio
             $result = ResultFactory::map(
                 $stream['url'],
                 $stream['title'],
-                $bingeGroup,
-                $imdbId
+                $bingeGroup
             );
 
             $results[] = $result;

src/Torrentio/Client/TorrentioUrl.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Torrentio\Client;
+
+use App\Values\TorrentioDebridProviderChoices;
+
+class TorrentioUrl
+{
+    const BASE_URL = "https://torrentio.strem.fun/";
+
+    public ?array $providers = null;
+    public ?array $language = null;
+    public ?array $qualityfilter = null;
+    public ?string $sorting = null;
+    public ?string $debridProvider = null;
+    public ?string $limit = null;
+    public ?string $sizefilter = null;
+    public ?string $debridToken = null;
+
+    public function __toString(): string
+    {
+        $result = "";
+        if (null !== $this->debridProvider && null !== $this->debridToken) {
+            $result .= "$this->debridProvider=$this->debridToken";
+        }
+
+        return static::BASE_URL . $result;
+    }
+
+    public static function fromString(string $url): self
+    {
+        $arrayData = ['providers', 'language', 'qualityfilter'];
+        $data = explode('|', str_replace('/', '', urldecode(urldecode(parse_url($url)['path']))));
+
+        $result = new self();
+        foreach ($data as $item) {$item = explode('=', $item);
+            if (count($item) !== 2) continue;
+            if (in_array($item[0], array_keys(TorrentioDebridProviderChoices::$providers))) {
+                $result->debridProvider = $item[0];
+                $result->debridToken = $item[1];
+            } elseif (in_array($item[0], $arrayData)) {
+                $result->{$item[0]} = explode(',', $item[1]);
+            } else {
+                $result->{$item[0]} = $item[1];
+            }
+        }
+
+        return $result;
+    }
+}

src/Torrentio/Framework/Form/TorrentioPreferencesForm.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Torrentio\Framework\Form;
+
+use Aimeos\Map;
+use App\User\Database\ProviderList;
+use App\Values\TorrentioDebridProviderChoices;
+use App\Values\TorrentioExcludeQualityChoices;
+use App\Values\TorrentioLanguageChoices;
+use App\Values\TorrentioProviderChoices;
+use App\Values\TorrentioSortChoices;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
+class TorrentioPreferencesForm extends AbstractType
+{
+    public function __construct(
+        private readonly UrlGeneratorInterface $urlGenerator,
+    ) {}
+
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $this->addChoiceField($builder, 'providers', TorrentioProviderChoices::asSelectOptions());
+        $this->addChoiceField($builder, 'sorting', TorrentioSortChoices::asSelectOptions(), 1);
+        $this->addChoiceField($builder, 'language', TorrentioLanguageChoices::asSelectOptions());
+        $this->addChoiceField($builder, 'qualityfilter', TorrentioExcludeQualityChoices::asSelectOptions());
+        $this->addTextField($builder, 'limit');
+        $this->addTextField($builder, 'sizefilter');
+        $this->addChoiceField($builder, 'debridProvider', TorrentioDebridProviderChoices::asSelectOptions(), 1);
+        $this->addTextField($builder, 'debridToken');
+    }
+
+    private function addChoiceField(FormBuilderInterface $builder, string $fieldName, array $choices, ?int $maxItems = null): void
+    {
+        $question = [
+            'attr' => [
+                'class' => 'min-w-24 text-input mb-4',
+            ],
+            'row_attr' => [
+                'class' => 'filter-label text-white'
+            ],
+            'label_attr' => ['class' => 'block font-semibold mb-2'],
+            'choices' => $choices,
+            'required' => false,
+        ];
+
+        if (null === $maxItems) {
+            $question['multiple'] = true;
+            $question['attr'] += [
+                'data-result-filter-target' => $fieldName,
+                'data-controller' => 'symfony--ux-autocomplete--autocomplete',
+                'data-symfony--ux-autocomplete--autocomplete-tom-select-options-value' => json_encode([
+                    'highlight' => false,
+                    'maxItems' => $maxItems,
+                ]),
+            ];
+        } else {
+            $question += [
+                'multiple' => false,
+                'expanded' => false,
+            ];
+        }
+
+        $builder->add($fieldName, ChoiceType::class, $question);
+    }
+
+    public function addTextField(FormBuilderInterface $builder, string $fieldName, ?array $options = null): void
+    {
+        $optinos = $options ?? [
+            'required' => false,
+            'attr' => [
+                'method' => 'post',
+                'action' => $this->urlGenerator->generate('app.torrentio-preferences.save'),
+                'class' => 'min-w-24 text-input mb-4 block',
+            ]
+        ];
+
+        $builder->add(
+            $fieldName,
+            TextType::class,
+            $optinos,
+        );
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'id' => 'torrentio-preferences-form',
+//            'action' => $this->urlGenerator->generate('app_user_media_preferences_submit'),
+            'attr' => [
+                'class' => 'filter-items w-full p-4 text-md dark:text-gray-50 rounded-lg',
+            ]
+        ]);
+    }
+}

src/Torrentio/Result/ResultFactory.php

@@ -18,35 +18,30 @@ class ResultFactory
     public static function map(
         string $url,
         string $title,
-        string $bingeGroup = "-",
-        string $imdbId = "-",
+        string $bingeGroup = "-"
     ) {
-        $title = trim(preg_replace('/\s+/', ' ', $title));
-        $ptn = (object) new PTN()->parse(self::setFilename($url));
-        $result = new TorrentioResult(
+        $ptn = (object) (new PTN())->parse($title);
+        return new TorrentioResult(
             self::trimTitle($title),
-            self::setUrl($url),
+            urldecode($url),
             self::setFilename($url),
             self::setSize($title),
             self::setSeeders($title),
             self::setProvider($title),
             self::setEpisode($title),
-            self::setSeason($ptn),
+            $ptn->season ?? "-",
             $bingeGroup,
-            self::setResolution($ptn),
-            self::setCodec($ptn),
-            self::setQuality($ptn),
+            $ptn->resolution ?? "-",
+            self::setCodec($ptn->codec ?? "-"),
+            $ptn->quality ?? "-",
             $ptn,
-            self::setKey($url),
-            self::setEpisodeNumber($ptn),
+            substr(base64_encode($url), strlen($url) - 10),
+            $ptn->episode ?? "-",
             self::setLanguages($title),
             self::setLanguageFlags($title),
             false,
-            uniqid(),
-            $imdbId,
+            uniqid()
         );
-
-        return $result;
     }
 
     public static function setFilename(string $url)
@@ -55,11 +50,6 @@ class ResultFactory
         return end($file);
     }
 
-    public static function setUrl(string $url): string
-    {
-        return urldecode($url);
-    }
-
     public static function setSize(string $title): string
     {
         $sizeMatch = [];
@@ -120,15 +110,9 @@ class ResultFactory
         }
     }
 
-    public static function setCodec(object $ptn): string
+    public static function setCodec(string $codec): string
     {
-        if (isset($ptn->codec) && array_key_exists($ptn->codec, self::$codecMap)) {
-            return self::$codecMap[strtolower($ptn->codec)];
-        } elseif (isset($ptn->codec)) {
-            return $ptn->codec;
-        }
-
-        return "-";
+        return self::$codecMap[strtolower($codec)] ?? $codec;
     }
 
     private static function setEpisode(string $title)
@@ -138,36 +122,6 @@ class ResultFactory
         return array_key_exists(0, $value) ? strtoupper($value[0]) : "n/a";
     }
 
-    public static function setSeason(object $ptn): string
-    {
-        return $ptn->season ?? "-";
-    }
-
-    public static function setBingeGroup(string $bingeGroup): string
-    {
-        return $bingeGroup;
-    }
-
-    public static function setResolution(object $ptn): string
-    {
-        return $ptn->resolution ?? "-";
-    }
-
-    public static function setQuality(object $ptn): string
-    {
-        return $ptn->quality ?? "-";
-    }
-
-    public static function setKey(string $url): string
-    {
-        return substr(base64_encode($url), strlen($url) - 10);
-    }
-
-    public static function setEpisodeNumber(object $ptn): string
-    {
-        return $ptn->episode ?? "-";
-    }
-
     private static function trimTitle(string $title)
     {
         $emoji = \Emoji\detect_emoji($title);

src/Torrentio/Result/TorrentioResult.php

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

src/Twig/Components/TvEpisodeList.php

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

src/Twig/Components/UpcomingEpisodes.php

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

src/Twig/Extensions/UtilExtension.php

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

src/User/Action/Command/SaveUserTorrentioPreferencesCommand.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\User\Action\Command;
+
+use App\Torrentio\Client\TorrentioUrl;
+use OneToMany\RichBundle\Contract\CommandInterface;
+
+/** @implements CommandInterface<SaveUserMediaPreferencesCommand> */
+class SaveUserTorrentioPreferencesCommand implements CommandInterface
+{
+    public function __construct(
+        public TorrentioUrl $torrentioUrl,
+    ) {}
+}

src/User/Action/Handler/SaveUserTorrentioPreferencesHandler.php

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

src/User/Database/ProviderList.php

@@ -5,20 +5,31 @@ namespace App\User\Database;
 class ProviderList
 {
     public static $providers = [
-        '1337x',
-        'Comando',
+        'YTS',
         'EZTV',
-        'ilCorSaRoNeRo',
-        'MagnetDL',
-        'MejorTorrent',
         'RARBG',
-        'Rutor',
-        'Rutracker',
+        '1337x',
         'ThePirateBay',
-        'Torrent9',
+        'KickassTorrents',
         'TorrentGalaxy',
+        'MagnetDL',
+        'HorribleSubs',
+        'NyaaSi',
+        'TokyoTosho',
+        'AniDex',
+        '🇷🇺 Rutor',
+        '🇷🇺 Rutracker',
+        '🇵🇹 Comando',
+        '🇵🇹 BluDV',
+        '🇫🇷 Torrent9',
+        '🇮🇹 ilCorSaRoNeRo',
+        '🇪🇸 MejorTorrent',
+        '🇪🇸 Wolfmax4k',
+        '🇲🇽 Cinecalidad',
+        '🇵🇱 BestTorrents'
     ];
 
+
     public static function getProviders()
     {
         return self::$providers;

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

@@ -5,10 +5,14 @@ declare(strict_types=1);
 namespace App\User\Framework\Controller\Web;
 
 use App\Base\Service\Broadcaster;
+use App\Torrentio\Client\TorrentioUrl;
+use App\Torrentio\Framework\Form\TorrentioPreferencesForm;
 use App\User\Action\Command\SaveUserMediaPreferencesCommand;
+use App\User\Action\Command\SaveUserTorrentioPreferencesCommand;
 use App\User\Action\Handler\SaveUserCalendarPreferencesHandler;
 use App\User\Action\Handler\SaveUserDownloadPreferencesHandler;
 use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
+use App\User\Action\Handler\SaveUserTorrentioPreferencesHandler;
 use App\User\Action\Input\SaveUserCalendarPreferencesInput;
 use App\User\Action\Input\SaveUserDownloadPreferencesInput;
 use App\User\Action\Input\SaveUserMediaPreferencesInput;
@@ -38,6 +42,9 @@ class PreferencesController extends AbstractController
         $calendarPreferences = $this->getUser()->getCalendarPreferences();
         $formData = (array) UserPreferencesFactory::createFromUser($this->getUser());
         $form = $this->createForm(UserMediaPreferencesForm::class, $formData);
+        $torrentioForm = $this->createForm(TorrentioPreferencesForm::class, TorrentioUrl::fromString(
+            $this->getUser()->getUserPreference('torrentio_url')->getPreferenceValue()
+        ));
 
         return $this->render(
             'user/preferences.html.twig',
@@ -45,6 +52,7 @@ class PreferencesController extends AbstractController
                 'downloadPreferences' => $downloadPreferences,
                 'calendarPreferences' => $calendarPreferences,
                 'preferences_form' => $form,
+                'torrentio_form' => $torrentioForm,
             ]
         );
     }
@@ -131,4 +139,26 @@ class PreferencesController extends AbstractController
             ]
         );
     }
+
+    #[Route('/user/preferences/torrentio', 'app.torrentio-preferences.save', methods: ['POST'])]
+    public function saveTorrentioPreferences(Request $request, SaveUserTorrentioPreferencesHandler $handler)
+    {
+        $form = $this->createForm(TorrentioPreferencesForm::class, new TorrentioUrl());
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $command = new SaveUserTorrentioPreferencesCommand(
+                $form->getData(),
+            );
+            $handler->handle($command);
+            $this->broadcaster->alert('Success', 'Your Torrentio preferences have been saved.');
+        }
+
+        return $this->render(
+            'user/preferences.html.twig',
+            [
+                'preferences_form' => $form,
+            ]
+        );
+    }
 }

src/User/Framework/Entity/User.php

@@ -4,8 +4,8 @@ namespace App\User\Framework\Entity;
 
 use Aimeos\Map;
 use App\Download\Framework\Entity\Download;
-use App\EventLog\Framework\Entity\EventLog;
 use App\Monitor\Framework\Entity\Monitor;
+use App\Torrentio\Client\TorrentioUrl;
 use App\User\Framework\Repository\UserRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
@@ -57,18 +57,11 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
     #[ORM\OneToMany(targetEntity: Download::class, mappedBy: 'user')]
     private Collection $downloads;
 
-    /**
-     * @var Collection<int, EventLog>
-     */
-    #[ORM\OneToMany(targetEntity: EventLog::class, mappedBy: 'user')]
-    private Collection $eventLogs;
-
     public function __construct()
     {
         $this->userPreferences = new ArrayCollection();
         $this->monitors = new ArrayCollection();
         $this->downloads = new ArrayCollection();
-        $this->eventLogs = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -351,33 +344,10 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
             (bool) $this->getUserPreference('enable_ical_up_ep')->getPreferenceValue() === true;
     }
 
-    /**
-     * @return Collection<int, EventLog>
-     */
-    public function getEventLogs(): Collection
+    public function getTorrentioUrl()
     {
-        return $this->eventLogs;
-    }
-
-    public function addEventLog(EventLog $eventLog): static
-    {
-        if (!$this->eventLogs->contains($eventLog)) {
-            $this->eventLogs->add($eventLog);
-            $eventLog->setUser($this);
-        }
-
-        return $this;
-    }
-
-    public function removeEventLog(EventLog $eventLog): static
-    {
-        if ($this->eventLogs->removeElement($eventLog)) {
-            // set the owning side to null (unless already changed)
-            if ($eventLog->getUser() === $this) {
-                $eventLog->setUser(null);
-            }
-        }
-
-        return $this;
+        return $this->hasUserPreference('torrentio_url')
+            ? TorrentioUrl::fromString($this->getUserPreference('torrentio_url')->getPreferenceValue())
+            : null;
     }
 }

src/User/Framework/Entity/UserPreference.php

@@ -21,7 +21,7 @@ class UserPreference
     #[ORM\JoinColumn(nullable: false)]
     private ?Preference $preference = null;
 
-    #[ORM\Column(length: 255, nullable: true)]
+    #[ORM\Column(length: 1024, nullable: true)]
     private ?string $preference_value = null;
 
     public function getId(): ?int

src/Values/TorrentioDebridProviderChoices.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Values;
+
+class TorrentioDebridProviderChoices
+{
+    public static array $providers = [
+        'realdebrid' => 'RealDebrid',
+        'premiumize' => 'Premiumize',
+        'alldebrid' => 'AllDebrid',
+        'debridlink' => 'DebridLink',
+        'easydebrid' => 'EasyDebrid',
+        'offcloud' => 'Offcloud',
+        'torbox' => 'TorBox',
+        'putio' => 'Put.io',
+    ];
+
+    public static function getProviders(): array
+    {
+        return self::$providers;
+    }
+
+    public static function asSelectOptions(): array
+    {
+        return array_flip(self::$providers);
+    }
+}

src/Values/TorrentioExcludeQualityChoices.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Values;
+
+class TorrentioExcludeQualityChoices
+{
+    public static array $choices = [
+        'brremux' => 'BluRay REMUX',
+        'hdrall' => 'HDR/HDR10+/Dolby Vision',
+        'dolbyvision' => 'Dolby Vision',
+        'dolbyvisionwithhdr' => 'Dolby Vision + HDR',
+        'threed' => '3D',
+        'nonthreed' => 'Non 3D (DO NOT SELECT IF NOT SURE)',
+        '4k' => '4k',
+        '1080p' => '1080p',
+        '720p' => '720p',
+        '480p' => '480p',
+        'other' => 'Other (DVDRip/HDRip/BDRip...)',
+        'scr' => 'Screener',
+        'cam' => 'Cam',
+        'unknown' => 'Unknown'
+    ];
+
+
+    public static function getChoices(): array
+    {
+        return self::$choices;
+    }
+
+    public static function asSelectOptions(): array
+    {
+        return array_flip(self::$choices);
+    }
+}

src/Values/TorrentioLanguageChoices.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Values;
+
+class TorrentioLanguageChoices
+{
+    public static array $languages = [
+        'japanese' => '🇯🇵 Japanese',
+        'russian' => '🇷🇺 Russian',
+        'italian' => '🇮🇹 Italian',
+        'portuguese' => '🇵🇹 Portuguese',
+        'spanish' => '🇪🇸 Spanish',
+        'latino' => '🇲🇽 Latino',
+        'korean' => '🇰🇷 Korean',
+        'chinese' => '🇨🇳 Chinese',
+        'taiwanese' => '🇹🇼 Taiwanese',
+        'french' => '🇫🇷 French',
+        'german' => '🇩🇪 German',
+        'dutch' => '🇳🇱 Dutch',
+        'hindi' => '🇮🇳 Hindi',
+        'telugu' => '🇮🇳 Telugu',
+        'tamil' => '🇮🇳 Tamil',
+        'polish' => '🇵🇱 Polish',
+        'lithuanian' => '🇱🇹 Lithuanian',
+        'latvian' => '🇱🇻 Latvian',
+        'estonian' => '🇪🇪 Estonian',
+        'czech' => '🇨🇿 Czech',
+        'slovakian' => '🇸🇰 Slovakian',
+        'slovenian' => '🇸🇮 Slovenian',
+        'hungarian' => '🇭🇺 Hungarian',
+        'romanian' => '🇷🇴 Romanian',
+        'bulgarian' => '🇧🇬 Bulgarian',
+        'serbian' => '🇷🇸 Serbian',
+        'croatian' => '🇭🇷 Croatian',
+        'ukrainian' => '🇺🇦 Ukrainian',
+        'greek' => '🇬🇷 Greek',
+        'danish' => '🇩🇰 Danish',
+        'finnish' => '🇫🇮 Finnish',
+        'swedish' => '🇸🇪 Swedish',
+        'norwegian' => '🇳🇴 Norwegian',
+        'turkish' => '🇹🇷 Turkish',
+        'arabic' => '🇸🇦 Arabic',
+        'persian' => '🇮🇷 Persian',
+        'hebrew' => '🇮🇱 Hebrew',
+        'vietnamese' => '🇻🇳 Vietnamese',
+        'indonesian' => '🇮🇩 Indonesian',
+        'malay' => '🇲🇾 Malay',
+        'thai' => '🇹🇭 Thai'
+    ];
+
+    public static function getLanguages(): array
+    {
+        return self::$languages;
+    }
+
+    public static function asSelectOptions(): array
+    {
+        return array_flip(self::$languages);
+    }
+}

src/Values/TorrentioProviderChoices.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Values;
+
+class TorrentioProviderChoices
+{
+    public static array $choices = [
+        'yts' => 'YTS',
+        'eztv' => 'EZTV',
+        'rarbg' => 'RARBG',
+        '1337x' => '1337x',
+        'thepiratebay' => 'ThePirateBay',
+        'kickasstorrents' => 'KickassTorrents',
+        'torrentgalaxy' => 'TorrentGalaxy',
+        'magnetdl' => 'MagnetDL',
+        'horriblesubs' => 'HorribleSubs',
+        'nyaasi' => 'NyaaSi',
+        'tokyotosho' => 'TokyoTosho',
+        'anidex' => 'AniDex',
+        'rutor' => '🇷🇺 Rutor',
+        'rutracker' => '🇷🇺 Rutracker',
+        'comando' => '🇵🇹 Comando',
+        'bludv' => '🇵🇹 BluDV',
+        'torrent9' => '🇫🇷 Torrent9',
+        'ilcorsaronero' => '🇮🇹 ilCorSaRoNeRo',
+        'mejortorrent' => '🇪🇸 MejorTorrent',
+        'wolfmax4k' => '🇪🇸 Wolfmax4k',
+        'cinecalidad' => '🇲🇽 Cinecalidad',
+        'besttorrents' => '🇵🇱 BestTorrents'
+    ];
+
+    public static function getChoices(): array
+    {
+        return self::$choices;
+    }
+
+    public static function asSelectOptions(): array
+    {
+        return array_flip(self::$choices);
+    }
+}

src/Values/TorrentioSortChoices.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Values;
+
+class TorrentioSortChoices
+{
+    public static array $choices = [
+        'quality' => 'By quality then seeders',
+        'qualitysize' => 'By quality then size',
+        'seeders' => 'By seeders',
+        'size' => 'By size',
+    ];
+
+    public static function getChoices(): array
+    {
+        return self::$choices;
+    }
+
+    public static function asSelectOptions(): array
+    {
+        return array_flip(self::$choices);
+    }
+}

templates/bare.html.twig

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