wip: adds cache rich functionality

.env

@@ -38,16 +38,3 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 ###< symfony/messenger ###
 
 REDIS_HOST=redis://redis
-
-###> symfony/mailer ###
-MAILER_DSN=null://null
-###< symfony/mailer ###
-
-AUTH_METHOD=form_login
-
-###> drenso/symfony-oidc-bundle ###
-OIDC_WELL_KNOWN_URL="https://oidc/.well-known"
-OIDC_CLIENT_ID="Enter your OIDC client id"
-OIDC_CLIENT_SECRET="Enter your OIDC client secret"
-OIDC_BYPASS_FORM_LOGIN=false
-###< drenso/symfony-oidc-bundle ###

assets/controllers.json

@@ -1,34 +1,5 @@
 {
     "controllers": {
-        "@spomky-labs/pwa-bundle": {
-            "connection-status": {
-                "enabled": true,
-                "fetch": "eager"
-            },
-            "backgroundsync-form": {
-                "enabled": true,
-                "fetch": "eager"
-            },
-            "sync-broadcast": {
-                "enabled": true,
-                "fetch": "eager"
-            },
-            "prefetch-on-demand": {
-                "enabled": true,
-                "fetch": "eager"
-            }
-        },
-        "@symfony/ux-autocomplete": {
-            "autocomplete": {
-                "enabled": true,
-                "fetch": "eager",
-                "autoimport": {
-                    "tom-select/dist/css/tom-select.default.css": true,
-                    "tom-select/dist/css/tom-select.bootstrap4.css": false,
-                    "tom-select/dist/css/tom-select.bootstrap5.css": false
-                }
-            }
-        },
         "@symfony/ux-live-component": {
             "live": {
                 "enabled": true,

assets/controllers/action_button_controller.js

@@ -1,46 +0,0 @@
-import { Controller } from '@hotwired/stimulus';
-
-/*
-* The following line makes this controller "lazy": it won't be downloaded until needed
-* See https://symfony.com/bundles/StimulusBundle/current/index.html#lazy-stimulus-controllers
-*/
-
-/* stimulusFetch: 'lazy' */
-export default class extends Controller {
-
-    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)
-    }
-
-    default() {
-        console.log('Looks like you need to add an action to your action button...')
-    }
-
-    monitorDispatch() {
-        fetch('/api/monitor/dispatch')
-    }
-}

assets/controllers/clear_cache_controller.js

@@ -0,0 +1,30 @@
+import { Controller } from '@hotwired/stimulus';
+
+/*
+* The following line makes this controller "lazy": it won't be downloaded until needed
+* See https://symfony.com/bundles/StimulusBundle/current/index.html#lazy-stimulus-controllers
+*/
+
+/* stimulusFetch: 'lazy' */
+export default class extends Controller {
+    initialize() {}
+
+    connect() {}
+
+    disconnect() {}
+
+    async clearAll() {
+        let response = await fetch('/api/torrentio/cache', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Accept': 'application/json',
+            },
+            body: JSON.stringify({
+                type: 'torrentio',
+                mediaType: 'tvshows',
+            })
+        });
+        response = await response.json()
+    }
+}

assets/controllers/hamburger_controller.js

@@ -1,43 +0,0 @@
-import { Controller } from '@hotwired/stimulus';
-
-/*
-* The following line makes this controller "lazy": it won't be downloaded until needed
-* See https://symfony.com/bundles/StimulusBundle/current/index.html#lazy-stimulus-controllers
-*/
-
-/* stimulusFetch: 'lazy' */
-export default class extends Controller {
-    static outlets = ['navbar']
-
-    initialize() {
-        // Called once when the controller is first instantiated (per element)
-
-        // Here you can initialize variables, create scoped callables for event
-        // listeners, instantiate external libraries, etc.
-        // this._fooBar = this.fooBar.bind(this)
-    }
-
-    connect() {
-        // Called every time the controller is connected to the DOM
-        // (on page load, when it's added to the DOM, moved in the DOM, etc.)
-
-        // Here you can add event listeners on the element or target elements,
-        // add or remove classes, attributes, dispatch custom events, etc.
-        // this.fooTarget.addEventListener('click', this._fooBar)
-    }
-
-    toggleMenu() {
-        this.navbarOutlet.toggle();
-    }
-
-    // Add custom controller actions here
-    // fooBar() { this.fooTarget.classList.toggle(this.bazClass) }
-
-    disconnect() {
-        // Called anytime its element is disconnected from the DOM
-        // (on page change, when it's removed from or moved in the DOM, etc.)
-
-        // Here you should remove all event listeners added in "connect()" 
-        // this.fooTarget.removeEventListener('click', this._fooBar)
-    }
-}

assets/controllers/monitor_button_controller.js

@@ -8,7 +8,7 @@ import { Controller } from '@hotwired/stimulus';
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
     static targets = ['button', 'options']
-    static outlets = ['result-filter', 'dialog']
+    static outlets = ['result-filter']
     static values = {
         tmdbId: String,
         imdbId: String,
@@ -54,9 +54,6 @@ export default class extends Controller {
             title: this.titleValue,
             monitorType: 'tvshows',
         });
-        if (this.hasDialogOutlet) {
-            this.dialogOutlet.close();
-        }
     }
 
     async monitorSeason() {

assets/controllers/movie_results_controller.js

@@ -16,23 +16,25 @@ export default class extends Controller {
     };
 
     static targets = ['list']
-    static outlets = ['loading-icon']
 
     options = []
     optionsLoaded = false
-    resultCountEl = null
 
     async connect() {
-        this.resultCountEl = document.querySelector('#movie_results_count');
+        await this.setOptions();
     }
 
-    async listTargetConnected() {
-        this.optionsLoaded = true;
-        this.options = this.element.querySelectorAll('tbody tr');
-        this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
-        this.dispatch('optionsLoaded', {detail: {options: this.options}})
-        this.loadingIconOutlet.toggleIcon();
-        this.resultCountEl.innerText = this.options.length;
+    async setOptions() {
+        if (false === this.optionsLoaded) {
+            this.optionsLoaded = true;
+            await fetch(`/torrentio/movies/${this.tmdbIdValue}/${this.imdbIdValue}`)
+                .then(res => res.text())
+                .then(response => {
+                    this.element.innerHTML = response;
+                    this.options = this.element.querySelectorAll('tbody tr');
+                    this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
+                });
+        }
     }
 
     // Keeps compatible with Filter & TV Shows
@@ -46,20 +48,15 @@ export default class extends Controller {
         let selectedCount = 0;
 
         this.options.forEach((option) => {
-            const optionHeader = document.querySelector(`[data-option-id="${option.dataset['localId']}"]`)
             const props = {
                 "resolution": option.querySelector('#resolution').textContent.trim(),
                 "codec": option.querySelector('#codec').textContent.trim(),
                 "provider": option.querySelector('#provider').textContent.trim(),
-                "quality": option.dataset['quality'],
                 "languages": JSON.parse(option.dataset['languages']),
             }
 
             let include = true;
-            option.classList.add('r-tablerow');
             option.classList.remove('hidden');
-            optionHeader.classList.add('r-tablerow');
-            optionHeader.classList.remove('hidden');
             option.querySelector('input[type="checkbox"]').checked = false;
 
             for (let [key, value] of Object.entries(activeFilter)) {
@@ -84,10 +81,7 @@ export default class extends Controller {
             }
 
             if (false === include) {
-                option.classList.remove('r-tablerow');
                 option.classList.add('hidden');
-                optionHeader.classList.remove('r-tablerow');
-                optionHeader.classList.add('hidden');
             } else if (true === firstIncluded) {
                 count = 1;
                 selectedCount = selectedCount + 1;
@@ -97,6 +91,5 @@ export default class extends Controller {
                 count = count + 1;
             }
         });
-        this.resultCountEl.innerText = count;
     }
 }

assets/controllers/navbar_controller.js

@@ -10,21 +10,16 @@ export default class extends Controller {
     activeStyles = "block rounded-lg bg-orange-500 hover:bg-opacity-70 bg-clip-padding backdrop-filter backdrop-blur-md bg-opacity-80 px-4 py-2 text-sm font-medium text-gray-50";
 
     connect() {
-        this.element.querySelectorAll('.nav-list a:not(.nav-foot)').forEach(link => {
+        console.log(window.location.pathname);
+        this.element.querySelectorAll('a:not(.nav-foot)').forEach(link => {
             link.className = this.inactiveStyles;
             if (window.location.pathname === (new URL(link.href)).pathname || window.location.pathname.startsWith( (new URL(link.href)).pathname + '/' ) ) {
                 link.className = this.activeStyles;
             }
         });
-
-        window.addEventListener("resize", (event) => {
-
-        });
     }
 
-    toggle() {
-        this.element.parentElement.classList.toggle('hidden');
-        this.element.classList.toggle('fixed');
-        this.element.classList.toggle('z-20');
+    setActive() {
+
     }
 }

assets/controllers/result_filter_controller.js

@@ -11,7 +11,6 @@ export default class extends Controller {
 
     languages = []
     providers = []
-    qualities = []
     seasons = []
 
     activeFilter = {
@@ -19,16 +18,13 @@ export default class extends Controller {
         "codec": "",
         "language": "",
         "provider": "",
-        "quality": "",
     }
 
     static outlets = ['movie-results', 'tv-results', 'tv-episode-list']
-    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'selectAll', 'downloadSelected']
+    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'selectAll', 'downloadSelected']
     static values = {
-        'imdbId': String,
         'media-type': String,
         'episodes': Array,
-        'reverseMappedQualities': Object,
     }
 
     async connect() {
@@ -38,12 +34,21 @@ export default class extends Controller {
         await this.filter();
     }
 
-    // Event is fired from movies/tvshows controllers to populate this data
-    async loadOptions({detail: { options }}) {
-        await options.forEach((option) => {
+    async movieResultsOutletConnected(outlet) {
+        await this.parseDownloadOptionForFilter(outlet)
+    }
+
+    async tvResultsOutletConnected(outlet) {
+        await this.parseDownloadOptionForFilter(outlet)
+    }
+
+    async parseDownloadOptionForFilter(outlet) {
+        if (outlet.options.length === 0) {
+            await outlet.setOptions();
+        }
+        outlet.options.forEach((option) => {
             this.addLanguages(option, option.dataset);
             this.addProviders(option, option.dataset);
-            this.addQualities(option, option.dataset);
         })
         await this.filter();
     }
@@ -100,34 +105,7 @@ export default class extends Controller {
 
     }
 
-    addQualities(option, props) {
-        if (!this.qualities.includes(props['quality'])) {
-            if (props['quality'].toLowerCase() in this.reverseMappedQualitiesValue) {
-                this.qualities.push(props['quality']);
-            }
-        }
-
-        const preferred = this.qualityTarget.dataset.preferred;
-        if (preferred) {
-            this.qualityTarget.innerHTML = '<option value="'+preferred+'" selected>'+preferred+'</option>';
-            this.qualityTarget.innerHTML += '<option value="">n/a</option>';
-        } else {
-            this.qualityTarget.innerHTML = '<option value="">n/a</option>';
-        }
-
-        this.qualityTarget.innerHTML += this.qualities.sort()
-            .map((quality) => {
-                const preferred = this.qualityTarget.dataset.preferred;
-                if (preferred === quality) {
-                    return;
-                }
-                return '<option value="' + quality + '">' + quality + '</option>'
-            })
-            .join();
-    }
-
     async filter() {
-        const downloadSeasonSpan = document.querySelector("#downloadSeasonModal");
         const currentSeason = this.activeFilter['season'];
 
         let results = [];
@@ -136,7 +114,6 @@ export default class extends Controller {
             "codec": this.codecTarget.value,
             "language": this.languageTarget.value,
             "provider": this.providerTarget.value,
-            "quality": this.qualityTarget.value,
         }
 
         if ("movies" === this.mediaTypeValue) {
@@ -146,7 +123,6 @@ export default class extends Controller {
         } else if ("tvshows" === this.mediaTypeValue) {
             results = this.tvResultsOutlets;
             this.activeFilter.season = this.seasonTarget.value;
-            downloadSeasonSpan.innerText = this.activeFilter.season;
             await results.forEach((list) => list.filter(this.activeFilter, currentSeason, this.seasonTarget.value));
         }
     }
@@ -159,14 +135,6 @@ export default class extends Controller {
         this.selectAllTarget.checked = false;
     }
 
-    downloadSeason() {
-        fetch(`/api/download/season/${this.imdbIdValue}/${this.activeFilter['season']}`, {
-            headers: {
-                'Content-Type': 'application/json'
-            }
-        })
-    }
-
     selectAllEpisodes() {
         this.tvResultsOutlets.forEach((episode) => {
             if (episode.isActive()) {

assets/controllers/search_bar_controller.js

@@ -1,59 +0,0 @@
-import { Controller } from '@hotwired/stimulus';
-
-export default class extends Controller {
-    initialize() {
-        this._onPreConnect = this._onPreConnect.bind(this);
-        this._onConnect = this._onConnect.bind(this);
-    }
-
-    connect() {
-        document.querySelector("#search").onsubmit = (event) => {
-            event.preventDefault();
-            const autocompleteController = this.application.getControllerForElementAndIdentifier(this.element, 'symfony--ux-autocomplete--autocomplete')
-            window.location.href = `/search?term=${autocompleteController.tomSelect.lastValue}`
-        }
-        this.element.addEventListener('autocomplete:pre-connect', this._onPreConnect);
-        this.element.addEventListener('autocomplete:connect', this._onConnect);
-    }
-
-    disconnect() {
-        // You should always remove listeners when the controller is disconnected to avoid side-effects
-        this.element.removeEventListener('autocomplete:connect', this._onConnect);
-        this.element.removeEventListener('autocomplete:pre-connect', this._onPreConnect);
-    }
-
-    _onPreConnect(event) {
-        // TomSelect has not been initialized - options can be changed
-        // console.log(event.detail); // Options that will be used to initialize TomSelect
-        event.detail.options.onItemAdd = (value, $item) => {
-            const params = value.split('|')
-            window.location.href = `/result/${params[0]}/${params[1]}`
-        };
-        event.detail.options.render.loading = (data, escape) => {
-            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>
-`;
-        }
-        event.detail.options.render.option = (data, escape) => {
-            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.description}</p>
-                        </div>
-                    </div>
-`
-        }
-    }
-
-    _onConnect(event) {
-        // TomSelect has just been initialized and you can access details from the event
-        // console.log(event.detail.tomSelect); // TomSelect instance
-        // console.log(event.detail.options); // Options used to initialize TomSelect
-    }
-}

assets/controllers/tv_results_controller.js

@@ -25,18 +25,36 @@ export default class extends Controller {
     optionsLoaded = false
     isOpen = false
 
-    async listTargetConnected() {
-        this.options = this.element.querySelectorAll('tbody tr');
-        if (this.options.length > 0) {
-            this.options.forEach((option) =>
-                option.querySelector('.download-btn').dataset['title'] = this.titleValue
-            );
-            this.options[0].querySelector('input[type="checkbox"]').checked = true;
-            this.dispatch('optionsLoaded', {detail: {options: this.options}})
-            this.loadingIconOutlet.increaseCount();
-        } else {
-            this.countTarget.innerText = 0;
-            this.episodeSelectorTarget.disabled = true;
+    async connect() {
+        await this.setOptions();
+    }
+
+    async setOptions() {
+        if (this.optionsLoaded === false) {
+            this.optionsLoaded = true;
+            let response;
+
+            try {
+                response = await fetch(`/torrentio/tvshows/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
+            } catch (error) {
+                console.log('There was an error', error);
+            }
+
+            if (response?.ok) {
+                response = await response.text()
+                this.listContainerTarget.innerHTML = response;
+                this.options = this.element.querySelectorAll('tbody tr');
+                if (this.options.length > 0) {
+                    this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
+                    this.options[0].querySelector('input[type="checkbox"]').checked = true;
+                } else {
+                    this.countTarget.innerText = 0;
+                    this.episodeSelectorTarget.disabled = true;
+                }
+                this.loadingIconOutlet.increaseCount();
+            } else {
+                console.log(`HTTP Response Code: ${response?.status}`)
+            }
         }
     }
 
@@ -72,7 +90,13 @@ export default class extends Controller {
     }
 
     toggleList() {
-        this.listTarget.classList.toggle('options-table');
+        // if (!this.isOpen) {
+        //     this.toggleButtonTarget.classList.add('rotate-180');
+        //     this.toggleButtonTarget.classList.remove('-rotate-180');
+        // } else {
+        //     this.toggleButtonTarget.classList.add('-rotate-180');
+        //     this.toggleButtonTarget.classList.remove('rotate-180');
+        // }
         this.listTarget.classList.toggle('hidden');
         this.toggleButtonTarget.classList.toggle('rotate-90');
         this.toggleButtonTarget.classList.toggle('-rotate-90');
@@ -109,20 +133,15 @@ export default class extends Controller {
         let selectedCount = 0;
 
         this.options.forEach((option) => {
-            const optionHeader = document.querySelector(`[data-option-id="${option.dataset['localId']}"]`)
             const props = {
                 "resolution": option.querySelector('#resolution').textContent.trim(),
                 "codec": option.querySelector('#codec').textContent.trim(),
                 "provider": option.querySelector('#provider').textContent.trim(),
                 "languages": JSON.parse(option.dataset['languages']),
-                "quality": option.dataset['quality'],
             }
 
             let include = true;
-            option.classList.add('r-tablerow');
             option.classList.remove('hidden');
-            optionHeader.classList.add('r-tablerow');
-            optionHeader.classList.remove('hidden');
             option.querySelector('input[type="checkbox"]').checked = false;
 
             for (let [key, value] of Object.entries(activeFilter)) {
@@ -147,10 +166,7 @@ export default class extends Controller {
             }
 
             if (false === include) {
-                option.classList.remove('r-tablerow');
                 option.classList.add('hidden');
-                optionHeader.classList.remove('r-tablerow');
-                optionHeader.classList.add('hidden');
             } else if (true === firstIncluded) {
                 count = 1;
                 selectedCount = selectedCount + 1;

assets/icons/pajamas/hamburger.svg

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

assets/styles/app.css

@@ -23,7 +23,14 @@
         @apply bg-green-950 hover:bg-green-900 border-green-500
     }
     .alert-warning {
-        @apply bg-yellow-500 hover:bg-yellow-600 border-yellow-400 text-black
+        @apply bg-yellow-500/70 hover:bg-yellow-600 border-yellow-400 text-black
+    }
+
+    .primary-btn {
+        @apply px-1 py-1 rounded-md bg-orange-500 self-end text-white w-16 ml-2 hover:bg-orange-600
+    }
+    .secondary-btn {
+        @apply px-1 py-1 rounded-md self-end w-16 hover:bg-stone-100
     }
 }
 
@@ -63,70 +70,3 @@ dialog[data-dialog-target="dialog"][open] {
 dialog[data-dialog-target="dialog"][closing] {
     animation: fade-out 200ms forwards;
 }
-
-.text-input {
-    @apply bg-gray-50 text-gray-50 p-1 bg-transparent border-b-2 border-orange-400
-}
-
-.submit-button {
-    @apply bg-green-600/40 px-1.5 py-1 w-full rounded-md text-gray-50 backdrop-filter backdrop-blur-sm border-2 border-green-500 hover:bg-green-700/40
-}
-
-.r-tablecell {
-    display: none;
-}
-
-.r-tablerow {
-    display: flex;
-}
-
-@media screen and (min-width: 768px) {
-    .r-tablecell {
-        display: table-cell;
-    }
-
-    .r-tablerow {
-        display: table-row;
-    }
-}
-
-.options-table {
-    display: flex;
-
-    :last-child {
-        border-bottom: none;
-    }
-}
-
-@media screen and (min-width: 768px) {
-    .options-table {
-        display: inline-table;
-    }
-}
-
-#search .ts-wrapper.single .ts-control::after {
-    display: none !important;
-}
-
-#search .ts-control {
-    background: transparent !important;
-    border: none !important;
-    box-shadow: none !important;
-    color: #fff !important;
-    padding-left: 0;
-
-    input {
-        color: #fff !important;
-        padding: 0;
-    }
-}
-
-#search .ts-dropdown {
-    background: unset;
-    @apply bg-orange-500/80 backdrop-filter backdrop-blur-md text-white border border-orange-500 rounded-md
-}
-
-#search .ts-dropdown .ts-dropdown-content .option.active {
-    background: unset;
-    @apply bg-orange-500/80 text-black font-bold rounded-md
-}

bash/caddy/Caddyfile

@@ -1,11 +1,6 @@
-{
-    log {
-        level DEBUG
-    }
-}
+dev.caldwell.digital:443
 
-dev.caldwell.digital:443 {
-    tls /etc/ssl/wildcard.crt /etc/ssl/wildcard.pem
+tls /etc/ssl/wildcard.crt /etc/ssl/wildcard.pem
+
+reverse_proxy app:80
 
-    reverse_proxy app:80
-}

compose.yml

@@ -2,7 +2,6 @@ services:
   caddy:
     image: caddy:2.9.1
     restart: unless-stopped
-    tty: true
     cap_add:
       - NET_ADMIN
     ports:
@@ -41,7 +40,7 @@ services:
     tty: true
     environment:
       TZ: America/Chicago
-    command: php /app/bin/console messenger:consume async -vv --time-limit=3600
+    command: php /app/bin/console messenger:consume media_cache -vv --time-limit=3600
 
 
   scheduler:

composer.json

@@ -16,7 +16,6 @@
         "doctrine/doctrine-migrations-bundle": "^3.4",
         "doctrine/orm": "^3.3",
         "dragonmantank/cron-expression": "^3.4",
-        "drenso/symfony-oidc-bundle": "^4.2",
         "guzzlehttp/guzzle": "^7.9",
         "league/pipeline": "^1.1",
         "nesbot/carbon": "^3.9",
@@ -27,7 +26,6 @@
         "php-tmdb/api": "^4.1",
         "predis/predis": "^2.4",
         "runtime/frankenphp-symfony": "^0.2.0",
-        "spomky-labs/pwa-bundle": "^1.2",
         "stof/doctrine-extensions-bundle": "^1.14",
         "symfony/asset": "7.3.*",
         "symfony/console": "7.3.*",
@@ -38,9 +36,7 @@
         "symfony/flex": "^2",
         "symfony/form": "7.3.*",
         "symfony/framework-bundle": "7.3.*",
-        "symfony/http-client": "7.3.*",
         "symfony/ldap": "7.3.*",
-        "symfony/mailer": "7.3.*",
         "symfony/mercure-bundle": "^0.3.9",
         "symfony/messenger": "7.3.*",
         "symfony/runtime": "7.3.*",
@@ -48,17 +44,14 @@
         "symfony/security-bundle": "7.3.*",
         "symfony/stimulus-bundle": "^2.24",
         "symfony/twig-bundle": "7.3.*",
-        "symfony/ux-autocomplete": "^2.27",
         "symfony/ux-icons": "^2.24",
         "symfony/ux-live-component": "^2.24",
         "symfony/ux-turbo": "^2.24",
         "symfony/ux-twig-component": "^2.24",
         "symfony/yaml": "7.3.*",
-        "symfonycasts/reset-password-bundle": "^1.23",
         "symfonycasts/tailwind-bundle": "^0.10.0",
         "twig/extra-bundle": "^2.12|^3.0",
-        "twig/twig": "^2.12|^3.0",
-        "web-token/jwt-library": "^4.0"
+        "twig/twig": "^2.12|^3.0"
     },
     "config": {
         "allow-plugins": {

config/bundles.php

@@ -19,8 +19,4 @@ return [
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
     Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
-    Symfony\UX\Autocomplete\AutocompleteBundle::class => ['all' => true],
-    SymfonyCasts\Bundle\ResetPassword\SymfonyCastsResetPasswordBundle::class => ['all' => true],
-    Drenso\OidcBundle\DrensoOidcBundle::class => ['all' => true],
-    SpomkyLabs\PwaBundle\SpomkyLabsPwaBundle::class => ['all' => true],
 ];

config/packages/cache.yaml

@@ -15,5 +15,11 @@ framework:
         #app: cache.adapter.apcu
 
         # Namespaced pools use the above "app" backend by default
-        #pools:
-            #my.dedicated.cache: null
+        pools:
+            torrentio.cache:
+                adapter: cache.app
+            tmdb.cache:
+                adapter: cache.app
+                default_lifetime: 2592000
+            page.cache:
+                adapter: cache.app

config/packages/doctrine.yaml

@@ -18,12 +18,6 @@ doctrine:
             Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
         auto_mapping: true
         mappings:
-#            App:
-#                type: attribute
-#                is_bundle: false
-#                dir: '%kernel.project_dir%/src/Entity'
-#                prefix: 'App\Entity'
-#                alias: App
             Download:
                 type: attribute
                 is_bundle: false

config/packages/drenso_oidc.yaml

@@ -1,19 +0,0 @@
-drenso_oidc:
-    #default_client: default # The default client, will be aliased to OidcClientInterface
-    clients:
-        default: # The client name, each client will be aliased to its name (for example, $defaultOidcClient)
-            # Required OIDC client configuration
-            well_known_url: '%env(OIDC_WELL_KNOWN_URL)%'
-            client_id: '%env(OIDC_CLIENT_ID)%'
-            client_secret: '%env(OIDC_CLIENT_SECRET)%'
-            redirect_route: '/login/oidc/auth'
-
-            # Extra configuration options
-            #redirect_route: '/login_check'
-            #custom_client_headers: []
-
-        # Add any extra client
-        #link: # Will be accessible using $linkOidcClient
-            #well_known_url: '%env(LINK_WELL_KNOWN_URL)%'
-            #client_id: '%env(LINK_CLIENT_ID)%'
-            #client_secret: '%env(LINK_CLIENT_SECRET)%'

config/packages/mailer.yaml

@@ -1,7 +0,0 @@
-framework:
-    mailer:
-        dsn: 'smtp://%env(SMTP_USER)%:%env(SMTP_PASS)%@%env(SMTP_HOST)%:%env(SMTP_PORT)%'
-        envelope:
-            sender: '%env(SMTP_FROM)%'
-        headers:
-            From: '%env(SMTP_FROM_NAME)% <%env(SMTP_FROM)%>'

config/packages/messenger.yaml

@@ -37,7 +37,6 @@ framework:
             # Route your messages to the transports
             # 'App\Message\YourMessage': async
             'App\Download\Action\Command\DownloadMediaCommand': async
-            'App\Download\Action\Command\DownloadSeasonCommand': async
             'App\Monitor\Action\Command\MonitorTvEpisodeCommand': async
             'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
             'App\Monitor\Action\Command\MonitorTvShowCommand': async

config/packages/pwa.yaml

@@ -1,21 +0,0 @@
-pwa:
-  manifest:
-    enabled: true
-    name: "Torsearch"
-    short_name: "torsearch"
-    start_url: "/"
-    display: "standalone"
-    id: "/"
-    background_color: "#f98e44"
-    theme_color: "#083344"
-    description: Torsearch provides a simple and intuitive way to manage your personal media library.
-    icons:
-      - src: "icon.png"
-        sizes: [ 192 ]
-      - src: "icon.png"
-        sizes: [ 192 ]
-        purpose: maskable
-    categories:
-      - entertainment
-      - multimedia
-      - utilities

config/packages/reset_password.yaml

@@ -1,2 +0,0 @@
-symfonycasts_reset_password:
-    request_password_repository: App\User\Framework\Repository\ResetPasswordRequestRepository

config/packages/security.yaml

@@ -10,9 +10,6 @@ security:
                 class: App\User\Framework\Entity\User
                 property: email
 
-        app_oidc:
-            id: App\User\Framework\Security\OidcUserProvider
-
         app_ldap:
             id: App\User\Framework\Security\LdapUserProvider
 
@@ -21,20 +18,14 @@ security:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
         main:
-            logout:
-                path: /logout
-            provider: app_oidc
+            lazy: true
+            provider: app_local
             form_login:
                 login_path: app_login
                 check_path: app_login
                 enable_csrf: true
-            oidc:
-                login_path: '/login/oidc'
-                check_path: '/login/oidc/auth'
-                enable_end_session_listener: true
-            http_basic:
-                realm: Secured Area
-            entry_point: form_login
+            logout:
+                path: app_logout
 
             # activate different ways to authenticate
             # https://symfony.com/doc/current/security.html#the-firewall
@@ -45,7 +36,6 @@ security:
     # Easy way to control access for large sections of your site
     # Note: Only the *first* access control that matches will be used
     access_control:
-        - { path: ^/reset-password, roles: PUBLIC_ACCESS }
         - { path: ^/getting-started, roles: PUBLIC_ACCESS }
         - { path: ^/register, roles: PUBLIC_ACCESS }
         - { path: ^/login, roles: PUBLIC_ACCESS }

config/routes.yaml

@@ -1,23 +1,7 @@
-controllersBase:
+controllersIndex:
     resource:
-        path: ../src/Base/Framework/Controller/
-        namespace: App\Base\Framework\Controller
-    type: attribute
-    defaults:
-        schemes: [ 'https' ]
-
-controllersLibrary:
-    resource:
-        path: ../src/Library/Framework/Controller/
-        namespace: App\Library\Framework\Controller
-    type: attribute
-    defaults:
-        schemes: [ 'https' ]
-
-controllersSearch:
-    resource:
-        path: ../src/Search/Framework/Controller/
-        namespace: App\Search\Framework\Controller
+        path: ../src/Controller/
+        namespace: App\Controller
     type: attribute
     defaults:
         schemes: [ 'https' ]
@@ -52,12 +36,5 @@ controllersTorrentio:
         namespace: App\Torrentio\Framework\Controller
     type: attribute
     defaults:
-        schemes: ['https']
+        schemes: [ 'https' ]
 
-controllersTmdb:
-    resource:
-        path: ../src/Tmdb/Framework/Controller
-        namespace: App\Tmdb\Framework\Controller
-    type: attribute
-    defaults:
-        schemes: ['https']

config/routes/ux_autocomplete.yaml

@@ -1,3 +0,0 @@
-ux_autocomplete:
-    resource: '@AutocompleteBundle/config/routes.php'
-    prefix: '/autocomplete'

config/security.yaml

@@ -0,0 +1,61 @@
+security:
+    # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
+    password_hashers:
+        Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
+    # https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider
+    providers:
+        users_in_memory: { memory: null }
+        app_local:
+            entity:
+                class: App\User\Framework\Entity\User
+                property: email
+
+        app_ldap:
+            id: App\User\Framework\Security\LdapUserProvider
+
+    firewalls:
+        dev:
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            security: false
+        main:
+            lazy: true
+            provider: app_ldap
+            entry_point: form_login_ldap
+            form_login_ldap:
+                login_path: app_login
+                check_path: app_login
+                enable_csrf: true
+                service: Symfony\Component\Ldap\Ldap
+                dn_string: '%env(LDAP_DN_STRING)%'
+            form_login:
+                login_path: app_login
+                check_path: app_login
+                enable_csrf: true
+            logout:
+                path: app_logout
+
+            # activate different ways to authenticate
+            # https://symfony.com/doc/current/security.html#the-firewall
+
+            # https://symfony.com/doc/current/security/impersonating_user.html
+            # switch_user: true
+
+    # Easy way to control access for large sections of your site
+    # Note: Only the *first* access control that matches will be used
+    access_control:
+        - { path: ^/register, roles: PUBLIC_ACCESS }
+        - { path: ^/login, roles: PUBLIC_ACCESS }
+        - { path: ^/, roles: ROLE_USER } # Or ROLE_ADMIN, ROLE_SUPER_ADMIN,
+
+when@test:
+    security:
+        password_hashers:
+            # By default, password hashers are resource intensive and take time. This is
+            # important to generate secure password hashes. In tests however, secure hashes
+            # are not important, waste resources and increase test times. The following
+            # reduces the work factor to the lowest possible values.
+            Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
+                algorithm: auto
+                cost: 4 # Lowest possible value for bcrypt
+                time_cost: 3 # Lowest possible value for argon
+                memory_cost: 10 # Lowest possible value for argon

config/services.yaml

@@ -4,16 +4,6 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
-    # App
-    app.url: '%env(APP_URL)%'
-    app.version: '%env(default:app.default.version:APP_VERSION)%'
-
-    # Debrid Services
-    app.debrid.real_debrid.key: '%env(REAL_DEBRID_KEY)%'
-
-    # TMDB Key
-    app.meta_provider.tmdb.key: '%env(TMDB_API)%'
-
     # Media
     media.base_path: '/var/download'
     media.default_movies_dir: movies
@@ -35,14 +25,7 @@ parameters:
     app.default.version: '0.dev'
     app.default.timezone: 'America/Chicago'
 
-    # Auth
-    auth.default.method: 'form_login'
-    auth.method: '%env(default:auth.default.method:AUTH_METHOD)%'
-
-    auth.oidc.well_known_url: '%env(OIDC_WELL_KNOWN_URL)%'
-    auth.oidc.client_id: '%env(OIDC_CLIENT_ID)%'
-    auth.oidc.client_secret: '%env(OIDC_CLIENT_SECRET)%'
-    auth.oidc.bypass_form_login: '%env(bool:OIDC_BYPASS_FORM_LOGIN)%'
+    app.version: '%env(default:app.default.version:APP_VERSION)%'
 
 services:
     # default configuration for services in *this* file

docs/examples/.env

@@ -3,15 +3,10 @@
 # or pass your certificates into the 'app' container.
 # Please omit any trailing slashes. The APP_URL is
 # used to generate the Mercure URL behind the scenes.
-APP_URL="https://dev.caldwell.digital"
+APP_URL="https://torsearch.idocode.io"
 APP_SECRET="70169beadfbc8101c393cbfbba27a313"
 APP_ENV=prod
 
-# Mercure is a Caddy module built into the webserver
-# that facilitates the usage of websockets to transmit
-# real time data (download progress, etc.)
-MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
-
 # Use the DATABASE_URL below to use the MariaDB container
 # provided in the example.compose.yml file, or remove this
 # line and fill in the details of your own MySQL/MariaDB server
@@ -24,48 +19,39 @@ DATABASE_URL="mysql://root:password@database:3306/app?serverVersion=10.6.19.2-Ma
 # This key is never saved anywhere
 # else and is passed to Torrentio
 # to retrieve download options
-REAL_DEBRID_KEY=""
+#REAL_DEBRID_KEY=""
 
-# Enter your TMDB API key
+# Enter you TMDB API key
 # This is used to provide rich search results
 # when searching for media and rendering the
 # Popular Movies and TV Shows section.
-TMDB_API=""
+#TMDB_API=
+
+REAL_DEBRID_KEY=""
+TMDB_API=eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiI0ZTJjYjJhOGUzOGJhNjdiNjVhOGU1NGM0ZWI1MzhmOCIsIm5iZiI6MTczNzkyNjA0NC41NjQsInN1YiI6IjY3OTZhNTljYzdiMDFiNzJjNzIzZWM5YiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.e8DbNe9qrSBC1y-ANRv-VWBAtls-ZS2r7aNCiI68mpw
+
+
+MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
 
 # Use your own Redis instance or use the
 # below value to use the container included
 # in the example compose.yml file.
 REDIS_HOST="redis://redis"
 
-### Auth ###
-# Change to "oidc" to and provide the required
-# environment variables below to use OIDC auth.
-AUTH_METHOD=form_login
-
-# OIDC
-OIDC_WELL_KNOWN_URL=
-OIDC_CLIENT_ID=
-OIDC_CLIENT_SECRET=
-# Allows you to skip the login page and directly
-# rely on your IdP for auth.
-OIDC_BYPASS_FORM_LOGIN=
-
-
 # LDAP Config: To use LDAP, enter the below fields
 # and run 'php bin/console config:set auth.method ldap'
-# (LDAP is still in progress and not ready for use)
-#LDAP_HOST=
-#LDAP_PORT=
-#LDAP_ENCRYPTION=
-#LDAP_BASE_DN=
-#LDAP_BIND_USER=
-#LDAP_BIND_PASS=
-#LDAP_DN_STRING=
-#LDAP_UID_KEY="uid"
+LDAP_HOST=
+LDAP_PORT=
+LDAP_ENCRYPTION=
+LDAP_BASE_DN=
+LDAP_BIND_USER=
+LDAP_BIND_PASS=
+LDAP_DN_STRING=
+LDAP_UID_KEY="uid"
 # LDAP group that identifies an Admin
 # Users with this LDAP group will automatically
 # get the admin role in this system.
-#LDAP_ADMIN_ROLE_DN=""
-#LDAP_EMAIL_ATTRIBUTE=mail
-#LDAP_USERNAME_ATTRIBUTE=uid
-#LDAP_NAME_ATTRIBUTE=displayname
+LDAP_ADMIN_ROLE_DN=""
+LDAP_EMAIL_ATTRIBUTE=mail
+LDAP_USERNAME_ATTRIBUTE=uid
+LDAP_NAME_ATTRIBUTE=displayname

docs/examples/compose.yml

@@ -1,4 +1,10 @@
 services:
+  # The "entrypoint" into the application. This reverse proxy
+  # proxies traffic back to their respective services. If not
+  # running behind a reverse proxy inject your SSL certificates
+  # into this container.
+  # This container runs the actual web app in a php:8.4-fpm
+  # base container.
   app:
     image: code.caldwell.digital/home/torsearch-app:latest
     ports:
@@ -6,8 +12,8 @@ services:
     env_file:
       - .env
     volumes:
-      - ./downloads/movies:/var/download/movies
-      - ./downloads/tvshows:/var/download/tvshows
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
     environment:
       TZ: America/Chicago
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
@@ -26,11 +32,11 @@ services:
   worker:
     image: code.caldwell.digital/home/torsearch-worker:latest
     volumes:
-      - ./downloads/movies:/var/download/movies
-      - ./downloads/tvshows:/var/download/tvshows
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
     environment:
       TZ: America/Chicago
-    command: -vv --time-limit=3600 --limit=10
+    command: -vvv
     env_file:
       - .env
     restart: always
@@ -46,11 +52,10 @@ services:
   scheduler:
     image: code.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
-      - ./downloads/movies:/var/download/movies
-      - ./downloads/tvshows:/var/download/tvshows
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
     env_file:
       - .env
-    command: -vv
     environment:
       TZ: America/Chicago
     restart: always

importmap.php

@@ -40,28 +40,4 @@ return [
     'stimulus-use' => [
         'version' => '0.52.2',
     ],
-    'animate.css' => [
-        'version' => '4.1.1',
-    ],
-    'animate.css/animate.min.css' => [
-        'version' => '4.1.1',
-        'type' => 'css',
-    ],
-    'tom-select' => [
-        'version' => '2.4.3',
-    ],
-    '@orchidjs/sifter' => [
-        'version' => '1.1.0',
-    ],
-    '@orchidjs/unicode-variants' => [
-        'version' => '1.1.2',
-    ],
-    'tom-select/dist/css/tom-select.default.min.css' => [
-        'version' => '2.4.3',
-        'type' => 'css',
-    ],
-    'tom-select/dist/css/tom-select.default.css' => [
-        'version' => '2.4.3',
-        'type' => 'css',
-    ],
 ];

migrations/Version20250708033046.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 Version20250708033046 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE monitor ADD only_future TINYINT(1) NOT NULL DEFAULT 1
-        SQL);
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE monitor DROP only_future
-        SQL);
-    }
-}

migrations/Version20250709161037.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 Version20250709161037 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE download CHANGE batch_id episode_id 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 download CHANGE episode_id batch_id VARCHAR(255) DEFAULT NULL
-        SQL);
-    }
-}

migrations/Version20250709200956.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 Version20250709200956 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 reset_password_request (id INT AUTO_INCREMENT NOT NULL, user_id INT NOT NULL, selector VARCHAR(20) NOT NULL, hashed_token VARCHAR(100) NOT NULL, requested_at DATETIME NOT NULL COMMENT '(DC2Type:datetime_immutable)', expires_at DATETIME NOT NULL COMMENT '(DC2Type:datetime_immutable)', INDEX IDX_7CE748AA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE reset_password_request ADD CONSTRAINT FK_7CE748AA76ED395 FOREIGN KEY (user_id) REFERENCES user (id)
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE monitor CHANGE only_future only_future TINYINT(1) NOT 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 reset_password_request DROP FOREIGN KEY FK_7CE748AA76ED395
-        SQL);
-        $this->addSql(<<<'SQL'
-            DROP TABLE reset_password_request
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE monitor CHANGE only_future only_future TINYINT(1) DEFAULT 1 NOT NULL
-        SQL);
-    }
-}

src/Base/ConfigResolver.php

@@ -1,95 +0,0 @@
-<?php
-
-namespace App\Base;
-
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
-
-final class ConfigResolver
-{
-    private array $messages = [];
-
-    public function __construct(
-        #[Autowire(param: 'app.url')]
-        private readonly ?string $appUrl = null,
-
-        #[Autowire(param: 'app.debrid.real_debrid.key')]
-        private readonly ?string $realDebridApiKey = null,
-
-        #[Autowire(param: 'app.meta_provider.tmdb.key')]
-        private readonly ?string $tmdbApiKey = null,
-
-        #[Autowire(param: 'media.movies_path')]
-        private readonly ?string $moviesPath = null,
-
-        #[Autowire(param: 'media.tvshows.path')]
-        private readonly ?string $tvshowsPath = null,
-
-        #[Autowire(param: 'auth.method')]
-        private readonly ?string $authMethod = null,
-
-        #[Autowire(param: 'auth.oidc.well_known_url')]
-        private readonly ?string $authOidcWellKnownUrl = null,
-
-        #[Autowire(param: 'auth.oidc.client_id')]
-        private readonly ?string $authOidcClientId = null,
-
-        #[Autowire(param: 'auth.oidc.client_secret')]
-        private readonly ?string $authOidcClientSecret = null,
-
-        #[Autowire(param: 'auth.oidc.bypass_form_login')]
-        private ?bool $authOidcBypassFormLogin = null,
-    ) {}
-
-    public function validate(): bool
-    {
-        $valid = true;
-
-        if (null === $this->realDebridApiKey || "" === $this->realDebridApiKey) {
-            $this->messages[] = "Your Real Debrid API key is missing. Please set it to the 'REAL_DEBRID_KEY' environment variable.";
-            $valid = false;
-        }
-
-        if (null === $this->tmdbApiKey || "" === $this->tmdbApiKey) {
-            $this->messages[] = "Your TMDB API key is missing. Please set it to the 'TMDB_API' environment variable.";
-            $valid = false;
-        }
-
-        return $valid;
-    }
-
-    public function getMessages(): array
-    {
-        return $this->messages;
-    }
-
-    public function authIs(string $method): bool
-    {
-        if (strtolower($method) === strtolower($this->getAuthMethod())) {
-            return true;
-        }
-        return false;
-    }
-
-    public function getAuthMethod(): string
-    {
-        return strtolower($this->authMethod);
-    }
-
-    public function bypassFormLogin(): bool
-    {
-        return $this->authOidcBypassFormLogin;
-    }
-
-    public function getAuthConfig(): array
-    {
-        return [
-            'method' => $this->authMethod,
-            'oidc' => [
-                'well_known_url' => $this->authOidcWellKnownUrl,
-                'client_id' => $this->authOidcClientId,
-                'client_secret' => $this->authOidcClientSecret,
-                'bypass_form_login' => $this->authOidcBypassFormLogin,
-            ]
-        ];
-    }
-}

src/Base/Framework/Command/UserResetPasswordCommand.php

@@ -1,112 +0,0 @@
-<?php
-
-namespace App\Base\Framework\Command;
-
-use App\User\Framework\Repository\UserRepository;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\Question;
-use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
-
-#[AsCommand(name: 'user:reset-password', description: 'Resets the password for the given user. Requires either the ID or email of the User. You will be asked for the password after running the command.')]
-class UserResetPasswordCommand extends Command
-{
-    private readonly Security $security;
-    private readonly UserRepository $userRepository;
-    private readonly UserPasswordHasherInterface $hasher;
-
-    public function __construct(
-        Security $security,
-        UserRepository $userRepository,
-        UserPasswordHasherInterface $hasher,
-    ) {
-        parent::__construct();
-        $this->security = $security;
-        $this->userRepository = $userRepository;
-        $this->hasher = $hasher;
-    }
-
-    protected function configure(): void
-    {
-        $this
-            ->addOption('id', null, InputOption::VALUE_REQUIRED, 'The ID of the user in the database.')
-            ->addOption('email', null, InputOption::VALUE_REQUIRED, 'The email of the user.')
-        ;
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $io = new SymfonyStyle($input, $output);
-
-        $queryParams = $this->parseInput($input, $io);
-        if ([] === $queryParams) {
-            $io->error('No ID or Email specified. Please run again and pass the "--id" or "--email" option.');
-            return Command::FAILURE;
-        }
-
-        $user = $this->userRepository->findOneBy($queryParams);
-        if (null === $user) {
-            $io->error('No such user exists.');
-            return Command::FAILURE;
-        }
-
-        try {
-            $newPassword = $this->askForPassword($input, $output);
-            $this->updateUsersPassword($user, $newPassword);
-        } catch (\Throwable $exception) {
-            $io->error($exception->getMessage());
-            return Command::FAILURE;
-        }
-
-        $io->success('Success. The password has been reset.');
-
-        return Command::SUCCESS;
-    }
-
-    private function parseInput(InputInterface $input, SymfonyStyle $io): array
-    {
-        if ($input->getOption('id')) {
-            return ['id' => $input->getOption('id')];
-        } elseif ($input->getOption('email')) {
-            return ['email' => $input->getOption('email')];
-        }
-
-        return [];
-    }
-
-    private function askForPassword(InputInterface $input, OutputInterface $output): ?string
-    {
-        $questionHelper = new QuestionHelper();
-        $question = new Question('New password (input is hidden): ')
-            ->setHidden(true)
-            ->setHiddenFallback(false)
-            ->setNormalizer(function (?string $value): string {
-                return $value ?? '';
-            })
-            ->setValidator(function (string $value): string {
-                if ('' === trim($value)) {
-                    throw new \Exception('The password cannot be empty');
-                }
-                return $value;
-            })
-            ->setMaxAttempts(5)
-        ;
-
-        return $questionHelper->ask($input, $output, $question);
-    }
-
-    private function updateUsersPassword(UserInterface $user, string $newPassword): void
-    {
-        $user->setPassword(
-            $this->hasher->hashPassword($user, $newPassword)
-        );
-        $this->userRepository->getEntityManager()->flush();
-    }
-}

src/Base/Util/EpisodeId.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Base\Util;
-
-class EpisodeId
-{
-    public static function fromSeasonEpisodeNumbers(int $season, int $episode): string
-    {
-        return "S". str_pad($season, 2, "0", STR_PAD_LEFT) .
-            "E". str_pad($episode, 2, "0", STR_PAD_LEFT);
-    }
-}

src/Command/ConfigSetCommand.php

@@ -1,17 +1,18 @@
 <?php
 
-namespace App\Base\Framework\Command;
+namespace App\Command;
 
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 #[AsCommand(
     name: 'config:set',
-    description: '[deprecated] This command currently serves no use. It may be re-purposed or removed in the future.',
+    description: 'Add a short description for your command',
 )]
 class ConfigSetCommand extends Command
 {

src/Command/SeedDatabaseCommand.php

@@ -1,12 +1,9 @@
 <?php
 
-namespace App\Base\Framework\Command;
+namespace App\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;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -15,23 +12,20 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 #[AsCommand(
     name: 'db:seed',
-    description: 'Seeds the database with required data. This command is run every time a new container is created from the torsearch-app image and is part of the init process.',
+    description: 'Seed the database with required data.',
 )]
 class SeedDatabaseCommand extends Command
 {
     private PreferencesRepository $preferenceRepository;
     private PreferenceOptionRepository $preferenceOptionRepository;
-    private UserRepository $userRepository;
 
     public function __construct(
         PreferencesRepository $preferenceRepository,
         PreferenceOptionRepository $preferenceOptionRepository,
-        UserRepository $userRepository,
     ) {
         parent::__construct();
         $this->preferenceRepository = $preferenceRepository;
         $this->preferenceOptionRepository = $preferenceOptionRepository;
-        $this->userRepository = $userRepository;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
@@ -40,7 +34,6 @@ class SeedDatabaseCommand extends Command
 
         $this->seedPreferences($io);
         $this->seedPreferenceOptions($io);
-        $this->updateUserPreferences($io);
 
         return Command::SUCCESS;
     }
@@ -51,48 +44,22 @@ class SeedDatabaseCommand extends Command
         $preferences = $this->getPreferences();
 
         foreach ($preferences as $preference) {
-            $isNewRecord = false;
-            $preferenceRecord = $this->preferenceRepository->findOneBy(['id' => $preference['id']]);
-            if (null === $preferenceRecord) {
-                $isNewRecord = true;
-                $preferenceRecord = new Preference();
+            if ($this->preferenceRepository->find($preference['id'])) {
+                continue;
             }
 
-            $preferenceRecord
+            $this->preferenceRepository->getEntityManager()->persist((new \App\User\Framework\Entity\Preference())
                 ->setId($preference['id'])
                 ->setName($preference['name'])
                 ->setDescription($preference['description'])
                 ->setEnabled($preference['enabled'])
-                ->setType($preference['type']);
-
-            if (true === $isNewRecord) {
-                $this->preferenceRepository->getEntityManager()->persist($preferenceRecord);
-            }
+                ->setType($preference['type'])
+            );
         }
 
         $this->preferenceRepository->getEntityManager()->flush();
     }
 
-    private function updateUserPreferences(SymfonyStyle $io)
-    {
-        $io->info('[SeedDatabaseCommand] > Updating user preferences...');
-        $users = $this->userRepository->findAll();
-        $preferences = $this->preferenceRepository->findAll();
-        foreach ($users as $user) {
-            foreach ($preferences as $preference) {
-                if (false === $user->hasUserPreference($preference->getId())) {
-                    $user->addUserPreference(
-                        new UserPreference()
-                            ->setPreference($preference)
-                            ->setUser($user)
-                            ->setPreferenceValue(null)
-                    );
-                }
-            }
-        }
-        $this->userRepository->getEntityManager()->flush();
-    }
-
     private function getPreferences(): array
     {
         return [
@@ -124,13 +91,6 @@ class SeedDatabaseCommand extends Command
                 'enabled' => true,
                 'type' => 'media',
             ],
-            [
-                'id' => 'quality',
-                'name' => 'Quality',
-                'description' => null,
-                'enabled' => true,
-                'type' => 'media',
-            ],
             [
                 'id' => 'movie_folder',
                 'name' => 'Create new folder for Movies',

src/Command/StartupStatusCommand.php

@@ -1,17 +1,19 @@
 <?php
 
-namespace App\Base\Framework\Command;
+namespace App\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 #[AsCommand(
     name: 'startup:status',
-    description: 'Used by the Docker healthcheck system to signal when the container is healthy.',
+    description: 'Add a short description for your command',
 )]
 class StartupStatusCommand extends Command
 {

src/Controller/AlertController.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Base\Framework\Controller;
+namespace App\Controller;
 
-use App\Base\Service\Broadcaster;
+use App\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;

src/Controller/IndexController.php

@@ -1,15 +1,14 @@
 <?php
 
-namespace App\Base\Framework\Controller;
+namespace App\Controller;
 
+use App\Download\Framework\Repository\DownloadRepository;
+use App\Monitor\Action\Command\MonitorTvShowCommand;
 use App\Monitor\Action\Handler\MonitorTvShowHandler;
 use App\Tmdb\Tmdb;
-use 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\Mime\Email;
 use Symfony\Component\Routing\Attribute\Route;
 
 final class IndexController extends AbstractController
@@ -22,8 +21,6 @@ final class IndexController extends AbstractController
     #[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(),
@@ -32,20 +29,10 @@ final class IndexController extends AbstractController
         ]);
     }
 
-    #[Route('/email')]
-    public function sendEmail(MailerInterface $mailer): Response
+    #[Route('/test', name: 'app_test')]
+    public function test()
     {
-        $email = (new Email())
-            ->to('brock@caldwell.digital')
-            ->subject('Time for Symfony Mailer!')
-            ->text('Sending emails is fun again!')
-            ->html('<p>See Twig integration for better HTML integration!</p>');
-
-        $mailer->send($email);
-
-        return $this->json([
-            'success' => true,
-            'message' => 'Email sent!'
-        ]);
+        $result = $this->monitorTvShowHandler->handle(new MonitorTvShowCommand(355));
+        return $this->json($result);
     }
 }

src/Controller/SearchController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Search\Framework\Controller;
+namespace App\Controller;
 
 use App\Search\Action\Handler\GetMediaInfoHandler;
 use App\Search\Action\Handler\SearchHandler;
@@ -14,7 +14,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
-final class WebController extends AbstractController
+final class SearchController extends AbstractController
 {
     public function __construct(
         private SearchHandler $searchHandler,
@@ -37,8 +37,7 @@ final class WebController extends AbstractController
     public function result(
         GetMediaInfoInput $input,
         ?int $season = null,
-    ): Response
-    {
+    ): Response {
         $result = $this->getMediaInfoHandler->handle($input->toCommand());
 
         return $this->render('search/result.html.twig', [
@@ -53,4 +52,32 @@ final class WebController extends AbstractController
             ]
         ]);
     }
+
+    private function warmDownloadOptionCache(TmdbResult $result)
+    {
+        if ($result->mediaType === 'tvshows') {
+            // dispatches a job to get the download options
+            // for each episode and load them in cache
+            foreach ($result->episodes as $season => $episodes) {
+                // Only do the first 2 seasons, so we reduce
+                // getting rate-limited by Torrentio
+                if ($season > 2) {
+                    return;
+                }
+                foreach ($episodes as $episode) {
+                    $this->bus->dispatch(new GetTvShowOptionsCommand(
+                        tmdbId: $result->tmdbId,
+                        imdbId: $result->imdbId,
+                        season: $season,
+                        episode: $episode['episode_number'],
+                    ));
+                }
+            }
+        } elseif ($result->mediaType === 'movies') {
+            $this->bus->dispatch(new GetMovieOptionsCommand(
+                $result->tmdbId,
+                $result->imdbId,
+            ));
+        }
+    }
 }

src/Controller/TorrentioController.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Controller;
+
+use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
+use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
+use App\Torrentio\Action\Input\GetMovieOptionsInput;
+use App\Torrentio\Action\Input\GetTvShowOptionsInput;
+use App\Torrentio\Exception\TorrentioRateLimitException;
+use App\Util\Broadcaster;
+use Carbon\Carbon;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Cache\ItemInterface;
+use Symfony\Contracts\Cache\TagAwareCacheInterface;
+
+final class TorrentioController extends AbstractController
+{
+    public function __construct(
+        private readonly GetMovieOptionsHandler $getMovieOptionsHandler,
+        private readonly GetTvShowOptionsHandler $getTvShowOptionsHandler,
+        private readonly Broadcaster $broadcaster,
+    ) {}
+
+    #[Route('/torrentio/movies/{tmdbId}/{imdbId}', name: 'app_torrentio_movies')]
+    public function movieOptions(GetMovieOptionsInput $input, TagAwareCacheInterface $pageCache): Response
+    {
+        $cacheId = sprintf(
+            "page.torrentio.movies.%s.%s",
+            $input->tmdbId,
+            $input->imdbId
+        );
+
+        try {
+            return $pageCache->get($cacheId, function (ItemInterface $item) use ($input) {
+                $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+                $item->tag(['page', 'page.torrentio', 'page.torrentio.movies', "page.torrentio.movies.$input->tmdbId.$input->imdbId", 'torrentio', 'torrentio.movies', "torrentio.movies.$input->tmdbId.$input->imdbId"]);
+                $results = $this->getMovieOptionsHandler->handle($input->toCommand());
+                return $this->render('torrentio/movies.html.twig', [
+                    'results' => $results,
+                ]);
+            });
+        } catch (TorrentioRateLimitException $exception) {
+            $this->broadcaster->alert('Warning', 'Torrentio has rate limited your requests. Please wait a few minutes before trying again.', 'warning');
+            return $this->render('bare.html.twig',
+                [],
+                new Response('Too many requests',
+                    Response::HTTP_TOO_MANY_REQUESTS,
+                    ['Retry-After' => 4000]
+                )
+            );
+        }
+    }
+
+    #[Route('/torrentio/tvshows/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_torrentio_tvshows')]
+    public function tvShowOptions(GetTvShowOptionsInput $input, TagAwareCacheInterface $pageCache): Response
+    {
+        $cacheId = sprintf(
+            "page.torrentio.tvshows.%s.%s.%s.%s",
+            $input->tmdbId,
+            $input->imdbId,
+            $input->season,
+            $input->episode,
+        );
+
+        try {
+            return $pageCache->get($cacheId, function (ItemInterface $item) use ($input) {
+                $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+                $item->tag(['page', 'page.torrentio', 'page.torrentio.tvshows', "page.torrentio.tvshows.$input->tmdbId.$input->imdbId", "page.torrentio.tvshows.$input->tmdbId.$input->imdbId.$input->season", "page.torrentio.tvshows.$input->tmdbId.$input->imdbId.$input->season.$input->episode", 'torrentio', 'torrentio.tvshows', "torrentio.tvshows.$input->tmdbId.$input->imdbId", "torrentio.tvshows.$input->tmdbId.$input->imdbId.$input->season", "torrentio.tvshows.$input->tmdbId.$input->imdbId.$input->season.$input->episode", $input->imdbId, $input->tmdbId]);
+                $results = $this->getTvShowOptionsHandler->handle($input->toCommand());
+                return $this->render('torrentio/tvshows.html.twig', [
+                    'results' => $results,
+                ]);
+            });
+        } catch (TorrentioRateLimitException $exception) {
+            $this->broadcaster->alert('Warning', 'Torrentio has rate limited your requests. Please wait a few minutes before trying again.', 'warning');
+            return $this->render('bare.html.twig',
+                [],
+                new Response('Too many requests',
+                    Response::HTTP_TOO_MANY_REQUESTS,
+                    ['Retry-After' => 4000]
+                )
+            );
+        }
+    }
+
+    #[Route('/torrentio/tvshows/clear/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_clear_torrentio_tvshows')]
+    public function clearTvShowOptions(GetTvShowOptionsInput $input, CacheInterface $cache, Request $request): Response
+    {
+        $cacheId = sprintf(
+            "page.torrentio.tvshows.%s.%s.%s.%s",
+            $input->tmdbId,
+            $input->imdbId,
+            $input->season,
+            $input->episode,
+        );
+        $cache->delete($cacheId);
+
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: 'Torrentio cache Cleared.'
+        );
+
+        return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
+            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+            $results = $this->getTvShowOptionsHandler->handle($input->toCommand());
+            return $this->render('torrentio/tvshows.html.twig', [
+                'results' => $results,
+            ]);
+        });
+    }
+}

src/Download/Action/Command/DownloadSeasonCommand.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Download\Action\Command;
-
-use OneToMany\RichBundle\Contract\CommandInterface;
-
-/**
- * @implements CommandInterface<DownloadSeasonCommand>
- */
-class DownloadSeasonCommand implements CommandInterface
-{
-    public function __construct(
-        public int $userId,
-        public int $season,
-        public string $imdbId,
-        public string $mediaType = 'tvshows',
-    ) {}
-}

src/Download/Action/Handler/DownloadSeasonHandler.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Download\Action\Handler;
-
-use Aimeos\Map;
-use App\Base\Service\MediaFiles;
-use App\Download\Action\Command\DownloadMediaCommand;
-use App\Download\Action\Command\DownloadSeasonCommand;
-use App\Download\Action\Result\DownloadMediaResult;
-use App\Download\Action\Result\DownloadSeasonResult;
-use App\Download\DownloadOptionEvaluator;
-use App\Tmdb\Tmdb;
-use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
-use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
-use App\User\Dto\UserPreferencesFactory;
-use App\User\Framework\Repository\UserRepository;
-use Nihilarr\PTN;
-use OneToMany\RichBundle\Contract\CommandInterface;
-use OneToMany\RichBundle\Contract\HandlerInterface;
-use OneToMany\RichBundle\Contract\ResultInterface;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
-
-/** @implements HandlerInterface<DownloadSeasonCommand, DownloadMediaResult> */
-readonly class DownloadSeasonHandler implements HandlerInterface
-{
-    public function __construct(
-        private MediaFiles $mediaFiles,
-        private LoggerInterface $logger,
-        private Tmdb $tmdb,
-        private MessageBusInterface $bus,
-        private DownloadOptionEvaluator $downloadOptionEvaluator,
-        private GetTvShowOptionsHandler $getTvShowOptionsHandler,
-        private UserRepository $userRepository,
-    ) {}
-
-    public function handle(CommandInterface $command): ResultInterface
-    {
-        $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]);
-        $this->logger->info('> [DownloadTvSeasonHandler] ...Found ' . count($episodesInSeason) . ' episodes in season ' . $command->season);
-
-        $downloadCommands = [];
-        foreach ($episodesInSeason as $episode) {
-            $this->logger->info('> [DownloadTvSeasonHandler] ...Evaluating episode ' . $episode['episode_number']);
-
-            $results = $this->getTvShowOptionsHandler->handle(
-                new GetTvShowOptionsCommand(
-                    $series->tmdbId,
-                    $command->imdbId,
-                    $command->season,
-                    $episode['episode_number']
-                )
-            );
-
-            $this->logger->info('> [DownloadTvSeasonHandler] ......Found ' . count($results->results) . ' total download options, beginning evaluation');
-
-            $userPreferences = UserPreferencesFactory::createFromUser(
-                $this->userRepository->findOneBy(['id' => $command->userId])
-            );
-
-            $result = $this->downloadOptionEvaluator->evaluateOptions($results->results, $userPreferences);
-
-            if (null !== $result) {
-                $this->logger->info('> [DownloadTvSeasonHandler] ......Found 1 matching result');
-                $this->logger->info('> [DownloadTvSeasonHandler] ......Dispatching DownloadMediaCommand for "' . $series->title . '" season ' . $command->season . ' episode ' . $episode['episode_number']);
-                $downloadCommand = new DownloadMediaCommand(
-                    $result->url,
-                    $series->title,
-                    $result->filename,
-                    'tvshows',
-                    $command->imdbId,
-                    $command->userId,
-                );
-                $this->bus->dispatch($downloadCommand);
-                $downloadCommands[] = $downloadCommand;
-            } else {
-                $this->logger->info('> [DownloadTvSeasonHandler] ......Found 0 matching results');
-            }
-        }
-
-        return new DownloadSeasonResult(
-            status: 200,
-            message: 'Success',
-            data: ['downloads' => $downloadCommands],
-        );
-    }
-
-    private function getDownloadedEpisodes(string $title)
-    {
-        // Check current episodes
-        $downloadedEpisodes = $this->mediaFiles
-            ->getEpisodes($title)
-            ->map(fn($episode) => (object) (new PTN())->parse($episode))
-            ->filter(fn ($episode) =>
-                property_exists($episode, 'episode')
-                && property_exists($episode, 'season')
-                && null !== $episode->episode
-                && null !== $episode->season
-            )
-            ->rekey(fn($episode) => $episode->episode);
-        $this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
-    }
-}

src/Download/Action/Input/DownloadSeasonInput.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Download\Action\Input;
-
-use App\Download\Action\Command\DownloadMediaCommand;
-use App\Download\Action\Command\DownloadSeasonCommand;
-use OneToMany\RichBundle\Attribute\SourceRequest;
-use OneToMany\RichBundle\Attribute\SourceRoute;
-use OneToMany\RichBundle\Contract\CommandInterface;
-use OneToMany\RichBundle\Contract\InputInterface;
-
-/** @implements InputInterface<DownloadSeasonInput> */
-class DownloadSeasonInput implements InputInterface
-{
-    public function __construct(
-        #[SourceRoute('imdbId')]
-        public string $imdbId,
-
-        #[SourceRoute('season')]
-        public int $season,
-
-        #[SourceRequest('mediaType')]
-        public string $mediaType = 'tvshows',
-
-        public ?int $userId = null,
-    ) {}
-
-    public function toCommand(): CommandInterface
-    {
-        return new DownloadSeasonCommand(
-            $this->userId,
-            $this->season,
-            $this->imdbId,
-            $this->mediaType,
-        );
-    }
-}

src/Download/Action/Result/DownloadSeasonResult.php

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

src/Download/Downloader/ProcessDownloader.php

@@ -2,8 +2,8 @@
 
 namespace App\Download\Downloader;
 
-use App\Base\Service\MediaFiles;
 use App\Download\Framework\Entity\Download;
+use App\Monitor\Service\MediaFiles;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Process\Exception\ProcessFailedException;
@@ -15,6 +15,7 @@ class ProcessDownloader implements DownloaderInterface
     /**
      * @var RedisAdapter $cache
      */
+
     public function __construct(
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
@@ -33,11 +34,11 @@ class ProcessDownloader implements DownloaderInterface
         $downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
         $path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
 
-        $processArgs = ['wget', '-O', $downloadEntity->getFilename(), $url];
+        $processArgs = ['wget', $url];
 
         if ($downloadEntity->getStatus() === 'Paused') {
             $downloadEntity->setStatus('In Progress');
-            $processArgs = ['wget', '-c', '-O', $downloadEntity->getFilename(), $url];
+            $processArgs = ['wget', '-c', $url];
         } else {
             $downloadEntity->setProgress(0);
         }

src/Download/Framework/Controller/ApiController.php

@@ -2,16 +2,16 @@
 
 namespace App\Download\Framework\Controller;
 
-use App\Base\Service\Broadcaster;
 use App\Download\Action\Handler\DeleteDownloadHandler;
 use App\Download\Action\Handler\PauseDownloadHandler;
 use App\Download\Action\Handler\ResumeDownloadHandler;
 use App\Download\Action\Input\DeleteDownloadInput;
 use App\Download\Action\Input\DownloadMediaInput;
-use App\Download\Action\Input\DownloadSeasonInput;
 use App\Download\Action\Input\PauseDownloadInput;
 use App\Download\Action\Input\ResumeDownloadInput;
 use App\Download\Framework\Repository\DownloadRepository;
+use App\Util\Broadcaster;
+use Nihilarr\PTN;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -29,6 +29,13 @@ class ApiController extends AbstractController
     public function download(
         DownloadMediaInput $input,
     ): Response {
+        $ptn = (object) new Ptn()->parse($input->filename);
+        if ($input->mediaType === "tvshows" &&
+            !property_exists($ptn, 'episode') && !property_exists($ptn, 'season')
+        ) {
+            $input->filename = $input->episodeId . '_' . $input->filename;
+        }
+
         $download = $this->downloadRepository->insert(
             $this->getUser(),
             $input->url,
@@ -36,8 +43,10 @@ class ApiController extends AbstractController
             $input->filename,
             $input->imdbId,
             $input->mediaType,
-            $input->episodeId,
+            "",
         );
+        $this->downloadRepository->getEntityManager()->persist($download);
+        $this->downloadRepository->getEntityManager()->flush();
         $input->downloadId = $download->getId();
         $input->userId = $this->getUser()->getId();
 
@@ -96,18 +105,4 @@ class ApiController extends AbstractController
 
         return $this->json(['status' => 200, 'message' => 'Download Resumed']);
     }
-
-    #[Route('/api/download/season/{imdbId}/{season}', name: 'api_download_season', methods: ['GET'])]
-    public function downloadSeason(
-        DownloadSeasonInput $input,
-    ): Response {
-        $input->userId = $this->getUser()->getId();
-        $this->bus->dispatch($input->toCommand());
-        $this->broadcaster->alert(
-            title: 'Success',
-            message: "Your download for season $input->season has been added to the queue.",
-        );
-
-        return $this->json(['status' => 200, 'message' => 'Download Resumed']);
-    }
 }

src/Download/Framework/Entity/Download.php

@@ -42,7 +42,7 @@ class Download
     private ?int $progress = null;
 
     #[ORM\Column(length: 255, nullable: true)]
-    private ?string $episodeId = null;
+    private ?string $batchId = null;
 
     #[ORM\ManyToOne(inversedBy: 'downloads')]
     private ?User $user = null;
@@ -143,14 +143,14 @@ class Download
         return $this;
     }
 
-    public function getEpisodeId(): ?string
+    public function getBatchId(): ?string
     {
-        return $this->episodeId;
+        return $this->batchId;
     }
 
-    public function setEpisodeId(?string $episodeId): static
+    public function setBatchId(?string $batchId): static
     {
-        $this->episodeId = $episodeId;
+        $this->batchId = $batchId;
 
         return $this;
     }

src/Download/Framework/Repository/DownloadRepository.php

@@ -2,12 +2,11 @@
 
 namespace App\Download\Framework\Repository;
 
-use App\Base\Util\Paginator;
 use App\Download\Framework\Entity\Download;
 use App\User\Framework\Entity\User;
+use App\Util\Paginator;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
-use Nihilarr\PTN;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
@@ -63,15 +62,9 @@ class DownloadRepository extends ServiceEntityRepository
         string $filename,
         string $imdbId,
         string $mediaType,
-        ?string $episodeId = null,
+        string $batchId,
         string $status = 'New'
     ): Download {
-        $ptn = (object) new Ptn()->parse($filename);
-        if ($mediaType === "tvshows" &&
-            !property_exists($ptn, 'episode') && !property_exists($ptn, 'season')
-        ) {
-            $filename = $episodeId . '_' . $filename;
-        }
         /** @var User $user */
         $download = (new Download())
             ->setUser($user)
@@ -80,7 +73,7 @@ class DownloadRepository extends ServiceEntityRepository
             ->setFilename($filename)
             ->setImdbId($imdbId)
             ->setMediaType($mediaType)
-            ->setEpisodeId($episodeId)
+            ->setBatchId($batchId)
             ->setProgress(0)
             ->setStatus($status);
 

src/Enum/MediaType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Enum;
+namespace App\Enum;
 
 enum MediaType: string
 {

src/Library/Action/Command/LibrarySearchCommand.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Library\Action\Command;
-
-use OneToMany\RichBundle\Contract\CommandInterface;
-
-class LibrarySearchCommand implements CommandInterface
-{
-    public function __construct(
-        public ?string $term = null,
-        public ?string $title = null,
-        public ?string $imdbId = null,
-        public ?string $season = null,
-        public ?string $episode = null,
-    ) {}
-}

src/Library/Action/Handler/LibrarySearchHandler.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Library\Action\Handler;
-
-use App\Base\Service\MediaFiles;
-use App\Library\Action\Command\LibrarySearchCommand;
-use App\Library\Action\Result\LibrarySearchResult;
-use App\Library\Dto\MediaFileDto;
-use Nihilarr\PTN;
-use OneToMany\RichBundle\Contract\CommandInterface;
-use OneToMany\RichBundle\Contract\HandlerInterface;
-use OneToMany\RichBundle\Contract\ResultInterface;
-
-/**
- * @implements HandlerInterface<LibrarySearchCommand,LibrarySearchHandler>
- */
-class LibrarySearchHandler implements HandlerInterface
-{
-    private array $searchTypes = [
-        'episode_by_title' => 'episodeByTitle',
-        'movie_by_title' => 'movieByTitle',
-    ];
-
-    public function __construct(
-        private readonly MediaFiles $mediaFiles,
-    ) {}
-
-    public function handle(CommandInterface $command): ResultInterface
-    {
-        $searchType = $this->getSearchType($command);
-        $function   = $this->searchTypes[$searchType];
-        return $this->$function($command);
-    }
-
-    private function getSearchType(CommandInterface $command): ?string
-    {
-        if (!is_null($command->title) &&
-            is_null($command->imdbId) &&
-            is_null($command->season) &&
-            is_null($command->episode)
-        ) {
-            return 'movie_by_title';
-        }
-
-        if ((!is_null($command->title) || is_null($command->imdbId)) &&
-            !is_null($command->season) &&
-            !is_null($command->episode)
-        ) {
-            return 'episode_by_title';
-        }
-        return null;
-    }
-
-    private function episodeByTitle(CommandInterface $command): ?LibrarySearchResult
-    {
-        $result = $this->mediaFiles->episodeExists(
-            $command->title,
-            (int) $command->season,
-            (int) $command->episode,
-        );
-        $exists =  $result instanceof \SplFileInfo;
-
-        return new LibrarySearchResult(
-            input: $command,
-            exists: $exists,
-            file: true === $exists ? MediaFileDto::fromSplFileInfo($result) : null,
-            ptn: true === $exists ? (object) new PTN()->parse($result->getFilename()) : null,
-        );
-    }
-
-    private function movieByTitle(CommandInterface $command): ?LibrarySearchResult
-    {
-        $result = $this->mediaFiles->movieExists($command->title);
-        $exists =  $result instanceof \SplFileInfo;
-
-        return new LibrarySearchResult(
-            input: $command,
-            exists: $exists,
-            file: true === $exists ? MediaFileDto::fromSplFileInfo($result) : null,
-            ptn: true === $exists ? (object) new PTN()->parse($result->getFilename()) : null,
-        );
-    }
-}

src/Library/Action/Input/LibrarySearchInput.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Library\Action\Input;
-
-use App\Library\Action\Command\LibrarySearchCommand;
-use OneToMany\RichBundle\Attribute\SourceQuery;
-use OneToMany\RichBundle\Contract\CommandInterface;
-use OneToMany\RichBundle\Contract\InputInterface;
-
-/**
- * @implements InputInterface<LibrarySearchInput, LibrarySearchCommand>
- */
-class LibrarySearchInput implements InputInterface
-{
-    public function __construct(
-        #[SourceQuery('term', nullify: true)]
-        private ?string $term = null,
-        #[SourceQuery('title', nullify: true)]
-        private ?string $title = null,
-        #[SourceQuery('imdbId', nullify: true)]
-        private ?string $imdbId = null,
-        #[SourceQuery('season', nullify: true)]
-        private ?string $season = null,
-        #[SourceQuery('episode', nullify: true)]
-        private ?string $episode = null,
-    ) {}
-
-    public function toCommand(): CommandInterface
-    {
-        return new LibrarySearchCommand(
-            term: $this->term,
-            title: $this->title,
-            imdbId: $this->imdbId,
-            season: $this->season,
-            episode: $this->episode,
-        );
-    }
-}

src/Library/Action/Result/LibrarySearchResult.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Library\Action\Result;
-
-use App\Library\Dto\MediaFileDto;
-use OneToMany\RichBundle\Contract\ResultInterface;
-
-class LibrarySearchResult implements ResultInterface
-{
-    public function __construct(
-        public object|array $input,
-        public bool $exists,
-        public ?MediaFileDto $file = null,
-        public ?object $ptn = null,
-    ) {}
-}

src/Library/Dto/MediaFileDto.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Library\Dto;
-
-readonly class MediaFileDto
-{
-    public function __construct(
-        public string $path,
-        public string $filename,
-        public string $extension,
-        public string $size,
-    ) {}
-
-    public static function fromSplFileInfo(\SplFileInfo $fileInfo): self
-    {
-        return new static(
-            path: $fileInfo->getRealPath(),
-            filename: $fileInfo->getFilename(),
-            extension: $fileInfo->getExtension(),
-            size: $fileInfo->getSize(),
-        );
-    }
-}

src/Library/Framework/Controller/Api.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Library\Framework\Controller;
-
-use App\Library\Action\Handler\LibrarySearchHandler;
-use App\Library\Action\Input\LibrarySearchInput;
-use App\Library\Action\Result\LibrarySearchResult;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Attribute\Route;
-use Symfony\UX\Turbo\TurboBundle;
-
-class Api extends AbstractController
-{
-    #[Route('/api/library/search', name: 'api.library.search', methods: ['GET'])]
-    public function search(LibrarySearchInput $input, LibrarySearchHandler $handler, Request $request): Response
-    {
-        $result = $handler->handle($input->toCommand());
-
-        if ($request->headers->get('Turbo-Frame')) {
-            return $this->sendFragmentResponse($result, $request);
-        }
-
-        return $this->json($handler->handle($input->toCommand()));
-    }
-
-    private function sendFragmentResponse(LibrarySearchResult $result, Request $request): Response
-    {
-        $request->setRequestFormat(TurboBundle::STREAM_FORMAT);
-        return $this->renderBlock(
-            'search/fragments.html.twig',
-            $request->query->get('block'),
-            [
-                'result' => $result,
-                'target' => $request->query->get('target')
-            ]
-        );
-    }
-}

src/Monitor/Action/Handler/MonitorMovieHandler.php

@@ -25,6 +25,7 @@ readonly class MonitorMovieHandler implements HandlerInterface
     public function __construct(
         private MonitorRepository $movieMonitorRepository,
         private GetMovieOptionsHandler $getMovieOptionsHandler,
+        private MonitorOptionEvaluator $monitorOptionEvaluator,
         private EntityManagerInterface $entityManager,
         private MessageBusInterface $bus,
         private LoggerInterface $logger,

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -2,18 +2,15 @@
 
 namespace App\Monitor\Action\Handler;
 
-use App\Base\Util\EpisodeId;
 use App\Download\Action\Command\DownloadMediaCommand;
-use App\Download\DownloadOptionEvaluator;
-use App\Download\Framework\Entity\Download;
-use App\Download\Framework\Repository\DownloadRepository;
 use App\Monitor\Action\Command\MonitorMovieCommand;
+use App\Monitor\Action\Result\MonitorMovieResult;
 use App\Monitor\Action\Result\MonitorTvEpisodeResult;
 use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Monitor\Service\MonitorOptionEvaluator;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
-use App\User\Dto\UserPreferencesFactory;
 use Carbon\Carbon;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
@@ -28,84 +25,68 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
 {
     public function __construct(
         private GetTvShowOptionsHandler $getTvShowOptionsHandler,
-        private DownloadOptionEvaluator $downloadOptionEvaluator,
+        private MonitorOptionEvaluator $monitorOptionEvaluator,
         private EntityManagerInterface $entityManager,
         private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
         private Tmdb $tmdb,
-        private DownloadRepository $downloadRepository,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        try {
-            $monitor = $this->monitorRepository->find($command->movieMonitorId);
-            $this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler for ' . $monitor->getTitle() . ' season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode());
+        $this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler');
+        $monitor = $this->monitorRepository->find($command->movieMonitorId);
 
-            $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
-            if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::today('UTC')) {
-                $this->logger->info('> [MonitorTvEpisodeHandler] ...Episode has not aired yet, skipping for now');
-                return new MonitorTvEpisodeResult(
-                    status: 'OK',
-                    result: [
-                        'message' => 'No change',
-                        'monitor' => $monitor,
-                    ]
-                );
-            }
-
-            $monitor->setStatus('In Progress');
-            $this->monitorRepository->getEntityManager()->flush();
-
-            $results = $this->getTvShowOptionsHandler->handle(
-                new GetTvShowOptionsCommand(
-                    $monitor->getTmdbId(),
-                    $monitor->getImdbId(),
-                    $monitor->getSeason(),
-                    $monitor->getEpisode()
-                )
+        $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
+        if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::now()) {
+            $this->logger->info('> [MonitorTvEpisodeHandler] Episode has not aired yet, skipping for now');
+            return new MonitorTvEpisodeResult(
+                status: 'OK',
+                result: [
+                    'message' => 'No change',
+                    'monitor' => $monitor,
+                ]
             );
+        }
 
-            $this->logger->info('> [MonitorTvEpisodeHandler] ...Found ' . count($results->results) . ' total download options, beginning evaluation');
+        $monitor->setStatus('In Progress');
+        $this->monitorRepository->getEntityManager()->flush();
 
-            $result = $this->downloadOptionEvaluator->evaluateOptions($results->results, UserPreferencesFactory::createFromUser($monitor->getUser()));
+        $this->logger->info('> [MonitorTvEpisodeHandler] Searching for "' . $monitor->getTitle() . '" season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode() . ' download options');
+        $results = $this->getTvShowOptionsHandler->handle(
+            new GetTvShowOptionsCommand(
+                $monitor->getTmdbId(),
+                $monitor->getImdbId(),
+                $monitor->getSeason(),
+                $monitor->getEpisode()
+            )
+        );
 
-            if (null !== $result) {
-                $this->logger->info('> [MonitorTvEpisodeHandler] ...Found 1 matching result found: dispatching DownloadMediaCommand for "' . $result->title . '"');
-                $download = $this->downloadRepository->insert(
-                    user: $monitor->getUser(),
-                    url: $result->url,
-                    title: $monitor->getTitle(),
-                    filename: $result->filename,
-                    imdbId: $monitor->getImdbId(),
-                    mediaType: 'tvshows',
-                    episodeId: EpisodeId::fromSeasonEpisodeNumbers($monitor->getSeason(), $monitor->getEpisode()),
-                );
-                $this->bus->dispatch(new DownloadMediaCommand(
-                    $download->getUrl(),
-                    $download->getTitle(),
-                    $download->getFilename(),
-                    'tvshows',
-                    $download->getImdbId(),
-                    $monitor->getUser()->getId(),
-                    $download->getId(),
-                ));
-                $monitor->setStatus('Complete');
-                $monitor->setDownloadedAt(new DateTimeImmutable());
-            } else {
-                $this->logger->info('> [MonitorTvEpisodeHandler] ...Found 0 matching results found, monitor will run at next interval');
-                $monitor->setStatus('Active');
-            }
-        } catch (\Throwable $exception) {
-            $this->logger->error('> [MonitorTvEpisodeHandler] ...Exception thrown: ' . $exception->getMessage());
-            $this->logger->error($exception->getMessage());
+        $this->logger->info('> [MonitorTvEpisodeHandler] Found ' . count($results->results) . ' download options');
+
+        $result = $this->monitorOptionEvaluator->evaluateOptions($monitor, $results->results);
+
+        if (null !== $result) {
+            $this->logger->info('> [MonitorTvEpisodeHandler] 1 matching result found: dispatching DownloadMediaCommand for "' . $result->title . '"');
+            $this->bus->dispatch(new DownloadMediaCommand(
+                $result->url,
+                $monitor->getTitle(),
+                $result->filename,
+                'tvshows',
+                $monitor->getImdbId(),
+                $monitor->getUser()->getId(),
+            ));
+            $monitor->setStatus('Complete');
+            $monitor->setDownloadedAt(new DateTimeImmutable());
+        } else {
+            $this->logger->info('> [MonitorTvEpisodeHandler] 0 matching results found, monitor will run at next interval');
             $monitor->setStatus('Active');
         }
 
         $monitor->setLastSearch(new DateTimeImmutable());
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
-        $this->monitorRepository->getEntityManager()->flush();
+        $this->entityManager->flush();
 
         return new MonitorTvEpisodeResult(
             status: 'OK',

src/Monitor/Action/Handler/MonitorTvSeasonHandler.php

@@ -3,12 +3,12 @@
 namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
-use App\Base\Service\MediaFiles;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
 use App\Monitor\Action\Command\MonitorTvSeasonCommand;
 use App\Monitor\Action\Result\MonitorTvSeasonResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -3,12 +3,12 @@
 namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
-use App\Base\Service\MediaFiles;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 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\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use Carbon\Carbon;
 use DateTimeImmutable;
@@ -61,27 +61,26 @@ readonly class MonitorTvShowHandler implements HandlerInterface
             // 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'));
+                $this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
                 if (false === $episodeInFuture) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for title: ' . 'for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ', skipping');
                     continue;
                 }
 
                 // Check if the episode is already downloaded
                 $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
-                $this->logger->info('> [MonitorTvShowHandler] ...Episode exists? ' . (true === $episodeExists ? 'YES' : 'NO'));
+                $this->logger->info('> [MonitorTvShowHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
                 if (true === $episodeExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] Episode exists for title: ' . $monitor->getTitle() . ', skipping');
                     continue;
                 }
 
                 // Check for existing monitors
                 $monitorExists = $this->monitorExists($monitor, $episode);
-                $this->logger->info('> [MonitorTvShowHandler] ...Monitor exists? ' . (true === $monitorExists ? 'YES' : 'NO'));
+                $this->logger->info('> [MonitorTvShowHandler] Monitor exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $monitorExists ? 'YES' : 'NO'));
                 if (true === $monitorExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] Monitor exists for title: ' . $monitor->getTitle() . ', skipping');
                     continue;
                 }
 
@@ -107,7 +106,7 @@ readonly class MonitorTvShowHandler implements HandlerInterface
                 // Immediately run the monitor
                 $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
                 $this->monitorTvEpisodeHandler->handle($command);
-                $this->logger->info('> [MonitorTvShowHandler] ...Dispatching MonitorTvEpisodeCommand');
+                $this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
             }
         }
 

src/Monitor/Framework/Controller/ApiController.php

@@ -2,14 +2,12 @@
 
 namespace App\Monitor\Framework\Controller;
 
-use App\Base\Service\Broadcaster;
 use App\Monitor\Action\Handler\AddMonitorHandler;
 use App\Monitor\Action\Handler\DeleteMonitorHandler;
 use App\Monitor\Action\Input\AddMonitorInput;
 use App\Monitor\Action\Input\DeleteMonitorInput;
-use App\Monitor\Framework\Scheduler\MonitorDispatcher;
+use App\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mercure\HubInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
@@ -52,17 +50,4 @@ class ApiController extends AbstractController
             'message' => $response
         ]);
     }
-
-    #[Route('/api/monitor/dispatch', name: 'api_monitor_dispatch', methods: ['GET'])]
-    public function dispatch(MonitorDispatcher $dispatcher, Broadcaster $broadcaster): Response
-    {
-        $dispatcher();
-
-        $broadcaster->alert('Success', 'The monitor job has been dispatched.');
-
-        return $this->json([
-            'status' => 200,
-            'message' => 'Manually dispatched MonitorDispatcher'
-        ]);
-    }
 }

src/Monitor/Framework/Entity/Monitor.php

@@ -4,7 +4,6 @@ namespace App\Monitor\Framework\Entity;
 
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\User\Framework\Entity\User;
-use Carbon\Carbon;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
@@ -50,9 +49,6 @@ class Monitor
     #[ORM\Column(nullable: true)]
     private ?int $searchCount = null;
 
-    #[ORM\Column]
-    private bool $onlyFuture = true;
-
     #[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: true)]
     private ?\DateTimeInterface $lastSearch = null;
 
@@ -150,14 +146,9 @@ class Monitor
         return $this;
     }
 
-    public function isOnlyFuture(): bool
-    {
-        return $this->onlyFuture;
-    }
-
     public function getLastSearch(): ?\DateTimeInterface
     {
-        return Carbon::parse($this->lastSearch);
+        return $this->lastSearch;
     }
 
     public function setLastSearch(?\DateTimeInterface $lastSearch): static

src/Monitor/Framework/Repository/MonitorRepository.php

@@ -2,8 +2,8 @@
 
 namespace App\Monitor\Framework\Repository;
 
-use App\Base\Util\Paginator;
 use App\Monitor\Framework\Entity\Monitor;
+use App\Util\Paginator;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Security\Core\User\UserInterface;

src/Monitor/Framework/Scheduler/MonitorDispatcher.php

@@ -7,7 +7,6 @@ use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
 use App\Monitor\Action\Command\MonitorTvSeasonCommand;
 use App\Monitor\Action\Command\MonitorTvShowCommand;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use Carbon\Carbon;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Scheduler\Attribute\AsCronTask;
@@ -24,8 +23,6 @@ class MonitorDispatcher
     public function __invoke() {
         $this->logger->info('[MonitorDispatcher] Executing MonitorDispatcher');
 
-        $this->cleanupStuckMonitors();
-
         $monitorHandlers = [
             'movie' => MonitorMovieCommand::class,
             'tvepisode' => MonitorTvEpisodeCommand::class,
@@ -44,18 +41,4 @@ class MonitorDispatcher
             $this->bus->dispatch(new $command($monitor->getId()));
         }
     }
-
-    private function cleanupStuckMonitors(): void
-    {
-        $hoursStuck = 4;
-        $monitors = $this->monitorRepository->findBy(['status' => 'In Progress']);
-        foreach ($monitors as $monitor) {
-            // Reset the status to active so it will be executed again
-            if ($monitor->getLastSearch()->diffInHours(Carbon::today()) > $hoursStuck) {
-                $this->logger->info('[MonitorDispatcher] Cleaning up monitor: ' . $monitor->getId() . ' (' . $monitor->getTitle() . '), resetting status to \'Active\' from \''. $monitor->getStatus() .'\' after being stuck for ' . $hoursStuck  . ' hours.');
-                $monitor->setStatus('Active');
-            }
-        }
-        $this->monitorRepository->getEntityManager()->flush();
-    }
 }

src/Monitor/Service/MediaFiles.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Service;
+namespace App\Monitor\Service;
 
 use Aimeos\Map;
 use App\Download\Framework\Entity\Download;
@@ -140,7 +140,7 @@ class MediaFiles
         return $path;
     }
 
-    public function episodeExists(string $tvshowTitle, int $seasonNumber, int $episodeNumber): SplFileInfo|false
+    public function episodeExists(string $tvshowTitle, int $seasonNumber, int $episodeNumber)
     {
         $existingEpisodes = $this->getEpisodes($tvshowTitle, false);
 

src/Monitor/Service/MonitorOptionEvaluator.php

@@ -1,13 +1,12 @@
 <?php
 
-namespace App\Download;
+namespace App\Monitor\Service;
 
 use Aimeos\Map;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Torrentio\Result\TorrentioResult;
-use App\User\Dto\UserPreferences;
 
-class DownloadOptionEvaluator
+class MonitorOptionEvaluator
 {
     /**
      * @param Monitor $monitor
@@ -15,7 +14,7 @@ class DownloadOptionEvaluator
      * @return TorrentioResult|null
      * @throws \Throwable
      */
-    public function evaluateOptions(array $results, UserPreferences $userPreferences): ?TorrentioResult
+    public function evaluateOptions(Monitor $monitor, array $results): ?TorrentioResult
     {
         $sizeLow = 000;
         $sizeHigh = 4096;
@@ -23,33 +22,35 @@ class DownloadOptionEvaluator
         $bestMatches = [];
         $matches = [];
 
+        $userPreferences = $monitor->getUser()->getUserPreferenceValues();
+
         foreach ($results as $result) {
-            if (!in_array($userPreferences->language, $result->languages)) {
+            if (!in_array($userPreferences['language'], $result->languages)) {
                 continue;
             }
 
-            if ($result->resolution === $userPreferences->resolution
-                && $result->codec === $userPreferences->codec
+            if ($result->resolution === $userPreferences['resolution']
+                && $result->codec === $userPreferences['codec']
             ) {
                 $bestMatches[] = $result;
             }
 
-            if ($userPreferences->resolution === '2160p'
-                && $userPreferences->codec === $result->codec
+            if ($userPreferences['resolution'] === '2160p'
+                && $userPreferences['codec'] === $result->codec
                 && $result->resolution === '1080p'
             ) {
                 $matches[] = $result;
             }
 
-            if ($userPreferences->codec === 'h264'
-                && $userPreferences->resolution === $result->resolution
+            if ($userPreferences['codec'] === 'h264'
+                && $userPreferences['resolution'] === $result->resolution
                 && $result->codec === 'h265'
             ) {
                 $matches[] = $result;
             }
 
-            if (($userPreferences->codec === null )
-                && ($userPreferences->resolution === null )) {
+            if (($userPreferences['codec'] === null )
+                && ($userPreferences['resolution'] === null )) {
                 $matches[] = $result;
             }
         }

src/Search/Action/Input/GetMediaInfoInput.php

@@ -2,6 +2,8 @@
 
 namespace App\Search\Action\Input;
 
+use App\Download\Action\Command\DownloadMediaCommand;
+use App\Enum\MediaType;
 use App\Search\Action\Command\GetMediaInfoCommand;
 use OneToMany\RichBundle\Attribute\SourceRoute;
 use OneToMany\RichBundle\Contract\CommandInterface;

src/Tmdb/Framework/Controller/ApiController.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Tmdb\Framework\Controller;
-
-use App\Tmdb\Tmdb;
-use App\Tmdb\TmdbResult;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Attribute\Route;
-
-class ApiController extends AbstractController
-{
-    #[Route('/api/tmdb/ajax-search', name: 'api_tmdb_ajax_search', methods: ['GET'])]
-    public function test(Tmdb $tmdb, Request $request): Response
-    {
-        $results = [];
-
-        $term = $request->query->get('query') ?? null;
-
-        if (null !== $term) {
-            $tmdbResults = $tmdb->search($term);
-
-            foreach ($tmdbResults as $tmdbResult) {
-                /** @var TmdbResult $tmdbResult */
-                $results[] = [
-                    'data' => $tmdbResult,
-                    'text' => $tmdbResult->title,
-                    'value' => "$tmdbResult->mediaType|$tmdbResult->imdbId",
-                ];
-            }
-        }
-
-        return $this->json([
-            'results' => $results,
-        ]);
-    }
-}

src/Tmdb/Tmdb.php

@@ -3,11 +3,14 @@
 namespace App\Tmdb;
 
 use Aimeos\Map;
-use App\Base\Enum\MediaType;
+use App\Enum\MediaType;
 use App\ValueObject\ResultFactory;
+use Carbon\Carbon;
 use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 use Tmdb\Api\Find;
 use Tmdb\Client;
@@ -17,6 +20,7 @@ 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\Listener\RequestListener;
 use Tmdb\Event\RequestEvent;
 use Tmdb\Model\Movie;
 use Tmdb\Model\Search\SearchQuery\KeywordSearchQuery;
@@ -40,7 +44,7 @@ class Tmdb
     const POSTER_IMG_PATH = "https://image.tmdb.org/t/p/w500";
 
     public function __construct(
-        private readonly CacheItemPoolInterface $cache,
+        private readonly CacheItemPoolInterface $tmdbCache,
         private readonly EventDispatcherInterface $eventDispatcher,
         #[Autowire(env: 'TMDB_API')] string $apiKey,
     ) {
@@ -74,7 +78,7 @@ class Tmdb
         $requestListener = new Psr6CachedRequestListener(
             $this->client->getHttpClient(),
             $this->eventDispatcher,
-            $cache,
+            $tmdbCache,
             $this->client->getHttpClient()->getPsr17StreamFactory(),
             []
         );
@@ -301,7 +305,6 @@ class Tmdb
             description: $data['overview'],
             year: (new \DateTime($data['release_date']))->format('Y'),
             mediaType: "movies",
-            episodeAirDate: (new \DateTime($data['release_date']))->format('m/d/Y'),
         );
     }
 
@@ -322,7 +325,7 @@ class Tmdb
 
     public function getImdbId(string $tmdbId, $mediaType)
     {
-        $externalIds = $this->cache->get("tmdb.externalIds.{$tmdbId}",
+        $externalIds = $this->tmdbCache->get("tmdb.externalIds.{$tmdbId}",
             function (ItemInterface $item) use ($tmdbId, $mediaType) {
                 switch (MediaType::tryFrom($mediaType)->value) {
                     case MediaType::Movie->value:
@@ -343,7 +346,7 @@ class Tmdb
 
     public function getImages($tmdbId, $mediaType)
     {
-        return $this->cache->get("tmdb.images.{$tmdbId}",
+        return $this->tmdbCache->get("tmdb.images.{$tmdbId}",
             function (ItemInterface $item) use ($tmdbId, $mediaType) {
                 switch (MediaType::tryFrom($mediaType)->value) {
                     case MediaType::Movie->value:

src/Torrentio/Action/Command/DeleteCacheCommand.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Torrentio\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+
+class DeleteCacheCommand implements CommandInterface
+{
+    public function __construct(
+        public ?string $type = null,
+        public ?string $mediaType = null,
+        public ?string $tmdbId = null,
+        public ?string $imdbId = null,
+        public ?int $season = null,
+        public ?int $episode = null,
+        public ?array $tags = null,
+    ) {}
+}

src/Torrentio/Action/Handler/DeleteCacheHandler.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Torrentio\Action\Handler;
+
+use Aimeos\Map;
+use App\Torrentio\Action\Command\DeleteCacheCommand;
+use App\Torrentio\Action\Result\DeleteCacheResult;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface;
+use Symfony\Contracts\Cache\TagAwareCacheInterface;
+
+/** @implements HandlerInterface<DeleteCacheCommand, DeleteCacheResult> */
+class DeleteCacheHandler implements HandlerInterface
+{
+    public function __construct(
+        private readonly TagAwareCacheInterface $torrentioCache
+    ) {}
+
+    public function handle(CommandInterface $command): ResultInterface
+    {
+        $input = Map::from((array) $command)
+            ->filter(fn ($value, $key) => null !== $value && "" !== $value)
+            ;
+
+        $cacheKey = null;
+        if ($input->has('type')) {
+            $cacheKey = $input->get('type');
+
+            if ($input->has('mediaType')) {
+                $cacheKey .= ".".$input->get('mediaType');
+
+                if ($input->has('tmdbId')) {
+                    $cacheKey .= ".".$input->get('tmdbId');
+
+                    if ($input->has('imdbId')) {
+                        $cacheKey .= ".".$input->get('imdbId');
+
+                        if ($input->has('season')) {
+                            $cacheKey .= ".".$input->get('season');
+
+                            if ($input->has('episode')) {
+                                $cacheKey .= ".".$input->get('episode');
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if ($cacheKey !== null) {
+            $this->torrentioCache->invalidateTags([$cacheKey]);
+        }
+
+        if ($input->has('tags')) {
+            $this->torrentioCache->invalidateTags($input->get('tags'));
+        }
+
+        return new DeleteCacheResult($input, $cacheKey, $command->tags);
+    }
+}

src/Torrentio/Action/Handler/GetMovieOptionsHandler.php

@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Action\Handler;
 
-use App\Base\Service\MediaFiles;
+use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Result\GetMovieOptionsResult;
 use App\Torrentio\Client\Torrentio;

src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php

@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Action\Handler;
 
-use App\Base\Service\MediaFiles;
+use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;

src/Torrentio/Action/Input/DeleteCacheInput.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Torrentio\Action\Input;
+
+use App\Torrentio\Action\Command\DeleteCacheCommand;
+use OneToMany\RichBundle\Attribute\SourceRequest;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\InputInterface;
+
+/**
+ * @implements DeleteCacheInput<DeleteCacheCommand>
+ */
+class DeleteCacheInput implements InputInterface
+{
+    public function __construct(
+        #[SourceRequest('type', nullify: true)]
+        public ?string $type,
+
+        #[SourceRequest('mediaType', nullify: true)]
+        public ?string $mediaType,
+
+        #[SourceRequest('tmdbId', nullify: true)]
+        public ?string $tmdbId,
+
+        #[SourceRequest('imdbId', nullify: true)]
+        public ?string $imdbId,
+
+        #[SourceRequest('season', nullify: true)]
+        public ?int $season,
+
+        #[SourceRequest('episode', nullify: true)]
+        public ?int $episode,
+
+        #[SourceRequest('tags', nullify: true)]
+        public ?array $tags,
+    ) {}
+
+    public function toCommand(): CommandInterface
+    {
+        return new DeleteCacheCommand(
+            type: $this->type,
+            mediaType:  $this->mediaType,
+            tmdbId: $this->tmdbId,
+            imdbId: $this->imdbId,
+            season: $this->season,
+            episode: $this->episode
+        );
+    }
+}

src/Torrentio/Action/Result/DeleteCacheResult.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Torrentio\Action\Result;
+
+use Aimeos\Map;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+class DeleteCacheResult implements ResultInterface
+{
+    public function __construct(
+        public Map $result,
+        public ?string $cacheKey = null,
+        public ?array $tags = null,
+    ) {}
+}

src/Torrentio/Client/Torrentio.php

@@ -23,7 +23,7 @@ class Torrentio
 
     public function __construct(
         #[Autowire(env: 'REAL_DEBRID_KEY')] private string $realDebridKey,
-        private TagAwareCacheInterface $cache,
+        private TagAwareCacheInterface $torrentioCache,
         private LoggerInterface $logger,
     ) {
         $this->searchUrl = str_replace('{realDebridKey}', $this->realDebridKey, $this->baseUrl);
@@ -32,11 +32,11 @@ class Torrentio
         ]);
     }
 
-    public function search(string $imdbCode, string $type, bool $parseResults = true): array
+    public function search(string $imdbCode, string $type, array $filter = []): array
     {
         $cacheKey = "torrentio.{$imdbCode}";
 
-        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode, $type) {
+        $results = $this->torrentioCache->get($cacheKey, function (ItemInterface $item) use ($imdbCode, $type) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
             $item->tag(['torrentio', $type, $imdbCode]);
             try {
@@ -56,17 +56,13 @@ class Torrentio
             return [];
         });
 
-        if (true === $parseResults) {
-            return $this->parse($results);
-        }
-
-        return $results;
+        return $this->parse($results, $filter);
     }
 
-    public function fetchEpisodeResults(string $imdbId, int $season, int $episode, bool $parseResults = true): array
+    public function fetchEpisodeResults(string $imdbId, int $season, int $episode): array
     {
         $cacheKey = "torrentio.$imdbId.$season.$episode";
-        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbId, $season, $episode) {
+        $results = $this->torrentioCache->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 {
@@ -90,15 +86,18 @@ class Torrentio
             throw new TorrentioRateLimitException();
         }
 
-        if (true === $parseResults) {
-            return $this->parse($results);
-        }
-
-        return $results;
+        return $this->parse($results, []);
     }
 
-    public function parse(array $data): array
+    public function parse(array $data, array $filter): array
     {
+        $ruleEngine = new RuleEngine();
+        foreach ($filter as $rule => $value) {
+            if ('resolution' === $rule) {
+                $ruleEngine->addRule(new Resolution($value));
+            }
+        }
+
         $results = [];
         foreach ($data['streams'] as $stream) {
             if (!str_starts_with($stream['url'], "https")) {
@@ -120,7 +119,9 @@ class Torrentio
                 $bingeGroup
             );
 
-            $results[] = $result;
+            if ($ruleEngine->validateAll($result)) {
+                $results[] = $result;
+            }
         }
 
         return $results;

src/Torrentio/Framework/Controller/ApiController.php

@@ -2,27 +2,20 @@
 
 namespace App\Torrentio\Framework\Controller;
 
-use App\Torrentio\Client\Torrentio;
+use App\Torrentio\Action\Handler\DeleteCacheHandler;
+use App\Torrentio\Action\Input\DeleteCacheInput;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 
-final class ApiController extends AbstractController
+class ApiController extends AbstractController
 {
-    public function __construct(
-        private readonly Torrentio $torrentio,
-    ) {}
-
-    #[Route('/api/torrentio/{imdbId}/{season?}/{episode?}', name: 'api_torrentio')]
-    public function api(string $imdbId, ?int $season, ?int $episode): Response
-    {
-        if (null !== $season && null !== $episode) {
-            return $this->json(
-                $this->torrentio->fetchEpisodeResults($imdbId, $season, $episode, false)
-            );
-        }
-        return $this->json(
-            $this->torrentio->search($imdbId, 'movies', false),
-        );
+    #[Route('/api/torrentio/cache', name: 'api.torrentio.cache', methods: ['POST'])]
+    public function deleteCache(
+        DeleteCacheInput $deleteCacheInput,
+        DeleteCacheHandler $deleteCacheHandler,
+    ): Response {
+        $result = $deleteCacheHandler->handle($deleteCacheInput->toCommand());
+        return $this->json($result, Response::HTTP_OK);
     }
 }

src/Torrentio/Framework/Controller/WebController.php

@@ -1,100 +0,0 @@
-<?php
-
-namespace App\Torrentio\Framework\Controller;
-
-use App\Base\Service\Broadcaster;
-use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
-use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
-use App\Torrentio\Action\Input\GetMovieOptionsInput;
-use App\Torrentio\Action\Input\GetTvShowOptionsInput;
-use App\Torrentio\Exception\TorrentioRateLimitException;
-use Carbon\Carbon;
-use OneToMany\RichBundle\Contract\ResultInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Cache\ItemInterface;
-use Symfony\UX\Turbo\TurboBundle;
-
-final class WebController extends AbstractController
-{
-    public function __construct(
-        private readonly GetMovieOptionsHandler $getMovieOptionsHandler,
-        private readonly GetTvShowOptionsHandler $getTvShowOptionsHandler,
-        private readonly Broadcaster $broadcaster,
-    ) {}
-
-    #[Route('/torrentio/movies/{tmdbId}/{imdbId}', name: 'app_torrentio_movies')]
-    public function movieOptions(GetMovieOptionsInput $input, CacheInterface $cache, Request $request): Response
-    {
-        $cacheId = sprintf(
-            "page.torrentio.movies.%s.%s",
-            $input->tmdbId,
-            $input->imdbId
-        );
-
-        return $cache->get($cacheId, function (ItemInterface $item) use ($input, $request) {
-            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $results = $this->getMovieOptionsHandler->handle($input->toCommand());
-
-            if ($request->headers->get('Turbo-Frame')) {
-                return $this->sendFragmentResponse($results, $request);
-            }
-
-            return $this->render('torrentio/movies.html.twig', [
-                'results' => $results,
-            ]);
-        });
-    }
-
-    #[Route('/torrentio/tvshows/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_torrentio_tvshows')]
-    public function tvShowOptions(GetTvShowOptionsInput $input, CacheInterface $cache, Request $request): Response
-    {
-        $cacheId = sprintf(
-            "page.torrentio.tvshows.%s.%s.%s.%s",
-            $input->tmdbId,
-            $input->imdbId,
-            $input->season,
-            $input->episode,
-        );
-
-        try {
-            return $cache->get($cacheId, function (ItemInterface $item) use ($input, $request) {
-                $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-                $results = $this->getTvShowOptionsHandler->handle($input->toCommand());
-
-                if ($request->headers->get('Turbo-Frame')) {
-                    return $this->sendFragmentResponse($results, $request);
-                }
-
-                return $this->render('torrentio/tvshows.html.twig', [
-                    'results' => $results,
-                ]);
-            });
-        } catch (TorrentioRateLimitException $exception) {
-            $this->broadcaster->alert('Warning', 'Torrentio has rate limited your requests. Please wait a few minutes before trying again.', 'warning');
-            return $this->render('bare.html.twig',
-                [],
-                new Response('Too many requests',
-                    Response::HTTP_TOO_MANY_REQUESTS,
-                    ['Retry-After' => 4000]
-                )
-            );
-        }
-    }
-
-    private function sendFragmentResponse(ResultInterface $result, Request $request): Response
-    {
-        $request->setRequestFormat(TurboBundle::STREAM_FORMAT);
-        return $this->renderBlock(
-            'torrentio/fragments.html.twig',
-            $request->query->get('block'),
-            [
-                'results' => $result,
-                'target' => $request->query->get('target')
-            ]
-        );
-    }
-}

src/Torrentio/Result/ResultFactory.php

@@ -2,7 +2,8 @@
 
 namespace App\Torrentio\Result;
 
-use App\User\Database\CountryLanguages;
+use App\Util\CountryCodes;
+use App\Util\CountryLanguages;
 use Nihilarr\PTN;
 
 class ResultFactory
@@ -33,14 +34,12 @@ class ResultFactory
             $bingeGroup,
             $ptn->resolution ?? "-",
             self::setCodec($ptn->codec ?? "-"),
-            $ptn->quality ?? "-",
             $ptn,
             substr(base64_encode($url), strlen($url) - 10),
             $ptn->episode ?? "-",
             self::setLanguages($title),
             self::setLanguageFlags($title),
-            false,
-            uniqid()
+            false
         );
     }
 

src/Torrentio/Result/TorrentioResult.php

@@ -16,13 +16,11 @@ class TorrentioResult
         public ?string $bingeGroup = "-",
         public ?string $resolution = "-",
         public ?string $codec = "-",
-        public ?string $quality = "-",
         public object|array $ptn = [],
         public ?string $key = "-",
         public ?string $episodeNumber = "-",
         public ?array $languages = [],
         public ?string $languageFlags = "-",
         public ?bool $selected = false,
-        public ?string $localId = "-"
     ) {}
 }

src/Twig/Components/ActionButton.php

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

src/Twig/Components/DownloadList.php

@@ -3,8 +3,11 @@
 namespace App\Twig\Components;
 
 use App\Download\Framework\Repository\DownloadRepository;
+use App\Util\Paginator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
+use Symfony\UX\LiveComponent\Attribute\LiveAction;
+use Symfony\UX\LiveComponent\Attribute\LiveArg;
 use Symfony\UX\LiveComponent\Attribute\LiveProp;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
 

src/Twig/Components/Filter.php

@@ -3,7 +3,6 @@
 namespace App\Twig\Components;
 
 use Aimeos\Map;
-use App\User\Database\QualityList;
 use App\User\Framework\Repository\PreferencesRepository;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
@@ -18,8 +17,6 @@ final class Filter
 
     public array $userPreferences = [];
 
-    public array $reverseMappedQualities = [];
-
     public function __construct(
         private readonly PreferencesRepository $preferencesRepository,
         private readonly Security $security,
@@ -30,6 +27,5 @@ final class Filter
             ->toArray();
         $this->userPreferences = Map::from($this->security->getUser()->getUserPreferenceValues())
             ->toArray();
-        $this->reverseMappedQualities = QualityList::getAsReverseMap();
     }
 }

src/Twig/Components/PaginateTrait.php

@@ -2,7 +2,7 @@
 
 namespace App\Twig\Components;
 
-use App\Base\Util\Paginator;
+use App\Util\Paginator;
 use Doctrine\ORM\Query;
 use Symfony\UX\LiveComponent\Attribute\LiveAction;
 use Symfony\UX\LiveComponent\Attribute\LiveArg;

src/Twig/Extensions/UtilExtension.php

@@ -2,9 +2,12 @@
 
 namespace App\Twig\Extensions;
 
-use App\Base\Service\MediaFiles;
+use App\Monitor\Framework\Entity\Monitor;
+use App\Monitor\Service\MediaFiles;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
+use App\Torrentio\Result\TorrentioResult;
 use ChrisUllyott\FileSize;
+use Tmdb\Model\Tv\Episode;
 use Twig\Attribute\AsTwigFilter;
 use Twig\Attribute\AsTwigFunction;
 
@@ -47,7 +50,7 @@ class UtilExtension
     }
 
     #[AsTwigFilter('episode_id_from_results')]
-    public function episodeIdFromResults($result): ?string
+    public function episodeId($result): ?string
     {
         if (!$result instanceof GetTvShowOptionsResult) {
             return null;
@@ -56,11 +59,4 @@ class UtilExtension
         return "S". str_pad($result->season, 2, "0", STR_PAD_LEFT) .
             "E". str_pad($result->episode, 2, "0", STR_PAD_LEFT);
     }
-
-    #[AsTwigFunction('episode_id')]
-    public function episodeId($season, $episode): ?string
-    {
-        return "S". str_pad($season, 2, "0", STR_PAD_LEFT) .
-            "E". str_pad($episode, 2, "0", STR_PAD_LEFT);
-    }
 }

src/User/Action/Command/SaveUserMediaPreferencesCommand.php

@@ -10,7 +10,6 @@ class SaveUserMediaPreferencesCommand implements CommandInterface
     public function __construct(
         public string $resolution,
         public string $codec,
-        public string $quality,
         public string $language,
         public string $provider,
     ) {}

src/User/Action/Input/SaveUserMediaPreferencesInput.php

@@ -18,9 +18,6 @@ class SaveUserMediaPreferencesInput implements InputInterface
         #[SourceRequest('resolution')]
         public string $resolution,
 
-        #[SourceRequest('quality')]
-        public string $quality,
-
         #[SourceRequest('codec')]
         public string $codec,
 
@@ -36,7 +33,6 @@ class SaveUserMediaPreferencesInput implements InputInterface
         return new SaveUserMediaPreferencesCommand(
             $this->resolution,
             $this->codec,
-            $this->quality,
             $this->language,
             $this->provider,
         );

src/User/Database/QualityList.php

@@ -1,124 +0,0 @@
-<?php
-
-namespace App\User\Database;
-
-class QualityList
-{
-    public static $qualities = [
-        "dvd-rip" => [
-            "dvdrip",
-            "dvdmux",
-            "dvdr",
-            "dvd-full",
-            "full-rip",
-            "iso rip",
-            "lossless rip",
-            "untouched rip",
-            "dvd-5",
-            "dvd-9",
-        ],
-        "hdtv, pdtv or dsrip" => [
-            "dsr",
-            "dsrip",
-            "satrip",
-            "dthrip",
-            "dvbrip",
-            "hdtv",
-            "pdtv",
-            "dtvrip",
-            "tvrip",
-            "hdtvrip",
-        ],
-        "vodrip" => [
-            "vodrip",
-            "vodr",
-        ],
-        "hc hd-rip" => [
-            "hc",
-            "hd-rip",
-        ],
-        "webcap" => [
-            "web-cap",
-            "webcap",
-            "web cap",
-        ],
-        "hdrip" => [
-            "hdrip",
-            "web-dlrip",
-        ],
-        "webrip" => [
-            "webrip",
-            "web rip",
-            "web-rip",
-            "webrip (p2p)",
-            "web rip (p2p)",
-            "web-rip (p2p)",
-        ],
-        "web-dl" => [
-            "webdl",
-            "web dl",
-            "web-dl",
-            "web (scene)",
-            "webrip",
-        ],
-        "blu-ray/bd/brrip" => [
-            "blu-ray",
-            "bluray",
-            "bluray",
-            "bdrip",
-            "brip",
-            "brrip",
-            "bdr[13]",
-            "bd25",
-            "bd50",
-            "bd66",
-            "bd100",
-            "bd5",
-            "bd9",
-            "bdmv",
-            "bdiso",
-            "complete.bluray",
-        ],
-        "4k" => [
-            "cbr",
-            "vbr",
-        ],
-    ];
-
-    public static function getQualities(): array
-    {
-        return self::$qualities;
-    }
-
-    public static function getBaseQualities(): array
-    {
-        return array_keys(self::$qualities);
-    }
-
-    public static function getBaseQualityFromSubQuality(string $key): ?string
-    {
-        return array_search($key, self::$qualities) ?? null;
-    }
-
-    public static function asSelectOptions(): array
-    {
-        $result = [];
-        foreach (array_keys(static::$qualities) as $quality) {
-            $result[$quality] = $quality;
-        }
-        return $result;
-    }
-
-    public static function getAsReverseMap(): array
-    {
-        $results = [];
-
-        foreach (self::$qualities as $baseQualtiy => $subQualities) {
-            foreach ($subQualities as $subQuality) {
-                $results[$subQuality] = $baseQualtiy;
-            }
-        }
-
-        return $results;
-    }
-}

src/User/Dto/UserPreferences.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\User\Dto;
-
-class UserPreferences
-{
-
-    public function __construct(
-        public readonly ?string $resolution,
-        public readonly ?string $codec,
-        public readonly ?string $language,
-        public readonly ?string $provider,
-        public readonly ?string $quality,
-    ) {}
-}

src/User/Dto/UserPreferencesFactory.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\User\Dto;
-
-use App\User\Framework\Entity\PreferenceOption;
-use App\User\Framework\Entity\User;
-use Symfony\Component\Security\Core\User\UserInterface;
-
-class UserPreferencesFactory
-{
-    /** @param User $user */
-    public static function createFromUser(UserInterface $user): UserPreferences
-    {
-        return new UserPreferences(
-            resolution: self::getNestedValue($user, 'resolution'),
-            codec: self::getNestedValue($user, 'codec'),
-            language: self::getValue($user, 'language'),
-            provider: self::getValue($user, 'provider'),
-            quality: self::getValue($user, 'quality'),
-        );
-    }
-
-    /** @param User $user */
-    private static function getValue(UserInterface $user, string $preferenceId)
-    {
-        $value = $user->getUserPreference($preferenceId)->getPreferenceValue();
-        if ($value === "") {
-            return null;
-        }
-        return $value;
-    }
-
-    /** @param User $user */
-    private static function getNestedValue(UserInterface $user, string $preferenceId): ?string
-    {
-        $preference = $user->getUserPreference($preferenceId);
-        if (null === $preference) {
-            return null;
-        }
-        return $preference->getPreference()
-            ->getPreferenceOptions()
-            ->filter(fn (PreferenceOption $option) => (string) $option->getId() === $preference->getPreferenceValue())
-            ->first()
-            ->getValue()
-        ;
-    }
-}

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

@@ -2,30 +2,22 @@
 
 namespace App\User\Framework\Controller\Web;
 
-use App\Base\ConfigResolver;
 use App\User\Framework\Repository\UserRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
-
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
 
 class LoginController extends AbstractController
 {
     #[Route(path: '/login', name: 'app_login')]
-    public function login(ConfigResolver $config, AuthenticationUtils $authenticationUtils, UserRepository $userRepository): Response
+    public function login(AuthenticationUtils $authenticationUtils, UserRepository $userRepository): Response
     {
         if ((new ArrayCollection($userRepository->findAll()))->count() === 0) {
             return $this->redirectToRoute('app_getting_started');
         }
 
-        if ($config->authIs('oidc') && $config->bypassFormLogin()) {
-            return $this->redirectToRoute('app_login_oidc');
-        }
-
         // get the login error if there is one
         $error = $authenticationUtils->getLastAuthenticationError();
 
@@ -33,14 +25,13 @@ class LoginController extends AbstractController
         $lastUsername = $authenticationUtils->getLastUsername();
 
         return $this->render('user/login.html.twig', [
-            'show_oidc_button' => $config->authIs('oidc'),
             'last_username' => $lastUsername,
             'error' => $error,
         ]);
     }
 
     #[Route(path: '/logout', name: 'app_logout')]
-    public function logout(Security $security, Request $request): void
+    public function logout(): void
     {
         throw new \LogicException('This method can be blank - it will be intercepted by the logout key on your firewall.');
     }

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

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\User\Framework\Controller\Web;
-
-use App\Base\ConfigResolver;
-use Drenso\OidcBundle\OidcClientInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Attribute\Route;
-
-class LoginOidcController extends AbstractController
-{
-
-    public function __construct(
-        private ConfigResolver $configResolver,
-    ) {}
-
-    #[Route('/login/oidc', name: 'app_login_oidc')]
-    public function oidcStart(OidcClientInterface $oidcClient): RedirectResponse
-    {
-        if (false === $this->configResolver->authIs('oidc')) {
-            throw new \Exception('You must configure the OIDC environment variables before logging in at this route.');
-        }
-
-        // Redirect to authorization @ OIDC provider
-        return $oidcClient->generateAuthorizationRedirect(scopes: ['openid', 'profile']);
-    }
-
-    #[Route('/login/oidc/auth', name: 'app_login_oidc_auth')]
-    public function oidcAuthenticate(): RedirectResponse
-    {
-        if (false === $this->configResolver->authIs('oidc')) {
-            throw new \Exception('You must configure the OIDC environment variables before logging in at this route.');
-        }
-
-        throw new \LogicException('This method can be blank - it will be intercepted by the "oidc" key on your firewall.');
-    }
-
-    #[Route('/logout/oidc', 'app_logout_oidc')]
-    public function oidcLogout(OidcClientInterface $oidcClient, Request $request, Security $security): RedirectResponse
-    {
-        // ToDo: Configure multiple authentication methods and redirect to the form login here
-    }
-}

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

@@ -4,17 +4,14 @@ declare(strict_types=1);
 
 namespace App\User\Framework\Controller\Web;
 
-use App\Base\Service\Broadcaster;
 use App\User\Action\Handler\SaveUserDownloadPreferencesHandler;
 use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
 use App\User\Action\Input\SaveUserDownloadPreferencesInput;
 use App\User\Action\Input\SaveUserMediaPreferencesInput;
-use App\User\Database\CountryLanguages;
-use App\User\Database\ProviderList;
-use App\User\Database\QualityList;
-use App\User\Dto\UserPreferencesFactory;
-use App\User\Framework\Form\GettingStartedFilterForm;
 use App\User\Framework\Repository\PreferencesRepository;
+use App\Util\Broadcaster;
+use App\Util\CountryLanguages;
+use App\Util\ProviderList;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -39,11 +36,9 @@ class PreferencesController extends AbstractController
             [
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
-                'providers' => ProviderList::getProviders(),
-                'qualities' => QualityList::getBaseQualities(),
+                'providers' => ProviderList::$providers,
                 'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
-                'filterForm' => $this->createForm(GettingStartedFilterForm::class, (array) UserPreferencesFactory::createFromUser($this->getUser())),
             ]
         );
     }
@@ -72,10 +67,8 @@ class PreferencesController extends AbstractController
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
                 'providers' => ProviderList::$providers,
-                'qualities' => QualityList::getBaseQualities(),
                 'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
-                'filterForm' => $this->createForm(GettingStartedFilterForm::class ?? null),
             ]
         );
     }
@@ -102,8 +95,7 @@ class PreferencesController extends AbstractController
             [
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
-                'providers' => ProviderList::getProviders(),
-                'qualities' => QualityList::getBaseQualities(),
+                'providers' => ProviderList::$providers,
                 'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
             ]