feat: uses web components to simplify javascript logic

.env

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

.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 Popover from '@stimulus-components/popover';
-import Dialog from '@stimulus-components/dialog'
+import Dialog from '@stimulus-components/dialog';
-import Dropdown from '@stimulus-components/dropdown'
+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,124 @@
+export default class DownloadOptionTr extends HTMLTableRowElement {
+    H264_CODECS = ['h264', 'h.264', 'x264']
+    H265_CODECS = ['h265', 'h.265', 'x265', 'hevc']
+
+    #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']}"]`)
+        const props = {
+            "resolution": this.resolution.trim(),
+            "codec": this.codec.trim(),
+            "provider": this.provider.trim(),
+            "languages": this.languages,
+            "quality": this.quality,
+        }
+
+        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;
+
+        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) {
+            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)
+            })
+    }
+}

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.json

@@ -1,5 +1,23 @@
 {
     "controllers": {
+        "@spomky-labs/pwa-bundle": {
+            "connection-status": {
+                "enabled": true,
+                "fetch": "eager"
+            },
+            "backgroundsync-form": {
+                "enabled": true,
+                "fetch": "eager"
+            },
+            "sync-broadcast": {
+                "enabled": true,
+                "fetch": "eager"
+            },
+            "prefetch-on-demand": {
+                "enabled": true,
+                "fetch": "eager"
+            }
+        },
         "@symfony/ux-autocomplete": {
             "autocomplete": {
                 "enabled": true,

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/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() {
+    async listTargetConnected() {
-        if (false === this.optionsLoaded) {
+        this.optionsLoaded = true;
-            this.optionsLoaded = true;
+        this.options = this.element.querySelectorAll('tbody tr');
-            await fetch(`/torrentio/movies/${this.tmdbIdValue}/${this.imdbIdValue}`)
+        this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
-                .then(res => res.text())
+        this.resultCountEl.innerText = this.options.length;
-                .then(response => {
+        this.loadingIconOutlet.toggleIcon();
-                    this.element.innerHTML = response;
+        document.dispatchEvent(new CustomEvent('optionsLoaded', {detail: {options: this.options}}));
-                    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;
-            }
-        });
     }
 }

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,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']
-
     languages = []
     providers = []
     qualities = []
@@ -22,7 +19,7 @@ export default class extends Controller {
         "quality": "",
     }
 
-    static outlets = ['movie-results', 'tv-results', 'tv-episode-list']
+    static outlets = ['tv-episode-list']
     static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'selectAll', 'downloadSelected']
     static values = {
         'imdbId': String,
@@ -36,20 +33,34 @@ export default class extends Controller {
             this.activeFilter['season'] = 1;
         }
         await this.filter();
+
+        document.addEventListener('optionsLoaded', this.loadOptions.bind(this));
     }
 
     // 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.addLanguages(option);
-            this.addProviders(option, option.dataset);
+            this.addProviders(option);
-            this.addQualities(option, option.dataset);
+            this.addQualities(option);
         })
         await this.filter();
     }
 
-    addLanguages(option, props) {
+    selectAllEpisodes() {
-        const languages = Object.assign([], JSON.parse(props['languages']));
+        document.dispatchEvent(new CustomEvent('selectEpisodeForDownload', {
+            detail: {
+                select: this.selectAllTarget.checked,
+            }
+        }));
+    }
+
+    downloadSelectedEpisodes() {
+        document.dispatchEvent(new CustomEvent('downloadSelectedEpisodes', {}));
+    }
+
+    addLanguages(option) {
+        const languages = Object.assign([], option.languages);
         languages.forEach((language) => {
             if (!this.languages.includes(language)) {
                 this.languages.push(language);
@@ -75,9 +86,9 @@ export default class extends Controller {
             .join();
     }
 
-    addProviders(option, props) {
+    addProviders(option) {
-        if (!this.providers.includes(props['provider'])) {
+        if (!this.providers.includes(option.provider)) {
-            this.providers.push(props['provider']);
+            this.providers.push(option.provider);
         }
 
         const preferred = this.providerTarget.dataset.preferred;
@@ -100,10 +111,10 @@ export default class extends Controller {
 
     }
 
-    addQualities(option, props) {
+    addQualities(option) {
-        if (!this.qualities.includes(props['quality'])) {
+        if (!this.qualities.includes(option.quality)) {
-            if (props['quality'].toLowerCase() in this.reverseMappedQualitiesValue) {
+            if (option.quality.toLowerCase() in this.reverseMappedQualitiesValue) {
-                this.qualities.push(props['quality']);
+                this.qualities.push(option.quality);
             }
         }
 
@@ -127,9 +138,8 @@ export default class extends Controller {
     }
 
     async filter() {
-        const currentSeason = this.activeFilter['season'];
+        const downloadSeasonSpan = document.querySelector("#downloadSeasonModal");
 
-        let results = [];
         this.activeFilter = {
             "resolution": this.resolutionTarget.value,
             "codec": this.codecTarget.value,
@@ -138,25 +148,26 @@ export default class extends Controller {
             "quality": this.qualityTarget.value,
         }
 
-        if ("movies" === this.mediaTypeValue) {
+        if ("tvshows" === this.mediaTypeValue) {
-            results = this.movieResultsOutlets;
+            downloadSeasonSpan.innerText = this.seasonTarget.value;
-            await results.forEach((list) => list.filter(this.activeFilter));
-
-        } else if ("tvshows" === this.mediaTypeValue) {
-            results = this.tvResultsOutlets;
             this.activeFilter.season = this.seasonTarget.value;
-            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: {
@@ -164,21 +175,4 @@ export default class extends Controller {
             }
         })
     }
-
-    selectAllEpisodes() {
-        this.tvResultsOutlets.forEach((episode) => {
-            if (episode.isActive()) {
-                episode.selectEpisodeForDownload()
-            }
-        });
-    }
-
-    downloadSelectedEpisodes() {
-        this.tvResultsOutlets.forEach(episode => {
-            if (episode.isActive() && episode.isSelected()) {
-                episode.download();
-            }
-        });
-        this.selectAllTarget.checked = false;
-    }
 }

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() {
+    listTargetConnected() {
-        await this.setOptions();
+        this.element.options = this.element.querySelectorAll('tbody tr');
-    }
+        if (this.element.options.length > 0) {
-
+            this.element.options.forEach((option) =>
-    async setOptions() {
+                option.querySelector('.download-btn').dataset['title'] = this.titleValue
-        if (this.optionsLoaded === false) {
+            );
-            this.optionsLoaded = true;
+            this.element.options[0].querySelector('input[type="checkbox"]').checked = true;
-            let response;
+            this.loadingIconOutlet.increaseCount();
-
+            document.dispatchEvent(new CustomEvent('optionsLoaded', {detail: {options: this.element.options}}));
-            try {
+        } else {
-                response = await fetch(`/torrentio/tvshows/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
+            this.countTarget.innerText = 0;
-            } catch (error) {
+            this.episodeSelectorTarget.disabled = true;
-                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}`)
-            }
         }
     }
-
-    //
-    // 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;
-        });
-    }
 }

assets/styles/app.css

@@ -64,6 +64,14 @@ dialog[data-dialog-target="dialog"][closing] {
     animation: fade-out 200ms forwards;
 }
 
+.text-input {
+    @apply bg-gray-50 text-gray-50 px-2 py-1 bg-transparent border-b-2 border-orange-400
+}
+
+.submit-button {
+    @apply bg-green-600/40 px-1.5 py-1 w-full rounded-md text-gray-50 backdrop-filter backdrop-blur-sm border-2 border-green-500 hover:bg-green-700/40
+}
+
 .r-tablecell {
     display: none;
 }
@@ -74,7 +82,7 @@ dialog[data-dialog-target="dialog"][closing] {
 
 @media screen and (min-width: 768px) {
     .r-tablecell {
-        display: inline-table;
+        display: table-cell;
     }
 
     .r-tablerow {
@@ -122,3 +130,21 @@ 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;
+}

bash/caddy/Caddyfile

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

compose.yml

@@ -2,6 +2,7 @@ services:
   caddy:
     image: caddy:2.9.1
     restart: unless-stopped
+    tty: true
     cap_add:
       - NET_ADMIN
     ports:

composer.json

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

config/bundles.php

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

config/packages/doctrine.yaml

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

config/packages/drenso_oidc.yaml

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

config/packages/mailer.yaml

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

config/packages/pwa.yaml

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

config/packages/reset_password.yaml

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

config/packages/security.yaml

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

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/security.yaml

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

config/services.yaml

@@ -6,6 +6,7 @@
 parameters:
     # App
     app.url: '%env(APP_URL)%'
+    app.version: '%env(default:app.default.version:APP_VERSION)%'
 
     # Debrid Services
     app.debrid.real_debrid.key: '%env(REAL_DEBRID_KEY)%'
@@ -34,7 +35,14 @@ parameters:
     app.default.version: '0.dev'
     app.default.timezone: 'America/Chicago'
 
-    app.version: '%env(default:app.default.version:APP_VERSION)%'
+    # Auth
+    auth.default.method: 'form_login'
+    auth.method: '%env(default:auth.default.method:AUTH_METHOD)%'
+
+    auth.oidc.well_known_url: '%env(OIDC_WELL_KNOWN_URL)%'
+    auth.oidc.client_id: '%env(OIDC_CLIENT_ID)%'
+    auth.oidc.client_secret: '%env(OIDC_CLIENT_SECRET)%'
+    auth.oidc.bypass_form_login: '%env(bool:OIDC_BYPASS_FORM_LOGIN)%'
 
 services:
     # default configuration for services in *this* file

docs/examples/.env

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

docs/examples/compose.yml

@@ -1,22 +1,4 @@
 services:
-  caddy:
-    image: caddy:2.9.1
-    restart: unless-stopped
-    cap_add:
-      - NET_ADMIN
-    ports:
-      - "80:80"
-      - "443:443"
-      - "443:443/udp"
-    volumes:
-      - $PWD/../../bash/caddy:/etc/caddy
-      - $PWD/../../bash/certs:/etc/ssl
-  # The "entrypoint" into the application. This reverse proxy
-  # proxies traffic back to their respective services. If not
-  # running behind a reverse proxy inject your SSL certificates
-  # into this container.
-  # This container runs the actual web app in a php:8.4-fpm
-  # base container.
   app:
     image: code.caldwell.digital/home/torsearch-app:latest
     ports:
@@ -48,7 +30,7 @@ services:
       - ./downloads/tvshows:/var/download/tvshows
     environment:
       TZ: America/Chicago
-    command: -vvv
+    command: -vv --time-limit=3600 --limit=10
     env_file:
       - .env
     restart: always
@@ -68,6 +50,7 @@ services:
       - ./downloads/tvshows:/var/download/tvshows
     env_file:
       - .env
+    command: -vv
     environment:
       TZ: America/Chicago
     restart: always

importmap.php

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

migrations/Version20250709200956.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250709200956 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            CREATE TABLE reset_password_request (id INT AUTO_INCREMENT NOT NULL, user_id INT NOT NULL, selector VARCHAR(20) NOT NULL, hashed_token VARCHAR(100) NOT NULL, requested_at DATETIME NOT NULL COMMENT '(DC2Type:datetime_immutable)', expires_at DATETIME NOT NULL COMMENT '(DC2Type:datetime_immutable)', INDEX IDX_7CE748AA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE reset_password_request ADD CONSTRAINT FK_7CE748AA76ED395 FOREIGN KEY (user_id) REFERENCES user (id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE monitor CHANGE only_future only_future TINYINT(1) NOT NULL
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE reset_password_request DROP FOREIGN KEY FK_7CE748AA76ED395
+        SQL);
+        $this->addSql(<<<'SQL'
+            DROP TABLE reset_password_request
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE monitor CHANGE only_future only_future TINYINT(1) DEFAULT 1 NOT NULL
+        SQL);
+    }
+}

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

@@ -23,6 +23,21 @@ final class ConfigResolver
 
         #[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
@@ -46,4 +61,35 @@ final class ConfigResolver
     {
         return $this->messages;
     }
+
+    public function authIs(string $method): bool
+    {
+        if (strtolower($method) === strtolower($this->getAuthMethod())) {
+            return true;
+        }
+        return false;
+    }
+
+    public function getAuthMethod(): string
+    {
+        return strtolower($this->authMethod);
+    }
+
+    public function bypassFormLogin(): bool
+    {
+        return $this->authOidcBypassFormLogin;
+    }
+
+    public function getAuthConfig(): array
+    {
+        return [
+            'method' => $this->authMethod,
+            'oidc' => [
+                'well_known_url' => $this->authOidcWellKnownUrl,
+                'client_id' => $this->authOidcClientId,
+                'client_secret' => $this->authOidcClientSecret,
+                'bypass_form_login' => $this->authOidcBypassFormLogin,
+            ]
+        ];
+    }
 }

src/Base/Framework/Command/ConfigSetCommand.php

@@ -11,7 +11,7 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 #[AsCommand(
     name: 'config:set',
-    description: 'Add a short description for your command',
+    description: '[deprecated] This command currently serves no use. It may be re-purposed or removed in the future.',
 )]
 class ConfigSetCommand extends Command
 {

src/Base/Framework/Command/SeedDatabaseCommand.php

@@ -15,22 +15,20 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 #[AsCommand(
     name: 'db:seed',
-    description: 'Seed the database with required data.',
+    description: 'Seeds the database with required data. This command is run every time a new container is created from the torsearch-app image and is part of the init process.',
 )]
 class SeedDatabaseCommand extends Command
 {
     private PreferencesRepository $preferenceRepository;
-    private PreferenceOptionRepository $preferenceOptionRepository;
+
     private UserRepository $userRepository;
 
     public function __construct(
         PreferencesRepository $preferenceRepository,
-        PreferenceOptionRepository $preferenceOptionRepository,
         UserRepository $userRepository,
     ) {
         parent::__construct();
         $this->preferenceRepository = $preferenceRepository;
-        $this->preferenceOptionRepository = $preferenceOptionRepository;
         $this->userRepository = $userRepository;
     }
 
@@ -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/Command/StartupStatusCommand.php

@@ -11,7 +11,7 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 
 #[AsCommand(
     name: 'startup:status',
-    description: 'Add a short description for your command',
+    description: 'Used by the Docker healthcheck system to signal when the container is healthy.',
 )]
 class StartupStatusCommand extends Command
 {

src/Base/Framework/Command/UserResetPasswordCommand.php

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

src/Base/Framework/Controller/AlertController.php

@@ -2,7 +2,7 @@
 
 namespace App\Base\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;

src/Base/Framework/Controller/IndexController.php

@@ -8,6 +8,8 @@ use App\User\Framework\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Mime\Email;
 use Symfony\Component\Routing\Attribute\Route;
 
 final class IndexController extends AbstractController
@@ -29,4 +31,21 @@ final class IndexController extends AbstractController
             'popular_tvshows' => $this->tmdb->popularTvShows(1, 6),
         ]);
     }
+
+    #[Route('/email')]
+    public function sendEmail(MailerInterface $mailer): Response
+    {
+        $email = (new Email())
+            ->to('brock@caldwell.digital')
+            ->subject('Time for Symfony Mailer!')
+            ->text('Sending emails is fun again!')
+            ->html('<p>See Twig integration for better HTML integration!</p>');
+
+        $mailer->send($email);
+
+        return $this->json([
+            'success' => true,
+            'message' => 'Email sent!'
+        ]);
+    }
 }

src/Base/Service/Broadcaster.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\Base\Service;
 
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RequestStack;

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

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

src/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/Framework/Controller/ApiController.php

@@ -2,9 +2,8 @@
 
 namespace App\Download\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use App\Download\Action\Handler\DeleteDownloadHandler;
-use App\Download\Action\Handler\DownloadSeasonHandler;
 use App\Download\Action\Handler\PauseDownloadHandler;
 use App\Download\Action\Handler\ResumeDownloadHandler;
 use App\Download\Action\Input\DeleteDownloadInput;
@@ -13,8 +12,6 @@ use App\Download\Action\Input\DownloadSeasonInput;
 use App\Download\Action\Input\PauseDownloadInput;
 use App\Download\Action\Input\ResumeDownloadInput;
 use App\Download\Framework\Repository\DownloadRepository;
-use App\User\Dto\UserPreferencesFactory;
-use Nihilarr\PTN;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -69,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/MonitorTvEpisodeHandler.php

@@ -2,8 +2,11 @@
 
 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;
 use App\Monitor\Framework\Repository\MonitorRepository;
@@ -31,6 +34,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
         private Tmdb $tmdb,
+        private DownloadRepository $downloadRepository,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
@@ -69,13 +73,23 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
 
             if (null !== $result) {
                 $this->logger->info('> [MonitorTvEpisodeHandler] ...Found 1 matching result found: dispatching DownloadMediaCommand for "' . $result->title . '"');
+                $download = $this->downloadRepository->insert(
+                    user: $monitor->getUser(),
+                    url: $result->url,
+                    title: $monitor->getTitle(),
+                    filename: $result->filename,
+                    imdbId: $monitor->getImdbId(),
+                    mediaType: 'tvshows',
+                    episodeId: EpisodeId::fromSeasonEpisodeNumbers($monitor->getSeason(), $monitor->getEpisode()),
+                );
                 $this->bus->dispatch(new DownloadMediaCommand(
-                    $result->url,
+                    $download->getUrl(),
-                    $monitor->getTitle(),
+                    $download->getTitle(),
-                    $result->filename,
+                    $download->getFilename(),
                     'tvshows',
-                    $monitor->getImdbId(),
+                    $download->getImdbId(),
                     $monitor->getUser()->getId(),
+                    $download->getId(),
                 ));
                 $monitor->setStatus('Complete');
                 $monitor->setDownloadedAt(new DateTimeImmutable());

src/Monitor/Framework/Controller/ApiController.php

@@ -2,7 +2,7 @@
 
 namespace App\Monitor\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use App\Monitor\Action\Handler\AddMonitorHandler;
 use App\Monitor\Action\Handler\DeleteMonitorHandler;
 use App\Monitor\Action\Input\AddMonitorInput;

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) {
+        return new GetMediaInfoResult($media, $command->season, $command->episode);
-            foreach ($media->episodes[$command->season] as $key => $episode) {
-                $media->episodes[$command->season][$key]['file'] = $this->mediaFiles->episodeExists($media->title, $command->season, $episode['episode_number']);
-            }
-        }
-
-        return new GetMediaInfoResult($media, $command->season);
     }
 }

src/Search/Action/Input/GetMediaInfoInput.php

@@ -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/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

@@ -33,11 +33,12 @@ final class WebController extends AbstractController
         ]);
     }
 
-    #[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 +53,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/Tmdb.php

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

@@ -2,19 +2,22 @@
 
 namespace App\Torrentio\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\Torrentio\Action\Input\GetMovieOptionsInput;
 use App\Torrentio\Action\Input\GetTvShowOptionsInput;
 use App\Torrentio\Exception\TorrentioRateLimitException;
 use Carbon\Carbon;
+use OneToMany\RichBundle\Contract\ResultInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\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->getMovieOptionsHandler->handle($input->toCommand());
-            return $this->render('torrentio/movies.html.twig', [
-                'results' => $results,
-            ]);
         });
+
+        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) {
+            $results = $cache->get($cacheId, function (ItemInterface $item) use ($input) {
-//                $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+                $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-                $results = $this->getTvShowOptionsHandler->handle($input->toCommand());
+                return $this->getTvShowOptionsHandler->handle($input->toCommand());
-                return $this->render('torrentio/tvshows.html.twig', [
+            });
-                    'results' => $results,
+
-                ]);
+            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')]
+    private function sendFragmentResponse(ResultInterface $result, Request $request): Response
-    public function clearTvShowOptions(GetTvShowOptionsInput $input, CacheInterface $cache, Request $request): Response
     {
-        $cacheId = sprintf(
+        $request->setRequestFormat(TurboBundle::STREAM_FORMAT);
-            "page.torrentio.tvshows.%s.%s.%s.%s",
+        return $this->renderBlock(
-            $input->tmdbId,
+            'torrentio/fragments.html.twig',
-            $input->imdbId,
+            $request->query->get('block'),
-            $input->season,
+            [
-            $input->episode,
+                '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/Torrentio/Result/ResultFactory.php

@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Result;
 
-use App\Base\Util\CountryLanguages;
+use App\User\Database\CountryLanguages;
 use Nihilarr\PTN;
 
 class ResultFactory

src/Twig/Components/Filter.php

@@ -3,14 +3,20 @@
 namespace App\Twig\Components;
 
 use Aimeos\Map;
-use App\Base\Util\QualityList;
+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\Repository\PreferencesRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
 
 #[AsLiveComponent]
-final class Filter
+final class Filter extends AbstractController
 {
     use DefaultActionTrait;
 
@@ -21,15 +27,20 @@ final class Filter
     public array $reverseMappedQualities = [];
 
     public function __construct(
-        private readonly PreferencesRepository $preferencesRepository,
         private readonly Security $security,
     ) {
-        $this->preferences = Map::from($this->preferencesRepository->findEnabled())
+        $this->preferences = (array) PreferenceOptionsFactory::createSelectOptions();
-            ->rekey(fn($element) => $element->getId())
+        $this->userPreferences = (array) UserPreferencesFactory::createFromUser($security->getUser());
-            ->map(fn($element) => $element->getPreferenceOptions()->toArray())
-            ->toArray();
-        $this->userPreferences = Map::from($this->security->getUser()->getUserPreferenceValues())
-            ->toArray();
         $this->reverseMappedQualities = QualityList::getAsReverseMap();
     }
+
+    public function getResolutionOptions()
+    {
+        return ResolutionList::asSelectOptions();
+    }
+
+    public function getCodecOptions()
+    {
+        return CodecList::asSelectOptions();
+    }
 }

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/', $episodeId, $seasonMatch);
+        if (empty($seasonMatch)) {
+            $season = "";
+        } else {
+            $season = str_replace(['S', 's'], '', $seasonMatch[0]);
+        }
+
+        // Capture episode
+        $episodeMatch = [];
+        preg_match('/[eE]\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: $form->get('resolution')->getData(),
+            codec: $form->get('codec')->getData(),
+            quality: $form->get('quality')->getData(),
+            language: $form->get('language')->getData(),
+            provider: $form->get('provider')->getData(),
+        );
+    }
 }

src/User/Database/CodecList.php

@@ -0,0 +1,25 @@
+<?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
+    {
+        $result = [];
+        foreach (static::$codecs as $codec) {
+            $result[$codec] = $codec;
+        }
+        return $result;
+    }
+}

src/User/Database/CountryCodes.php

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

src/User/Database/CountryLanguages.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\User\Database;
 
 class CountryLanguages
 {
@@ -137,4 +137,13 @@ class CountryLanguages
 
         return $countryLanguages[$countryName] ?? null;
     }
+
+    public static function asSelectOptions(): array
+    {
+        $result = [];
+        foreach (static::$languages as $language) {
+            $result[$language] = $language;
+        }
+        return $result;
+    }
 }

src/User/Database/ProviderList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\User\Database;
 
 class ProviderList
 {
@@ -23,4 +23,13 @@ class ProviderList
     {
         return self::$providers;
     }
+
+    public static function asSelectOptions(): array
+    {
+        $result = [];
+        foreach (static::$providers as $provider) {
+            $result[$provider] = $provider;
+        }
+        return $result;
+    }
 }

src/User/Database/QualityList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\User\Database;
 
 class QualityList
 {
@@ -100,6 +100,15 @@ class QualityList
         return array_search($key, self::$qualities) ?? null;
     }
 
+    public static function asSelectOptions(): array
+    {
+        $result = ['n/a' => null];
+        foreach (array_keys(static::$qualities) as $quality) {
+            $result[$quality] = $quality;
+        }
+        return $result;
+    }
+
     public static function getAsReverseMap(): array
     {
         $results = [];

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

@@ -12,8 +12,8 @@ class UserPreferencesFactory
     public static function createFromUser(UserInterface $user): UserPreferences
     {
         return new UserPreferences(
-            resolution: self::getNestedValue($user, 'resolution'),
+            resolution: self::getValue($user, 'resolution'),
-            codec: self::getNestedValue($user, 'codec'),
+            codec: self::getValue($user, 'codec'),
             language: self::getValue($user, 'language'),
             provider: self::getValue($user, 'provider'),
             quality: self::getValue($user, 'quality'),
@@ -29,19 +29,4 @@ class UserPreferencesFactory
         }
         return $value;
     }
-
-    /** @param User $user */
-    private static function getNestedValue(UserInterface $user, string $preferenceId): ?string
-    {
-        $preference = $user->getUserPreference($preferenceId);
-        if (null === $preference) {
-            return null;
-        }
-        return $preference->getPreference()
-            ->getPreferenceOptions()
-            ->filter(fn (PreferenceOption $option) => (string) $option->getId() === $preference->getPreferenceValue())
-            ->first()
-            ->getValue()
-        ;
-    }
 }

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

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

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

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

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

@@ -4,16 +4,21 @@ declare(strict_types=1);
 
 namespace App\User\Framework\Controller\Web;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
-use App\Base\Util\CountryLanguages;
+use App\User\Action\Command\SaveUserMediaPreferencesCommand;
-use App\Base\Util\ProviderList;
-use App\Base\Util\QualityList;
 use App\User\Action\Handler\SaveUserDownloadPreferencesHandler;
 use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
 use App\User\Action\Input\SaveUserDownloadPreferencesInput;
 use App\User\Action\Input\SaveUserMediaPreferencesInput;
+use App\User\Database\CountryLanguages;
+use App\User\Database\ProviderList;
+use App\User\Database\QualityList;
+use App\User\Dto\UserPreferencesFactory;
+use App\User\Framework\Form\GettingStartedFilterForm;
+use App\User\Framework\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;
 
@@ -27,51 +32,43 @@ 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;
+        $formData = (array) UserPreferencesFactory::createFromUser($this->getUser());
-        sort($languages);
+        $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,
+                'preferences_form' => $form,
             ]
         );
     }
 
-    #[Route('/user/preferences/media', 'app_save_media_preferences', methods: ['POST'])]
+    #[Route('/user/preferences/media', 'app_user_media_preferences_submit', methods: ['POST'])]
-    public function saveMediaPreferences(
+    public function mediaPreferencesSubmit(
-        SaveUserMediaPreferencesInput $input,
+        Request $request,
-        SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler,
+        SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler
     ): Response
     {
-        $saveUserMediaPreferencesHandler->handle($input->toCommand());
-        $mediaPreferences = $this->getUser()->getMediaPreferences();
         $downloadPreferences = $this->getUser()->getDownloadPreferences();
+        $formData = (array) UserPreferencesFactory::createFromUser($this->getUser());
+        $form = $this->createForm(UserMediaPreferencesForm::class, $formData);
 
-        $languages = CountryLanguages::$languages;
+        $form->handleRequest($request);
-        sort($languages);
 
-        $this->broadcaster->alert(
+        if ($form->isSubmitted() && $form->isValid()) {
-            title: 'Success',
+            $saveUserMediaPreferencesHandler->handle(
-            message: 'Your media preferences have been saved.'
+                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,
+                'preferences_form' => $form,
             ]
         );
     }
@@ -82,11 +79,11 @@ class PreferencesController extends AbstractController
         SaveUserDownloadPreferencesHandler $saveUserDownloadPreferencesHandler,
     ): Response
     {
-        $downloadPreferences = $saveUserDownloadPreferencesHandler->handle($input->toCommand())->downloadPreferences;
+        $downloadPreferences = $this->getUser()->getDownloadPreferences();
-        $mediaPreferences = $this->getUser()->getMediaPreferences();
+        $formData = (array) UserPreferencesFactory::createFromUser($this->getUser());
+        $form = $this->createForm(UserMediaPreferencesForm::class, $formData);
 
-        $languages = CountryLanguages::$languages;
+        $saveUserDownloadPreferencesHandler->handle($input->toCommand());
-        sort($languages);
 
         $this->broadcaster->alert(
             title: 'Success',
@@ -96,12 +93,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/Controller/Web/RegistrationController.php

@@ -5,30 +5,22 @@ namespace App\User\Framework\Controller\Web;
 use App\User\Action\Command\RegisterUserCommand;
 use App\User\Action\Handler\RegisterUserHandler;
 use App\User\Framework\Entity\User;
+use App\User\Framework\Form\GettingStartedFilterForm;
 use App\User\Framework\Form\RegistrationFormType;
-use App\User\Framework\Pipeline\GettingStarted\AddPreferencesToDatabase;
-use App\User\Framework\Pipeline\GettingStarted\GettingStartedInput;
-use App\User\Framework\Pipeline\GettingStarted\MigrateDatabase;
-use App\User\Framework\Repository\PreferencesRepository;
 use App\User\Framework\Repository\UserRepository;
 use Doctrine\Common\Collections\ArrayCollection;
-use League\Pipeline\Pipeline;
-use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
 class RegistrationController extends AbstractController
 {
     public function __construct(private readonly RegisterUserHandler $registerUserHandler,
-        private readonly RequestStack $requestStack
+        private readonly RequestStack $requestStack,
-    )
+    ) {}
-    {
-    }
 
     #[Route('/register', name: 'app_register')]
     public function register(
@@ -57,7 +49,7 @@ class RegistrationController extends AbstractController
     }
 
     #[Route(path: '/getting-started', name: 'app_getting_started')]
-    public function gettingStarted(Request $request, Security $security, UserRepository $userRepository, PreferencesRepository $preferencesRepository, KernelInterface $kernel, LoggerInterface $logger): Response
+    public function gettingStarted(Request $request, Security $security, UserRepository $userRepository): Response
     {
         if ((new ArrayCollection($userRepository->findAll()))->count() !== 0) {
             return $this->redirectToRoute('app_index');
@@ -73,14 +65,42 @@ class RegistrationController extends AbstractController
                 password: $form->get('plainPassword')->getData(),
             ));
 
-            $security->login($user->user);
+            $security->login($user->user, 'form_login');
             $this->requestStack->getCurrentRequest()->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
 
-            return $this->redirectToRoute('app_index');
+            return $this->redirectToRoute('app_getting_started_filter');
         }
 
-        return $this->render('user/getting-started.html.twig', [
+        return $this->render('user/getting_started/register-user.html.twig', [
             'registrationForm' => $form,
         ]);
     }
+
+    #[Route(path: '/getting-started/filter', name: 'app_getting_started_filter')]
+    public function gettingStartedPreferences(Request $request, UserRepository $userRepository): Response
+    {
+        if ((new ArrayCollection($userRepository->findAll()))->count() !== 0) {
+            return $this->redirectToRoute('app_index');
+        }
+
+        $form = $this->createForm(GettingStartedFilterForm::class);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            foreach ($form->getData() as $preference => $value) {
+                if (null !== $value) {
+                    $this->getUser()->updateUserPreference($preference, $value);
+                }
+            }
+            $userRepository->getEntityManager()->flush();
+            return $this->redirectToRoute('app_index');
+        }
+
+        return $this->render(
+            'user/getting_started/filter.html.twig',
+            [
+                'form' => $form,
+            ]
+        );
+    }
 }

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

@@ -0,0 +1,191 @@
+<?php
+
+namespace App\User\Framework\Controller\Web;
+
+use App\Base\ConfigResolver;
+use App\User\Framework\Entity\User;
+use App\User\Framework\Form\ChangePasswordForm;
+use App\User\Framework\Form\ResetPasswordRequestForm;
+use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Bridge\Twig\Mime\TemplatedEmail;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use SymfonyCasts\Bundle\ResetPassword\Controller\ResetPasswordControllerTrait;
+use SymfonyCasts\Bundle\ResetPassword\Exception\ResetPasswordExceptionInterface;
+use SymfonyCasts\Bundle\ResetPassword\ResetPasswordHelperInterface;
+
+#[Route('/reset-password')]
+class ResetPasswordController extends AbstractController
+{
+    use ResetPasswordControllerTrait;
+
+    public function __construct(
+        private ResetPasswordHelperInterface $resetPasswordHelper,
+        private EntityManagerInterface $entityManager,
+        private readonly ConfigResolver $configResolver,
+        private readonly Security $security
+    ) {
+    }
+
+    /**
+     * Display & process form to request a password reset.
+     */
+    #[Route('', name: 'app_forgot_password_request')]
+    public function request(
+        Request $request,
+        MailerInterface $mailer,
+        LoggerInterface $logger
+    ): Response {
+        $form = $this->createForm(ResetPasswordRequestForm::class);
+        $form->handleRequest($request);
+
+        if ($this->configResolver->authIs('oidc')) {
+            $this->addFlash('reset_password_error', 'Your auth method is set to "oidc", so you will need to reset your password with your identity provider.');
+            return $this->render('user/reset_password/request.html.twig', [
+                'requestForm' => $form,
+            ])->setStatusCode(Response::HTTP_ACCEPTED);
+        }
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            /** @var string $email */
+            $email = $form->get('email')->getData();
+            return $this->processSendingPasswordResetEmail($email, $mailer, $logger);
+        }
+
+        return $this->render('user/reset_password/request.html.twig', [
+            'requestForm' => $form,
+        ]);
+    }
+
+    /**
+     * Confirmation page after a user has requested a password reset.
+     */
+    #[Route('/check-email', name: 'app_check_email')]
+    public function checkEmail(): Response
+    {
+        // Generate a fake token if the user does not exist or someone hit this page directly.
+        // This prevents exposing whether or not a user was found with the given email address or not
+        if (null === ($resetToken = $this->getTokenObjectFromSession())) {
+            $resetToken = $this->resetPasswordHelper->generateFakeResetToken();
+        }
+
+        return $this->render('user/reset_password/check_email.html.twig', [
+            'resetToken' => $resetToken,
+        ]);
+    }
+
+    /**
+     * Validates and process the reset URL that the user clicked in their email.
+     */
+    #[Route('/reset/{token}', name: 'app_reset_password')]
+    public function reset(
+        Request $request,
+        UserPasswordHasherInterface $passwordHasher,
+        TranslatorInterface $translator,
+        ?string $token = null
+    ): Response {
+        if ($token) {
+            // We store the token in session and remove it from the URL, to avoid the URL being
+            // loaded in a browser and potentially leaking the token to 3rd party JavaScript.
+            $this->storeTokenInSession($token);
+
+            return $this->redirectToRoute('app_reset_password');
+        }
+
+        $token = $this->getTokenFromSession();
+
+        if (null === $token) {
+            throw $this->createNotFoundException('No reset password token found in the URL or in the session.');
+        }
+
+        try {
+            /** @var User $user */
+            $user = $this->resetPasswordHelper->validateTokenAndFetchUser($token);
+        } catch (ResetPasswordExceptionInterface $e) {
+            $this->addFlash('reset_password_error', sprintf(
+                '%s - %s',
+                $translator->trans(ResetPasswordExceptionInterface::MESSAGE_PROBLEM_VALIDATE, [], 'ResetPasswordBundle'),
+                $translator->trans($e->getReason(), [], 'ResetPasswordBundle')
+            ));
+
+            return $this->redirectToRoute('app_forgot_password_request');
+        }
+
+        // The token is valid; allow the user to change their password.
+        $form = $this->createForm(ChangePasswordForm::class);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            // A password reset token should be used only once, remove it.
+            $this->resetPasswordHelper->removeResetRequest($token);
+
+            /** @var string $plainPassword */
+            $plainPassword = $form->get('plainPassword')->getData();
+
+            // Encode(hash) the plain password, and set it.
+            $user->setPassword($passwordHasher->hashPassword($user, $plainPassword));
+            $this->entityManager->flush();
+
+            // The session is cleaned up after the password has been changed.
+            $this->cleanSessionAfterReset();
+
+            return $this->redirectToRoute('app_index');
+        }
+
+        return $this->render('user/reset_password/reset.html.twig', [
+            'resetForm' => $form,
+        ]);
+    }
+
+    private function processSendingPasswordResetEmail(
+        string $emailFormData,
+        MailerInterface $mailer,
+        LoggerInterface $logger
+    ): RedirectResponse {
+        $user = $this->entityManager->getRepository(User::class)->findOneBy([
+            'email' => $emailFormData,
+        ]);
+
+        // Do not reveal whether a user account was found or not.
+        if (!$user) {
+            return $this->redirectToRoute('app_check_email');
+        }
+
+        try {
+            $resetToken = $this->resetPasswordHelper->generateResetToken($user);
+        } catch (ResetPasswordExceptionInterface $e) {
+            $logger->error('> [ResetPasswordController@processSendingPasswordResetEmail] ' . $e->getMessage());
+
+            $this->addFlash(
+                'reset_password_error',
+                'Your password reset token could not be generated. If you\'re the system administrator, check the server logs for more details.'
+            );
+
+            return $this->redirectToRoute('app_check_email');
+        }
+
+        $email = (new TemplatedEmail())
+            ->to((string) $user->getEmail())
+            ->subject('Your password reset request')
+            ->htmlTemplate('user/reset_password/email.html.twig')
+            ->context([
+                'resetToken' => $resetToken,
+            ])
+        ;
+
+        $mailer->send($email);
+
+        // Store the token object in session for retrieval in check-email route.
+        $this->setTokenObjectInSession($resetToken);
+
+        return $this->redirectToRoute('app_check_email');
+    }
+}

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

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\User\Framework\Entity;
+
+use App\User\Framework\Repository\ResetPasswordRequestRepository;
+use Doctrine\ORM\Mapping as ORM;
+use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestInterface;
+use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestTrait;
+
+#[ORM\Entity(repositoryClass: ResetPasswordRequestRepository::class)]
+class ResetPasswordRequest implements ResetPasswordRequestInterface
+{
+    use ResetPasswordRequestTrait;
+
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne]
+    #[ORM\JoinColumn(nullable: false)]
+    private ?User $user = null;
+
+    public function __construct(User $user, \DateTimeInterface $expiresAt, string $selector, string $hashedToken)
+    {
+        $this->user = $user;
+        $this->initialize($expiresAt, $selector, $hashedToken);
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+}

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/EventListener/LoginSuccessListener.php

@@ -3,7 +3,7 @@
 namespace App\User\Framework\EventListener;
 
 use App\Base\ConfigResolver;
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;

src/User/Framework/Form/ChangePasswordForm.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\User\Framework\Form;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
+use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Length;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Constraints\NotCompromisedPassword;
+use Symfony\Component\Validator\Constraints\PasswordStrength;
+
+class ChangePasswordForm extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('plainPassword', RepeatedType::class, [
+                'type' => PasswordType::class,
+                'options' => [
+                    'attr' => [
+                        'autocomplete' => 'new-password',
+                        'class' => 'text-input w-full mb-4'
+                    ],
+                    'label_attr' => [
+                        'class' => 'block'
+                    ]
+                ],
+                'first_options' => [
+                    'constraints' => [
+                        new NotBlank([
+                            'message' => 'Please enter a password',
+                        ]),
+                        new Length([
+                            'min' => 12,
+                            'minMessage' => 'Your password should be at least {{ limit }} characters',
+                            // max length allowed by Symfony for security reasons
+                            'max' => 4096,
+                        ]),
+                        new PasswordStrength(),
+                        new NotCompromisedPassword(),
+                    ],
+                    'label' => 'New password',
+                ],
+                'second_options' => [
+                    'label' => 'Repeat Password',
+                ],
+                'invalid_message' => 'The password fields must match.',
+                // Instead of being set onto the object directly,
+                // this is read and encoded in the controller
+                'mapped' => false,
+            ])
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([]);
+    }
+}