fix: blocks pw resets when auth method = oidc

.env

@@ -38,3 +38,16 @@ 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 ###

Dockerfile

@@ -3,6 +3,7 @@ FROM dunglas/frankenphp:php8.4
 ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
 ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+ENV APP_VERSION="0.0.1"
 
 RUN install-php-extensions \
 	pdo_mysql \

assets/controllers.json

@@ -1,5 +1,16 @@
 {
     "controllers": {
+        "@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

@@ -0,0 +1,46 @@
+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/download_button_controller.js

@@ -12,6 +12,7 @@ export default class extends Controller {
         filename: String,
         mediaType: String,
         imdbId: String,
+        episodeId: String
     }
 
     download() {
@@ -27,6 +28,7 @@ export default class extends Controller {
                 filename: this.filenameValue,
                 mediaType: this.mediaTypeValue,
                 imdbId: this.imdbIdValue,
+                episodeId: this.episodeIdValue
             })
         })
             .then(res => res.json())

assets/controllers/hamburger_controller.js

@@ -0,0 +1,43 @@
+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']
+    static outlets = ['result-filter', 'dialog']
     static values = {
         tmdbId: String,
         imdbId: String,
@@ -54,6 +54,9 @@ 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,6 +16,7 @@ export default class extends Controller {
     };
 
     static targets = ['list']
+    static outlets = ['loading-icon']
 
     options = []
     optionsLoaded = false
@@ -33,6 +34,8 @@ export default class extends Controller {
                     this.element.innerHTML = response;
                     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();
                 });
         }
     }
@@ -48,15 +51,20 @@ 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)) {
@@ -81,7 +89,10 @@ 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/controllers/navbar_controller.js

@@ -10,16 +10,21 @@ 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() {
-        console.log(window.location.pathname);
-        this.element.querySelectorAll('a:not(.nav-foot)').forEach(link => {
+        this.element.querySelectorAll('.nav-list 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) => {
+
+        });
     }
 
-    setActive() {
-
+    toggle() {
+        this.element.parentElement.classList.toggle('hidden');
+        this.element.classList.toggle('fixed');
+        this.element.classList.toggle('z-20');
     }
 }

assets/controllers/result_filter_controller.js

@@ -11,6 +11,7 @@ export default class extends Controller {
 
     languages = []
     providers = []
+    qualities = []
     seasons = []
 
     activeFilter = {
@@ -18,13 +19,16 @@ 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', 'selectAll', 'downloadSelected']
+    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'selectAll', 'downloadSelected']
     static values = {
+        'imdbId': String,
         'media-type': String,
         'episodes': Array,
+        'reverseMappedQualities': Object,
     }
 
     async connect() {
@@ -34,21 +38,12 @@ export default class extends Controller {
         await this.filter();
     }
 
-    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) => {
+    // Event is fired from movies/tvshows controllers to populate this data
+    async loadOptions({detail: { options }}) {
+        await options.forEach((option) => {
             this.addLanguages(option, option.dataset);
             this.addProviders(option, option.dataset);
+            this.addQualities(option, option.dataset);
         })
         await this.filter();
     }
@@ -105,7 +100,34 @@ 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 = [];
@@ -114,6 +136,7 @@ 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) {
@@ -123,6 +146,7 @@ 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));
         }
     }
@@ -135,6 +159,14 @@ 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

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

@@ -18,7 +18,7 @@ export default class extends Controller {
         active: Boolean,
     };
 
-    static targets = ['list', 'count', 'episodeSelector', 'toggleButton']
+    static targets = ['list', 'count', 'episodeSelector', 'toggleButton', 'listContainer']
     static outlets = ['loading-icon']
 
     options = []
@@ -32,19 +32,30 @@ export default class extends Controller {
     async setOptions() {
         if (this.optionsLoaded === false) {
             this.optionsLoaded = true;
-            await fetch(`/torrentio/tvshows/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
-                .then(res => res.text())
-                .then(response => {
-                    this.element.innerHTML = response;
+            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.dispatch('optionsLoaded', {detail: {options: this.options}})
                 this.loadingIconOutlet.increaseCount();
-                });
+            } else {
+                console.log(`HTTP Response Code: ${response?.status}`)
+            }
         }
     }
 
@@ -80,13 +91,7 @@ export default class extends Controller {
     }
 
     toggleList() {
-        // 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('options-table');
         this.listTarget.classList.toggle('hidden');
         this.toggleButtonTarget.classList.toggle('rotate-90');
         this.toggleButtonTarget.classList.toggle('-rotate-90');
@@ -123,6 +128,7 @@ 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(),
@@ -131,7 +137,10 @@ export default class extends Controller {
             }
 
             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)) {
@@ -156,7 +165,10 @@ 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

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

@@ -15,6 +15,18 @@
     }
 }
 
+@layer components {
+    .alert {
+        @apply text-white text-sm min-w-[250px] border px-4 py-3 rounded-md
+    }
+    .alert-success {
+        @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
+    }
+}
+
 /* Prevent scrolling while dialog is open */
 body:has(dialog[data-dialog-target="dialog"][open]) {
     overflow: hidden;
@@ -51,3 +63,70 @@ 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
+}

compose.yml

@@ -40,7 +40,7 @@ services:
     tty: true
     environment:
       TZ: America/Chicago
-    command: php /app/bin/console messenger:consume media_cache -vv --time-limit=3600
+    command: php /app/bin/console messenger:consume async -vv --time-limit=3600
 
 
   scheduler:

composer.json

@@ -16,11 +16,14 @@
         "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",
         "nihilarr/parse-torrent-name": "^0.0.1",
         "nyholm/psr7": "*",
         "p3k/emoji-detector": "^1.2",
+        "php-http/cache-plugin": "^2.0",
         "php-tmdb/api": "^4.1",
         "predis/predis": "^2.4",
         "runtime/frankenphp-symfony": "^0.2.0",
@@ -34,7 +37,9 @@
         "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.*",
@@ -42,14 +47,17 @@
         "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"
+        "twig/twig": "^2.12|^3.0",
+        "web-token/jwt-library": "^4.0"
     },
     "config": {
         "allow-plugins": {

config/bundles.php

@@ -19,4 +19,7 @@ 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],
 ];

config/packages/doctrine.yaml

@@ -18,6 +18,12 @@ 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

@@ -0,0 +1,19 @@
+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/framework.yaml

@@ -11,7 +11,7 @@ framework:
     trusted_headers: [ 'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port', 'x-forwarded-prefix' ]
 
     session:
-        handler_id: Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler
+        handler_id: '%env(REDIS_HOST)%'
 
     #esi: true
     #fragments: true

config/packages/mailer.yaml

@@ -0,0 +1,7 @@
+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,6 +37,7 @@ 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/reset_password.yaml

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

config/packages/security.yaml

@@ -10,6 +10,9 @@ 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
 
@@ -18,14 +21,18 @@ security:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
         main:
-            lazy: true
-            provider: app_local
+            logout:
+                path: /logout
+            provider: app_oidc
             form_login:
                 login_path: app_login
                 check_path: app_login
                 enable_csrf: true
-            logout:
-                path: app_logout
+            oidc:
+                login_path: '/login/oidc'
+                check_path: '/login/oidc/auth'
+                enable_end_session_listener: true
+            entry_point: form_login
 
             # activate different ways to authenticate
             # https://symfony.com/doc/current/security.html#the-firewall
@@ -36,6 +43,7 @@ security:
     # Easy way to control access for large sections of your site
     # Note: Only the *first* access control that matches will be used
     access_control:
+        - { path: ^/reset-password, roles: PUBLIC_ACCESS }
         - { path: ^/getting-started, roles: PUBLIC_ACCESS }
         - { path: ^/register, roles: PUBLIC_ACCESS }
         - { path: ^/login, roles: PUBLIC_ACCESS }

config/packages/twig.yaml

@@ -1,6 +1,9 @@
 twig:
+    globals:
+        version: '%app.version%'
     file_name_pattern: '*.twig'
     date:
+        format: 'm/d/Y'
         timezone: '%env(default:app.default.timezone:TZ)%'
 
 when@test:

config/routes.yaml

@@ -1,7 +1,15 @@
-controllersIndex:
+controllersBase:
     resource:
-        path: ../src/Controller/
-        namespace: App\Controller
+        path: ../src/Base/Framework/Controller/
+        namespace: App\Base\Framework\Controller
+    type: attribute
+    defaults:
+        schemes: [ 'https' ]
+
+controllersSearch:
+    resource:
+        path: ../src/Search/Framework/Controller/
+        namespace: App\Search\Framework\Controller
     type: attribute
     defaults:
         schemes: [ 'https' ]
@@ -29,3 +37,19 @@ controllersMonitor:
     type: attribute
     defaults:
         schemes: ['https']
+
+controllersTorrentio:
+    resource:
+        path: ../src/Torrentio/Framework/Controller
+        namespace: App\Torrentio\Framework\Controller
+    type: attribute
+    defaults:
+        schemes: ['https']
+
+controllersTmdb:
+    resource:
+        path: ../src/Tmdb/Framework/Controller
+        namespace: App\Tmdb\Framework\Controller
+    type: attribute
+    defaults:
+        schemes: ['https']

config/routes/ux_autocomplete.yaml

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

config/security.yaml

@@ -1,61 +0,0 @@
-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,6 +4,16 @@
 # 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
@@ -22,8 +32,18 @@ parameters:
     app.cache.redis.host.default: 'redis://redis'
 
     # Various configs
+    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)%'
+
 services:
     # default configuration for services in *this* file
     _defaults:

docker/Dockerfile.app

@@ -4,6 +4,9 @@ ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
 ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
+ARG APP_VERSION="0.dev"
+ENV APP_VERSION="${APP_VERSION}"
+
 RUN install-php-extensions \
 	pdo_mysql \
 	gd \

docker/Dockerfile.scheduler

@@ -4,6 +4,9 @@ ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
 ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
+ARG APP_VERSION="0.dev"
+ENV APP_VERSION="${APP_VERSION}"
+
 RUN install-php-extensions \
 	pdo_mysql \
 	gd \

docker/Dockerfile.worker

@@ -4,6 +4,9 @@ ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
 ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
+ARG APP_VERSION="0.dev"
+ENV APP_VERSION="${APP_VERSION}"
+
 RUN install-php-extensions \
 	pdo_mysql \
 	gd \

docs/examples/.env

@@ -3,7 +3,7 @@
 # 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://torsearch.idocode.io"
+APP_URL="https://dev.caldwell.digital"
 APP_SECRET="70169beadfbc8101c393cbfbba27a313"
 APP_ENV=prod
 
@@ -27,7 +27,7 @@ DATABASE_URL="mysql://root:password@database:3306/app?serverVersion=10.6.19.2-Ma
 # Popular Movies and TV Shows section.
 #TMDB_API=
 
-REAL_DEBRID_KEY="QYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ"
+REAL_DEBRID_KEY=""
 TMDB_API=eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiI0ZTJjYjJhOGUzOGJhNjdiNjVhOGU1NGM0ZWI1MzhmOCIsIm5iZiI6MTczNzkyNjA0NC41NjQsInN1YiI6IjY3OTZhNTljYzdiMDFiNzJjNzIzZWM5YiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.e8DbNe9qrSBC1y-ANRv-VWBAtls-ZS2r7aNCiI68mpw
 
 

docs/examples/compose.yml

@@ -1,16 +1,17 @@
 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:
       - '8006:80'
     env_file:
       - .env
+    volumes:
+      - ./downloads/movies:/var/download/movies
+      - ./downloads/tvshows:/var/download/tvshows
+    environment:
+      TZ: America/Chicago
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
     depends_on:
       database:
         condition: service_healthy
@@ -25,9 +26,11 @@ services:
   worker:
     image: code.caldwell.digital/home/torsearch-worker:latest
     volumes:
-      - /mnt/media/downloads/movies:/var/download/movies
-      - /mnt/media/downloads/tvshows:/var/download/tvshows
-    command: -vvv
+      - ./downloads/movies:/var/download/movies
+      - ./downloads/tvshows:/var/download/tvshows
+    environment:
+      TZ: America/Chicago
+    command: -vv --time-limit=3600 --limit=10
     env_file:
       - .env
     restart: always
@@ -43,35 +46,18 @@ services:
   scheduler:
     image: code.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
-      - ./downloads:/var/download
+      - ./downloads/movies:/var/download/movies
+      - ./downloads/tvshows:/var/download/tvshows
     env_file:
       - .env
+    command: -vv
+    environment:
+      TZ: America/Chicago
     restart: always
     depends_on:
       app:
         condition: service_healthy
 
-  # This container facilitates viewing the progress of downloads
-  # in realtime. It also handles sending alerts and notifications.
-  # The MERCURE_PUBLISHER_JWT key & MERCURE_SUBSCRIBER_JWT_KEY should
-  # match the MERCURE_JWT_SECRET environment variable.
-  mercure:
-    image: dunglas/mercure
-    restart: unless-stopped
-    ports:
-      - "3001:80"
-    environment:
-      SERVER_NAME: ':80'
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_EXTRA_DIRECTIVES: |
-        cors_origins *
-        anonymous
-    command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
-    volumes:
-      - mercure_data:/data
-      - mercure_config:/config
-
   database:
     image: mariadb:10.11.2
     volumes:

importmap.php

@@ -40,4 +40,28 @@ 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

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class 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

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class 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

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class 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

@@ -0,0 +1,95 @@
+<?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/Enum/MediaType.php

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

src/Base/Framework/Command/ConfigSetCommand.php

@@ -1,18 +1,17 @@
 <?php
 
-namespace App\Command;
+namespace App\Base\Framework\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: 'Add a short description for your command',
+    description: '[deprecated] This command currently serves no use. It may be re-purposed or removed in the future.',
 )]
 class ConfigSetCommand extends Command
 {

src/Base/Framework/Command/SeedDatabaseCommand.php

@@ -1,9 +1,12 @@
 <?php
 
-namespace App\Command;
+namespace App\Base\Framework\Command;
 
+use App\User\Framework\Entity\Preference;
+use App\User\Framework\Entity\UserPreference;
 use App\User\Framework\Repository\PreferenceOptionRepository;
 use App\User\Framework\Repository\PreferencesRepository;
+use App\User\Framework\Repository\UserRepository;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -12,20 +15,23 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 #[AsCommand(
     name: 'db:seed',
-    description: 'Seed the database with required data.',
+    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.',
 )]
 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
@@ -34,6 +40,7 @@ class SeedDatabaseCommand extends Command
 
         $this->seedPreferences($io);
         $this->seedPreferenceOptions($io);
+        $this->updateUserPreferences($io);
 
         return Command::SUCCESS;
     }
@@ -44,22 +51,48 @@ class SeedDatabaseCommand extends Command
         $preferences = $this->getPreferences();
 
         foreach ($preferences as $preference) {
-            if ($this->preferenceRepository->find($preference['id'])) {
-                continue;
+            $isNewRecord = false;
+            $preferenceRecord = $this->preferenceRepository->findOneBy(['id' => $preference['id']]);
+            if (null === $preferenceRecord) {
+                $isNewRecord = true;
+                $preferenceRecord = new Preference();
             }
 
-            $this->preferenceRepository->getEntityManager()->persist((new \App\User\Framework\Entity\Preference())
+            $preferenceRecord
                 ->setId($preference['id'])
                 ->setName($preference['name'])
                 ->setDescription($preference['description'])
                 ->setEnabled($preference['enabled'])
-                ->setType($preference['type'])
-            );
+                ->setType($preference['type']);
+
+            if (true === $isNewRecord) {
+                $this->preferenceRepository->getEntityManager()->persist($preferenceRecord);
+            }
         }
 
         $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 [
@@ -91,6 +124,13 @@ 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/Base/Framework/Command/StartupStatusCommand.php

@@ -1,19 +1,17 @@
 <?php
 
-namespace App\Command;
+namespace App\Base\Framework\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: 'Add a short description for your command',
+    description: 'Used by the Docker healthcheck system to signal when the container is healthy.',
 )]
 class StartupStatusCommand extends Command
 {

src/Base/Framework/Command/UserResetPasswordCommand.php

@@ -0,0 +1,112 @@
+<?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/Framework/Controller/AlertController.php

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

src/Base/Framework/Controller/IndexController.php

@@ -1,14 +1,15 @@
 <?php
 
-namespace App\Controller;
+namespace App\Base\Framework\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
@@ -21,6 +22,8 @@ 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(),
@@ -29,10 +32,20 @@ final class IndexController extends AbstractController
         ]);
     }
 
-    #[Route('/test', name: 'app_test')]
-    public function test()
+    #[Route('/email')]
+    public function sendEmail(MailerInterface $mailer): Response
     {
-        $result = $this->monitorTvShowHandler->handle(new MonitorTvShowCommand(355));
-        return $this->json($result);
+        $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!'
+        ]);
     }
 }

src/Base/Service/MediaFiles.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Monitor\Service;
+namespace App\Base\Service;
 
 use Aimeos\Map;
 use App\Download\Framework\Entity\Download;

src/Base/Util/Broadcaster.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -17,7 +17,7 @@ readonly class Broadcaster
         private RequestStack $requestStack,
     ) {}
 
-    public function alert(string $title, string $message): void
+    public function alert(string $title, string $message, string $type = "success"): void
     {
         $userAlertTopic = $this->requestStack->getCurrentRequest()->getSession()->get('mercure_alert_topic');
         $update = new Update(
@@ -26,6 +26,7 @@ readonly class Broadcaster
                 'alert_id' => uniqid(),
                 'title' => $title,
                 'message' => $message,
+                'type' => $type,
             ])
         );
         $this->hub->publish($update);

src/Base/Util/CountryCodes.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 class CountryCodes
 {

src/Base/Util/CountryLanguages.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 class CountryLanguages
 {

src/Base/Util/EpisodeId.php

@@ -0,0 +1,12 @@
+<?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/Base/Util/Paginator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;

src/Base/Util/ProviderList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 class ProviderList
 {

src/Base/Util/QualityList.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Base\Util;
+
+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 getAsReverseMap(): array
+    {
+        $results = [];
+
+        foreach (self::$qualities as $baseQualtiy => $subQualities) {
+            foreach ($subQualities as $subQuality) {
+                $results[$subQuality] = $baseQualtiy;
+            }
+        }
+
+        return $results;
+    }
+}

src/Download/Action/Command/DownloadSeasonCommand.php

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

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

@@ -26,6 +26,9 @@ class DownloadMediaInput implements InputInterface
         #[SourceRequest('imdbId')]
         public string $imdbId,
 
+        #[SourceRequest('episodeId', nullify: true)]
+        public ?string $episodeId = null,
+
         public ?int $userId = null,
 
         public ?int $downloadId = null,

src/Download/Action/Input/DownloadSeasonInput.php

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

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

@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Monitor\Service;
+namespace App\Download;
 
 use Aimeos\Map;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Torrentio\Result\TorrentioResult;
+use App\User\Dto\UserPreferences;
 
-class MonitorOptionEvaluator
+class DownloadOptionEvaluator
 {
     /**
      * @param Monitor $monitor
@@ -14,7 +15,7 @@ class MonitorOptionEvaluator
      * @return TorrentioResult|null
      * @throws \Throwable
      */
-    public function evaluateOptions(Monitor $monitor, array $results): ?TorrentioResult
+    public function evaluateOptions(array $results, UserPreferences $userPreferences): ?TorrentioResult
     {
         $sizeLow = 000;
         $sizeHigh = 4096;
@@ -22,35 +23,33 @@ class MonitorOptionEvaluator
         $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/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,7 +15,6 @@ class ProcessDownloader implements DownloaderInterface
     /**
      * @var RedisAdapter $cache
      */
-
     public function __construct(
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
@@ -34,11 +33,11 @@ class ProcessDownloader implements DownloaderInterface
         $downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
         $path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
 
-        $processArgs = ['wget', $url];
+        $processArgs = ['wget', '-O', $downloadEntity->getFilename(), $url];
 
         if ($downloadEntity->getStatus() === 'Paused') {
             $downloadEntity->setStatus('In Progress');
-            $processArgs = ['wget', '-c', $url];
+            $processArgs = ['wget', '-c', '-O', $downloadEntity->getFilename(), $url];
         } else {
             $downloadEntity->setProgress(0);
         }

src/Download/Framework/Controller/ApiController.php

@@ -2,15 +2,19 @@
 
 namespace App\Download\Framework\Controller;
 
+use App\Base\Util\Broadcaster;
 use App\Download\Action\Handler\DeleteDownloadHandler;
+use App\Download\Action\Handler\DownloadSeasonHandler;
 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 App\User\Dto\UserPreferencesFactory;
+use Nihilarr\PTN;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -35,10 +39,8 @@ 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();
 
@@ -97,4 +99,18 @@ 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 $batchId = null;
+    private ?string $episodeId = null;
 
     #[ORM\ManyToOne(inversedBy: 'downloads')]
     private ?User $user = null;
@@ -143,14 +143,14 @@ class Download
         return $this;
     }
 
-    public function getBatchId(): ?string
+    public function getEpisodeId(): ?string
     {
-        return $this->batchId;
+        return $this->episodeId;
     }
 
-    public function setBatchId(?string $batchId): static
+    public function setEpisodeId(?string $episodeId): static
     {
-        $this->batchId = $batchId;
+        $this->episodeId = $episodeId;
 
         return $this;
     }

src/Download/Framework/Repository/DownloadRepository.php

@@ -2,11 +2,12 @@
 
 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;
 
 /**
@@ -62,9 +63,15 @@ class DownloadRepository extends ServiceEntityRepository
         string $filename,
         string $imdbId,
         string $mediaType,
-        string $batchId,
+        ?string $episodeId = null,
         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)
@@ -73,7 +80,7 @@ class DownloadRepository extends ServiceEntityRepository
             ->setFilename($filename)
             ->setImdbId($imdbId)
             ->setMediaType($mediaType)
-            ->setBatchId($batchId)
+            ->setEpisodeId($episodeId)
             ->setProgress(0)
             ->setStatus($status);
 

src/Monitor/Action/Handler/MonitorMovieHandler.php

@@ -25,7 +25,6 @@ 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,15 +2,18 @@
 
 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;
@@ -25,22 +28,24 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
 {
     public function __construct(
         private GetTvShowOptionsHandler $getTvShowOptionsHandler,
-        private MonitorOptionEvaluator $monitorOptionEvaluator,
+        private DownloadOptionEvaluator $downloadOptionEvaluator,
         private EntityManagerInterface $entityManager,
         private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
         private Tmdb $tmdb,
+        private DownloadRepository $downloadRepository,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler');
+        try {
             $monitor = $this->monitorRepository->find($command->movieMonitorId);
+            $this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler for ' . $monitor->getTitle() . ' season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode());
 
             $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
-        if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::now()) {
-            $this->logger->info('> [MonitorTvEpisodeHandler] Episode has not aired yet, skipping for now');
+            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: [
@@ -53,7 +58,6 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
             $monitor->setStatus('In Progress');
             $this->monitorRepository->getEntityManager()->flush();
 
-        $this->logger->info('> [MonitorTvEpisodeHandler] Searching for "' . $monitor->getTitle() . '" season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode() . ' download options');
             $results = $this->getTvShowOptionsHandler->handle(
                 new GetTvShowOptionsCommand(
                     $monitor->getTmdbId(),
@@ -63,30 +67,45 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
                 )
             );
 
-        $this->logger->info('> [MonitorTvEpisodeHandler] Found ' . count($results->results) . ' download options');
+            $this->logger->info('> [MonitorTvEpisodeHandler] ...Found ' . count($results->results) . ' total download options, beginning evaluation');
 
-        $result = $this->monitorOptionEvaluator->evaluateOptions($monitor, $results->results);
+            $result = $this->downloadOptionEvaluator->evaluateOptions($results->results, UserPreferencesFactory::createFromUser($monitor->getUser()));
 
             if (null !== $result) {
-            $this->logger->info('> [MonitorTvEpisodeHandler] 1 matching result found: dispatching DownloadMediaCommand for "' . $result->title . '"');
+                $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(
-                $result->url,
-                $monitor->getTitle(),
-                $result->filename,
+                    $download->getUrl(),
+                    $download->getTitle(),
+                    $download->getFilename(),
                     'tvshows',
-                $monitor->getImdbId(),
+                    $download->getImdbId(),
                     $monitor->getUser()->getId(),
+                    $download->getId(),
                 ));
                 $monitor->setStatus('Complete');
                 $monitor->setDownloadedAt(new DateTimeImmutable());
             } else {
-            $this->logger->info('> [MonitorTvEpisodeHandler] 0 matching results found, monitor will run at next interval');
+                $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());
             $monitor->setStatus('Active');
         }
 
         $monitor->setLastSearch(new DateTimeImmutable());
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
-        $this->entityManager->flush();
+        $this->monitorRepository->getEntityManager()->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,26 +61,27 @@ readonly class MonitorTvShowHandler implements HandlerInterface
             // Dispatch Episode commands for each missing Episode
             foreach ($episodesInShow as $episode) {
                 // Only monitor future episodes
-                $episodeInFuture = $this->episodeInFuture($episode);
-                $this->logger->info('> [MonitorTvShowHandler] Episode is in future for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
+                $this->logger->info('> [MonitorTvShowHandler] Evaluating "' . $monitor->getTitle() . '", season "' . $episode['season_number'] . '" episode "' . $episode['episode_number'] . '"');
+                $episodeInFuture = $this->episodeReleasedAfterMonitorCreated($monitor->getCreatedAt(), $episode);
+                $this->logger->info('> [MonitorTvShowHandler] ...Released after monitor started? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
                 if (false === $episodeInFuture) {
-                    $this->logger->info('> [MonitorTvShowHandler] Episode not in future for title: ' . 'for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ', skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
                     continue;
                 }
 
                 // Check if the episode is already downloaded
                 $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
-                $this->logger->info('> [MonitorTvShowHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
+                $this->logger->info('> [MonitorTvShowHandler] ...Episode exists? ' . (true === $episodeExists ? 'YES' : 'NO'));
                 if (true === $episodeExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] Episode exists for title: ' . $monitor->getTitle() . ', skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
                     continue;
                 }
 
                 // Check for existing monitors
                 $monitorExists = $this->monitorExists($monitor, $episode);
-                $this->logger->info('> [MonitorTvShowHandler] Monitor exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $monitorExists ? 'YES' : 'NO'));
+                $this->logger->info('> [MonitorTvShowHandler] ...Monitor exists? ' . (true === $monitorExists ? 'YES' : 'NO'));
                 if (true === $monitorExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] Monitor exists for title: ' . $monitor->getTitle() . ', skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
                     continue;
                 }
 
@@ -106,7 +107,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 for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
+                $this->logger->info('> [MonitorTvShowHandler] ...Dispatching MonitorTvEpisodeCommand');
             }
         }
 
@@ -125,11 +126,11 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         );
     }
 
-    private function episodeInFuture(array $episodeInShow): bool
+    private function episodeReleasedAfterMonitorCreated(string|DateTimeImmutable $monitorStartDate, array $episodeInShow): bool
     {
-        static $today = Carbon::today();
+        $monitorStartDate = Carbon::parse($monitorStartDate)->setTime(0, 0);
         $episodeAirDate = Carbon::parse($episodeInShow['air_date']);
-        return $episodeAirDate > $today;
+        return $episodeAirDate >= $monitorStartDate;
     }
 
     private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool

src/Monitor/Framework/Controller/ApiController.php

@@ -2,17 +2,15 @@
 
 namespace App\Monitor\Framework\Controller;
 
-use App\Download\Action\Input\DeleteDownloadInput;
+use App\Base\Util\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\Util\Broadcaster;
+use App\Monitor\Framework\Scheduler\MonitorDispatcher;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
 use Symfony\Component\Routing\Attribute\Route;
 
 class ApiController extends AbstractController
@@ -46,22 +44,25 @@ class ApiController extends AbstractController
     public function deleteMonitor(
         DeleteMonitorInput $input,
         DeleteMonitorHandler $handler,
-        HubInterface $hub,
     ) {
         $response = $handler->handle($input->toCommand());
 
-        $hub->publish(new Update(
-            'alerts',
-            $this->renderer->render('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => "New monitor added for {$response->monitor->getTitle()}",
-            ])
-        ));
-
         return $this->json([
             'status' => 200,
             'message' => $response
         ]);
     }
+
+    #[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,6 +4,7 @@ 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;
@@ -49,6 +50,9 @@ 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;
 
@@ -146,9 +150,14 @@ class Monitor
         return $this;
     }
 
+    public function isOnlyFuture(): bool
+    {
+        return $this->onlyFuture;
+    }
+
     public function getLastSearch(): ?\DateTimeInterface
     {
-        return $this->lastSearch;
+        return Carbon::parse($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,6 +7,7 @@ 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;
@@ -23,6 +24,8 @@ class MonitorDispatcher
     public function __invoke() {
         $this->logger->info('[MonitorDispatcher] Executing MonitorDispatcher');
 
+        $this->cleanupStuckMonitors();
+
         $monitorHandlers = [
             'movie' => MonitorMovieCommand::class,
             'tvepisode' => MonitorTvEpisodeCommand::class,
@@ -41,4 +44,18 @@ 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/Search/Action/Handler/GetMediaInfoHandler.php

@@ -2,6 +2,7 @@
 
 namespace App\Search\Action\Handler;
 
+use App\Base\Service\MediaFiles;
 use App\Search\Action\Command\GetMediaInfoCommand;
 use App\Search\Action\Result\GetMediaInfoResult;
 use App\Tmdb\Tmdb;
@@ -14,12 +15,19 @@ class GetMediaInfoHandler implements HandlerInterface
 {
     public function __construct(
         private readonly Tmdb $tmdb,
+        private readonly MediaFiles $mediaFiles
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
         $media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
 
+        if ("tvshows" === $command->mediaType) {
+            foreach ($media->episodes[$command->season] as $key => $episode) {
+                $media->episodes[$command->season][$key]['file'] = $this->mediaFiles->episodeExists($media->title, $command->season, $episode['episode_number']);
+            }
+        }
+
         return new GetMediaInfoResult($media, $command->season);
     }
 }

src/Search/Action/Input/GetMediaInfoInput.php

@@ -2,8 +2,6 @@
 
 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/Search/Framework/Controller/WebController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace App\Search\Framework\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 SearchController extends AbstractController
+final class WebController extends AbstractController
 {
     public function __construct(
         private SearchHandler $searchHandler,
@@ -40,8 +40,6 @@ final class SearchController extends AbstractController
     ): Response {
         $result = $this->getMediaInfoHandler->handle($input->toCommand());
 
-//        $this->warmDownloadOptionCache($result->media);
-
         return $this->render('search/result.html.twig', [
             'results' => $result,
             'filter' => [

src/Tmdb/Framework/Controller/ApiController.php

@@ -0,0 +1,38 @@
+<?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,20 +3,20 @@
 namespace App\Tmdb;
 
 use Aimeos\Map;
-use App\Enum\MediaType;
+use App\Base\Enum\MediaType;
 use App\ValueObject\ResultFactory;
+use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 use Tmdb\Api\Find;
 use Tmdb\Client;
 use Tmdb\Event\BeforeRequestEvent;
+use Tmdb\Event\Listener\Psr6CachedRequestListener;
 use Tmdb\Event\Listener\Request\AcceptJsonRequestListener;
 use Tmdb\Event\Listener\Request\ApiTokenRequestListener;
 use Tmdb\Event\Listener\Request\ContentTypeJsonRequestListener;
 use Tmdb\Event\Listener\Request\UserAgentRequestListener;
-use Tmdb\Event\Listener\RequestListener;
 use Tmdb\Event\RequestEvent;
 use Tmdb\Model\Movie;
 use Tmdb\Model\Search\SearchQuery\KeywordSearchQuery;
@@ -40,7 +40,7 @@ class Tmdb
     const POSTER_IMG_PATH = "https://image.tmdb.org/t/p/w500";
 
     public function __construct(
-        private readonly CacheInterface $cache,
+        private readonly CacheItemPoolInterface $cache,
         private readonly EventDispatcherInterface $eventDispatcher,
         #[Autowire(env: 'TMDB_API')] string $apiKey,
     ) {
@@ -71,7 +71,13 @@ class Tmdb
         /**
          * Required event listeners and events to be registered with the PSR-14 Event Dispatcher.
          */
-        $requestListener = new RequestListener($this->client->getHttpClient(), $this->eventDispatcher);
+        $requestListener = new Psr6CachedRequestListener(
+            $this->client->getHttpClient(),
+            $this->eventDispatcher,
+            $cache,
+            $this->client->getHttpClient()->getPsr17StreamFactory(),
+            []
+        );
         $this->eventDispatcher->addListener(RequestEvent::class, $requestListener);
 
         $apiTokenListener = new ApiTokenRequestListener($this->client->getToken());
@@ -209,7 +215,12 @@ class Tmdb
                 continue;
             }
 
-            $series['episodes'][$season['season_number']] = $client->getApi()->getSeason($series['id'], $season['season_number'])['episodes'];
+            $series['episodes'][$season['season_number']] = Map::from(
+                $client->getApi()->getSeason($series['id'], $season['season_number'])['episodes']
+            )->map(function ($data) {
+                $data['poster'] = (null !== $data['still_path']) ? self::POSTER_IMG_PATH . $data['still_path'] : null;
+                return $data;
+            })->toArray();
         }
         return $series;
     }

src/Torrentio/Action/Handler/GetMovieOptionsHandler.php

@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Action\Handler;
 
-use App\Monitor\Service\MediaFiles;
+use App\Base\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\Monitor\Service\MediaFiles;
+use App\Base\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;

src/Torrentio/Client/Torrentio.php

@@ -6,63 +6,99 @@ use App\Torrentio\Client\Rule\DownloadOptionFilter\Resolution;
 use App\Torrentio\Client\Rule\RuleEngine;
 use App\Torrentio\Result\ResultFactory;
 use Carbon\Carbon;
+use App\Torrentio\Exception\TorrentioRateLimitException;
+use GuzzleHttp\Client;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
+use Symfony\Contracts\Cache\TagAwareCacheInterface;
 
 class Torrentio
 {
-    private string $baseUrl = 'https://torrentio.strem.fun/providers%253Dyts%252Ceztv%252Crarbg%252C1337x%252Cthepiratebay%252Ckickasstorrents%252Ctorrentgalaxy%252Cmagnetdl%252Chorriblesubs%252Cnyaasi%7Csort%253Dqualitysize%7Cqualityfilter%253D480p%252Cscr%252Ccam%7Crealdebrid={realDebridKey}/stream/movie/{imdbCode}.json';
+    private string $baseUrl = 'https://torrentio.strem.fun/providers%253Dyts%252Ceztv%252Crarbg%252C1337x%252Cthepiratebay%252Ckickasstorrents%252Ctorrentgalaxy%252Cmagnetdl%252Chorriblesubs%252Cnyaasi%7Csort%253Dqualitysize%7Cqualityfilter%253D480p%252Cscr%252Ccam%7Crealdebrid={realDebridKey}/stream/movie';
 
     private string $searchUrl;
 
+    private Client $client;
+
     public function __construct(
         #[Autowire(env: 'REAL_DEBRID_KEY')] private string $realDebridKey,
-        private CacheInterface $cache,
+        private TagAwareCacheInterface $cache,
+        private LoggerInterface $logger,
     ) {
         $this->searchUrl = str_replace('{realDebridKey}', $this->realDebridKey, $this->baseUrl);
+        $this->client = new Client([
+            'base_uri' => $this->searchUrl,
+        ]);
     }
 
-    public function search(string $imdbCode, string $type, array $filter = []): array
+    public function search(string $imdbCode, string $type, bool $parseResults = true): array
     {
         $cacheKey = "torrentio.{$imdbCode}";
 
-        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode) {
+        $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode, $type) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $response = file_get_contents(str_replace('{imdbCode}', $imdbCode, $this->searchUrl));
+            $item->tag(['torrentio', $type, $imdbCode]);
+            try {
+                $response = $this->client->get("$this->searchUrl/$imdbCode.json");
                 return json_decode(
-                $response,
+                    $response->getBody()->getContents(),
                     true
                 );
-        });
-
-        return $this->parse($results, $filter);
+            } catch (\Throwable $exception) {
+                if ($exception->getCode() === 429) {
+                    $this->logger->warning("> [TorrentioClient] Rate limit exceeded");
+                    return null;
+                }
             }
 
-    public function fetchEpisodeResults(string $imdbId, int $season, int $episode): array
+            $this->logger->error("> [TorrentioClient] Request error: " . $response->getStatusCode() . " - " . $response->getBody()->getContents());
+            return [];
+        });
+
+        if (true === $parseResults) {
+            return $this->parse($results);
+        }
+
+        return $results;
+    }
+
+    public function fetchEpisodeResults(string $imdbId, int $season, int $episode, bool $parseResults = true): array
     {
         $cacheKey = "torrentio.$imdbId.$season.$episode";
         $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbId, $season, $episode) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $response = file_get_contents(str_replace('{imdbCode}', "$imdbId:$season:$episode", $this->searchUrl));
+            $item->tag(['torrentio', 'tvshows', 'torrentio.tvshows', $imdbId, "torrentio.$imdbId", "$imdbId.$season", "torrentio.$imdbId.$season", "$imdbId.$season.$episode", "torrentio.$imdbId.$season.$episode"]);
+            try {
+                $response = $this->client->get("$this->searchUrl/$imdbId:$season:$episode.json");
                 return json_decode(
-                $response,
+                    $response->getBody()->getContents(),
                     true
                 );
+            } catch (\Throwable $exception) {
+                if ($exception->getCode() === 429) {
+                    $this->logger->warning("> [TorrentioClient] Rate limit exceeded");
+                    return null;
+                }
+            }
+
+            $this->logger->error("> [TorrentioClient] Request error: " . $response->getStatusCode() . " - " . $response->getBody()->getContents());
+            return [];
         });
 
-        return $this->parse($results, []);
+        if (null === $results) {
+            throw new TorrentioRateLimitException();
         }
 
-    public function parse(array $data, array $filter): array
+        if (true === $parseResults) {
+            return $this->parse($results);
+        }
+
+        return $results;
+    }
+
+    public function parse(array $data): 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")) {
@@ -84,10 +120,8 @@ class Torrentio
                 $bingeGroup
             );
 
-            if ($ruleEngine->validateAll($result)) {
             $results[] = $result;
         }
-        }
 
         return $results;
     }

src/Torrentio/Exception/TorrentioRateLimitException.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Torrentio\Exception;
+
+class TorrentioRateLimitException extends \Exception
+{
+    public function __construct()
+    {
+        parent::__construct(sprintf("[TorrentioClient] Rate limit exceeded"));
+    }
+}

src/Torrentio/Framework/Controller/ApiController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Torrentio\Framework\Controller;
+
+use App\Torrentio\Client\Torrentio;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+
+final 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),
+        );
+    }
+}

src/Torrentio/Framework/Controller/WebController.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Controller;
+namespace App\Torrentio\Framework\Controller;
 
+use App\Base\Util\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\Util\Broadcaster;
+use App\Torrentio\Exception\TorrentioRateLimitException;
 use Carbon\Carbon;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
@@ -15,7 +16,7 @@ use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 
-final class TorrentioController extends AbstractController
+final class WebController extends AbstractController
 {
     public function __construct(
         private readonly GetMovieOptionsHandler $getMovieOptionsHandler,
@@ -52,13 +53,24 @@ final class TorrentioController extends AbstractController
             $input->episode,
         );
 
-        return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
-            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+        try {
+//            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,
                 ]);
-        });
+//            });
+        } 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')]

src/Torrentio/Result/ResultFactory.php

@@ -2,8 +2,7 @@
 
 namespace App\Torrentio\Result;
 
-use App\Util\CountryCodes;
-use App\Util\CountryLanguages;
+use App\Base\Util\CountryLanguages;
 use Nihilarr\PTN;
 
 class ResultFactory
@@ -34,12 +33,14 @@ 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
+            false,
+            uniqid()
         );
     }
 

src/Torrentio/Result/TorrentioResult.php

@@ -16,11 +16,13 @@ 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

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

src/Twig/Components/DownloadList.php

@@ -3,11 +3,8 @@
 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,6 +3,7 @@
 namespace App\Twig\Components;
 
 use Aimeos\Map;
+use App\Base\Util\QualityList;
 use App\User\Framework\Repository\PreferencesRepository;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
@@ -17,6 +18,8 @@ final class Filter
 
     public array $userPreferences = [];
 
+    public array $reverseMappedQualities = [];
+
     public function __construct(
         private readonly PreferencesRepository $preferencesRepository,
         private readonly Security $security,
@@ -27,5 +30,6 @@ 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\Util\Paginator;
+use App\Base\Util\Paginator;
 use Doctrine\ORM\Query;
 use Symfony\UX\LiveComponent\Attribute\LiveAction;
 use Symfony\UX\LiveComponent\Attribute\LiveArg;

src/Twig/Extensions/UtilExtension.php

@@ -2,8 +2,8 @@
 
 namespace App\Twig\Extensions;
 
-use App\Monitor\Framework\Entity\Monitor;
-use App\Monitor\Service\MediaFiles;
+use App\Base\Service\MediaFiles;
+use App\Torrentio\Action\Result\GetTvShowOptionsResult;
 use ChrisUllyott\FileSize;
 use Twig\Attribute\AsTwigFilter;
 use Twig\Attribute\AsTwigFunction;
@@ -21,6 +21,15 @@ class UtilExtension
         return uniqid();
     }
 
+    #[AsTwigFilter('truncate')]
+    public function truncate(string $text)
+    {
+        if (strlen($text) > 300) {
+            $text = substr($text, 0, 300) . '...';
+        }
+        return $text;
+    }
+
     #[AsTwigFilter('filesize')]
     public function type(string|int $size)
     {
@@ -36,4 +45,15 @@ class UtilExtension
             $path
         );
     }
+
+    #[AsTwigFilter('episode_id_from_results')]
+    public function episodeId($result): ?string
+    {
+        if (!$result instanceof GetTvShowOptionsResult) {
+            return null;
+        }
+
+        return "S". str_pad($result->season, 2, "0", STR_PAD_LEFT) .
+            "E". str_pad($result->episode, 2, "0", STR_PAD_LEFT);
+    }
 }

src/User/Action/Command/SaveUserMediaPreferencesCommand.php

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

src/User/Dto/UserPreferences.php

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

@@ -0,0 +1,47 @@
+<?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,22 +2,30 @@
 
 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(AuthenticationUtils $authenticationUtils, UserRepository $userRepository): Response
+    public function login(ConfigResolver $config, 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();
 
@@ -25,13 +33,14 @@ 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(): void
+    public function logout(Security $security, Request $request): 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

@@ -0,0 +1,46 @@
+<?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,14 +4,15 @@ declare(strict_types=1);
 
 namespace App\User\Framework\Controller\Web;
 
+use App\Base\Util\Broadcaster;
+use App\Base\Util\CountryLanguages;
+use App\Base\Util\ProviderList;
+use App\Base\Util\QualityList;
 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\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;
@@ -36,7 +37,8 @@ class PreferencesController extends AbstractController
             [
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
-                'providers' => ProviderList::$providers,
+                'providers' => ProviderList::getProviders(),
+                'qualities' => QualityList::getBaseQualities(),
                 'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
             ]
@@ -67,6 +69,7 @@ class PreferencesController extends AbstractController
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
                 'providers' => ProviderList::$providers,
+                'qualities' => QualityList::getBaseQualities(),
                 'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
             ]
@@ -95,7 +98,8 @@ class PreferencesController extends AbstractController
             [
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
-                'providers' => ProviderList::$providers,
+                'providers' => ProviderList::getProviders(),
+                'qualities' => QualityList::getBaseQualities(),
                 'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
             ]

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

@@ -17,13 +17,16 @@ use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
 class RegistrationController extends AbstractController
 {
-    public function __construct(private readonly RegisterUserHandler $registerUserHandler)
+    public function __construct(private readonly RegisterUserHandler $registerUserHandler,
+        private readonly RequestStack $requestStack
+    )
     {
     }
 
@@ -71,6 +74,7 @@ class RegistrationController extends AbstractController
             ));
 
             $security->login($user->user);
+            $this->requestStack->getCurrentRequest()->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
 
             return $this->redirectToRoute('app_index');
         }