fix: season/episode regex parser

.env

@@ -51,11 +51,3 @@ 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 ###
-
-
-SMTP_HOST=
-SMTP_USER=
-SMTP_PASS=
-SMTP_PORT=
-SMTP_FROM=
-SMTP_FROM_NAME=""

.gitignore

@@ -18,3 +18,4 @@ bolt.db
 ###> phpstan/phpstan ###
 phpstan.neon
 ###< phpstan/phpstan ###
+.php-cs-fixer.cache

assets/app.js

@@ -6,6 +6,7 @@ import './bootstrap.js';
  * which should already be in your base.html.twig.
  */
 import './styles/app.css';
+import PullToRefresh from 'pulltorefreshjs';
 
 console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉');
 
@@ -18,3 +19,10 @@ var observer = new MutationObserver(function(mutations) {
 
 observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
 
+const ptr = PullToRefresh.init({
+    mainElement: 'body',
+    onRefresh() {
+        window.location.reload();
+    }
+});
+

assets/bootstrap.js

@@ -1,10 +1,19 @@
+import EpisodeContainer from './components/episode-container.js';
+import DownloadOptionTr from './components/download-option-tr.js';
+import MovieContainer   from "./components/movie-container.js";
+
 import { startStimulusApp } from '@symfony/stimulus-bundle';
-import Popover from '@stimulus-components/popover'
-import Dialog from '@stimulus-components/dialog'
-import Dropdown from '@stimulus-components/dropdown'
+import Popover from '@stimulus-components/popover';
+import Dialog from '@stimulus-components/dialog';
+import Dropdown from '@stimulus-components/dropdown';
+import 'animate.css';
 
 const app = startStimulusApp();
 // register any custom, 3rd party controllers here
 app.register('popover', Popover);
 app.register('dialog', Dialog);
 app.register('dropdown', Dropdown);
+
+customElements.define('episode-container', EpisodeContainer);
+customElements.define('movie-container', MovieContainer);
+customElements.define('dl-tr', DownloadOptionTr, {extends: 'tr'});

assets/components/download-option-tr.js

@@ -0,0 +1,187 @@
+export default class DownloadOptionTr extends HTMLTableRowElement {
+    H264_CODECS = {
+        'h264': 'h264',
+        'h.264': 'h264',
+        'x264': 'h264',
+    }
+    H265_CODECS = {
+        'h265': 'h265',
+        'h.265': 'h265',
+        'x265': 'h265',
+        'hevc': 'h265',
+    }
+
+    #downloadBtnEl;
+    #selectEpisodeInputEl;
+
+    url;
+    size;
+    quality;
+    resolution;
+    codec;
+    seeders;
+    provider;
+    languages;
+    mediaType;
+    season;
+    episode;
+    filename;
+    imdbId;
+    episodeId;
+    mediaTitle;
+
+    constructor() {
+        super();
+        this.url = this.getAttribute('url');
+        this.size = this.getAttribute('size');
+        this.quality = this.getAttribute('quality');
+        this.resolution = this.getAttribute('resolution');
+        this.codec = this.getAttribute('codec');
+        this.seeders = this.getAttribute('seeders');
+        this.provider = this.getAttribute('provider');
+        this.filename = this.getAttribute('filename');
+        this.imdbId = this.getAttribute('imdb-id');
+        this.languages = JSON.parse(this.getAttribute('languages'));
+        this.mediaType = this.getAttribute('media-type');
+        this.mediaTitle = this.getAttribute('media-title');
+        this.season = this.getAttribute('season') ?? null;
+        this.episode = this.getAttribute('episode') ?? null;
+        this.episodeId = this.getAttribute('episode-id') ?? null;
+        this.#downloadBtnEl = this.querySelector('.download-btn');
+        this.#selectEpisodeInputEl = this.querySelector('input[type="checkbox"]');
+
+        this.#downloadBtnEl.addEventListener('click', () => this.download());
+    }
+    get isSelected() {
+        return this.#selectEpisodeInputEl.checked;
+    }
+
+    set isSelected(value) {
+        this.#selectEpisodeInputEl.checked = value;
+    }
+
+    filter({ detail: { activeFilter } }) {
+        const optionHeader = document.querySelector(`[data-option-id="${this.dataset['localId']}"]`)
+
+        let include = true;
+        this.classList.add('r-tablerow');
+        this.classList.remove('hidden');
+        optionHeader.classList.add('r-tablerow');
+        optionHeader.classList.remove('hidden');
+
+        this.querySelector('input[type="checkbox"]').checked = false;
+
+        if (!this.#validateResolutions(activeFilter.resolution)) {
+            include = false;
+        }
+
+        if (!this.#validateCodecs(activeFilter.codec)) {
+            include = false;
+        }
+
+        if (!this.#validateLanguages(activeFilter.language)) {
+            include = false;
+        }
+
+        if (!this.#validateQualities(activeFilter.quality)) {
+            include = false;
+        }
+
+        if (!this.#validateProviders(activeFilter.provider)) {
+            include = false;
+        }
+
+        if (false === include) {
+            this.classList.remove('r-tablerow');
+            this.classList.add('hidden');
+            optionHeader.classList.remove('r-tablerow');
+            optionHeader.classList.add('hidden');
+        }
+
+        return include;
+    }
+
+    download() {
+        fetch('/api/download', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Accept': 'application/json',
+            },
+            body: JSON.stringify({
+                url: this.url,
+                title: this.mediaTitle,
+                filename: this.filename,
+                mediaType: this.mediaType,
+                imdbId: this.imdbId,
+                episodeId: this.episodeId
+            })
+        })
+            .then(res => res.json())
+            .then(json => {
+                console.log(json)
+            })
+    }
+
+    #validateResolutions(selectedOptions) {
+        return this.#validateIntersection(selectedOptions, this.resolution.trim().split(','));
+    }
+
+    #validateCodecs(selectedOptions) {
+        if (this.#validateIntersection(selectedOptions, Object.keys(this.H264_CODECS))) {
+            return this.#validateIntersection(
+                selectedOptions,
+                [...this.codec.trim().split(','), '', 'n/a']
+            );
+        }
+        if (this.#validateIntersection(selectedOptions, Object.keys(this.H265_CODECS))) {
+            return this.#validateIntersection(
+                selectedOptions,
+                [...this.codec.trim().split(','), '', 'n/a']
+            );
+        }
+        return false;
+    }
+
+    #validateQualities(selectedOptions) {
+        return this.#validateIntersection(selectedOptions, this.quality.trim().split(','));
+    }
+
+    #validateProviders(selectedOptions) {
+        return this.#validateIntersection(selectedOptions, this.provider.trim().split(','));
+    }
+
+    #validateLanguages(selectedOptions) {
+        return this.#validateIntersection(selectedOptions, this.languages);
+    }
+
+    #validateIntersection(selectedOptions, localOptions) {
+        if (selectedOptions === null || selectedOptions === undefined) {
+            return true;
+        }
+
+        if (typeof selectedOptions === 'string' || selectedOptions instanceof String) {
+            selectedOptions = [selectedOptions];
+        }
+
+        if (selectedOptions.length === 0 ||
+            (selectedOptions.length === 1 && selectedOptions[0] === "") ||
+            (selectedOptions.length === 1 && selectedOptions[0] === "n/a")
+        ) {
+            return true;
+        }
+
+        return this.#doesIntersect(localOptions, selectedOptions);
+    }
+
+    #doesIntersect(a, b) {
+        if (a.length === 0 || b.length === 0) {
+            return false;
+        }
+        return this.#intersect(a, b).length > 0;
+    }
+
+    #intersect(a, b) {
+        return a.filter(Set.prototype.has, new Set(b));
+    }
+}

assets/components/episode-container.js

@@ -0,0 +1,76 @@
+export default class EpisodeContainer extends HTMLElement {
+    options = [];
+    showTitle;
+
+    #episodeSelectorEl;
+    #resultsToggleBtnEl;
+    #resultsTableEl;
+    #resultsCountBadgeEl;
+    #resultsCountNumberEl;
+
+    constructor() {
+        super();
+        this.showTitle = this.getAttribute('show-title');
+        this.#resultsTableEl = this.querySelector('.results-container');
+        this.#resultsToggleBtnEl = this.querySelector('.dropdown-button');
+        this.#resultsCountBadgeEl = this.querySelector('.results-count-badge');
+        this.#resultsCountNumberEl = this.querySelector('.results-count-number');
+        this.#episodeSelectorEl = this.querySelector('.episode-selector');
+
+        this.#resultsToggleBtnEl.addEventListener('click', () => this.toggleResults());
+        this.#resultsCountBadgeEl.addEventListener('click', () => this.toggleResults());
+
+        document.addEventListener('filterDownloadOptions', this.filter.bind(this));
+        document.addEventListener('downloadSelectedEpisodes', this.downloadSelectedResults.bind(this));
+        document.addEventListener('selectEpisodeForDownload', (e) => this.selectEpisodeForDownload(e.detail.select));
+    }
+
+    toggleResults() {
+        this.#resultsToggleBtnEl.classList.toggle('rotate-90');
+        this.#resultsToggleBtnEl.classList.toggle('-rotate-90');
+        this.#resultsTableEl.classList.toggle('hidden');
+    }
+
+    selectEpisodeForDownload(select) {
+        if (this.#episodeSelectorEl.disabled === false) {
+            this.#episodeSelectorEl.checked = select;
+        }
+    }
+
+    downloadSelectedResults() {
+        if (this.#episodeSelectorEl.disabled === false &&
+            this.#episodeSelectorEl.checked === true
+        ) {
+            console.log('episode is selected')
+            this.options.forEach(option => {
+                if (option.isSelected === true) {
+                    option.download();
+                }
+                option.isSelected = false;
+            })
+        }
+    }
+
+    filter({ detail: { activeFilter } }) {
+        let firstIncluded = true;
+        let count = 0;
+        let selectedCount = 0;
+
+        this.options.forEach((option) => {
+            const include = option.filter({ detail: { activeFilter: activeFilter } });
+
+            if (false === include) {
+                option.classList.remove('r-tablerow');
+                option.classList.add('hidden');
+            } else if (true === firstIncluded) {
+                count = 1;
+                selectedCount = selectedCount + 1;
+                option.querySelector('input[type="checkbox"]').checked = true;
+                firstIncluded = false;
+            } else {
+                count = count + 1;
+            }
+        });
+        this.#resultsCountNumberEl.innerText = count;
+    }
+}

assets/components/movie-container.js

@@ -0,0 +1,36 @@
+export default class MovieContainer extends HTMLElement {
+    #resultsTableEl;
+    #resultsCountNumberEl;
+
+    constructor() {
+        super();
+        this.#resultsTableEl = this.querySelector('.results-container');
+        this.#resultsCountNumberEl = document.querySelector('.results-count-number');
+
+        document.addEventListener('filterDownloadOptions', this.filter.bind(this));
+    }
+
+    filter({ detail: { activeFilter } }) {
+        const options = this.querySelectorAll('tr.download-option');
+        let firstIncluded = true;
+        let count = 0;
+        let selectedCount = 0;
+
+        options.forEach((option) => {
+            const include = option.filter({ detail: { activeFilter: activeFilter } });
+
+            if (false === include) {
+                option.classList.remove('r-tablerow');
+                option.classList.add('hidden');
+            } else if (true === firstIncluded) {
+                count = 1;
+                selectedCount = selectedCount + 1;
+                option.querySelector('input[type="checkbox"]').checked = true;
+                firstIncluded = false;
+            } else {
+                count = count + 1;
+            }
+        });
+        this.#resultsCountNumberEl.innerText = count;
+    }
+}

assets/controllers/download_list_controller.js

@@ -7,7 +7,7 @@ import { getComponent } from '@symfony/ux-live-component';
 
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
-    static targets = ['download']
+    static targets = ['download', 'deleteFileInput']
 
     async initialize() {
         this.component = await getComponent(this.element);
@@ -42,7 +42,8 @@ export default class extends Controller {
     }
 
     deleteDownload(data) {
-        fetch(`/api/download/${data.params.id}`, {method: 'DELETE'})
+        const deleteFileInput = document.querySelector(`#delete_file_${data.params.id}`)
+        fetch(`/api/download/${data.params.id}?deleteFile=${deleteFileInput.checked}`, {method: 'DELETE'})
             .then(res => res.json())
             .then(json => console.debug(json));
     }

assets/controllers/loading_icon_controller.js

@@ -14,7 +14,22 @@ export default class extends Controller {
     static targets = ['icon']
 
     connect() {
+        this.element.hideIcon = this.hideIcon.bind(this);
+        this.element.showIcon = this.showIcon.bind(this);
+        this.element.toggleIcon = this.toggleIcon.bind(this);
+        this.element.isVisibile = this.isVisible.bind(this);
+    }
 
+    isVisible() {
+        return !this.iconTarget.classList.contains('hidden');
+    }
+
+    showIcon() {
+        this.iconTarget.classList.remove('hidden');
+    }
+
+    hideIcon() {
+        this.iconTarget.classList.add('hidden');
     }
 
     toggleIcon() {
@@ -26,6 +41,8 @@ export default class extends Controller {
         if (this.countValue === this.totalValue) {
             this.toggleIcon();
             this.countValue = 0;
+            console.log('filtering')
+            document.getElementById('filter').filterResults();
         }
     }
 }

assets/controllers/movie_results_controller.js

@@ -6,9 +6,6 @@ import { Controller } from '@hotwired/stimulus';
 */
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
-    H264_CODECS = ['h264', 'h.264', 'x264']
-    H265_CODECS = ['h265', 'h.265', 'x265', 'hevc']
-
     static values = {
         title: String,
         tmdbId: String,
@@ -20,87 +17,18 @@ export default class extends Controller {
 
     options = []
     optionsLoaded = false
+    resultCountEl = null
 
     async connect() {
-        await this.setOptions();
+        this.resultCountEl = document.querySelector('#movie_results_count');
     }
 
-    async setOptions() {
-        if (false === this.optionsLoaded) {
-            this.optionsLoaded = true;
-            await fetch(`/torrentio/movies/${this.tmdbIdValue}/${this.imdbIdValue}`)
-                .then(res => res.text())
-                .then(response => {
-                    this.element.innerHTML = response;
-                    this.options = this.element.querySelectorAll('tbody tr');
-                    this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
-                    this.dispatch('optionsLoaded', {detail: {options: this.options}})
-                    this.loadingIconOutlet.toggleIcon();
-                });
-        }
-    }
-
-    // Keeps compatible with Filter & TV Shows
-    isActive() {
-        return true;
-    }
-
-    async filter(activeFilter) {
-        let firstIncluded = true;
-        let count = 0;
-        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)) {
-                if (value === "" || key === "season") {
-                    continue;
-                }
-                if (key === "codec" && value === "h264") {
-                    if (!this.H264_CODECS.includes(props[key].toLowerCase())) {
-                        include = false;
-                    }
-                } else if (key === "codec" && value === "h265") {
-                    if (!this.H265_CODECS.includes(props[key].toLowerCase())) {
-                        include = false;
-                    }
-                } else if (key === "language") {
-                    if (!props["languages"].includes(value)) {
-                        include = false;
-                    }
-                } else if (props[key] !== value) {
-                    include = false;
-                }
-            }
-
-            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;
-                option.querySelector('input[type="checkbox"]').checked = true;
-                firstIncluded = false;
-            } else {
-                count = count + 1;
-            }
-        });
+    async listTargetConnected() {
+        this.optionsLoaded = true;
+        this.options = this.element.querySelectorAll('tbody tr');
+        this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
+        this.resultCountEl.innerText = this.options.length;
+        this.loadingIconOutlet.toggleIcon();
+        document.dispatchEvent(new CustomEvent('optionsLoaded', {detail: {options: this.options}}));
     }
 }

assets/controllers/navbar_controller.js

@@ -24,6 +24,7 @@ export default class extends Controller {
 
     toggle() {
         this.element.parentElement.classList.toggle('hidden');
+        this.element.classList.toggle('animate__slideInLeft');
         this.element.classList.toggle('fixed');
         this.element.classList.toggle('z-20');
     }

assets/controllers/result_filter_controller.js

@@ -6,24 +6,23 @@ import { Controller } from '@hotwired/stimulus';
 */
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
-    H264_CODECS = ['h264', 'h.264', 'x264']
-    H265_CODECS = ['h265', 'h.265', 'x265', 'hevc']
-
     languages = []
     providers = []
     qualities = []
     seasons = []
 
     activeFilter = {
-        "resolution": "",
-        "codec": "",
-        "language": "",
-        "provider": "",
-        "quality": "",
+        "resolution": [],
+        "codec": [],
+        "language": [],
+        "provider": [],
+        "quality": [],
     }
 
-    static outlets = ['movie-results', 'tv-results', 'tv-episode-list']
-    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'selectAll', 'downloadSelected']
+    defaultOptions = '<option value="-">-</option>';
+
+    static outlets = ['tv-episode-list']
+    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'loadingIcon', 'selectAll', 'downloadSelected']
     static values = {
         'imdbId': String,
         'media-type': String,
@@ -32,133 +31,77 @@ export default class extends Controller {
     }
 
     async connect() {
+        await this.setInitialFilter();
+        this.setTimerToStopLoadingIcon();
+        this.element.filterResults = this.filter.bind(this);
+        document.addEventListener('optionsLoaded', this.loadOptions.bind(this));
+    }
+
+    async setInitialFilter() {
+        const response = await fetch('/api/user/filters');
+        const filters = await response.json();
+        if (filters.length > 0) {
+            this.activeFilter = filters[0];
+        }
         if (this.mediaTypeValue === "tvshows") {
             this.activeFilter['season'] = 1;
         }
-        await this.filter();
+    }
+
+    setTimerToStopLoadingIcon() {
+        setTimeout(() => this.loadingIconTarget.hideIcon(), 10000);
     }
 
     // Event is fired from movies/tvshows controllers to populate this data
     async loadOptions({detail: { options }}) {
         await options.forEach((option) => {
-            this.addLanguages(option, option.dataset);
-            this.addProviders(option, option.dataset);
-            this.addQualities(option, option.dataset);
+            option.filter({detail: {activeFilter: this.activeFilter }});
         })
-        await this.filter();
     }
 
-    addLanguages(option, props) {
-        const languages = Object.assign([], JSON.parse(props['languages']));
-        languages.forEach((language) => {
-            if (!this.languages.includes(language)) {
-                this.languages.push(language);
+    selectAllEpisodes() {
+        document.dispatchEvent(new CustomEvent('selectEpisodeForDownload', {
+            detail: {
+                select: this.selectAllTarget.checked,
             }
-        });
-
-        const preferred = this.languageTarget.dataset.preferred;
-        if (preferred) {
-            this.languageTarget.innerHTML = '<option value="'+preferred+'" selected>'+preferred+'</option>';
-            this.languageTarget.innerHTML += '<option value="">n/a</option>';
-        } else {
-            this.languageTarget.innerHTML = '<option value="">n/a</option>';
-        }
-
-        this.languageTarget.innerHTML += this.languages.sort()
-            .map((language) => {
-                const preferred = this.languageTarget.dataset.preferred;
-                if (preferred === language) {
-                    return;
-                }
-                return '<option value="'+language+'">'+language+'</option>';
-            })
-            .join();
+        }));
     }
 
-    addProviders(option, props) {
-        if (!this.providers.includes(props['provider'])) {
-            this.providers.push(props['provider']);
-        }
-
-        const preferred = this.providerTarget.dataset.preferred;
-        if (preferred) {
-            this.providerTarget.innerHTML = '<option value="'+preferred+'" selected>'+preferred+'</option>';
-            this.providerTarget.innerHTML += '<option value="">n/a</option>';
-        } else {
-            this.providerTarget.innerHTML = '<option value="">n/a</option>';
-        }
-
-        this.providerTarget.innerHTML += this.providers.sort()
-            .map((provider) => {
-                const preferred = this.languageTarget.dataset.preferred;
-                if (preferred === provider) {
-                    return;
-                }
-                return '<option value="' + provider + '">' + provider + '</option>'
-            })
-            .join();
-
+    downloadSelectedEpisodes() {
+        document.dispatchEvent(new CustomEvent('downloadSelectedEpisodes', {}));
     }
 
-    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() {
+    filter() {
         const downloadSeasonSpan = document.querySelector("#downloadSeasonModal");
-        const currentSeason = this.activeFilter['season'];
 
-        let results = [];
         this.activeFilter = {
-            "resolution": this.resolutionTarget.value,
-            "codec": this.codecTarget.value,
-            "language": this.languageTarget.value,
-            "provider": this.providerTarget.value,
-            "quality": this.qualityTarget.value,
+            "resolution": this.#fetchValuesFromNodeList(this.resolutionTarget.selectedOptions),
+            "codec": this.#fetchValuesFromNodeList(this.codecTarget.selectedOptions),
+            "language": this.#fetchValuesFromNodeList(this.languageTarget.selectedOptions),
+            "provider": this.#fetchValuesFromNodeList(this.providerTarget.selectedOptions),
+            "quality": this.#fetchValuesFromNodeList(this.qualityTarget.selectedOptions),
         }
 
-        if ("movies" === this.mediaTypeValue) {
-            results = this.movieResultsOutlets;
-            await results.forEach((list) => list.filter(this.activeFilter));
-
-        } else if ("tvshows" === this.mediaTypeValue) {
-            results = this.tvResultsOutlets;
+        if ("tvshows" === this.mediaTypeValue) {
+            downloadSeasonSpan.innerText = this.seasonTarget.value;
             this.activeFilter.season = this.seasonTarget.value;
-            downloadSeasonSpan.innerText = this.activeFilter.season;
-            await results.forEach((list) => list.filter(this.activeFilter, currentSeason, this.seasonTarget.value));
         }
+
+        const event = new CustomEvent('filterDownloadOptions', {
+            detail: {
+                activeFilter: this.activeFilter
+            }
+        })
+
+        // Event is picked up by the episode-container
+        // or movie-container web components
+        document.dispatchEvent(event);
     }
 
     setSeason(event) {
         this.tvEpisodeListOutlet.setSeason(event.target.value);
     }
 
-    uncheckSelectAllBtn() {
-        this.selectAllTarget.checked = false;
-    }
-
     downloadSeason() {
         fetch(`/api/download/season/${this.imdbIdValue}/${this.activeFilter['season']}`, {
             headers: {
@@ -167,20 +110,15 @@ export default class extends Controller {
         })
     }
 
-    selectAllEpisodes() {
-        this.tvResultsOutlets.forEach((episode) => {
-            if (episode.isActive()) {
-                episode.selectEpisodeForDownload()
-            }
-        });
+    #fetchValuesFromNodeList(nodeList) {
+        return [...nodeList].map(option => option.value)
     }
 
-    downloadSelectedEpisodes() {
-        this.tvResultsOutlets.forEach(episode => {
-            if (episode.isActive() && episode.isSelected()) {
-                episode.download();
-            }
-        });
-        this.selectAllTarget.checked = false;
+    #serializeSelectOptions(options) {
+        return this.defaultOptions + options.sort()
+            .map((option) => {
+                return '<option value="' + option + '">' + option + '</option>'
+            })
+            .join();
     }
 }

assets/controllers/search_bar_controller.js

@@ -12,6 +12,11 @@ export default class extends Controller {
             const autocompleteController = this.application.getControllerForElementAndIdentifier(this.element, 'symfony--ux-autocomplete--autocomplete')
             window.location.href = `/search?term=${autocompleteController.tomSelect.lastValue}`
         }
+        document.querySelector("#search-button").addEventListener('click', (event) => {
+            event.preventDefault();
+            const autocompleteController = this.application.getControllerForElementAndIdentifier(this.element, 'symfony--ux-autocomplete--autocomplete')
+            window.location.href = `/search?term=${autocompleteController.tomSelect.lastQuery}`
+        });
         this.element.addEventListener('autocomplete:pre-connect', this._onPreConnect);
         this.element.addEventListener('autocomplete:connect', this._onConnect);
     }

assets/controllers/tv_episode_list_controller.js

@@ -14,6 +14,13 @@ export default class extends Controller {
         this.component.on('render:finished', (component) => {
             console.log(component);
         });
+        if (window.location.hash) {
+            let targetElement = document.querySelector(window.location.hash);
+            if (targetElement) {
+                targetElement.scrollIntoView({ behavior: 'smooth', block: 'start' });
+                targetElement.classList.add('animate__animated', 'animate__pulse', 'animate__faster');
+            }
+        }
     }
 
     setSeason(season) {
@@ -25,6 +32,7 @@ export default class extends Controller {
 
     paginate(event) {
         this.element.querySelectorAll(".episode-container").forEach(element => element.remove());
+        this.component.set('episodeNumber', null);
         this.component.action('paginate', {page: event.params.page});
         this.component.render();
     }

assets/controllers/tv_results_controller.js

@@ -18,167 +18,23 @@ export default class extends Controller {
         active: Boolean,
     };
 
-    static targets = ['list', 'count', 'episodeSelector', 'toggleButton', 'listContainer']
+    static targets = ['list', 'count', 'episodeSelector',]
     static outlets = ['loading-icon']
 
     options = []
-    optionsLoaded = false
-    isOpen = false
 
-    async connect() {
-        await this.setOptions();
-    }
-
-    async setOptions() {
-        if (this.optionsLoaded === false) {
-            this.optionsLoaded = true;
-            let response;
-
-            try {
-                response = await fetch(`/torrentio/tvshows/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
-            } catch (error) {
-                console.log('There was an error', error);
-            }
-
-            if (response?.ok) {
-                response = await response.text()
-                this.listContainerTarget.innerHTML = response;
-                this.options = this.element.querySelectorAll('tbody tr');
-                if (this.options.length > 0) {
-                    this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
-                    this.options[0].querySelector('input[type="checkbox"]').checked = true;
-                } else {
-                    this.countTarget.innerText = 0;
-                    this.episodeSelectorTarget.disabled = true;
-                }
-                this.dispatch('optionsLoaded', {detail: {options: this.options}})
-                this.loadingIconOutlet.increaseCount();
-            } else {
-                console.log(`HTTP Response Code: ${response?.status}`)
-            }
+    listTargetConnected() {
+        this.element.options = this.element.querySelectorAll('tbody tr');
+        if (this.element.options.length > 0) {
+            this.element.options.forEach((option) =>
+                option.querySelector('.download-btn').dataset['title'] = this.titleValue
+            );
+            this.element.options[0].querySelector('input[type="checkbox"]').checked = true;
+            document.dispatchEvent(new CustomEvent('optionsLoaded', {detail: {options: this.element.options}}));
+        } else {
+            this.countTarget.innerText = 0;
+            this.episodeSelectorTarget.disabled = true;
         }
-    }
-
-    //
-    // async clearCache() {
-    //     await fetch(`/torrentio/tvshows/clear/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
-    //         .then(res => res.text())
-    //         .then(response => {});
-    // }
-
-    async setActive() {
-        if (false === this.optionsLoaded) {
-            await this.setOptions();
-        }
-    }
-
-    async setInActive() {
-        this.episodeSelectorTarget.checked = false;
-    }
-
-    isActive() {
-        return this.activeValue;
-    }
-
-    isSelected() {
-        return this.episodeSelectorTarget.checked;
-    }
-
-    selectEpisodeForDownload() {
-        if (true === this.isActive() && this.episodeSelectorTarget.disabled === false) {
-            this.episodeSelectorTarget.checked = !this.episodeSelectorTarget.checked;
-        }
-    }
-
-    toggleList() {
-        this.listTarget.classList.toggle('options-table');
-        this.listTarget.classList.toggle('hidden');
-        this.toggleButtonTarget.classList.toggle('rotate-90');
-        this.toggleButtonTarget.classList.toggle('-rotate-90');
-    }
-
-    download() {
-        this.options.forEach(option => {
-            const optionSelector = option.querySelector('input[type="checkbox"]');
-            if (true === optionSelector.checked) {
-                const downloadBtn = option.querySelector('button.download-btn');
-                const downloadBtnController = this.application.getControllerForElementAndIdentifier(downloadBtn, 'download-button');
-                downloadBtnController.download();
-                optionSelector.checked = false;
-                this.episodeSelectorTarget.checked = false;
-            }
-        })
-    }
-
-    async filter(activeFilter, currentSeason, newSeason) {
-        if (currentSeason !== activeFilter['season']) {
-            if (this.seasonValue === newSeason) {
-                await this.setActive();
-            } else {
-                await this.setInActive();
-            }
-        }
-
-        if (false === this.isActive()) {
-            return;
-        }
-
-        let firstIncluded = true;
-        let count = 0;
-        let selectedCount = 0;
-
-        this.options.forEach((option) => {
-            const optionHeader = document.querySelector(`[data-option-id="${option.dataset['localId']}"]`)
-            const props = {
-                "resolution": option.querySelector('#resolution').textContent.trim(),
-                "codec": option.querySelector('#codec').textContent.trim(),
-                "provider": option.querySelector('#provider').textContent.trim(),
-                "languages": JSON.parse(option.dataset['languages']),
-            }
-
-            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)) {
-                if (value === "" || key === "season") {
-                    continue;
-                }
-                if (key === "codec" && value === "h264") {
-                    if (!this.H264_CODECS.includes(props[key].toLowerCase())) {
-                        include = false;
-                    }
-                } else if (key === "codec" && value === "h265") {
-                    if (!this.H265_CODECS.includes(props[key].toLowerCase())) {
-                        include = false;
-                    }
-                } else if (key === "language") {
-                    if (!props["languages"].includes(value)) {
-                        include = false;
-                    }
-                } else if (props[key] !== value) {
-                    include = false;
-                }
-            }
-
-            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;
-                option.querySelector('input[type="checkbox"]').checked = true;
-                firstIncluded = false;
-            } else {
-                count = count + 1;
-            }
-
-            this.countTarget.innerText = count;
-        });
+        this.loadingIconOutlet.increaseCount();
     }
 }

assets/icons/zondicons/checkmark.svg

@@ -0,0 +1 @@
+<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 20 20"><path fill="currentColor" d="m0 11l2-2l5 5L18 3l2 2L7 18z"/></svg>

assets/styles/app.css

@@ -65,7 +65,17 @@ dialog[data-dialog-target="dialog"][closing] {
 }
 
 .text-input {
-    @apply bg-gray-50 text-gray-50 p-1 bg-transparent border-b-2 border-orange-400
+    @apply bg-gray-50 text-gray-50 px-2 py-1 bg-transparent border-b-2 border-orange-400
+}
+
+.text-input[multiple="multiple"] {
+    @apply bg-transparent backdrop-filter backdrop-blur-md text-white border border-orange-500 rounded-md
+}
+
+.text-input option[checked="checked"],
+.text-input option[checked],
+.text-input option[selected] {
+    @apply bg-orange-500/60
 }
 
 .submit-button {
@@ -130,3 +140,52 @@ dialog[data-dialog-target="dialog"][closing] {
     background: unset;
     @apply bg-orange-500/80 text-black font-bold rounded-md
 }
+
+.progress {
+    display: grid;
+    grid-template: 1fr / 1fr;
+    place-items: center;
+}
+.progress > * {
+    grid-column: 1 / 1;
+    grid-row: 1 / 1;
+}
+.progress .background {
+    z-index: 1;
+    place-self: start;
+}
+.progress .number {
+    z-index: 2;
+    background: transparent;
+}
+
+#filter {
+    .ts-wrapper {
+        box-shadow: none !important;
+        padding: 0;
+
+        .ts-control {
+            border: none !important;
+            box-shadow: none !important;
+            @apply bg-orange-500/60 backdrop-filter backdrop-blur-md;
+        }
+
+        .item[data-ts-item] {
+            background-image: none !important;
+            border: none;
+            box-shadow: none;
+            text-shadow: none;
+            @apply bg-orange-500 rounded-ms font-bold text-black;
+        }
+
+        @apply border border-orange-500 bg-transparent rounded-ms;
+    }
+
+    .ts-wrapper.plugin-remove_button:not(.rtl) .item .remove {
+        @apply border-l border-l-orange-600 !important;
+    }
+}
+
+.filter-label {
+    @apply flex flex-col gap-1 justify-between;
+}

composer.json

@@ -43,7 +43,6 @@
         "symfony/mailer": "7.3.*",
         "symfony/mercure-bundle": "^0.3.9",
         "symfony/messenger": "7.3.*",
-        "symfony/monolog-bundle": "^3.10",
         "symfony/runtime": "7.3.*",
         "symfony/scheduler": "7.3.*",
         "symfony/security-bundle": "7.3.*",
@@ -105,6 +104,7 @@
         "post-update-cmd": [
             "@auto-scripts"
         ],
+        "tail": "docker compose exec app ./bin/console tailwind:build --watch",
         "sym": "docker compose exec app ./bin/console"
     },
     "conflict": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cf9a5b3cdb6e21e270da6c4efee09005",
+    "content-hash": "0f98dada0a01d471cebf4eb1b51b9006",
     "packages": [
         {
             "name": "1tomany/rich-bundle",
@@ -2681,109 +2681,6 @@
             },
             "time": "2025-02-06T08:48:15+00:00"
         },
-        {
-            "name": "monolog/monolog",
-            "version": "3.9.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/10d85740180ecba7896c87e06a166e0c95a0e3b6",
-                "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "psr/log": "^2.0 || ^3.0"
-            },
-            "provide": {
-                "psr/log-implementation": "3.0.0"
-            },
-            "require-dev": {
-                "aws/aws-sdk-php": "^3.0",
-                "doctrine/couchdb": "~1.0@dev",
-                "elasticsearch/elasticsearch": "^7 || ^8",
-                "ext-json": "*",
-                "graylog2/gelf-php": "^1.4.2 || ^2.0",
-                "guzzlehttp/guzzle": "^7.4.5",
-                "guzzlehttp/psr7": "^2.2",
-                "mongodb/mongodb": "^1.8",
-                "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "php-console/php-console": "^3.1.8",
-                "phpstan/phpstan": "^2",
-                "phpstan/phpstan-deprecation-rules": "^2",
-                "phpstan/phpstan-strict-rules": "^2",
-                "phpunit/phpunit": "^10.5.17 || ^11.0.7",
-                "predis/predis": "^1.1 || ^2",
-                "rollbar/rollbar": "^4.0",
-                "ruflin/elastica": "^7 || ^8",
-                "symfony/mailer": "^5.4 || ^6",
-                "symfony/mime": "^5.4 || ^6"
-            },
-            "suggest": {
-                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-                "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
-                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-                "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler",
-                "ext-mbstring": "Allow to work properly with unicode symbols",
-                "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)",
-                "ext-openssl": "Required to send log messages using SSL",
-                "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)",
-                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-                "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
-                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-                "rollbar/rollbar": "Allow sending log messages to Rollbar",
-                "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Monolog\\": "src/Monolog"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "https://seld.be"
-                }
-            ],
-            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-            "homepage": "https://github.com/Seldaek/monolog",
-            "keywords": [
-                "log",
-                "logging",
-                "psr-3"
-            ],
-            "support": {
-                "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.9.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/Seldaek",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-03-24T10:02:05+00:00"
-        },
         {
             "name": "nesbot/carbon",
             "version": "3.10.0",
@@ -7681,165 +7578,6 @@
             ],
             "time": "2025-02-19T08:51:26+00:00"
         },
-        {
-            "name": "symfony/monolog-bridge",
-            "version": "v7.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/monolog-bridge.git",
-                "reference": "1b188c8abbbef25b111da878797514b7a8d33990"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/1b188c8abbbef25b111da878797514b7a8d33990",
-                "reference": "1b188c8abbbef25b111da878797514b7a8d33990",
-                "shasum": ""
-            },
-            "require": {
-                "monolog/monolog": "^3",
-                "php": ">=8.2",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/service-contracts": "^2.5|^3"
-            },
-            "conflict": {
-                "symfony/console": "<6.4",
-                "symfony/http-foundation": "<6.4",
-                "symfony/security-core": "<6.4"
-            },
-            "require-dev": {
-                "symfony/console": "^6.4|^7.0",
-                "symfony/http-client": "^6.4|^7.0",
-                "symfony/mailer": "^6.4|^7.0",
-                "symfony/messenger": "^6.4|^7.0",
-                "symfony/mime": "^6.4|^7.0",
-                "symfony/security-core": "^6.4|^7.0",
-                "symfony/var-dumper": "^6.4|^7.0"
-            },
-            "type": "symfony-bridge",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Bridge\\Monolog\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides integration for Monolog with various Symfony components",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/monolog-bridge/tree/v7.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-03-21T12:17:46+00:00"
-        },
-        {
-            "name": "symfony/monolog-bundle",
-            "version": "v3.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/monolog-bundle.git",
-                "reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181",
-                "reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181",
-                "shasum": ""
-            },
-            "require": {
-                "monolog/monolog": "^1.25.1 || ^2.0 || ^3.0",
-                "php": ">=7.2.5",
-                "symfony/config": "^5.4 || ^6.0 || ^7.0",
-                "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
-                "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
-                "symfony/monolog-bridge": "^5.4 || ^6.0 || ^7.0"
-            },
-            "require-dev": {
-                "symfony/console": "^5.4 || ^6.0 || ^7.0",
-                "symfony/phpunit-bridge": "^6.3 || ^7.0",
-                "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Bundle\\MonologBundle\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony MonologBundle",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "log",
-                "logging"
-            ],
-            "support": {
-                "issues": "https://github.com/symfony/monolog-bundle/issues",
-                "source": "https://github.com/symfony/monolog-bundle/tree/v3.10.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-11-06T17:08:13+00:00"
-        },
         {
             "name": "symfony/options-resolver",
             "version": "v7.3.0",

config/bundles.php

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

config/packages/monolog.yaml

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

config/packages/pwa.yaml

@@ -10,9 +10,9 @@ pwa:
     theme_color: "#083344"
     description: Torsearch provides a simple and intuitive way to manage your personal media library.
     icons:
-      - src: "icon.png"
+      - src: "/icon.png"
         sizes: [ 192 ]
-      - src: "icon.png"
+      - src: "/icon.png"
         sizes: [ 192 ]
         purpose: maskable
     categories:

config/routes.yaml

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

config/services.yaml

@@ -6,7 +6,6 @@
 parameters:
     # App
     app.url: '%env(APP_URL)%'
-    app.env: '%env(default:app.default.env:APP_ENV)%'
     app.version: '%env(default:app.default.version:APP_VERSION)%'
 
     # Debrid Services
@@ -33,7 +32,6 @@ parameters:
     app.cache.redis.host.default: 'redis://redis'
 
     # Various configs
-    app.default.env: 'prod'
     app.default.version: '0.dev'
     app.default.timezone: 'America/Chicago'
 

importmap.php

@@ -64,4 +64,7 @@ return [
         'version' => '2.4.3',
         'type' => 'css',
     ],
+    'pulltorefreshjs' => [
+        'version' => '0.1.22',
+    ],
 ];

migrations/Version20250724042107.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250724042107 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 preference_option DROP FOREIGN KEY FK_607C52FD81022C0
+        SQL);
+        $this->addSql(<<<'SQL'
+            DROP TABLE preference_option
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            CREATE TABLE preference_option (id INT AUTO_INCREMENT NOT NULL, preference_id VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, name VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, value VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, enabled TINYINT(1) NOT NULL, INDEX IDX_607C52FD81022C0 (preference_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = '' 
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE preference_option ADD CONSTRAINT FK_607C52FD81022C0 FOREIGN KEY (preference_id) REFERENCES preference (id)
+        SQL);
+    }
+}

src/Base/Config/AppConfig.php

@@ -1,105 +0,0 @@
-<?php
-
-namespace App\Base\Config;
-
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
-
-class AppConfig implements ConfigInterface
-{
-    private array $messages = [];
-
-    public function __construct(
-        #[Autowire(param: 'app.env')]
-        private readonly ?string $appEnv = null,
-
-        #[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,
-    ) {}
-
-    public function isValid(): bool
-    {
-        $valid = true;
-
-        if (false === $this->isVariableValid('APP_ENV', $this->appEnv)) {
-            $valid = false;
-        }
-
-        if (false === $this->isVariableValid('APP_URL', $this->appUrl)) {
-            $valid = false;
-        }
-
-        if (false === $this->isVariableValid('REAL_DEBRID_KEY', $this->realDebridApiKey)) {
-            $valid = false;
-        }
-
-        if (false === $this->isVariableValid('TMDB_API', $this->tmdbApiKey)) {
-            $valid = false;
-        }
-
-        if (false === $this->isVariableValid('MOVIES_PATH', $this->moviesPath)) {
-            $valid = false;
-        }
-
-        if (false === $this->isVariableValid('TVSHOWS_PATH', $this->tvshowsPath)) {
-            $valid = false;
-        }
-
-        return $valid;
-    }
-
-    public function getMessages(): array
-    {
-        return $this->messages;
-    }
-
-    private function isVariableValid($key, $value): bool
-    {
-        if ("" === $value || null === $value) {
-            $this->messages[] = "Your system is misconfigured. Please set the $key environment variable appropriately.";
-            return false;
-        }
-        return true;
-    }
-
-    public function getAppEnv(): ?string
-    {
-        return $this->appEnv;
-    }
-
-    public function getAppUrl(): ?string
-    {
-        return $this->appUrl;
-    }
-
-    public function getRealDebridApiKey(): ?string
-    {
-        return $this->realDebridApiKey;
-    }
-
-    public function getTmdbApiKey(): ?string
-    {
-        return $this->tmdbApiKey;
-    }
-
-    public function getMoviesPath(): ?string
-    {
-        return $this->moviesPath;
-    }
-
-    public function getTvshowsPath(): ?string
-    {
-        return $this->tvshowsPath;
-    }
-}

src/Base/Config/Auth/OidcConfig.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace App\Base\Config\Auth;
-
-use App\Base\Config\ConfigInterface;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
-
-class OidcConfig implements ConfigInterface
-{
-    private array $messages = [];
-
-    public function __construct(
-        #[Autowire(param: 'auth.method')]
-        private readonly ?string $authMethod = null,
-
-        #[Autowire(param: 'auth.oidc.well_known_url')]
-        private readonly ?string $wellKnownUrl = null,
-
-        #[Autowire(param: 'auth.oidc.client_id')]
-        private readonly ?string $clientId = null,
-
-        #[Autowire(param: 'auth.oidc.client_secret')]
-        private readonly ?string $clientSecret = null,
-
-        #[Autowire(param: 'auth.oidc.bypass_form_login')]
-        private readonly ?bool $bypassFormLogin = null,
-    ) {}
-
-    public function isEnabled(): bool
-    {
-        return "oidc" === strtolower($this->authMethod);
-    }
-
-    public function isValid(): bool
-    {
-        $valid = true;
-
-        if (true === $this->isEnabled()) {
-            if (false === $this->isVariableValid("OIDC_CLIENT_ID", $this->clientId)) {
-                $valid = false;
-            }
-
-            if (false === $this->isVariableValid("OIDC_CLIENT_SECRET", $this->clientSecret)) {
-                $valid = false;
-            }
-
-            if (false === $this->isVariableValid("OIDC_WELL_KNOWN_URL", $this->wellKnownUrl)) {
-                $valid = false;
-            }
-        }
-
-        return $valid;
-    }
-
-    public function getWellKnownUrl(): ?string
-    {
-        return $this->wellKnownUrl;
-    }
-
-    public function getClientId(): ?string
-    {
-        return $this->clientId;
-    }
-
-    public function getClientSecret(): ?string
-    {
-        return $this->clientSecret;
-    }
-
-    public function getBypassFormLogin(): ?bool
-    {
-        return $this->bypassFormLogin;
-    }
-
-    public function getMessages(): array
-    {
-        return $this->messages;
-    }
-
-    private function isVariableValid(string $key, mixed $value): bool
-    {
-        if ("" === $value || null === $value) {
-            $this->messages[] = "Your OIDC is misconfigured. Please set the $key environment variable to the required value.";
-            return true;
-        }
-        return false;
-    }
-}

src/Base/Config/AuthConfig.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace App\Base\Config;
-
-use App\Base\Config\Auth\OidcConfig;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
-
-class AuthConfig implements ConfigInterface
-{
-    const AUTH_METHODS = ['form_login', 'oidc'];
-
-    private array $messages = [];
-
-    public function __construct(
-        #[Autowire(param: 'auth.method')]
-        private readonly ?string $authMethod,
-        private readonly OidcConfig $oidcConfig,
-    ) {}
-
-    public function isMethod(string $method): bool
-    {
-        return $this->getAuthMethod() === strtolower($method);
-    }
-
-    public function getAuthMethod(): string
-    {
-        return strtolower($this->authMethod);
-    }
-
-    public function getOidcConfig(): OidcConfig
-    {
-        return $this->oidcConfig;
-    }
-
-    public function isValid(): bool
-    {
-        $valid = true;
-        if (null === $this->getAuthMethod() || "" === $this->getAuthMethod()) {
-            $this->messages[] = "Your auth method is missing. Please set the AUTH_METHOD environment variable to your desired value. Valid options: [form_login, oidc].";
-            return false;
-        }
-
-        if (!in_array($this->getAuthMethod(), self::AUTH_METHODS, true)) {
-            $this->messages[] = "Your auth method is incorrect. Please set the AUTH_METHOD environment variable to your desired value. Valid options: [form_login, oidc].";
-            return false;
-        }
-
-        if ("oidc" === $this->getAuthMethod()) {
-            if (false === $this->oidcConfig->isValid()) {
-                $this->messages += $this->oidcConfig->getMessages();
-                $valid = false;
-            }
-        }
-
-        return $valid;
-    }
-
-    public function getMessages(): array
-    {
-        return $this->messages;
-    }
-}

src/Base/Config/ConfigInterface.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Base\Config;
-
-interface ConfigInterface
-{
-    /** Validates the config values are present and as expected */
-    public function isValid(): bool;
-
-    /** Holds the error messages so they can be logged */
-    public function getMessages(): array;
-}

src/Base/Config/SmtpConfig.php

@@ -1,113 +0,0 @@
-<?php
-
-namespace App\Base\Config;
-
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
-
-class SmtpConfig implements ConfigInterface
-{
-    private array $messages = [];
-
-    /*
-     * SMTP is considered enabled if any of
-     * the parameters are set. If none are set,
-     * then the User must not need it.
-     */
-    private bool $isEnabled = false;
-
-    public function __construct(
-        #[Autowire(env: 'SMTP_HOST')]
-        private readonly ?string $smtpHost,
-        #[Autowire(env: 'SMTP_USER')]
-        private readonly ?string $smtpUser,
-        #[Autowire(env: 'SMTP_PASS')]
-        private readonly ?string $smtpPass,
-        #[Autowire(env: 'SMTP_PORT')]
-        private readonly ?string $smtpPort,
-        #[Autowire(env: 'SMTP_FROM')]
-        private readonly ?string $smtpFrom,
-        #[Autowire(env: 'SMTP_FROM_NAME')]
-        private readonly ?string $smtpFromName,
-    ) {
-        foreach (func_get_args() as $key => $value) {
-            if ("" !== $value && $value !== null) {
-                $this->isEnabled = true;
-            }
-        }
-    }
-
-    public function isEnabled(): bool
-    {
-        return $this->isEnabled;
-    }
-
-    public function getMessages(): array
-    {
-        return $this->messages;
-    }
-
-    public function isValid(): bool
-    {
-        if (false === $this->isEnabled) {
-            return true;
-        }
-
-        $valid = true;
-
-        $params = [
-            'SMTP_HOST' => $this->smtpHost,
-            'SMTP_USER' => $this->smtpUser,
-            'SMTP_PASS' => $this->smtpPass,
-            'SMTP_PORT' => $this->smtpPort,
-            'SMTP_FROM' => $this->smtpFrom,
-            'SMTP_FROM_NAME' => $this->smtpFromName,
-        ];
-
-        foreach ($params as $key => $value) {
-            if (false === $this->isVariableValid($key, $value)) {
-                $valid = false;
-            }
-        }
-
-        return $valid;
-    }
-
-    private function isVariableValid($key, $value): bool
-    {
-        if ("" === $value || null === $value) {
-            $this->messages[] = "Your SMTP is misconfigured. Please set the $key environment variable appropriately.";
-            return false;
-        }
-        return true;
-    }
-
-    public function getSmtpHost(): ?string
-    {
-        return $this->smtpHost;
-    }
-
-    public function getSmtpUser(): ?string
-    {
-        return $this->smtpUser;
-    }
-
-    public function getSmtpPass(): ?string
-    {
-        return $this->smtpPass;
-    }
-
-    public function getSmtpPort(): ?string
-    {
-        return $this->smtpPort;
-    }
-
-    public function getSmtpFrom(): ?string
-    {
-        return $this->smtpFrom;
-    }
-
-    public function getSmtpFromName(): ?string
-    {
-        return $this->smtpFromName;
-    }
-}

src/Base/ConfigResolver.php

@@ -2,60 +2,58 @@
 
 namespace App\Base;
 
-use App\Base\Config\AppConfig;
-use App\Base\Config\AuthConfig;
-use App\Base\Config\SmtpConfig;
-use Psr\Log\LoggerInterface;
-use Symfony\Contracts\Cache\TagAwareCacheInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 final class ConfigResolver
 {
     private array $messages = [];
 
     public function __construct(
-        private readonly LoggerInterface $logger,
-        private readonly TagAwareCacheInterface $cache,
-        private readonly AuthConfig $authConfig,
-        private readonly SmtpConfig $smtpConfig,
-        private readonly AppConfig $appConfig,
+        #[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
-    {
-        if ("prod" === strtolower($this->appConfig->getAppEnv())) {
-            return $this->cache->get('app.valid_config', function () {
-                return $this->doValidate();
-            });
-        } else {
-            return $this->doValidate();
-        }
-    }
-
-    private function doValidate(): bool
     {
         $valid = true;
 
-        if (false === $this->appConfig->isValid()) {
-            $this->messages += $this->appConfig->getMessages();
+        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 (false === $this->authConfig->isValid()) {
-            $this->messages += $this->authConfig->getMessages();
+        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;
         }
 
-        if (false === $this->smtpConfig->isValid()) {
-            $this->messages += $this->smtpConfig->getMessages();
-            $valid = false;
-        }
-
-        if (false === $valid) {
-            foreach ($this->messages as $message) {
-                $this->logger->error('> [ConfigResolver] ' . $message);
-            }
-        }
-
         return $valid;
     }
 
@@ -64,18 +62,34 @@ final class ConfigResolver
         return $this->messages;
     }
 
-    public function getAuthConfig(): AuthConfig
-    {
-        return $this->authConfig;
-    }
-
     public function authIs(string $method): bool
     {
-        return $this->authConfig->isMethod($method);
+        if (strtolower($method) === strtolower($this->getAuthMethod())) {
+            return true;
+        }
+        return false;
     }
 
     public function getAuthMethod(): string
     {
-        return $this->authConfig->getAuthMethod();
+        return strtolower($this->authMethod);
+    }
+
+    public function bypassFormLogin(): bool
+    {
+        return $this->authOidcBypassFormLogin;
+    }
+
+    public function getAuthConfig(): array
+    {
+        return [
+            'method' => $this->authMethod,
+            'oidc' => [
+                'well_known_url' => $this->authOidcWellKnownUrl,
+                'client_id' => $this->authOidcClientId,
+                'client_secret' => $this->authOidcClientSecret,
+                'bypass_form_login' => $this->authOidcBypassFormLogin,
+            ]
+        ];
     }
 }

src/Base/Framework/Command/SeedDatabaseCommand.php

@@ -20,17 +20,15 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 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;
     }
 
@@ -39,7 +37,6 @@ class SeedDatabaseCommand extends Command
         $io = new SymfonyStyle($input, $output);
 
         $this->seedPreferences($io);
-        $this->seedPreferenceOptions($io);
         $this->updateUserPreferences($io);
 
         return Command::SUCCESS;
@@ -140,72 +137,4 @@ class SeedDatabaseCommand extends Command
             ],
         ];
     }
-
-    private function seedPreferenceOptions(SymfonyStyle $io)
-    {
-        $io->info('[SeedDatabaseCommand] > Seeding preference options...');
-        $options = $this->getPreferenceOptions();
-
-        foreach ($options as $option) {
-            if ($this->preferenceOptionRepository->findBy([
-                'preference' => $option['preference_id'],
-                'name' => $option['name'],
-                'value' => $option['value'],
-                'enabled' => $option['enabled'],
-            ])) {
-                continue;
-            }
-            $this->preferenceOptionRepository->getEntityManager()->persist(
-                (new \App\User\Framework\Entity\PreferenceOption())
-                    ->setPreference($this->preferenceRepository->find($option['preference_id']))
-                    ->setName($option['name'])
-                    ->setValue($option['value'])
-                    ->setEnabled($option['enabled'])
-            );
-        }
-
-        $this->preferenceOptionRepository->getEntityManager()->flush();
-    }
-
-    private function getPreferenceOptions(): array
-    {
-        return [
-            [
-                'preference_id' => 'resolution',
-                'name' => '720p',
-                'value' => '720p',
-                'enabled' => true
-            ],
-            [
-                'preference_id' => 'resolution',
-                'name' => '1080p',
-                'value' => '1080p',
-                'enabled' => true
-            ],
-            [
-                'preference_id' => 'resolution',
-                'name' => '2160p',
-                'value' => '2160p',
-                'enabled' => true
-            ],
-            [
-                'preference_id' => 'codec',
-                'name' => '-',
-                'value' => '-',
-                'enabled' => true
-            ],
-            [
-                'preference_id' => 'codec',
-                'name' => 'h264',
-                'value' => 'h264',
-                'enabled' => true
-            ],
-            [
-                'preference_id' => 'codec',
-                'name' => 'h265/HEVC',
-                'value' => 'h265',
-                'enabled' => true
-            ]
-        ];
-    }
 }

src/Base/Framework/EventListener/KernelRequestValidateConfig.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Base\Framework\EventListener;
-
-use App\Base\ConfigResolver;
-use App\Base\Service\Broadcaster;
-use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
-use Symfony\Component\HttpKernel\Event\RequestEvent;
-
-final class KernelRequestValidateConfig
-{
-    public function __construct(
-        private readonly ConfigResolver $configResolver,
-        private readonly Broadcaster $broadcaster,
-    ) {}
-
-    #[AsEventListener(event: 'kernel.request', priority: 20)]
-    public function validateConfig(RequestEvent $event): void
-    {
-        if (false === $this->configResolver->validate()) {
-            $this->broadcaster->systemAlert('Ruh-roh', 'It looks like your system is misconfigured. Please search the application logs for strings starting with "[error] > [ConfigResolver]" to find more information.');
-        }
-    }
-}

src/Base/Service/Broadcaster.php

@@ -15,8 +15,7 @@ readonly class Broadcaster
         private Environment $renderer,
         private HubInterface $hub,
         private RequestStack $requestStack,
-    ) {
-    }
+    ) {}
 
     public function alert(string $title, string $message, string $type = "success"): void
     {
@@ -32,18 +31,4 @@ readonly class Broadcaster
         );
         $this->hub->publish($update);
     }
-
-    public function systemAlert(string $title, string $message, string $type = "warning"): void
-    {
-        $update = new Update(
-            'system_alerts',
-            $this->renderer->render('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => $title,
-                'message' => $message,
-                'type' => $type,
-            ])
-        );
-        $this->hub->publish($update);
-    }
 }

src/Base/Service/MediaFiles.php

@@ -5,6 +5,7 @@ namespace App\Base\Service;
 use Aimeos\Map;
 use App\Download\Framework\Entity\Download;
 use Nihilarr\PTN;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
@@ -21,6 +22,7 @@ class MediaFiles
     private string $tvShowsPath;
 
     private Filesystem $filesystem;
+    private LoggerInterface $logger;
 
     public function __construct(
         #[Autowire(param: 'media.base_path')]
@@ -33,12 +35,14 @@ class MediaFiles
         string $tvShowsPath,
 
         Filesystem $filesystem,
+        LoggerInterface $logger,
     ) {
         $this->finder = new Finder();
         $this->basePath = $basePath;
         $this->moviesPath = $moviesPath;
         $this->tvShowsPath = $tvShowsPath;
         $this->filesystem = $filesystem;
+        $this->logger = $logger;
     }
 
     public function getPathByType(string $mediaType): string
@@ -140,7 +144,7 @@ class MediaFiles
         return $path;
     }
 
-    public function episodeExists(string $tvshowTitle, int $seasonNumber, int $episodeNumber)
+    public function episodeExists(string $tvshowTitle, int $seasonNumber, int $episodeNumber): SplFileInfo|false
     {
         $existingEpisodes = $this->getEpisodes($tvshowTitle, false);
 
@@ -220,4 +224,26 @@ class MediaFiles
     {
         $this->filesystem->chmod($filepath, $permissions);
     }
+
+    /**
+     * @param string $filepath
+     * @return bool
+     * Returns true if file was deleted
+     * Returns false is file not found or was not deleted
+     */
+    public function removeFile(string $filepath): bool
+    {
+        if (true === $this->filesystem->exists($filepath)) {
+            try {
+                $this->filesystem->remove($filepath);
+                return true;
+            } catch (\Throwable $exception) {
+                $this->logger->error($exception->getMessage(), ['file' => $filepath]);
+                return false;
+            }
+        }
+
+        $this->logger->warning('> [MediaFiles] Attempted to remove file, but it did not exist.', ['file' => $filepath]);
+        return false;
+    }
 }

src/Base/Util/ImdbMatcher.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Base\Util;
+
+class ImdbMatcher
+{
+    public static function isMatch(string $imdbId): bool
+    {
+        return preg_match('/^tt\d{7}$/', $imdbId);
+    }
+}

src/Download/Action/Command/DeleteDownloadCommand.php

@@ -11,5 +11,6 @@ class DeleteDownloadCommand implements CommandInterface
 {
     public function __construct(
         public int $downloadId,
+        public bool $deleteFile = false,
     ) {}
 }

src/Download/Action/Handler/DeleteDownloadHandler.php

@@ -5,6 +5,8 @@ namespace App\Download\Action\Handler;
 use App\Download\Action\Command\DeleteDownloadCommand;
 use App\Download\Action\Result\DeleteDownloadResult;
 use App\Download\Framework\Repository\DownloadRepository;
+use App\Library\Action\Command\DeleteMediaFileCommand;
+use App\Library\Action\Handler\DeleteMediaFileHandler;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -14,13 +16,26 @@ readonly class DeleteDownloadHandler implements HandlerInterface
 {
     public function __construct(
         private DownloadRepository $downloadRepository,
+        private DeleteMediaFileHandler $deleteMediaFileHandler,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
         $download = $this->downloadRepository->find($command->downloadId);
+
+        if (true === $command->deleteFile) {
+            $deletedFileResult = $this->deleteMediaFileHandler->handle(new DeleteMediaFileCommand(
+                filename: $download->getFilename(),
+                downloadId: $command->downloadId
+            ));
+        }
         $this->downloadRepository->delete($command->downloadId);
 
-        return new DeleteDownloadResult(200, 'Success', $download);
+        return new DeleteDownloadResult(
+            status: 200,
+            message: 'Success',
+            download: $download,
+            deleteMediaFileResult: $deletedFileResult ?? null
+        );
     }
 }

src/Download/Action/Input/DeleteDownloadInput.php

@@ -3,6 +3,7 @@
 namespace App\Download\Action\Input;
 
 use App\Download\Action\Command\DeleteDownloadCommand;
+use OneToMany\RichBundle\Attribute\SourceQuery;
 use OneToMany\RichBundle\Attribute\SourceRoute;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\InputInterface;
@@ -13,12 +14,15 @@ class DeleteDownloadInput implements InputInterface
     public function __construct(
         #[SourceRoute('downloadId')]
         public int $downloadId,
+        #[SourceQuery('deleteFile')]
+        public bool $deleteFile = false,
     ) {}
 
     public function toCommand(): CommandInterface
     {
         return new DeleteDownloadCommand(
             $this->downloadId,
+            $this->deleteFile,
         );
     }
 }

src/Download/Action/Result/DeleteDownloadResult.php

@@ -12,5 +12,6 @@ class DeleteDownloadResult implements ResultInterface
         public int $status,
         public string $message,
         public Download $download,
+        public ?DeleteMediaFileResult $deleteMediaFileResult = null,
     ) {}
 }

src/Download/Action/Result/DeleteMediaFileResult.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Download\Action\Result;
+
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+class DeleteMediaFileResult implements ResultInterface
+{
+    public function __construct(
+        public string $message,
+        public string $filepath,
+        public bool $isDeleted,
+    ) {}
+}

src/Download/DownloadOptionEvaluator.php

@@ -3,92 +3,80 @@
 namespace App\Download;
 
 use Aimeos\Map;
-use App\Monitor\Framework\Entity\Monitor;
 use App\Torrentio\Result\TorrentioResult;
 use App\User\Dto\UserPreferences;
 
 class DownloadOptionEvaluator
 {
     /**
-     * @param Monitor $monitor
      * @param TorrentioResult[] $results
+     * @param UserPreferences $filter
      * @return TorrentioResult|null
      * @throws \Throwable
      */
-    public function evaluateOptions(array $results, UserPreferences $userPreferences): ?TorrentioResult
+    public function evaluateOptions(array $results, UserPreferences $filter): ?TorrentioResult
     {
-        $sizeLow = 000;
-        $sizeHigh = 4096;
-
-        $bestMatches = [];
-        $matches = [];
-
-        foreach ($results as $result) {
-            if (!in_array($userPreferences->language, $result->languages)) {
-                continue;
+        $matches = Map::from($results)->filter(function ($result) use ($filter) {
+            if (false === $this->validateFilterItems($result, $filter)) {
+                return false;
             }
 
-            if ($result->resolution === $userPreferences->resolution
-                && $result->codec === $userPreferences->codec
-            ) {
-                $bestMatches[] = $result;
+            if (false === $this->validateSize($result, $filter)) {
+                return false;
             }
 
-            if ($userPreferences->resolution === '2160p'
-                && $userPreferences->codec === $result->codec
-                && $result->resolution === '1080p'
-            ) {
-                $matches[] = $result;
-            }
+            return true;
+        });
 
-            if ($userPreferences->codec === 'h264'
-                && $userPreferences->resolution === $result->resolution
-                && $result->codec === 'h265'
-            ) {
-                $matches[] = $result;
-            }
-
-            if (($userPreferences->codec === null )
-                && ($userPreferences->resolution === null )) {
-                $matches[] = $result;
-            }
-        }
-
-        $sizeMatches = [];
-
-        foreach ($bestMatches as $result) {
-            if (str_contains($result->size, 'GB')) {
-                $size = (int) trim(str_replace('GB', '', $result->size)) * 1024;
-            } else {
-                $size = (int) trim(str_replace('MB', '', $result->size));
-            }
-
-            if ($size > $sizeLow && $size < $sizeHigh) {
-                $sizeMatches[] = $result;
-            }
-        }
-
-        if (!empty($sizeMatches)) {
-            return Map::from($sizeMatches)->usort(fn($a, $b) => $a->seeders <=> $b->seeders)->last();
-        }
-
-        foreach ($matches as $result) {
-            $size = 0;
-            if (str_contains($result->size, 'GB')) {
-                $size = (int) trim(str_replace('GB', '', $result->size)) * 1024;
-            } else {
-                $size = (int) trim(str_replace('MB', '', $result->size));
-            }
-
-            if ($size > $sizeLow && $size < $sizeHigh) {
-                $sizeMatches[] = $result;
-            }
-        }
-
-        if (!empty($sizeMatches)) {
-            return Map::from($sizeMatches)->usort(fn($a, $b) => $a->seeders <=> $b->seeders)->last();
+        if ($matches->count() > 0) {
+            return Map::from($matches)->usort(fn($a, $b) => $a->seeders <=> $b->seeders)->last();
         }
 
         return null;
     }
+
+    private function validateFilterItems(TorrentioResult $result, UserPreferences $filter): bool
+    {
+        if (array_intersect($filter->language, $result->languages) === []) {
+            return false;
+        }
+
+        $valid = true;
+
+        if (null !== $filter->resolution && !in_array($result->resolution, $filter->resolution)) {
+            $valid = false;
+        }
+
+        if (null !== $filter->codec && in_array($result->codec, $filter->codec)) {
+            $valid = false;
+        }
+
+        if (null !== $filter->quality && in_array($result->quality, $filter->quality)) {
+            $valid = false;
+        }
+
+        if (null !== $filter->provider && in_array($result->provider, $filter->provider)) {
+            $valid = false;
+        }
+
+        return $valid;
+    }
+
+    private function validateSize(TorrentioResult $result, UserPreferences $filter): bool
+    {
+        $sizeLow = 000;
+        $sizeHigh = 4096;
+
+        if (str_contains($result->size, 'GB')) {
+            $size = (int) trim(str_replace('GB', '', $result->size)) * 1024;
+        } else {
+            $size = (int) trim(str_replace('MB', '', $result->size));
+        }
+
+        if ($size > $sizeLow && $size < $sizeHigh) {
+            return true;
+        }
+
+        return false;
+    }
 }

src/Download/Framework/Controller/ApiController.php

@@ -66,7 +66,7 @@ class ApiController extends AbstractController
             message: "{$result->download->getTitle()} has been deleted.",
         );
 
-        return $this->json(['status' => 200, 'message' => 'Download Deleted']);
+        return $this->json($result);
     }
 
     #[Route('/api/download/{downloadId}/pause', name: 'api_download_pause', methods: ['PATCH'])]

src/Download/Framework/Entity/Download.php

@@ -7,6 +7,7 @@ use App\User\Framework\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Timestampable\Traits\TimestampableEntity;
 use Nihilarr\PTN;
+use Symfony\Component\Serializer\Attribute\Ignore;
 use Symfony\UX\Turbo\Attribute\Broadcast;
 
 #[ORM\Entity(repositoryClass: DownloadRepository::class)]
@@ -44,6 +45,7 @@ class Download
     #[ORM\Column(length: 255, nullable: true)]
     private ?string $episodeId = null;
 
+    #[Ignore]
     #[ORM\ManyToOne(inversedBy: 'downloads')]
     private ?User $user = null;
 

src/Library/Action/Command/DeleteMediaFileCommand.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Library\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+
+/**
+ * @implements CommandInterface<DeleteMediaFileCommand>
+ */
+class DeleteMediaFileCommand implements CommandInterface
+{
+    public function __construct(
+        public string $filename,
+        public ?int $downloadId = null,
+    ) {}
+}

src/Library/Action/Command/LibrarySearchCommand.php

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

src/Library/Action/Handler/DeleteMediaFileHandler.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Library\Action\Handler;
+
+use App\Base\Service\MediaFiles;
+use App\Download\Action\Result\DeleteMediaFileResult;
+use App\Download\Framework\Entity\Download;
+use App\Download\Framework\Repository\DownloadRepository;
+use App\Library\Action\Command\DeleteMediaFileCommand;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/**
+ * @implements HandlerInterface<DeleteMediaFileCommand,DeleteMediaFileResult>
+ */
+class DeleteMediaFileHandler implements HandlerInterface
+{
+    public function __construct(
+        private readonly DownloadRepository $downloadRepository,
+        private readonly MediaFiles $mediaFiles,
+    ) {}
+
+    public function handle(CommandInterface $command): ResultInterface
+    {
+        /** @var Download $downloadRecord */
+        $downloadRecord = $this->downloadRepository->find($command->downloadId);
+        $filepath = $this->getFullFilepath($downloadRecord);
+        $result = $this->mediaFiles->removeFile($filepath);
+
+        return new DeleteMediaFileResult(
+            message: true === $result ? 'File removed' : 'File not removed',
+            filepath: $filepath,
+            isDeleted: $result
+        );
+    }
+
+    private function getFullFilepath(Download $download): string
+    {
+        return $this->mediaFiles->getPathByType($download->getMediaType()) . DIRECTORY_SEPARATOR . $download->getFilename();
+    }
+}

src/Library/Action/Handler/LibrarySearchHandler.php

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

src/Library/Action/Input/DeleteMediaFileInput.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Library\Action\Input;
+
+use App\Library\Action\Command\DeleteMediaFileCommand;
+use OneToMany\RichBundle\Attribute\SourceRequest;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\InputInterface;
+
+/**
+ * @implements InputInterface<DeleteMediaFileInput,DeleteMediaFileCommand>
+ */
+class DeleteMediaFileInput implements InputInterface
+{
+    public function __construct(
+        #[SourceRequest('filename')]
+        public string $filename,
+        #[SourceRequest('downloadId', nullify: true)]
+        public ?int $downloadId = null,
+    ) {}
+
+    public function toCommand(): CommandInterface
+    {
+        return new DeleteMediaFileCommand(
+            $this->filename,
+            $this->downloadId,
+        );
+    }
+}

src/Library/Action/Input/LibrarySearchInput.php

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

src/Library/Action/Result/DeleteMediaFileResult.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Library\Action\Result;
+
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/**
+ * @implements ResultInterface
+ */
+class DeleteMediaFileResult implements ResultInterface
+{
+    public function __construct(
+        public string $status,
+    ) {}
+}

src/Library/Action/Result/LibrarySearchResult.php

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

src/Library/Dto/MediaFileDto.php

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

src/Library/Framework/Controller/Api.php

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

src/Monitor/Action/Handler/MonitorMovieHandler.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Monitor\Action\Handler;
+
+use App\Download\Action\Command\DownloadMediaCommand;
+use App\Monitor\Action\Command\MonitorMovieCommand;
+use App\Monitor\Action\Result\MonitorMovieResult;
+use App\Monitor\Framework\Entity\Monitor;
+use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Monitor\Service\MonitorOptionEvaluator;
+use App\Torrentio\Action\Command\GetMovieOptionsCommand;
+use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
+use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+/** @implements HandlerInterface<MonitorMovieCommand> */
+readonly class MonitorMovieHandler implements HandlerInterface
+{
+    public function __construct(
+        private MonitorRepository $movieMonitorRepository,
+        private GetMovieOptionsHandler $getMovieOptionsHandler,
+        private EntityManagerInterface $entityManager,
+        private MessageBusInterface $bus,
+        private LoggerInterface $logger,
+        private Security $security,
+    ) {}
+
+    public function handle(CommandInterface $command): ResultInterface
+    {
+        $this->logger->info('> [MonitorMovieHandler] Executing MonitorMovieHandler');
+        /** @var Monitor $monitor */
+        $monitor = $this->movieMonitorRepository->find($command->movieMonitorId);
+        $monitor->setStatus('In Progress');
+
+        $this->logger->info('> [MonitorMovieHandler] Searching for "' . $monitor->getTitle() . '" download options');
+        $results = $this->getMovieOptionsHandler->handle(
+            new GetMovieOptionsCommand($monitor->getTmdbId(), $monitor->getImdbId())
+        );
+        $this->logger->info('> [MonitorMovieHandler] Found ' . count($results->results) . ' download options');
+
+        $result = $this->monitorOptionEvaluator->evaluateOptions($monitor, $results->results);
+
+        if (null !== $result) {
+            $this->logger->info('> [MonitorMovieHandler] 1 result found: dispatching DownloadMediaCommand for "' . $result->title . '"');
+            $this->bus->dispatch(new DownloadMediaCommand(
+                $result->url,
+                $monitor->getTitle(),
+                $result->filename,
+                'movies',
+                $monitor->getImdbId(),
+                $monitor->getUser()->getId(),
+            ));
+            $monitor->setStatus('Complete');
+            $monitor->setDownloadedAt(new DateTimeIMmutable());
+        } else {
+            $monitor->setStatus('Active');
+        }
+
+        $monitor->setLastSearch(new DateTimeImmutable());
+        $monitor->incrementSearchCount();
+        $this->entityManager->flush();
+
+        return new MonitorMovieResult(
+            status: 'OK',
+            result: [
+                'monitor' => $monitor,
+            ]
+        );
+    }
+}

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -5,6 +5,7 @@ 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\MonitorTvEpisodeResult;
@@ -15,6 +16,7 @@ use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\User\Dto\UserPreferencesFactory;
 use Carbon\Carbon;
 use DateTimeImmutable;
+use Doctrine\ORM\EntityManagerInterface;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -27,6 +29,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
     public function __construct(
         private GetTvShowOptionsHandler $getTvShowOptionsHandler,
         private DownloadOptionEvaluator $downloadOptionEvaluator,
+        private EntityManagerInterface $entityManager,
         private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -18,22 +18,19 @@ use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\DependencyInjection\Attribute\Target;
 
 /** @implements HandlerInterface<MonitorMovieCommand> */
 readonly class MonitorTvShowHandler implements HandlerInterface
 {
     public function __construct(
-        #[Target('monitorLogger')]
-        private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
         private EntityManagerInterface $entityManager,
         private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
         private MediaFiles $mediaFiles,
+        private LoggerInterface $logger,
         private Tmdb $tmdb,
     ) {}
 
-
     public function handle(CommandInterface $command): ResultInterface
     {
         $this->logger->info('> [MonitorTvShowHandler] Executing MonitorTvShowHandler');

src/Monitor/Framework/Scheduler/MonitorDispatcher.php

@@ -9,7 +9,6 @@ use App\Monitor\Action\Command\MonitorTvShowCommand;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use Carbon\Carbon;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\DependencyInjection\Attribute\Target;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Scheduler\Attribute\AsCronTask;
 
@@ -17,14 +16,13 @@ use Symfony\Component\Scheduler\Attribute\AsCronTask;
 class MonitorDispatcher
 {
     public function __construct(
-        #[Target('monitorLogger')]
         private readonly LoggerInterface $logger,
         private readonly MonitorRepository $monitorRepository,
         private readonly MessageBusInterface $bus,
     ) {}
 
     public function __invoke() {
-        $this->logger->info('[MonitorDispatcher] > Executing MonitorDispatcher');
+        $this->logger->info('[MonitorDispatcher] Executing MonitorDispatcher');
 
         $this->cleanupStuckMonitors();
 
@@ -36,19 +34,15 @@ class MonitorDispatcher
         ];
 
         $monitors = $this->monitorRepository->findBy(['status' => ['New', 'Active']]);
-        $this->logger->info('[MonitorDispatcher]   ' . count($monitors) . ' monitors found');
 
         foreach ($monitors as $monitor) {
-            $this->logger->info('[MonitorDispatcher]   - Evaluating monitor ' . $monitor->getId() . ' for "' . $monitor->getTitle() . '"');
             $monitor->setStatus('In Progress');
             $this->monitorRepository->getEntityManager()->flush();
 
             $command = $monitorHandlers[$monitor->getMonitorType()];
-            $this->logger->info('[MonitorDispatcher]     Dispatching ' . $command . ' for ' . $monitor->getTitle());
+            $this->logger->info('[MonitorDispatcher] Dispatching ' . $command . ' for ' . $monitor->getTitle());
             $this->bus->dispatch(new $command($monitor->getId()));
         }
-
-        $this->logger->info('[MonitorDispatcher] < Complete');
     }
 
     private function cleanupStuckMonitors(): void

src/Search/Action/Command/GetMediaInfoCommand.php

@@ -11,5 +11,6 @@ class GetMediaInfoCommand implements CommandInterface
         public string $imdbId,
         public string $mediaType,
         public ?int $season = null,
+        public ?int $episode = null,
     ) {}
 }

src/Search/Action/Handler/GetMediaInfoHandler.php

@@ -2,7 +2,6 @@
 
 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;
@@ -15,19 +14,12 @@ 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);
+        return new GetMediaInfoResult($media, $command->season, $command->episode);
     }
 }

src/Search/Action/Handler/SearchHandler.php

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

src/Search/Action/Input/GetMediaInfoInput.php

@@ -19,6 +19,9 @@ class GetMediaInfoInput implements InputInterface
 
         #[SourceRoute('season', nullify: true)]
         public ?int $season,
+
+        #[SourceRoute('episode', nullify: true)]
+        public ?int $episode,
     ) {}
 
     public function toCommand(): CommandInterface
@@ -26,6 +29,10 @@ class GetMediaInfoInput implements InputInterface
         if ("tvshows" === $this->mediaType  && null === $this->season) {
             $this->season = 1;
         }
-        return new GetMediaInfoCommand($this->imdbId, $this->mediaType, $this->season);
+
+        if ("tvshows" === $this->mediaType && null === $this->episode) {
+            $this->episode = 1;
+        }
+        return new GetMediaInfoCommand($this->imdbId, $this->mediaType, $this->season, $this->episode);
     }
 }

src/Search/Action/Result/GetMediaInfoResult.php

@@ -11,5 +11,6 @@ class GetMediaInfoResult implements ResultInterface
     public function __construct(
         public TmdbResult $media,
         public ?int $season,
+        public ?int $episode,
     ) {}
 }

src/Search/Action/Result/RedirectToMediaResult.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Search\Action\Result;
+
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+class RedirectToMediaResult implements ResultInterface
+{
+    public function __construct(
+        public string $imdbId,
+        public string $mediaType,
+    ) {}
+}

src/Search/Framework/Command/SearchCommand.php

@@ -0,0 +1,213 @@
+<?php
+
+namespace App\Search\Framework\Command;
+
+use Aimeos\Map;
+use App\Download\Action\Command\DownloadMediaCommand;
+use App\Download\Action\Handler\DownloadMediaHandler;
+use App\Download\Framework\Repository\DownloadRepository;
+use App\Search\Action\Handler\SearchHandler;
+use App\Search\Action\Command\SearchCommand as CommandInput;
+use App\Search\Action\Result\SearchResult;
+use App\Tmdb\TmdbResult;
+use App\Torrentio\Action\Command\GetMovieOptionsCommand;
+use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
+use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
+use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
+use App\Torrentio\Result\TorrentioResult;
+use App\User\Framework\Repository\UserRepository;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\Table;
+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\Question\ChoiceQuestion;
+use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+#[AsCommand('search')]
+class SearchCommand extends Command
+{
+    private SearchHandler $searchHandler;
+    private GetTvShowOptionsHandler $getTvShowOptionsHandler;
+    private GetMovieOptionsHandler $getMovieOptionsHandler;
+    private UserRepository $userRepository;
+    private DownloadRepository $downloadRepository;
+    private DownloadMediaHandler $downloadMediaHandler;
+    private MessageBusInterface $bus;
+
+    public function __construct(SearchHandler $searchHandler, GetTvShowOptionsHandler $getTvShowOptionsHandler,
+        GetMovieOptionsHandler $getMovieOptionsHandler,
+        UserRepository $userRepository,
+        DownloadRepository $downloadRepository,
+        DownloadMediaHandler $downloadMediaHandler,
+        MessageBusInterface $bus,
+        ?string $name = null
+    ) {
+        parent::__construct($name);
+        $this->searchHandler = $searchHandler;
+        $this->getTvShowOptionsHandler = $getTvShowOptionsHandler;
+        $this->getMovieOptionsHandler = $getMovieOptionsHandler;
+        $this->userRepository = $userRepository;
+        $this->downloadRepository = $downloadRepository;
+        $this->downloadMediaHandler = $downloadMediaHandler;
+        $this->bus = $bus;
+    }
+
+    protected function configure()
+    {
+        $this->addArgument('term', InputArgument::REQUIRED);
+        $this->addOption('local', 'l', InputOption::VALUE_NONE, 'Perform the download locally instead of submitting it to the queue.');
+    }
+
+    public function run(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+        $command = new CommandInput($input->getArgument('term'));
+
+        // Perform search
+        $mediaOptions = $this->searchHandler->handle($command);
+
+        // Render results and ask the User to pick one
+        $mediaChoice = $this->askToChooseMediaOption($io, $output, $mediaOptions);
+
+        // Find download options based on the User's choice
+        $downloadOptions = $this->fetchDownloadOptions($mediaChoice);
+
+        // Render results and ask the User to pick one
+        $downloadChoice = $this->askToChooseDownloadOption($io, $output, $downloadOptions);
+
+        // Have user confirm download action
+        $confirmation = $this->askToConfirmDownload($io, $output, $downloadChoice);
+
+        // Begin download or submit to the queue
+        if (true === $confirmation) {
+            $downloadLocally = $input->getOption('local');
+            $this->submitDownload($io, $mediaChoice, $downloadChoice, $downloadLocally);
+        } else {
+            $io->success('No results found.');
+        }
+
+        $io->success('Success!');
+
+        return Command::SUCCESS;
+    }
+
+    private function askToChooseMediaOption(SymfonyStyle $io, OutputInterface $output, SearchResult $result): TmdbResult
+    {
+        $table = new Table($output)
+            ->setHeaders(['ID', 'Title', 'Year', 'IMDb ID', 'Description'])
+            ->setRows(
+                Map::from($result->results)
+                    ->map(fn ($result, $index) => [$index, $result->title, $result->year, $result->imdbId, substr($result->description, 0, 80) . '...'])
+                    ->toArray()
+            );
+
+        $table->render();
+
+        $question = new Question('Enter the ID of the correct result: ');
+        $choiceId = $io->askQuestion($question);
+        $choice = $result->results[$choiceId];
+
+        $io->info('You chose: ' . $choice->title);
+        $io->table(
+            ['ID', 'Title', 'Year', 'IMDb ID', 'Description'],
+            [
+                [$choiceId, $choice->title, $choice->year, $choice->imdbId, substr($choice->description, 0, 80) . '...'],
+            ]
+        );
+
+        return $choice;
+    }
+
+    private function fetchDownloadOptions(TmdbResult $result): array
+    {
+        $handlers = [
+            'movies' => $this->getMovieOptionsHandler,
+            'tvshows' => $this->getTvShowOptionsHandler,
+        ];
+
+        $handler = $handlers[$result->mediaType];
+
+        if ("movies" === $result->mediaType) {
+            $command = new GetMovieOptionsCommand(
+                $result->tmdbId,
+                $result->imdbId
+            );
+        } else {
+            $command = new GetTvShowOptionsCommand(
+                $result->tmdbId,
+                $result->imdbId,
+                1,
+                1
+            );
+        }
+
+        $result = $handler->handle($command);
+        return $result->results;
+    }
+
+    private function askToChooseDownloadOption(SymfonyStyle $io, OutputInterface $output, array $options): TorrentioResult
+    {
+        $table = new Table($output)
+            ->setHeaders(['ID', 'Size', 'Resolution', 'Codec', 'Seeders', 'Provider', 'Language'])
+            ->setRows(
+                Map::from($options)
+                    ->map(fn (TorrentioResult $result, $index) => [$index, $result->size, $result->resolution, $result->codec, $result->seeders, $result->provider, implode(', ', $result->languages)])
+                    ->toArray()
+            );
+        $table->render();
+
+        $question = new Question('Enter the ID of the item to download: ');
+        $choiceId = $io->askQuestion($question);
+        $choice = $options[$choiceId];
+        $io->info('You chose: ' . $choice->title);
+
+        return $choice;
+    }
+
+    private function askToConfirmDownload(SymfonyStyle $io, OutputInterface $output, TorrentioResult $downloadOption): bool
+    {
+        $question = new ChoiceQuestion('Are you sure you want to download the above file?', ['yes', 'no']);
+        $choice = $io->askQuestion($question);
+        return $choice === 'yes';
+    }
+
+    private function submitDownload(SymfonyStyle $io, TmdbResult $mediaChoice, TorrentioResult $downloadOption, bool $downloadLocally = false): void
+    {
+        $io->writeln('> Adding download record');
+        $user = $this->userRepository->find(1);
+        $download = $this->downloadRepository->insert(
+            $user,
+            $downloadOption->url,
+            $downloadOption->title,
+            $downloadOption->filename,
+            $mediaChoice->imdbId,
+            $mediaChoice->mediaType,
+        );
+
+        $io->writeln('> Download record added: ' . $download->getId());
+        $downloadCommand = new DownloadMediaCommand(
+            $download->getUrl(),
+            $download->getTitle(),
+            $download->getFilename(),
+            $download->getMEdiaType(),
+            $download->getImdbId(),
+            $download->getUser()->getId(),
+            $download->getId()
+        );
+
+        if (true === $downloadLocally) {
+            $io->writeln('> Beginning local download');
+            $this->downloadMediaHandler->handle($downloadCommand);
+        } else {
+            $io->writeln('> Submitting download to queue');
+            $this->bus->dispatch($downloadCommand);
+        }
+
+        $io->writeln('> Download added to queue');
+    }
+}

src/Search/Framework/Controller/WebController.php

@@ -6,6 +6,7 @@ use App\Search\Action\Handler\GetMediaInfoHandler;
 use App\Search\Action\Handler\SearchHandler;
 use App\Search\Action\Input\GetMediaInfoInput;
 use App\Search\Action\Input\SearchInput;
+use App\Search\Action\Result\RedirectToMediaResult;
 use App\Tmdb\TmdbResult;
 use App\Torrentio\Action\Command\GetMovieOptionsCommand;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
@@ -28,16 +29,24 @@ final class WebController extends AbstractController
     ): Response {
         $results = $this->searchHandler->handle($searchInput->toCommand());
 
+        if ($results instanceof RedirectToMediaResult) {
+            return $this->redirectToRoute('app_search_result', [
+                'mediaType' => $results->mediaType,
+                'imdbId' => $results->imdbId,
+            ]);
+        }
+
         return $this->render('search/results.html.twig', [
             'results' => $results,
         ]);
     }
 
-    #[Route('/result/{mediaType}/{imdbId}/{season}', name: 'app_search_result')]
+    #[Route('/result/{mediaType}/{imdbId}/{season}/{episode?}', name: 'app_search_result')]
     public function result(
         GetMediaInfoInput $input,
         ?int $season = null,
-    ): Response {
+    ): Response
+    {
         $result = $this->getMediaInfoHandler->handle($input->toCommand());
 
         return $this->render('search/result.html.twig', [
@@ -52,32 +61,4 @@ final class WebController extends AbstractController
             ]
         ]);
     }
-
-    private function warmDownloadOptionCache(TmdbResult $result)
-    {
-        if ($result->mediaType === 'tvshows') {
-            // dispatches a job to get the download options
-            // for each episode and load them in cache
-            foreach ($result->episodes as $season => $episodes) {
-                // Only do the first 2 seasons, so we reduce
-                // getting rate-limited by Torrentio
-                if ($season > 2) {
-                    return;
-                }
-                foreach ($episodes as $episode) {
-                    $this->bus->dispatch(new GetTvShowOptionsCommand(
-                        tmdbId: $result->tmdbId,
-                        imdbId: $result->imdbId,
-                        season: $season,
-                        episode: $episode['episode_number'],
-                    ));
-                }
-            }
-        } elseif ($result->mediaType === 'movies') {
-            $this->bus->dispatch(new GetMovieOptionsCommand(
-                $result->tmdbId,
-                $result->imdbId,
-            ));
-        }
-    }
 }

src/Tmdb/Framework/Controller/ApiController.php

@@ -2,6 +2,7 @@
 
 namespace App\Tmdb\Framework\Controller;
 
+use App\Base\Util\ImdbMatcher;
 use App\Tmdb\Tmdb;
 use App\Tmdb\TmdbResult;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -17,17 +18,28 @@ class ApiController extends AbstractController
         $results = [];
 
         $term = $request->query->get('query') ?? null;
+        $term = trim($term);
 
         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",
+            if (ImdbMatcher::isMatch($term)) {
+                $tmdbResult = $tmdb->findByImdbId($term);
+                $results = [
+                    [
+                        'data' => $tmdbResult,
+                        'text' => $tmdbResult->title,
+                        'value' => "$tmdbResult->mediaType|$tmdbResult->imdbId",
+                    ]
                 ];
+            } else {
+                $tmdbResults = $tmdb->search($term);
+                foreach ($tmdbResults as $tmdbResult) {
+                    /** @var TmdbResult $tmdbResult */
+                    $results[] = [
+                        'data' => $tmdbResult,
+                        'text' => $tmdbResult->title,
+                        'value' => "$tmdbResult->mediaType|$tmdbResult->imdbId",
+                    ];
+                }
             }
         }
 

src/Tmdb/Tmdb.php

@@ -185,6 +185,28 @@ class Tmdb
         throw new \Exception("No results found for $id");
     }
 
+    public function findByImdbId(string $imdbId)
+    {
+        $finder = new Find($this->client);
+        $result = $finder->findBy($imdbId, ['external_source' => 'imdb_id']);
+
+        if (count($result['movie_results']) > 0) {
+            $result = $result['movie_results'][0];
+            $mediaType = MediaType::Movie->value;
+        } elseif (count($result['tv_results']) > 0) {
+            $result = $result['tv_results'][0];
+            $mediaType = MediaType::TvShow->value;
+        } elseif (count($result['tv_episode_results']) > 0) {
+            $result = $result['tv_episode_results'][0];
+            $mediaType = MediaType::TvShow->value;
+        }
+
+        $result['media_type'] = $mediaType;
+        $result = $this->mediaDetails($imdbId, $result['media_type']);
+
+        return $result;
+    }
+
     public function movieDetails(string $id)
     {
         $client = new MovieRepository($this->client);
@@ -301,6 +323,7 @@ class Tmdb
             description: $data['overview'],
             year: (new \DateTime($data['release_date']))->format('Y'),
             mediaType: "movies",
+            episodeAirDate: (new \DateTime($data['release_date']))->format('m/d/Y'),
         );
     }
 

src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php

@@ -3,6 +3,7 @@
 namespace App\Torrentio\Action\Handler;
 
 use App\Base\Service\MediaFiles;
+use App\Library\Dto\MediaFileDto;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
@@ -27,8 +28,9 @@ class GetTvShowOptionsHandler implements HandlerInterface
         $file = $this->mediaFiles->episodeExists($parentShow->title, $command->season, $command->episode);
 
         return new GetTvShowOptionsResult(
+            parentShow: $parentShow,
             media: $media,
-            file: $file,
+            file: MediaFileDto::fromSplFileInfo($file),
             season: $command->season,
             episode: $command->episode,
             results: $this->torrentio->fetchEpisodeResults(

src/Torrentio/Action/Result/GetTvShowOptionsResult.php

@@ -2,15 +2,16 @@
 
 namespace App\Torrentio\Action\Result;
 
+use App\Library\Dto\MediaFileDto;
 use App\Tmdb\TmdbResult;
 use OneToMany\RichBundle\Contract\ResultInterface;
-use Symfony\Component\Finder\SplFileInfo;
 
 class GetTvShowOptionsResult implements ResultInterface
 {
     public function __construct(
+        public TmdbResult $parentShow,
         public TmdbResult $media,
-        public bool|SplFileInfo $file,
+        public MediaFileDto|false $file,
         public string $season,
         public string $episode,
         public array $results

src/Torrentio/Framework/Controller/WebController.php

@@ -9,12 +9,15 @@ use App\Torrentio\Action\Input\GetMovieOptionsInput;
 use App\Torrentio\Action\Input\GetTvShowOptionsInput;
 use App\Torrentio\Exception\TorrentioRateLimitException;
 use Carbon\Carbon;
+use OneToMany\RichBundle\Contract\ResultInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Attribute\Cache;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
+use Symfony\UX\Turbo\TurboBundle;
 
 final class WebController extends AbstractController
 {
@@ -24,8 +27,9 @@ final class WebController extends AbstractController
         private readonly Broadcaster $broadcaster,
     ) {}
 
+    #[Cache(expires: 3600, public: false, mustRevalidate: true)]
     #[Route('/torrentio/movies/{tmdbId}/{imdbId}', name: 'app_torrentio_movies')]
-    public function movieOptions(GetMovieOptionsInput $input, CacheInterface $cache): Response
+    public function movieOptions(GetMovieOptionsInput $input, CacheInterface $cache, Request $request): Response
     {
         $cacheId = sprintf(
             "page.torrentio.movies.%s.%s",
@@ -33,17 +37,22 @@ final class WebController extends AbstractController
             $input->imdbId
         );
 
-        return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
+        $results =  $cache->get($cacheId, function (ItemInterface $item) use ($input, $request) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $results = $this->getMovieOptionsHandler->handle($input->toCommand());
-            return $this->render('torrentio/movies.html.twig', [
-                'results' => $results,
-            ]);
+            return $this->getMovieOptionsHandler->handle($input->toCommand());
         });
+
+        if ($request->headers->get('Turbo-Frame')) {
+            return $this->sendFragmentResponse($results, $request);
+        }
+
+        return $this->render('torrentio/movies.html.twig', [
+            'results' => $results,
+        ]);
     }
 
     #[Route('/torrentio/tvshows/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_torrentio_tvshows')]
-    public function tvShowOptions(GetTvShowOptionsInput $input, CacheInterface $cache): Response
+    public function tvShowOptions(GetTvShowOptionsInput $input, CacheInterface $cache, Request $request): Response
     {
         $cacheId = sprintf(
             "page.torrentio.tvshows.%s.%s.%s.%s",
@@ -54,13 +63,18 @@ final class WebController extends AbstractController
         );
 
         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,
-                ]);
-//            });
+            $results = $cache->get($cacheId, function (ItemInterface $item) use ($input) {
+                $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+                return $this->getTvShowOptionsHandler->handle($input->toCommand());
+            });
+
+            if ($request->headers->get('Turbo-Frame')) {
+                return $this->sendFragmentResponse($results, $request);
+            }
+
+            return $this->render('torrentio/tvshows.html.twig', [
+                'results' => $results,
+            ]);
         } catch (TorrentioRateLimitException $exception) {
             $this->broadcaster->alert('Warning', 'Torrentio has rate limited your requests. Please wait a few minutes before trying again.', 'warning');
             return $this->render('bare.html.twig',
@@ -73,29 +87,16 @@ final class WebController extends AbstractController
         }
     }
 
-    #[Route('/torrentio/tvshows/clear/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_clear_torrentio_tvshows')]
-    public function clearTvShowOptions(GetTvShowOptionsInput $input, CacheInterface $cache, Request $request): Response
+    private function sendFragmentResponse(ResultInterface $result, Request $request): Response
     {
-        $cacheId = sprintf(
-            "page.torrentio.tvshows.%s.%s.%s.%s",
-            $input->tmdbId,
-            $input->imdbId,
-            $input->season,
-            $input->episode,
+        $request->setRequestFormat(TurboBundle::STREAM_FORMAT);
+        return $this->renderBlock(
+            'torrentio/fragments.html.twig',
+            $request->query->get('block'),
+            [
+                'results' => $result,
+                'target' => $request->query->get('target')
+            ]
         );
-        $cache->delete($cacheId);
-
-        $this->broadcaster->alert(
-            title: 'Success',
-            message: 'Torrentio cache Cleared.'
-        );
-
-        return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
-            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $results = $this->getTvShowOptionsHandler->handle($input->toCommand());
-            return $this->render('torrentio/tvshows.html.twig', [
-                'results' => $results,
-            ]);
-        });
     }
 }

src/Twig/Components/Filter.php

@@ -3,16 +3,27 @@
 namespace App\Twig\Components;
 
 use Aimeos\Map;
+use App\User\Database\CodecList;
 use App\User\Database\QualityList;
+use App\User\Database\ResolutionList;
+use App\User\Dto\PreferenceOptions;
+use App\User\Dto\PreferenceOptionsFactory;
+use App\User\Dto\UserPreferencesFactory;
+use App\User\Framework\Form\UserMediaPreferencesForm;
 use App\User\Framework\Repository\PreferencesRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Form\FormInterface;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
+use Symfony\UX\LiveComponent\ComponentWithFormTrait;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 
 #[AsLiveComponent]
-final class Filter
+final class Filter extends AbstractController
 {
     use DefaultActionTrait;
+    use ComponentWithFormTrait;
 
     public array $preferences = [];
 
@@ -21,15 +32,25 @@ final class Filter
     public array $reverseMappedQualities = [];
 
     public function __construct(
-        private readonly PreferencesRepository $preferencesRepository,
         private readonly Security $security,
     ) {
-        $this->preferences = Map::from($this->preferencesRepository->findEnabled())
-            ->rekey(fn($element) => $element->getId())
-            ->map(fn($element) => $element->getPreferenceOptions()->toArray())
-            ->toArray();
-        $this->userPreferences = Map::from($this->security->getUser()->getUserPreferenceValues())
-            ->toArray();
+        $this->preferences = (array) PreferenceOptionsFactory::createSelectOptions();
+        $this->userPreferences = (array) UserPreferencesFactory::createFromUser($security->getUser());
         $this->reverseMappedQualities = QualityList::getAsReverseMap();
     }
+
+    public function getResolutionOptions()
+    {
+        return ResolutionList::asSelectOptions();
+    }
+
+    public function getCodecOptions()
+    {
+        return CodecList::asSelectOptions();
+    }
+
+    protected function instantiateForm(): FormInterface
+    {
+        return $this->createForm(UserMediaPreferencesForm::class, UserPreferencesFactory::createFromUser($this->getUser()));
+    }
 }

src/Twig/Components/TvEpisodeList.php

@@ -6,11 +6,13 @@ use App\Search\Action\Command\GetMediaInfoCommand;
 use App\Search\Action\Handler\GetMediaInfoHandler;
 use App\Search\TvEpisodePaginator;
 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;
 
 #[AsLiveComponent]
-final class TvEpisodeList
+final class  TvEpisodeList
 {
     use DefaultActionTrait;
     use PaginateTrait;
@@ -27,6 +29,12 @@ final class TvEpisodeList
     #[LiveProp(writable: true)]
     public int $season = 1;
 
+    #[LiveProp(writable: true)]
+    public int $reloadCount = 0;
+
+    #[LiveProp(writable: true)]
+    public ?int $episodeNumber = null;
+
     public function __construct(
         private GetMediaInfoHandler $getMediaInfoHandler,
     ) {}
@@ -34,6 +42,14 @@ final class TvEpisodeList
     public function getEpisodes()
     {
         $results = $this->getMediaInfoHandler->handle(new GetMediaInfoCommand($this->imdbId, "tvshows", $this->season));
+
+        if (null !== $this->episodeNumber) {
+            $this->pageNumber = ceil($this->episodeNumber / $this->perPage);
+            $this->episodeNumber = null;
+        }
+
+        $this->reloadCount++;
+
         return new TvEpisodePaginator()->paginate($results, $this->pageNumber, $this->perPage);
     }
 

src/Twig/Dto/EpisodeIdDto.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Twig\Dto;
+
+class EpisodeIdDto
+{
+    public function __construct(
+        public string $season,
+        public string $episode,
+    ) {}
+
+    public function asEpisodeId(): string
+    {
+        return "S". str_pad($this->season, 2, "0", STR_PAD_LEFT) .
+        "E". str_pad($this->episode, 2, "0", STR_PAD_LEFT);
+    }
+
+    public function __toString(): string
+    {
+        if ("" !== $this->season && "" !== $this->episode) {
+            return $this->asEpisodeId();
+        }
+        return "";
+    }
+}

src/Twig/Extensions/UtilExtension.php

@@ -4,6 +4,7 @@ namespace App\Twig\Extensions;
 
 use App\Base\Service\MediaFiles;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
+use App\Twig\Dto\EpisodeIdDto;
 use ChrisUllyott\FileSize;
 use Twig\Attribute\AsTwigFilter;
 use Twig\Attribute\AsTwigFunction;
@@ -47,7 +48,7 @@ class UtilExtension
     }
 
     #[AsTwigFilter('episode_id_from_results')]
-    public function episodeId($result): ?string
+    public function episodeIdFromResults($result): ?string
     {
         if (!$result instanceof GetTvShowOptionsResult) {
             return null;
@@ -56,4 +57,49 @@ class UtilExtension
         return "S". str_pad($result->season, 2, "0", STR_PAD_LEFT) .
             "E". str_pad($result->episode, 2, "0", STR_PAD_LEFT);
     }
+
+    #[AsTwigFunction('episode_id')]
+    public function episodeId($season, $episode): ?string
+    {
+        return "S". str_pad($season, 2, "0", STR_PAD_LEFT) .
+            "E". str_pad($episode, 2, "0", STR_PAD_LEFT);
+    }
+
+    #[AsTwigFunction('episode_anchor')]
+    public function episodeAnchor($season, $episode): ?string
+    {
+        return "episode_" . (int) $season . "_" . (int) $episode;
+    }
+
+    #[AsTwigFunction('extract_from_episode_id')]
+    public function extractFromEpisodeId(?string $episodeId): ?EpisodeIdDto
+    {
+        if (null === $episodeId) {
+            return new EpisodeIdDto("", "");
+        }
+
+        // Capture season
+        $seasonMatch = [];
+        preg_match('/[sS]\d\d(\d)?(\d)?/', $episodeId, $seasonMatch);
+        if (empty($seasonMatch)) {
+            $season = "";
+        } else {
+            $season = str_replace(['S', 's'], '', $seasonMatch[0]);
+        }
+
+        // Capture episode
+        $episodeMatch = [];
+        preg_match('/[eE]\d\d(\d)?(\d)?/', $episodeId, $episodeMatch);
+        if (empty($episodeMatch)) {
+            $episode = "";
+        } else {
+            $episode = str_replace(['E', 'e'], '', $episodeMatch[0]);
+        }
+
+        if (null === $season && null === $episode) {
+            return new EpisodeIdDto("", "");
+        }
+
+        return new EpisodeIdDto($season, $episode);
+    }
 }

src/User/Action/Command/SaveUserMediaPreferencesCommand.php

@@ -3,6 +3,7 @@
 namespace App\User\Action\Command;
 
 use OneToMany\RichBundle\Contract\CommandInterface;
+use Symfony\Component\Form\FormInterface;
 
 /** @implements CommandInterface<SaveUserMediaPreferencesCommand> */
 class SaveUserMediaPreferencesCommand implements CommandInterface
@@ -14,4 +15,15 @@ class SaveUserMediaPreferencesCommand implements CommandInterface
         public string $language,
         public string $provider,
     ) {}
+
+    public static function fromUserMediaPreferencesForm(FormInterface $form): self
+    {
+        return new static(
+            resolution: \implode(',', $form->get('resolution')->getData()),
+            codec: \implode(',', $form->get('codec')->getData()),
+            quality: \implode(',', $form->get('quality')->getData()),
+            language: \implode(',', $form->get('language')->getData()),
+            provider: \implode(',', $form->get('provider')->getData()),
+        );
+    }
 }

src/User/Database/CodecList.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\User\Database;
+
+class CodecList
+{
+    public static $codecs = [
+        'h264',
+        'h265/HEVC',
+    ];
+
+    public static function getCodecs()
+    {
+        return self::$codecs;
+    }
+
+    public static function asSelectOptions(): array
+    {
+        return [
+            'h264' => 'h264',
+            'h265/HEVC' => 'h265',
+        ];
+    }
+}

src/User/Database/QualityList.php

@@ -102,7 +102,7 @@ class QualityList
 
     public static function asSelectOptions(): array
     {
-        $result = [];
+        $result = ['n/a' => null];
         foreach (array_keys(static::$qualities) as $quality) {
             $result[$quality] = $quality;
         }

src/User/Database/ResolutionList.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\User\Database;
+
+class ResolutionList
+{
+    public static $resolutions = [
+        '480p',
+        '720p',
+        '1080p',
+        '2160p',
+    ];
+
+    public static function getResolutions()
+    {
+        return self::$resolutions;
+    }
+
+    public static function asSelectOptions(): array
+    {
+        $result = [];
+        foreach (static::$resolutions as $resolution) {
+            $result[$resolution] = $resolution;
+        }
+        return $result;
+    }
+}

src/User/Dto/PreferenceOptions.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\User\Dto;
+
+class PreferenceOptions
+{
+    public function __construct(
+        public readonly array $resolutions,
+        public readonly array $codecs,
+        public readonly array $languages,
+        public readonly array $providers,
+        public readonly array $qualities,
+    ) {}
+}

src/User/Dto/PreferenceOptionsFactory.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\User\Dto;
+
+use App\User\Database\CodecList;
+use App\User\Database\CountryLanguages;
+use App\User\Database\ProviderList;
+use App\User\Database\QualityList;
+use App\User\Database\ResolutionList;
+
+class PreferenceOptionsFactory
+{
+    public static function createSelectOptions(): PreferenceOptions
+    {
+        return new PreferenceOptions(
+            resolutions: ResolutionList::asSelectOptions(),
+            codecs: CodecList::asSelectOptions(),
+            languages: CountryLanguages::asSelectOptions(),
+            providers: ProviderList::asSelectOptions(),
+            qualities: QualityList::asSelectOptions(),
+        );
+    }
+}

src/User/Dto/UserPreferences.php

@@ -6,10 +6,10 @@ 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,
+        public readonly ?array $resolution,
+        public readonly ?array $codec,
+        public readonly ?array $language,
+        public readonly ?array $provider,
+        public readonly ?array $quality,
     ) {}
 }

src/User/Dto/UserPreferencesFactory.php

@@ -12,8 +12,8 @@ class UserPreferencesFactory
     public static function createFromUser(UserInterface $user): UserPreferences
     {
         return new UserPreferences(
-            resolution: self::getNestedValue($user, 'resolution'),
-            codec: self::getNestedValue($user, 'codec'),
+            resolution: self::getValue($user, 'resolution'),
+            codec: self::getValue($user, 'codec'),
             language: self::getValue($user, 'language'),
             provider: self::getValue($user, 'provider'),
             quality: self::getValue($user, 'quality'),
@@ -27,21 +27,7 @@ class UserPreferencesFactory
         if ($value === "") {
             return null;
         }
+        $value = explode(',', $value);
         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/Api/UserFilterApiController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\User\Framework\Controller\Api;
+
+use App\User\Dto\UserPreferences;
+use App\User\Dto\UserPreferencesFactory;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+
+#[Route('/api/user/filters')]
+class UserFilterApiController extends AbstractController
+{
+    #[Route('', 'api.user.filters', methods: ['GET'])]
+    public function getFilters(): Response
+    {
+        return $this->json([
+            UserPreferencesFactory::createFromUser($this->getUser())
+        ]);
+    }
+}

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

@@ -22,7 +22,7 @@ class LoginController extends AbstractController
             return $this->redirectToRoute('app_getting_started');
         }
 
-        if ($config->authIs('oidc') && true === $config->getAuthConfig()->getOidcConfig()->getBypassFormLogin()) {
+        if ($config->authIs('oidc') && $config->bypassFormLogin()) {
             return $this->redirectToRoute('app_login_oidc');
         }
 

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

@@ -3,7 +3,6 @@
 namespace App\User\Framework\Controller\Web;
 
 use App\Base\ConfigResolver;
-use App\Base\Service\Broadcaster;
 use Drenso\OidcBundle\OidcClientInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
@@ -16,15 +15,13 @@ class LoginOidcController extends AbstractController
 
     public function __construct(
         private ConfigResolver $configResolver,
-        private Broadcaster $broadcaster,
     ) {}
 
     #[Route('/login/oidc', name: 'app_login_oidc')]
     public function oidcStart(OidcClientInterface $oidcClient): RedirectResponse
     {
         if (false === $this->configResolver->authIs('oidc')) {
-            $this->broadcaster->systemAlert('Your authentication must be set to "oidc" in order to login with OIDC.', 'warning');
-            return $this->redirectToRoute('app_login');
+            throw new \Exception('You must configure the OIDC environment variables before logging in at this route.');
         }
 
         // Redirect to authorization @ OIDC provider

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\User\Framework\Controller\Web;
 
 use App\Base\Service\Broadcaster;
+use App\User\Action\Command\SaveUserMediaPreferencesCommand;
 use App\User\Action\Handler\SaveUserDownloadPreferencesHandler;
 use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
 use App\User\Action\Input\SaveUserDownloadPreferencesInput;
@@ -14,8 +15,10 @@ use App\User\Database\ProviderList;
 use App\User\Database\QualityList;
 use App\User\Dto\UserPreferencesFactory;
 use App\User\Framework\Form\GettingStartedFilterForm;
+use App\User\Framework\Form\UserMediaPreferencesForm;
 use App\User\Framework\Repository\PreferencesRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 
@@ -29,53 +32,42 @@ class PreferencesController extends AbstractController
     #[Route('/user/preferences', 'app_user_preferences', methods: ['GET'])]
     public function mediaPreferences(): Response
     {
-        $mediaPreferences = $this->getUser()->getMediaPreferences();
         $downloadPreferences = $this->getUser()->getDownloadPreferences();
-        $languages = CountryLanguages::$languages;
-        sort($languages);
+        $formData = (array) UserPreferencesFactory::createFromUser($this->getUser());
+        $form = $this->createForm(UserMediaPreferencesForm::class, $formData);
 
         return $this->render(
             'user/preferences.html.twig',
             [
-                'preferences' => $this->preferencesRepository->findEnabled(),
-                'languages' => $languages,
-                'providers' => ProviderList::getProviders(),
-                'qualities' => QualityList::getBaseQualities(),
-                'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
-                'filterForm' => $this->createForm(GettingStartedFilterForm::class, (array) UserPreferencesFactory::createFromUser($this->getUser())),
+                'preferences_form' => $form,
             ]
         );
     }
 
-    #[Route('/user/preferences/media', 'app_save_media_preferences', methods: ['POST'])]
-    public function saveMediaPreferences(
-        SaveUserMediaPreferencesInput $input,
-        SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler,
+    #[Route('/user/preferences/media', 'app_user_media_preferences_submit', methods: ['POST'])]
+    public function mediaPreferencesSubmit(
+        Request $request,
+        SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler
     ): Response
     {
-        $saveUserMediaPreferencesHandler->handle($input->toCommand());
-        $mediaPreferences = $this->getUser()->getMediaPreferences();
         $downloadPreferences = $this->getUser()->getDownloadPreferences();
+        $form = $this->createForm(UserMediaPreferencesForm::class);
 
-        $languages = CountryLanguages::$languages;
-        sort($languages);
+        $form->handleRequest($request);
 
-        $this->broadcaster->alert(
-            title: 'Success',
-            message: 'Your media preferences have been saved.'
-        );
+        if ($form->isSubmitted() && $form->isValid()) {
+            $saveUserMediaPreferencesHandler->handle(
+                SaveUserMediaPreferencesCommand::fromUserMediaPreferencesForm($form)
+            );
+            $this->broadcaster->alert('Success', 'Your media preferences have been saved.');
+        }
 
         return $this->render(
             'user/preferences.html.twig',
             [
-                'preferences' => $this->preferencesRepository->findEnabled(),
-                'languages' => $languages,
-                'providers' => ProviderList::$providers,
-                'qualities' => QualityList::getBaseQualities(),
-                'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
-                'filterForm' => $this->createForm(GettingStartedFilterForm::class ?? null),
+                'preferences_form' => $form,
             ]
         );
     }
@@ -86,11 +78,11 @@ class PreferencesController extends AbstractController
         SaveUserDownloadPreferencesHandler $saveUserDownloadPreferencesHandler,
     ): Response
     {
-        $downloadPreferences = $saveUserDownloadPreferencesHandler->handle($input->toCommand())->downloadPreferences;
-        $mediaPreferences = $this->getUser()->getMediaPreferences();
+        $downloadPreferences = $this->getUser()->getDownloadPreferences();
+        $formData = (array) UserPreferencesFactory::createFromUser($this->getUser());
+        $form = $this->createForm(UserMediaPreferencesForm::class, $formData);
 
-        $languages = CountryLanguages::$languages;
-        sort($languages);
+        $saveUserDownloadPreferencesHandler->handle($input->toCommand());
 
         $this->broadcaster->alert(
             title: 'Success',
@@ -100,12 +92,8 @@ class PreferencesController extends AbstractController
         return $this->render(
             'user/preferences.html.twig',
             [
-                'preferences' => $this->preferencesRepository->findEnabled(),
-                'languages' => $languages,
-                'providers' => ProviderList::getProviders(),
-                'qualities' => QualityList::getBaseQualities(),
-                'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
+                'preferences_form' => $form,
             ]
         );
     }

src/User/Framework/Entity/Preference.php

@@ -26,17 +26,6 @@ class Preference
     #[ORM\Column]
     private ?bool $enabled = null;
 
-    /**
-     * @var Collection<int, PreferenceOption>
-     */
-    #[ORM\OneToMany(targetEntity: PreferenceOption::class, mappedBy: 'preference', fetch: 'EAGER')]
-    private Collection $preferenceOptions;
-
-    public function __construct()
-    {
-        $this->preferenceOptions = new ArrayCollection();
-    }
-
     public function getId(): ?string
     {
         return $this->id;
@@ -94,34 +83,4 @@ class Preference
 
         return $this;
     }
-
-    /**
-     * @return Collection<int, PreferenceOption>
-     */
-    public function getPreferenceOptions(): Collection
-    {
-        return $this->preferenceOptions;
-    }
-
-    public function addPreferenceOption(PreferenceOption $preferenceOption): static
-    {
-        if (!$this->preferenceOptions->contains($preferenceOption)) {
-            $this->preferenceOptions->add($preferenceOption);
-            $preferenceOption->setPreference($this);
-        }
-
-        return $this;
-    }
-
-    public function removePreferenceOption(PreferenceOption $preferenceOption): static
-    {
-        if ($this->preferenceOptions->removeElement($preferenceOption)) {
-            // set the owning side to null (unless already changed)
-            if ($preferenceOption->getPreference() === $this) {
-                $preferenceOption->setPreference(null);
-            }
-        }
-
-        return $this;
-    }
 }

src/User/Framework/Entity/PreferenceOption.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\User\Framework\Entity;
-
-use App\User\Framework\Repository\PreferenceOptionRepository;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Attribute\Ignore;
-
-#[ORM\Entity(repositoryClass: PreferenceOptionRepository::class)]
-class PreferenceOption
-{
-    #[ORM\Id]
-    #[ORM\GeneratedValue]
-    #[ORM\Column]
-    private ?int $id = null;
-
-    #[ORM\Column(length: 255, nullable: true)]
-    private ?string $name = null;
-
-    #[ORM\Column(length: 255, nullable: true)]
-    private ?string $value = null;
-
-    #[Ignore]
-    #[ORM\ManyToOne(inversedBy: 'preferenceOptions')]
-    private ?Preference $preference = null;
-
-    #[ORM\Column]
-    private ?bool $enabled = null;
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getName(): ?string
-    {
-        return $this->name;
-    }
-
-    public function setName(?string $name): static
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    public function getValue(): ?string
-    {
-        return $this->value;
-    }
-
-    public function setValue(?string $value): static
-    {
-        $this->value = $value;
-
-        return $this;
-    }
-
-    public function getPreference(): ?Preference
-    {
-        return $this->preference;
-    }
-
-    public function setPreference(?Preference $preference): static
-    {
-        $this->preference = $preference;
-
-        return $this;
-    }
-
-    public function isEnabled(): ?bool
-    {
-        return $this->enabled;
-    }
-
-    public function setEnabled(bool $enabled): static
-    {
-        $this->enabled = $enabled;
-
-        return $this;
-    }
-}

src/User/Framework/Entity/User.php

@@ -215,11 +215,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
                 if (in_array($userPreference->getPreference()->getId(), ['language', 'provider', 'quality'])) {
                     return $userPreference->getPreferenceValue();
                 }
-                foreach ($userPreference->getPreference()->getPreferenceOptions() as $preferenceOption) {
-                    if ($preferenceOption->getId() === (int) $userPreference->getPreferenceValue()) {
-                        return $preferenceOption->getValue();
-                    }
-                }
                 return null;
             })
             ->toArray();

src/User/Framework/Form/GettingStartedFilterForm.php

@@ -2,11 +2,11 @@
 
 namespace App\User\Framework\Form;
 
-use Aimeos\Map;
+use App\User\Database\CodecList;
 use App\User\Database\CountryLanguages;
 use App\User\Database\ProviderList;
 use App\User\Database\QualityList;
-use App\User\Framework\Repository\PreferenceOptionRepository;
+use App\User\Database\ResolutionList;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -14,17 +14,14 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class GettingStartedFilterForm extends AbstractType
 {
-    public function __construct(
-        private readonly PreferenceOptionRepository $preferenceOptionRepository,
-    ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $this->addChoiceField($builder, 'language', CountryLanguages::asSelectOptions());
         $this->addChoiceField($builder, 'quality', QualityList::asSelectOptions());
         $this->addChoiceField($builder, 'provider', ProviderList::asSelectOptions());
-        $this->addChoiceField($builder, 'resolution', $this->getPreferenceChoices('resolution'));
-        $this->addChoiceField($builder, 'codec', $this->getPreferenceChoices('codec'));
+        $this->addChoiceField($builder, 'resolution', ResolutionList::asSelectOptions());
+        $this->addChoiceField($builder, 'codec', CodecList::asSelectOptions());;
     }
 
     private function addChoiceField(FormBuilderInterface $builder, string $fieldName, array $choices): void
@@ -42,16 +39,6 @@ class GettingStartedFilterForm extends AbstractType
         $resolver->setDefaults([]);
     }
 
-    private function getPreferenceChoices(string $preference): array
-    {
-        $options = $this->preferenceOptionRepository->findBy(['preference' => $preference]);
-        $result = [];
-        foreach ($options as $item) {
-            $result[$item->getName()] = $item->getId();
-        }
-        return $result;
-    }
-
     private function addDefaultChoice(array $choices): iterable
     {
         return ['n/a' => null] + $choices;

src/User/Framework/Form/UserMediaPreferencesForm.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\User\Framework\Form;
+
+use Aimeos\Map;
+use App\User\Database\CodecList;
+use App\User\Database\CountryLanguages;
+use App\User\Database\ProviderList;
+use App\User\Database\QualityList;
+use App\User\Database\ResolutionList;
+use App\User\Dto\UserPreferences;
+use App\User\Dto\UserPreferencesFactory;
+use App\User\Framework\Repository\PreferenceOptionRepository;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Event\PreSetDataEvent;
+use Symfony\Component\Form\Event\PreSubmitEvent;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Routing\Generator\UrlGenerator;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
+class UserMediaPreferencesForm extends AbstractType
+{
+    private UserPreferences $userPreferences;
+
+    public function __construct(
+        private readonly UrlGeneratorInterface $urlGenerator,
+        private readonly Security $security,
+    ) {
+        $this->userPreferences = UserPreferencesFactory::createFromUser($security->getUser());
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $this->addChoiceField($builder, 'language', CountryLanguages::asSelectOptions());
+        $this->addChoiceField($builder, 'quality', QualityList::asSelectOptions());
+        $this->addChoiceField($builder, 'provider', ProviderList::asSelectOptions());
+        $this->addChoiceField($builder, 'resolution', ResolutionList::asSelectOptions());
+        $this->addChoiceField($builder, 'codec', CodecList::asSelectOptions());
+    }
+
+    private function addChoiceField(FormBuilderInterface $builder, string $fieldName, array $choices): void
+    {
+        $question = [
+            'attr' => [
+                'class' => 'min-w-24 text-input mb-4',
+                'data-result-filter-target' => $fieldName,
+                'data-controller' => 'symfony--ux-autocomplete--autocomplete',
+                'data-symfony--ux-autocomplete--autocomplete-tom-select-options-value' => '{"highlight":false}',
+                'data-preferred' => \json_encode($this->userPreferences->$fieldName),
+            ],
+            'row_attr' => [
+                'class' => 'filter-label text-white'
+            ],
+            'label_attr' => ['class' => 'block font-semibold mb-2'],
+            'choices' => $this->addDefaultChoice($choices),
+            'required' => false,
+            'multiple' => true,
+        ];
+        $builder->add($fieldName, ChoiceType::class, $question);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'action' => $this->urlGenerator->generate('app_user_media_preferences_submit'),
+            'attr' => [
+                'class' => 'filter-items w-full p-4 bg-black/20 border-2 border-orange-500 text-md dark:text-gray-50 rounded-lg',
+            ]
+        ]);
+    }
+
+    private function addDefaultChoice(array $choices): iterable
+    {
+        return ['n/a' => 'n/a'] + $choices;
+    }
+}

src/User/Framework/Repository/PreferenceOptionRepository.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\User\Framework\Repository;
-
-use App\User\Framework\Entity\PreferenceOption;
-use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Persistence\ManagerRegistry;
-
-/**
- * @extends ServiceEntityRepository<PreferenceOption>
- */
-class PreferenceOptionRepository extends ServiceEntityRepository
-{
-    public function __construct(ManagerRegistry $registry)
-    {
-        parent::__construct($registry, PreferenceOption::class);
-    }
-
-    //    /**
-    //     * @return PreferenceOption[] Returns an array of PreferenceOption objects
-    //     */
-    //    public function findByExampleField($value): array
-    //    {
-    //        return $this->createQueryBuilder('p')
-    //            ->andWhere('p.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->orderBy('p.id', 'ASC')
-    //            ->setMaxResults(10)
-    //            ->getQuery()
-    //            ->getResult()
-    //        ;
-    //    }
-
-    //    public function findOneBySomeField($value): ?PreferenceOption
-    //    {
-    //        return $this->createQueryBuilder('p')
-    //            ->andWhere('p.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->getQuery()
-    //            ->getOneOrNullResult()
-    //        ;
-    //    }
-}

src/User/Framework/Security/OidcUserProvider.php

@@ -4,9 +4,13 @@ namespace App\User\Framework\Security;
 
 use App\User\Framework\Entity\User;
 use App\User\Framework\Repository\UserRepository;
+use Drenso\OidcBundle\Exception\OidcException;
 use Drenso\OidcBundle\Model\OidcTokens;
 use Drenso\OidcBundle\Model\OidcUserData;
 use Drenso\OidcBundle\Security\UserProvider\OidcUserProviderInterface;
+use Symfony\Component\PasswordHasher\PasswordHasherInterface;
+use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
+use Symfony\Component\Security\Core\Exception\UserNotFoundException;
 use Symfony\Component\Security\Core\User\OidcUser;
 use Symfony\Component\Security\Core\User\UserInterface;
 
@@ -43,7 +47,7 @@ class OidcUserProvider implements OidcUserProviderInterface
 
     public function supportsClass(string $class): bool
     {
-        return User::class === $class || OidcUser::class === $class || is_subclass_of($class, User::class);
+        return User::class === $class || OidcUser::class === $class;
     }
 
     public function loadUserByIdentifier(string $identifier): UserInterface

symfony.lock

@@ -217,18 +217,6 @@
             "config/packages/messenger.yaml"
         ]
     },
-    "symfony/monolog-bundle": {
-        "version": "3.10",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "3.7",
-            "ref": "aff23899c4440dd995907613c1dd709b6f59503f"
-        },
-        "files": [
-            "config/packages/monolog.yaml"
-        ]
-    },
     "symfony/property-info": {
         "version": "7.3",
         "recipe": {

tailwind.config.js

@@ -10,6 +10,8 @@ module.exports = {
       "flex-row",
       "p-2",
       "p-4",
+      "w-32",
+      "w-64",
       "bg-blue-300",
       "bg-orange-300",
       "bg-fuchsia-300",
@@ -18,8 +20,10 @@ module.exports = {
       "bg-orange-400",
       "bg-blue-600",
       "bg-rose-600",
+      "bg-black/20",
       "alert-success",
       "alert-warning",
+      "font-bold",
       "min-w-64",
       "rotate-180",
       "-rotate-180",
@@ -34,6 +38,9 @@ module.exports = {
       "rounded-sm",
       "rounded-md",
       "r-tablecell",
+      "animate__animated",
+      "animate__slideInLeft",
+      "animate__animateFaster"
   ],
   theme: {
       extend: {

templates/bare.html.twig

@@ -23,17 +23,5 @@
                 <span class="text-sm">v{{ version }}</span>
             </div>
         </div>
-        <div {{ turbo_stream_listen('system_alerts') }} class="fixed z-40 top-10 right-10">
-            <div class="z-40">
-                <ul id="alert_list" class="flex flex-col gap-2">
-                    {% for message in app.flashes('warning') %}
-                        <twig:Alert :title="'Warning'" :message="message" :alert_id="''" type="warning" data-controller="alert" />
-                    {% endfor %}
-                    {% for message in app.flashes('success') %}
-                        <twig:Alert :title="'Success'" :message="message" :alert_id="''" type="warning" data-controller="alert" />
-                    {% endfor %}
-                </ul>
-            </div>
-        </div>
     </body>
 </html>

templates/broadcast/Download.stream.html.twig

@@ -14,14 +14,11 @@
     {% if entity.status != "Complete" %}
         <turbo-stream action="update" target="download_progress_{{ id }}">
             <template>
-                <div class="text-black text-center rounded-sm text-bold bg-green-300 h-5 relative z-10"
-                     style="width:{{ entity.progress }}%">
-                </div>
-                <div class="absolute text-black text-center"
-                     style="z-index: 400;margin-top: -1.25rem; margin-left: 1.2rem">
-                    {{ entity.progress }}%
-                </div>
+                <div class="background text-black text-center rounded-sm text-bold bg-green-300 h-5 relative z-10"
+                     style="width: {{ entity.progress }}%">
                 </div>
+                <div class="number text-black font-bold text-center z-40"
+                >{{ entity.progress }}%</div>
             </template>
         </turbo-stream>
         <turbo-stream action="update" target="action_buttons_{{ id }}">

templates/components/Alert.html.twig

@@ -1,6 +1,6 @@
 <li {{ attributes }} id="alert_{{ alert_id }}"
     class="alert alert-{{ type|default('success') }}"
-  role="alert"
+    role="alert"
 >
     <div class="flex items-center">
         <svg class="shrink-0 w-4 h-4 me-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
@@ -9,7 +9,7 @@
         <span class="sr-only">Info</span>
         <h3 class="text-lg font-medium font-bold">{{ title|default('') }}</h3>
     </div>
-    <div class="mt-2 text-sm w-[350px] font-bold">
+    <div class="mt-2 text-sm w-[300px] font-bold overflow-hidden text-wrap">
         {{ message }}
     </div>
 </li>