wip: base stream class

.env

@@ -39,23 +39,5 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 
 REDIS_HOST=redis://redis
 
-###> symfony/mailer ###
+MOVIES_PATH=/var/download/movies
-MAILER_DSN=null://null
+TVSHOWS_PATH=/var/download/tvshows
-###< 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 ###
-
-
-SMTP_HOST=
-SMTP_USER=
-SMTP_PASS=
-SMTP_PORT=
-SMTP_FROM=
-SMTP_FROM_NAME=""

.gitignore

@@ -1,5 +1,4 @@
 .idea
-bolt.db
 ###> symfony/framework-bundle ###
 /.env.local
 /.env.local.php

Dockerfile

@@ -1,19 +1,19 @@
-FROM dunglas/frankenphp:php8.4
+FROM php:8.4-fpm-alpine3.21
 
-ENV SERVER_NAME=":80"
+RUN docker-php-ext-install pdo_mysql
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
-ENV APP_VERSION="0.0.1"
 
-RUN install-php-extensions \
+# SETUP PHP-FPM CONFIG SETTINGS (max_children / max_requests)
-	pdo_mysql \
+RUN echo 'pm = dynamic' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
-	gd \
+    echo 'pm.max_children = 75' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
-	intl \
+    echo 'pm.start_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
-	zip \
+    echo 'pm.min_spare_servers = 5' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
-	opcache
+    echo 'pm.max_spare_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+    echo 'pm.process_idle_timeout = 10s' >> /usr/local/etc/php-fpm.d/zz-docker.conf
 
-RUN apt update && apt install -y wget
+COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
 
-HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
+HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
 
-COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile
+ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+
+WORKDIR /var/www

Dockerfile.prod

@@ -0,0 +1,11 @@
+FROM registry.caldwell.digital/library/php:8.4-apache
+
+RUN apt-get update && \
+    apt-get install libldap2-dev -y && \
+    rm -rf /var/lib/apt/lists/* && \
+    docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
+    docker-php-ext-install ldap
+
+COPY --chown=www-data:www-data . /var/www
+COPY bash/nginx.conf /etc/apache2/sites-enabled/vhost.conf
+RUN rm /etc/apache2/sites-enabled/000-default.conf

assets/bootstrap.js

@@ -1,10 +1,5 @@
 import { startStimulusApp } from '@symfony/stimulus-bundle';
-import Popover from '@stimulus-components/popover'
-import Dialog from '@stimulus-components/dialog'
-import Dropdown from '@stimulus-components/dropdown'
 
 const app = startStimulusApp();
 // register any custom, 3rd party controllers here
-app.register('popover', Popover);
+// app.register('some_controller_name', SomeImportedController);
-app.register('dialog', Dialog);
-app.register('dropdown', Dropdown);

assets/controllers.json

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

assets/controllers/action_button_controller.js

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

assets/controllers/download_button_controller.js

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

assets/controllers/download_list_controller.js

@@ -29,24 +29,6 @@ export default class extends Controller {
         }
     }
 
-    pauseDownload(data) {
-        fetch(`/api/download/${data.params.id}/pause`, {method: 'PATCH'})
-            .then(res => res.json())
-            .then(json => console.debug(json));
-    }
-
-    resumeDownload(data) {
-        fetch(`/api/download/${data.params.id}/resume`, {method: 'PATCH'})
-            .then(res => res.json())
-            .then(json => console.debug(json));
-    }
-
-    deleteDownload(data) {
-        fetch(`/api/download/${data.params.id}`, {method: 'DELETE'})
-            .then(res => res.json())
-            .then(json => console.debug(json));
-    }
-
     // Add custom controller actions here
     // fooBar() { this.fooTarget.classList.toggle(this.bazClass) }
 

assets/controllers/hamburger_controller.js

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

assets/controllers/monitor_button_controller.js

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

assets/controllers/monitor_controller.js

@@ -0,0 +1,24 @@
+import { Controller } from '@hotwired/stimulus';
+
+/*
+* The following line makes this controller "lazy": it won't be downloaded until needed
+* See https://github.com/symfony/stimulus-bridge#lazy-controllers
+*/
+/* stimulusFetch: 'lazy' */
+export default class extends Controller {
+    static values = {
+        title: String,
+        tmdbId: String,
+        imdbId: String,
+        mediaType: String,
+    }
+
+    addMovieMonitor() {
+        console.log(`/monitor/movies/${this.tmdbIdValue}/${this.imdbIdValue}/${encodeURI(this.titleValue)}`)
+        fetch(`/monitor/movies/${this.tmdbIdValue}/${this.imdbIdValue}/${encodeURI(this.titleValue)}`)
+            .then(res => res.json())
+            .then(json => {
+                console.log(json)
+            })
+    }
+}

assets/controllers/monitor_list_controller.js

@@ -1,14 +0,0 @@
-import { Controller } from '@hotwired/stimulus';
-
-/*
-* The following line makes this controller "lazy": it won't be downloaded until needed
-* See https://github.com/symfony/stimulus-bridge#lazy-controllers
-*/
-/* stimulusFetch: 'lazy' */
-export default class extends Controller {
-    deleteMonitor(data) {
-        fetch(`/api/monitor/${data.params.id}`, {method: 'DELETE'})
-            .then(res => res.json())
-            .then(json => console.debug(json));
-    }
-}

assets/controllers/movie_results_controller.js

@@ -16,7 +16,6 @@ export default class extends Controller {
     };
 
     static targets = ['list']
-    static outlets = ['loading-icon']
 
     options = []
     optionsLoaded = false
@@ -34,8 +33,6 @@ export default class extends Controller {
                     this.element.innerHTML = response;
                     this.options = this.element.querySelectorAll('tbody tr');
                     this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
-                    this.dispatch('optionsLoaded', {detail: {options: this.options}})
-                    this.loadingIconOutlet.toggleIcon();
                 });
         }
     }
@@ -51,20 +48,15 @@ export default class extends Controller {
         let selectedCount = 0;
 
         this.options.forEach((option) => {
-            const optionHeader = document.querySelector(`[data-option-id="${option.dataset['localId']}"]`)
             const props = {
                 "resolution": option.querySelector('#resolution').textContent.trim(),
                 "codec": option.querySelector('#codec').textContent.trim(),
                 "provider": option.querySelector('#provider').textContent.trim(),
-                "quality": option.dataset['quality'],
                 "languages": JSON.parse(option.dataset['languages']),
             }
 
             let include = true;
-            option.classList.add('r-tablerow');
             option.classList.remove('hidden');
-            optionHeader.classList.add('r-tablerow');
-            optionHeader.classList.remove('hidden');
             option.querySelector('input[type="checkbox"]').checked = false;
 
             for (let [key, value] of Object.entries(activeFilter)) {
@@ -89,10 +81,7 @@ export default class extends Controller {
             }
 
             if (false === include) {
-                option.classList.remove('r-tablerow');
                 option.classList.add('hidden');
-                optionHeader.classList.remove('r-tablerow');
-                optionHeader.classList.add('hidden');
             } else if (true === firstIncluded) {
                 count = 1;
                 selectedCount = selectedCount + 1;

assets/controllers/navbar_controller.js

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

assets/controllers/result_filter_controller.js

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

assets/controllers/search_bar_controller.js

@@ -1,59 +0,0 @@
-import { Controller } from '@hotwired/stimulus';
-
-export default class extends Controller {
-    initialize() {
-        this._onPreConnect = this._onPreConnect.bind(this);
-        this._onConnect = this._onConnect.bind(this);
-    }
-
-    connect() {
-        document.querySelector("#search").onsubmit = (event) => {
-            event.preventDefault();
-            const autocompleteController = this.application.getControllerForElementAndIdentifier(this.element, 'symfony--ux-autocomplete--autocomplete')
-            window.location.href = `/search?term=${autocompleteController.tomSelect.lastValue}`
-        }
-        this.element.addEventListener('autocomplete:pre-connect', this._onPreConnect);
-        this.element.addEventListener('autocomplete:connect', this._onConnect);
-    }
-
-    disconnect() {
-        // You should always remove listeners when the controller is disconnected to avoid side-effects
-        this.element.removeEventListener('autocomplete:connect', this._onConnect);
-        this.element.removeEventListener('autocomplete:pre-connect', this._onPreConnect);
-    }
-
-    _onPreConnect(event) {
-        // TomSelect has not been initialized - options can be changed
-        // console.log(event.detail); // Options that will be used to initialize TomSelect
-        event.detail.options.onItemAdd = (value, $item) => {
-            const params = value.split('|')
-            window.location.href = `/result/${params[0]}/${params[1]}`
-        };
-        event.detail.options.render.loading = (data, escape) => {
-            return `
-            <span data-controller="loading-icon" data-loading-icon-total-value="52" data-loading-icon-count-value="20" class="loading-icon">
-                <svg viewBox="0 0 24 24" fill="currentColor" height="20" width="20" data-loading-icon-target="icon" class="text-end" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M12 6.99998C9.1747 6.99987 6.99997 9.24998 7 12C7.00003 14.55 9.02119 17 12 17C14.7712 17 17 14.75 17 12"><animateTransform attributeName="transform" attributeType="XML" dur="560ms" from="0,12,12" repeatCount="indefinite" to="360,12,12" type="rotate"></animateTransform></path></svg>
-            </span>
-`;
-        }
-        event.detail.options.render.option = (data, escape) => {
-            if (data.data.description.length > 60) {
-                data.data.description = data.data.description.substring(0, 107) + "...";
-            }
-            return `<div class="flex flex-row">
-                        <img src="${data.data.poster}" class="w-16 rounded-md">
-                        <div class="p-2 flex flex-col">
-                            <h2>${data.data.title}</h2>
-                            <p class="max-w-[60ch] text-wrap">${data.data.description}</p>
-                        </div>
-                    </div>
-`
-        }
-    }
-
-    _onConnect(event) {
-        // TomSelect has just been initialized and you can access details from the event
-        // console.log(event.detail.tomSelect); // TomSelect instance
-        // console.log(event.detail.options); // Options used to initialize TomSelect
-    }
-}

assets/controllers/tv_episode_list_controller.js

@@ -1,51 +0,0 @@
-import { Controller } from '@hotwired/stimulus';
-import { getComponent } from '@symfony/ux-live-component';
-
-/*
-* The following line makes this controller "lazy": it won't be downloaded until needed
-* See https://symfony.com/bundles/StimulusBundle/current/index.html#lazy-stimulus-controllers
-*/
-
-/* stimulusFetch: 'lazy' */
-export default class extends Controller {
-
-    async initialize() {
-        this.component = await getComponent(this.element);
-        this.component.on('render:finished', (component) => {
-            console.log(component);
-        });
-    }
-
-    setSeason(season) {
-        this.element.querySelectorAll(".episode-container").forEach(element => element.remove());
-        this.component.set('pageNumber', 1);
-        this.component.set('season', parseInt(season));
-        this.component.render();
-    }
-
-    paginate(event) {
-        this.element.querySelectorAll(".episode-container").forEach(element => element.remove());
-        this.component.action('paginate', {page: event.params.page});
-        this.component.render();
-    }
-
-    connect() {
-        // Called every time the controller is connected to the DOM
-        // (on page load, when it's added to the DOM, moved in the DOM, etc.)
-
-        // Here you can add event listeners on the element or target elements,
-        // add or remove classes, attributes, dispatch custom events, etc.
-        // this.fooTarget.addEventListener('click', this._fooBar)
-    }
-
-    // Add custom controller actions here
-    // fooBar() { this.fooTarget.classList.toggle(this.bazClass) }
-
-    disconnect() {
-        // Called anytime its element is disconnected from the DOM
-        // (on page change, when it's removed from or moved in the DOM, etc.)
-
-        // Here you should remove all event listeners added in "connect()" 
-        // this.fooTarget.removeEventListener('click', this._fooBar)
-    }
-}

assets/controllers/tv_results_controller.js

@@ -18,44 +18,32 @@ export default class extends Controller {
         active: Boolean,
     };
 
-    static targets = ['list', 'count', 'episodeSelector', 'toggleButton', 'listContainer']
+    static targets = ['list', 'count', 'episodeSelector']
     static outlets = ['loading-icon']
 
     options = []
     optionsLoaded = false
-    isOpen = false
 
     async connect() {
         await this.setOptions();
     }
 
     async setOptions() {
-        if (this.optionsLoaded === false) {
+        if (true === this.activeValue && this.optionsLoaded === false) {
             this.optionsLoaded = true;
-            let response;
+            await fetch(`/torrentio/tvshows/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
-
+                .then(res => res.text())
-            try {
+                .then(response => {
-                response = await fetch(`/torrentio/tvshows/${this.tmdbIdValue}/${this.imdbIdValue}/${this.seasonValue}/${this.episodeValue}`)
+                    this.element.innerHTML = response;
-            } catch (error) {
+                    this.options = this.element.querySelectorAll('tbody tr');
-                console.log('There was an error', error);
+                    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;
-            if (response?.ok) {
+                    } else {
-                response = await response.text()
+                        this.episodeSelectorTarget.disabled = true;
-                this.listContainerTarget.innerHTML = response;
+                    }
-                this.options = this.element.querySelectorAll('tbody tr');
+                    this.loadingIconOutlet.increaseCount();
-                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}`)
-            }
         }
     }
 
@@ -67,13 +55,19 @@ export default class extends Controller {
     // }
 
     async setActive() {
+        this.activeValue = true;
+        this.element.classList.remove('hidden');
         if (false === this.optionsLoaded) {
             await this.setOptions();
         }
     }
 
     async setInActive() {
+        this.activeValue = false;
+        // if (true === this.hasEpisodeSelectorTarget()) {
         this.episodeSelectorTarget.checked = false;
+        // }
+        this.element.classList.add('hidden');
     }
 
     isActive() {
@@ -91,10 +85,7 @@ export default class extends Controller {
     }
 
     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() {
@@ -128,7 +119,6 @@ export default class extends Controller {
         let selectedCount = 0;
 
         this.options.forEach((option) => {
-            const optionHeader = document.querySelector(`[data-option-id="${option.dataset['localId']}"]`)
             const props = {
                 "resolution": option.querySelector('#resolution').textContent.trim(),
                 "codec": option.querySelector('#codec').textContent.trim(),
@@ -137,10 +127,7 @@ export default class extends Controller {
             }
 
             let include = true;
-            option.classList.add('r-tablerow');
             option.classList.remove('hidden');
-            optionHeader.classList.add('r-tablerow');
-            optionHeader.classList.remove('hidden');
             option.querySelector('input[type="checkbox"]').checked = false;
 
             for (let [key, value] of Object.entries(activeFilter)) {
@@ -165,10 +152,7 @@ export default class extends Controller {
             }
 
             if (false === include) {
-                option.classList.remove('r-tablerow');
                 option.classList.add('hidden');
-                optionHeader.classList.remove('r-tablerow');
-                optionHeader.classList.add('hidden');
             } else if (true === firstIncluded) {
                 count = 1;
                 selectedCount = selectedCount + 1;

assets/icons/ic/twotone-cancel.svg

@@ -1 +0,0 @@
-<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" d="M12 4c-4.41 0-8 3.59-8 8s3.59 8 8 8s8-3.59 8-8s-3.59-8-8-8m5 11.59L15.59 17L12 13.41L8.41 17L7 15.59L10.59 12L7 8.41L8.41 7L12 10.59L15.59 7L17 8.41L13.41 12z" opacity=".3"/><path fill="currentColor" d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10s10-4.47 10-10S17.53 2 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8s8 3.59 8 8s-3.59 8-8 8m3.59-13L12 10.59L8.41 7L7 8.41L10.59 12L7 15.59L8.41 17L12 13.41L15.59 17L17 15.59L13.41 12L17 8.41z"/></svg>

assets/icons/icon-park-twotone/pause-one.svg

@@ -1 +0,0 @@
-<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 48 48"><defs><mask id="ipTPauseOne0"><g fill="none" stroke="#fff" stroke-linejoin="round" stroke-width="4"><path fill="#555" d="M24 44c11.046 0 20-8.954 20-20S35.046 4 24 4S4 12.954 4 24s8.954 20 20 20Z"/><path stroke-linecap="round" d="M19 18v12m10-12v12"/></g></mask></defs><path fill="currentColor" d="M0 0h48v48H0z" mask="url(#ipTPauseOne0)"/></svg>

assets/icons/icon-park-twotone/play.svg

@@ -1 +0,0 @@
-<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 48 48"><defs><mask id="ipTPlay0"><g fill="#555" stroke="#fff" stroke-linejoin="round" stroke-width="4"><path d="M24 44c11.046 0 20-8.954 20-20S35.046 4 24 4S4 12.954 4 24s8.954 20 20 20Z"/><path d="M20 24v-6.928l6 3.464L32 24l-6 3.464l-6 3.464z"/></g></mask></defs><path fill="currentColor" d="M0 0h48v48H0z" mask="url(#ipTPlay0)"/></svg>

assets/icons/line-md/circle-twotone.svg

@@ -1 +0,0 @@
-<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" fill-opacity="0" stroke="currentColor" stroke-dasharray="64" stroke-dashoffset="64" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12c0 -4.97 4.03 -9 9 -9c4.97 0 9 4.03 9 9c0 4.97 -4.03 9 -9 9c-4.97 0 -9 -4.03 -9 -9Z"><animate fill="freeze" attributeName="fill-opacity" begin="0.6s" dur="0.15s" values="0;0.3"/><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.6s" values="64;0"/></path></svg>

assets/icons/pajamas/hamburger.svg

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

assets/styles/app.css

@@ -10,123 +10,4 @@
     h2 {
         font-size: var(--text-xl);
     }
-    .rounded-ms {
-        border-radius: 0.275rem;
-    }
-}
-
-@layer components {
-    .alert {
-        @apply text-white text-sm min-w-[250px] border px-4 py-3 rounded-md
-    }
-    .alert-success {
-        @apply bg-green-950 hover:bg-green-900 border-green-500
-    }
-    .alert-warning {
-        @apply bg-yellow-500 hover:bg-yellow-600 border-yellow-400 text-black
-    }
-}
-
-/* Prevent scrolling while dialog is open */
-body:has(dialog[data-dialog-target="dialog"][open]) {
-    overflow: hidden;
-}
-
-/* Customize the dialog backdrop */
-dialog {
-    box-shadow: 0 0 0 100vw rgb(0 0 0 / 0.5);
-}
-
-@keyframes fade-in {
-    0% {
-        opacity: 0;
-    }
-    100% {
-        opacity: 1;
-    }
-}
-
-@keyframes fade-out {
-    0% {
-        opacity: 1;
-    }
-    100% {
-        opacity: 0;
-    }
-}
-
-/* Add animations */
-dialog[data-dialog-target="dialog"][open] {
-    animation: fade-in 200ms forwards;
-}
-
-dialog[data-dialog-target="dialog"][closing] {
-    animation: fade-out 200ms forwards;
-}
-
-.text-input {
-    @apply bg-gray-50 text-gray-50 p-1 bg-transparent border-b-2 border-orange-400
-}
-
-.submit-button {
-    @apply bg-green-600/40 px-1.5 py-1 w-full rounded-md text-gray-50 backdrop-filter backdrop-blur-sm border-2 border-green-500 hover:bg-green-700/40
-}
-
-.r-tablecell {
-    display: none;
-}
-
-.r-tablerow {
-    display: flex;
-}
-
-@media screen and (min-width: 768px) {
-    .r-tablecell {
-        display: table-cell;
-    }
-
-    .r-tablerow {
-        display: table-row;
-    }
-}
-
-.options-table {
-    display: flex;
-
-    :last-child {
-        border-bottom: none;
-    }
-}
-
-@media screen and (min-width: 768px) {
-    .options-table {
-        display: inline-table;
-    }
-}
-
-#search .ts-wrapper.single .ts-control::after {
-    display: none !important;
-}
-
-#search .ts-control {
-    background: transparent !important;
-    border: none !important;
-    box-shadow: none !important;
-    color: #fff !important;
-    padding-left: 0;
-
-    input {
-        color: #fff !important;
-        padding: 0;
-    }
-}
-
-#search .ts-dropdown {
-    background: unset;
-    @apply bg-orange-500/80 backdrop-filter backdrop-blur-md text-white border border-orange-500 rounded-md
-}
-
-#search .ts-dropdown .ts-dropdown-content .option.active {
-    background: unset;
-    @apply bg-orange-500/80 text-black font-bold rounded-md
 }

bash/app/wget_download.sh

@@ -0,0 +1,2 @@
+# $1 = movies/tvshows/etc, $2 = title of media, $3 = URL of download
+cd /var/download/${1} && if [ ! -d "${2}" ]; then mkdir "${2}"; fi && cd "${2}" && wget "${3}"

bash/caddy/Caddyfile

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

bash/entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Sleep for a second to ensure DB is awake and ready
+SLEEP_TIME=$(shuf -i 2-5 -n 1)
+echo "> Sleeping for ${SLEEP_TIME} seconds to wait for the database"
+echo "> If there are errors after the migration runs, it's possible another container (scheduler, worker, etc.) already ran the migrations"
+sleep $SLEEP_TIME
+
+# Provision database
+php /var/www/bin/console doctrine:migrations:migrate --no-interaction
+php /var/www/bin/console db:seed
+
+/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf

bash/nginx.conf

@@ -0,0 +1,32 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  localhost;
+
+    root /var/www/public;
+
+    location /hub/ {
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_redirect   off;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://mercure/;
+    }
+
+
+    location / {
+        # try to serve file directly, fallback to index.php
+        try_files $uri /index.php$is_args$args;
+    }
+
+    location ~ \.php$ {
+        fastcgi_pass unix:/run/php-fpm.sock;
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        fastcgi_buffers 16 16k;
+        fastcgi_buffer_size 32k;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_param DOCUMENT_ROOT $realpath_root;
+        internal;
+    }
+}

compose.yml

@@ -2,7 +2,6 @@ services:
   caddy:
     image: caddy:2.9.1
     restart: unless-stopped
-    tty: true
     cap_add:
       - NET_ADMIN
     ports:
@@ -13,56 +12,68 @@ services:
       - $PWD/bash/caddy:/etc/caddy
       - $PWD/bash/certs:/etc/ssl
 
-
-  app:
-    build: .
-    restart: unless-stopped
-    volumes:
-      - $PWD:/app
-      - $PWD/var/download:/var/download
-      - mercure_data:/data
-      - mercure_config:/config
-    tty: true
-    environment:
-      TZ: America/Chicago
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-    depends_on:
-      database:
-        condition: service_healthy
-
-
-  worker:
-    build: .
-    restart: unless-stopped
-    volumes:
-      - $PWD:/app
-      - $PWD/var/download:/var/download
-    tty: true
-    environment:
-      TZ: America/Chicago
-    command: php /app/bin/console messenger:consume async -vv --time-limit=3600
-
-
-  scheduler:
-    build: .
-    restart: unless-stopped
-    volumes:
-      - $PWD:/app
-    environment:
-      TZ: America/Chicago
-    command: php /app/bin/console messenger:consume scheduler_monitor -vv
-    tty: true
-
-
   redis:
     image: redis:latest
     volumes:
       - redis_data:/data
     command: redis-server --maxmemory 512MB
     restart: unless-stopped
+
+  app:
+    build:
+      dockerfile: docker/Dockerfile.app
+      context: .
+    ports:
+      - "8001:80"
+    volumes:
+      - ./:/var/www
+    depends_on:
+      database:
+        condition: service_healthy
+
+  worker:
+    build:
+      dockerfile: docker/Dockerfile.worker
+      context: .
+    volumes:
+      - ./:/app
+      - ./var/downloads/movies:/var/download/movies
+      - ./var/downloads/tvshows:/var/download/tvshows
+    command: -vvv --time-limit=3600
+    env_file:
+      - .env
+    depends_on:
+      app:
+        condition: service_healthy
+
+  scheduler:
+    build:
+      dockerfile: docker/Dockerfile.scheduler
+      context: .
+    volumes:
+      - ./:/var/www
+      - ./var/download:/var/download
+    command: -vv --time-limit=3600
+    depends_on:
+      app:
+        condition: service_healthy
+
+  mercure:
+    image: dunglas/mercure
+    restart: unless-stopped
+    ports:
+      - "3000:80"
     environment:
-      TZ: America/Chicago
+      SERVER_NAME: ':80'
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_EXTRA_DIRECTIVES: |
+        cors_origins *
+        anonymous
+    command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
+    volumes:
+      - mercure_data:/data
+      - mercure_config:/config
 
 
   database:
@@ -72,24 +83,20 @@ services:
     volumes:
       - mysql:/var/lib/mysql
     environment:
-      TZ: America/Chicago
       MYSQL_DATABASE: app
       MYSQL_USERNAME: app
       MYSQL_PASSWORD: password
       MYSQL_ROOT_PASSWORD: password
     healthcheck:
       test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      interval: 5s
+      timeout: 10s
-      timeout: 5s
       retries: 10
 
-
   adminer:
     image: adminer
     ports:
       - "8081:8080"
 
-
 volumes:
   mysql:
   mercure_data:

composer.json

@@ -4,62 +4,49 @@
     "minimum-stability": "stable",
     "prefer-stable": true,
     "require": {
-        "php": ">=8.4",
+        "php": ">=8.2",
         "ext-ctype": "*",
         "ext-iconv": "*",
         "1tomany/rich-bundle": "^1.8",
         "aimeos/map": "^3.12",
-        "chrisullyott/php-filesize": "^4.2",
         "doctrine/dbal": "^3",
         "doctrine/doctrine-bundle": "^2.14",
         "doctrine/doctrine-fixtures-bundle": "^4.1",
         "doctrine/doctrine-migrations-bundle": "^3.4",
         "doctrine/orm": "^3.3",
         "dragonmantank/cron-expression": "^3.4",
-        "drenso/symfony-oidc-bundle": "^4.2",
-        "guzzlehttp/guzzle": "^7.9",
         "league/pipeline": "^1.1",
         "nesbot/carbon": "^3.9",
         "nihilarr/parse-torrent-name": "^0.0.1",
         "nyholm/psr7": "*",
         "p3k/emoji-detector": "^1.2",
-        "php-http/cache-plugin": "^2.0",
         "php-tmdb/api": "^4.1",
         "predis/predis": "^2.4",
-        "runtime/frankenphp-symfony": "^0.2.0",
+        "symfony/asset": "7.2.*",
-        "spomky-labs/pwa-bundle": "^1.2",
+        "symfony/console": "7.2.*",
-        "stof/doctrine-extensions-bundle": "^1.14",
+        "symfony/doctrine-messenger": "7.2.*",
-        "symfony/asset": "7.3.*",
+        "symfony/dotenv": "7.2.*",
-        "symfony/console": "7.3.*",
+        "symfony/filesystem": "7.2.*",
-        "symfony/doctrine-messenger": "7.3.*",
+        "symfony/finder": "7.2.*",
-        "symfony/dotenv": "7.3.*",
-        "symfony/filesystem": "7.3.*",
-        "symfony/finder": "7.3.*",
         "symfony/flex": "^2",
-        "symfony/form": "7.3.*",
+        "symfony/form": "7.2.*",
-        "symfony/framework-bundle": "7.3.*",
+        "symfony/framework-bundle": "7.2.*",
-        "symfony/http-client": "7.3.*",
+        "symfony/ldap": "7.2.*",
-        "symfony/ldap": "7.3.*",
-        "symfony/mailer": "7.3.*",
         "symfony/mercure-bundle": "^0.3.9",
-        "symfony/messenger": "7.3.*",
+        "symfony/messenger": "7.2.*",
-        "symfony/monolog-bundle": "^3.10",
+        "symfony/runtime": "7.2.*",
-        "symfony/runtime": "7.3.*",
+        "symfony/scheduler": "7.2.*",
-        "symfony/scheduler": "7.3.*",
+        "symfony/security-bundle": "7.2.*",
-        "symfony/security-bundle": "7.3.*",
         "symfony/stimulus-bundle": "^2.24",
-        "symfony/twig-bundle": "7.3.*",
+        "symfony/twig-bundle": "7.2.*",
-        "symfony/ux-autocomplete": "^2.27",
         "symfony/ux-icons": "^2.24",
         "symfony/ux-live-component": "^2.24",
         "symfony/ux-turbo": "^2.24",
         "symfony/ux-twig-component": "^2.24",
-        "symfony/yaml": "7.3.*",
+        "symfony/yaml": "7.2.*",
-        "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": {
@@ -67,9 +54,6 @@
             "symfony/flex": true,
             "symfony/runtime": true
         },
-        "platform": {
-            "php": "8.4"
-        },
         "bump-after-update": true,
         "sort-packages": true
     },
@@ -113,13 +97,13 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "7.3.*"
+            "require": "7.2.*"
         }
     },
     "require-dev": {
         "phpstan/phpstan": "^2.1",
         "symfony/maker-bundle": "^1.62",
-        "symfony/stopwatch": "7.3.*",
+        "symfony/stopwatch": "7.2.*",
-        "symfony/web-profiler-bundle": "7.3.*"
+        "symfony/web-profiler-bundle": "7.2.*"
     }
 }

config/bundles.php

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

config/packages/doctrine.yaml

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

config/packages/drenso_oidc.yaml

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

config/packages/framework.yaml

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

config/packages/mailer.yaml

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

config/packages/messenger.yaml

@@ -10,22 +10,10 @@ framework:
                 options:
                     use_notify: true
                     check_delayed_interval: 60000
-                    queue_name: default
                 retry_strategy:
                     max_retries: 1
                     multiplier: 1
 
-            media_cache:
-                dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
-                options:
-                    use_notify: true
-                    check_delayed_interval: 60000
-                    queue_name: media_cache
-                retry_strategy:
-                    max_retries: 1
-                    multiplier: 1
-
-
             failed: 'doctrine://default?queue_name=failed'
 
         default_bus: messenger.bus.default
@@ -37,12 +25,11 @@ framework:
             # Route your messages to the transports
             # 'App\Message\YourMessage': async
             'App\Download\Action\Command\DownloadMediaCommand': async
-            'App\Download\Action\Command\DownloadSeasonCommand': async
             'App\Monitor\Action\Command\MonitorTvEpisodeCommand': async
             'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
             'App\Monitor\Action\Command\MonitorTvShowCommand': async
             'App\Monitor\Action\Command\MonitorMovieCommand': async
-            'App\Torrentio\Action\Command\GetTvShowOptionsCommand': media_cache
+            'App\Torrentio\Action\Command\GetTvShowOptionsCommand': async
 
 # when@test:
 #    framework:

config/packages/monolog.yaml

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

config/packages/property_info.yaml

@@ -1,3 +0,0 @@
-framework:
-    property_info:
-        with_constructor_extractor: true

config/packages/pwa.yaml

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

config/packages/reset_password.yaml

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

config/packages/security.yaml

@@ -10,9 +10,6 @@ security:
                 class: App\User\Framework\Entity\User
                 property: email
 
-        app_oidc:
-            id: App\User\Framework\Security\OidcUserProvider
-
         app_ldap:
             id: App\User\Framework\Security\LdapUserProvider
 
@@ -21,20 +18,14 @@ security:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
         main:
-            logout:
+            lazy: true
-                path: /logout
+            provider: app_local
-            provider: app_oidc
             form_login:
                 login_path: app_login
                 check_path: app_login
                 enable_csrf: true
-            oidc:
+            logout:
-                login_path: '/login/oidc'
+                path: app_logout
-                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
@@ -45,7 +36,6 @@ security:
     # Easy way to control access for large sections of your site
     # Note: Only the *first* access control that matches will be used
     access_control:
-        - { path: ^/reset-password, roles: PUBLIC_ACCESS }
         - { path: ^/getting-started, roles: PUBLIC_ACCESS }
         - { path: ^/register, roles: PUBLIC_ACCESS }
         - { path: ^/login, roles: PUBLIC_ACCESS }

config/packages/stof_doctrine_extensions.yaml

@@ -1,7 +0,0 @@
-# Read the documentation: https://symfony.com/doc/current/bundles/StofDoctrineExtensionsBundle/index.html
-# See the official DoctrineExtensions documentation for more details: https://github.com/doctrine-extensions/DoctrineExtensions/tree/main/doc
-stof_doctrine_extensions:
-  default_locale: en_US
-  orm:
-    default:
-      timestampable: true

config/packages/twig.yaml

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

config/routes.yaml

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

config/routes/ux_autocomplete.yaml

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

config/security.yaml

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

config/services.yaml

@@ -4,27 +4,15 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
-    # App
-    app.url: '%env(APP_URL)%'
-    app.env: '%env(default:app.default.env:APP_ENV)%'
-    app.version: '%env(default:app.default.version:APP_VERSION)%'
-
-    # Debrid Services
-    app.debrid.real_debrid.key: '%env(REAL_DEBRID_KEY)%'
-
-    # TMDB Key
-    app.meta_provider.tmdb.key: '%env(TMDB_API)%'
-
     # Media
-    media.base_path: '/var/download'
     media.default_movies_dir: movies
     media.default_tvshows_dir: tvshows
-    media.movies_path: '/var/download/%env(default:media.default_movies_dir:MOVIES_PATH)%'
+    media.movies_path: '%env(default:media.default_movies_dir:MOVIES_PATH)%'
     media.tvshows_path: '/var/download/%env(default:media.default_tvshows_dir:TVSHOWS_PATH)%'
 
     # Mercure
-    app.mercure.url: 'http://app/.well-known/mercure'
+    app.mercure.url: 'http://mercure/.well-known/mercure'
-    app.mercure.public_url: '%env(APP_URL)%/.well-known/mercure'
+    app.mercure.public_url: '%env(APP_URL)%/hub/.well-known/mercure'
 
     # Cache
     app.cache.adapter: '%env(default:app.cache.adapter.default:CACHE_ADAPTER)%'
@@ -32,20 +20,6 @@ parameters:
     app.cache.adapter.default: 'filesystem'
     app.cache.redis.host.default: 'redis://redis'
 
-    # Various configs
-    app.default.env: 'prod'
-    app.default.version: '0.dev'
-    app.default.timezone: 'America/Chicago'
-
-    # Auth
-    auth.default.method: 'form_login'
-    auth.method: '%env(default:auth.default.method:AUTH_METHOD)%'
-
-    auth.oidc.well_known_url: '%env(OIDC_WELL_KNOWN_URL)%'
-    auth.oidc.client_id: '%env(OIDC_CLIENT_ID)%'
-    auth.oidc.client_secret: '%env(OIDC_CLIENT_SECRET)%'
-    auth.oidc.bypass_form_login: '%env(bool:OIDC_BYPASS_FORM_LOGIN)%'
-
 services:
     # default configuration for services in *this* file
     _defaults:

deploy.compose.yml

@@ -1,58 +1,50 @@
 services:
-  app:
+  web:
-    image: registry.caldwell.digital/home/torsearch-app:${TAG}
+    image: code.caldwell.digital/home/torsearch/web:latest
     ports:
       - '8001:80'
-    environment:
+    volumes:
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      - $PWD/bash/nginx.conf:/etc/nginx/conf.d/default.conf
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+    depends_on:
-    tty: true
+      app:
+        condition: service_healthy
+
+  app:
+    image: code.caldwell.digital/home/torsearch/app:${TAG}
     deploy:
       replicas: 2
-    volumes:
-      - /mnt/media/downloads/movies:/var/download/movies
-      - /mnt/media/downloads/tvshows:/var/download/tvshows
-      - mercure_data:/data
-      - mercure_config:/config
-    depends_on:
-      - database
-
 
   worker:
-    image: registry.caldwell.digital/home/torsearch-worker:${TAG}
+    image: code.caldwell.digital/home/torsearch/app:${TAG}
     volumes:
-      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads:/var/download
-      - /mnt/media/downloads/tvshows:/var/download/tvshows
+    command: php ./bin/console messenger:consume async -v --time-limit=3600 --limit=10
-    restart: always
-    command: -vv --time-limit=3600 --limit=10
     deploy:
       replicas: 2
-    depends_on:
-      - app
-
 
   scheduler:
-    image: registry.caldwell.digital/home/torsearch-scheduler:${TAG}
+    image: code.caldwell.digital/home/torsearch/app:${TAG}
     volumes:
-      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads:/var/download
-      - /mnt/media/downloads/tvshows:/var/download/tvshows
+    command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600
-    restart: always
-    command: -vv
-    depends_on:
-      - app
 
-
+  mercure:
-  redis:
+    image: dunglas/mercure
-    image: redis:latest
-    volumes:
-      - redis_data:/data
-    command: redis-server --maxmemory 512MB
     restart: unless-stopped
-
+    ports:
+      - "3000:80"
+    environment:
+      SERVER_NAME: ':80'
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_EXTRA_DIRECTIVES: |
+        cors_origins *
+        anonymous
+    command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
+    volumes:
+      - mercure_data:/data
+      - mercure_config:/config
 
 volumes:
-  mysql:
   mercure_config:
   mercure_data:
-  redis_data:
-

docker/Dockerfile.app

@@ -1,25 +1,19 @@
-FROM dunglas/frankenphp
+FROM trafex/php-nginx:3.9.0
 
-ENV SERVER_NAME=":80"
+USER root
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-ARG APP_VERSION="0.dev"
+RUN apk add --no-cache \
-ENV APP_VERSION="${APP_VERSION}"
+      php84-pdo_mysql \
+      php84-simplexml
 
-RUN install-php-extensions \
+USER nobody
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
 
-COPY . /app
+COPY --chown=nobody:nobody . /var/www
-COPY --chmod=775 docker/app/entrypoint.sh /usr/local/bin/docker-entrypoint
+COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
-COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile
+COPY --chmod=0755 ./bash/nginx.conf /etc/nginx/conf.d/site.conf
 
-ENTRYPOINT [ "/usr/local/bin/docker-entrypoint" ]
+HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
 
-CMD [ "frankenphp", "run", "--config", "/etc/frankenphp/Caddyfile" ]
+ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 
-HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
+WORKDIR /var/www

docker/Dockerfile.scheduler

@@ -1,21 +1,7 @@
-FROM dunglas/frankenphp:php8.4-alpine
+FROM php:8.4-cli-alpine3.21
 
-ENV SERVER_NAME=":80"
+RUN docker-php-ext-install pdo_mysql
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-ARG APP_VERSION="0.dev"
+COPY --chown=www-data:www-data . /app
-ENV APP_VERSION="${APP_VERSION}"
 
-RUN install-php-extensions \
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume",  "scheduler_monitor" ]
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
-
-COPY . /app
-
-ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
-
-HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0

docker/Dockerfile.web

@@ -0,0 +1,3 @@
+FROM nginx:1.28-alpine
+
+COPY bash/nginx.conf /etc/nginx/conf.d/default.conf

docker/Dockerfile.worker

@@ -1,23 +1,7 @@
-FROM dunglas/frankenphp:php8.4-alpine
+FROM php:8.4-cli-alpine3.21
 
-ENV SERVER_NAME=":80"
+RUN docker-php-ext-install pdo_mysql
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-ARG APP_VERSION="0.dev"
+COPY --chown=www-data:www-data . /app
-ENV APP_VERSION="${APP_VERSION}"
 
-RUN install-php-extensions \
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume",  "async" ]
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
-
-RUN apk add --no-cache wget
-
-COPY . /app
-
-ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]
-
-HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0

docker/app/Caddyfile

@@ -1,59 +0,0 @@
-{
-	{$CADDY_GLOBAL_OPTIONS}
-
-	frankenphp {
-		{$FRANKENPHP_CONFIG}
-	}
-}
-
-{$CADDY_EXTRA_CONFIG}
-
-{$SERVER_NAME:localhost} {
-	log {
-		{$CADDY_SERVER_LOG_OPTIONS}
-		# Redact the authorization query parameter that can be set by Mercure
-		format filter {
-			request>uri query {
-				replace authorization REDACTED
-			}
-		}
-	}
-
-	root /app/public
-	encode zstd br gzip
-
-	mercure {
-		# Publisher JWT key
-		publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
-		# Subscriber JWT key
-		subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG}
-		# Allow anonymous subscribers (double-check that it's what you want)
-		anonymous
-		# Enable the subscription API (double-check that it's what you want)
-		subscriptions
-		# Custmo cors
-		cors_origins *
-		# Extra directives
-		{$MERCURE_EXTRA_DIRECTIVES}
-	}
-
-	vulcain
-
-	{$CADDY_SERVER_EXTRA_DIRECTIVES}
-
-	# Disable Topics tracking if not enabled explicitly: https://github.com/jkarlin/topics
-	header ?Permissions-Policy "browsing-topics=()"
-
-	@phpRoute {
-		not path /.well-known/mercure*
-		not file {path}
-	}
-	rewrite @phpRoute index.php
-
-	@frontController path index.php
-	php @frontController
-
-	file_server {
-		hide *.php
-	}
-}

docker/app/entrypoint.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Sleep for a second to ensure DB is awake and ready
-SLEEP_TIME=$(shuf -i 2-4 -n 1)
-echo "> Sleeping for ${SLEEP_TIME} seconds to wait for the database"
-sleep $SLEEP_TIME
-
-# Provision database
-php /app/bin/console doctrine:migrations:migrate --no-interaction
-php /app/bin/console db:seed
-
-exec docker-php-entrypoint "$@"

docker/app/messenger-worker@.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Torsearch media cache warming services
-
-[Service]
-ExecStart=php /app/bin/console messenger:consume media_cache --time-limit=3600
-# for Redis, set a custom consumer name for each instance
-Environment="MESSENGER_CONSUMER_NAME=symfony-%n-%i"
-Restart=always
-RestartSec=30
-
-[Install]
-WantedBy=default.target

docs/examples/.env

@@ -3,15 +3,10 @@
 # or pass your certificates into the 'app' container.
 # Please omit any trailing slashes. The APP_URL is
 # used to generate the Mercure URL behind the scenes.
-APP_URL="https://dev.caldwell.digital"
+APP_URL="https://torsearch.idocode.io"
 APP_SECRET="70169beadfbc8101c393cbfbba27a313"
 APP_ENV=prod
 
-# Mercure is a Caddy module built into the webserver
-# that facilitates the usage of websockets to transmit
-# real time data (download progress, etc.)
-MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
-
 # Use the DATABASE_URL below to use the MariaDB container
 # provided in the example.compose.yml file, or remove this
 # line and fill in the details of your own MySQL/MariaDB server
@@ -26,46 +21,33 @@ DATABASE_URL="mysql://root:password@database:3306/app?serverVersion=10.6.19.2-Ma
 # to retrieve download options
 REAL_DEBRID_KEY=""
 
-# Enter your TMDB API key
+# Enter you TMDB API key
 # This is used to provide rich search results
 # when searching for media and rendering the
 # Popular Movies and TV Shows section.
-TMDB_API=""
+TMDB_API=
+
+MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
 
 # Use your own Redis instance or use the
 # below value to use the container included
 # in the example compose.yml file.
 REDIS_HOST="redis://redis"
 
-### Auth ###
-# Change to "oidc" to and provide the required
-# environment variables below to use OIDC auth.
-AUTH_METHOD=form_login
-
-# OIDC
-OIDC_WELL_KNOWN_URL=
-OIDC_CLIENT_ID=
-OIDC_CLIENT_SECRET=
-# Allows you to skip the login page and directly
-# rely on your IdP for auth.
-OIDC_BYPASS_FORM_LOGIN=
-
-
 # LDAP Config: To use LDAP, enter the below fields
 # and run 'php bin/console config:set auth.method ldap'
-# (LDAP is still in progress and not ready for use)
+LDAP_HOST=
-#LDAP_HOST=
+LDAP_PORT=
-#LDAP_PORT=
+LDAP_ENCRYPTION=
-#LDAP_ENCRYPTION=
+LDAP_BASE_DN=
-#LDAP_BASE_DN=
+LDAP_BIND_USER=
-#LDAP_BIND_USER=
+LDAP_BIND_PASS=
-#LDAP_BIND_PASS=
+LDAP_DN_STRING=
-#LDAP_DN_STRING=
+LDAP_UID_KEY="uid"
-#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,17 +1,16 @@
 services:
+  # The "entrypoint" into the application. This reverse proxy
+  # proxies traffic back to their respective services. If not
+  # running behind a reverse proxy inject your SSL certificates
+  # into this container.
+  # This container runs the actual web app in a php:8.4-fpm
+  # base container.
   app:
     image: code.caldwell.digital/home/torsearch-app:latest
     ports:
       - '8006:80'
     env_file:
       - .env
-    volumes:
-      - ./downloads/movies:/var/download/movies
-      - ./downloads/tvshows:/var/download/tvshows
-    environment:
-      TZ: America/Chicago
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
     depends_on:
       database:
         condition: service_healthy
@@ -26,11 +25,9 @@ services:
   worker:
     image: code.caldwell.digital/home/torsearch-worker:latest
     volumes:
-      - ./downloads/movies:/var/download/movies
+      - /mnt/media/downloads/movies:/var/download/movies
-      - ./downloads/tvshows:/var/download/tvshows
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
-    environment:
+    command: -v --time-limit=3600 --limit=10
-      TZ: America/Chicago
-    command: -vv --time-limit=3600 --limit=10
     env_file:
       - .env
     restart: always
@@ -46,18 +43,36 @@ services:
   scheduler:
     image: code.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
-      - ./downloads/movies:/var/download/movies
+      - ./downloads:/var/download
-      - ./downloads/tvshows:/var/download/tvshows
+    command: -vv --time-limit=3600
     env_file:
       - .env
-    command: -vv
-    environment:
-      TZ: America/Chicago
     restart: always
     depends_on:
       app:
         condition: service_healthy
 
+  # This container facilitates viewing the progress of downloads
+  # in realtime. It also handles sending alerts and notifications.
+  # The MERCURE_PUBLISHER_JWT key & MERCURE_SUBSCRIBER_JWT_KEY should
+  # match the MERCURE_JWT_SECRET environment variable.
+  mercure:
+    image: dunglas/mercure
+    restart: unless-stopped
+    ports:
+      - "3001:80"
+    environment:
+      SERVER_NAME: ':80'
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_EXTRA_DIRECTIVES: |
+        cors_origins *
+        anonymous
+    command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
+    volumes:
+      - mercure_data:/data
+      - mercure_config:/config
+
   database:
     image: mariadb:10.11.2
     volumes:
@@ -69,8 +84,7 @@ services:
       MYSQL_ROOT_PASSWORD: password
     healthcheck:
       test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      interval: 5s
+      timeout: 10s
-      timeout: 5s
       retries: 10
 
   redis:

docs/examples/swarm.compose.yml

@@ -1,115 +0,0 @@
-services:
-  # The "entrypoint" into the application. This reverse proxy
-  # proxies traffic back to their respective services. If not
-  # running behind a reverse proxy inject your SSL certificates
-  # into this container.
-  # This container runs the actual web app in a php:8.4-fpm
-  # base container.
-  app:
-    image: code.caldwell.digital/home/torsearch-app:latest
-    ports:
-      - '8006:80'
-    configs:
-      - env_file
-    deploy:
-      replicas: 2
-    depends_on:
-      - database
-
-  # Downloads happen in this container. Replicate this
-  # container to run multiple downloads simultaneously.
-  # Map your "movies" folder to /var/download/movies
-  # Map your "TV shows" folder to /var/download/tvshows
-  # If your folders are on another machine, use an NFS volume.
-  # This container runs a Symfony worker process.
-  # See: https://symfony.com/doc/current/messenger.html
-  worker:
-    image: code.caldwell.digital/home/torsearch-worker:latest
-    configs:
-      - source: env_file
-        target: /app/bin/.env.local
-    volumes:
-      - /mnt/media/downloads/movies:/var/download/movies
-      - /mnt/media/downloads/tvshows:/var/download/tvshows
-    restart: always
-    command: -vv
-    deploy:
-      replicas: 4
-    depends_on:
-      - app
-
-  # This container handles the monitoring for new media. When new
-  # monitors are added, jobs are periodically dispatched to this
-  # container, and the desired media is searched for and downloaded.
-  # This container runs a Symfony worker process.
-  # See: https://symfony.com/doc/current/messenger.html
-  scheduler:
-    image: code.caldwell.digital/home/torsearch-scheduler:latest
-    configs:
-      - env_file
-    volumes:
-      - ./downloads:/var/download
-    restart: always
-    depends_on:
-      - app
-
-  # This container facilitates viewing the progress of downloads
-  # in realtime. It also handles sending alerts and notifications.
-  # The MERCURE_PUBLISHER_JWT key & MERCURE_SUBSCRIBER_JWT_KEY should
-  # match the MERCURE_JWT_SECRET environment variable.
-  mercure:
-    image: dunglas/mercure
-    restart: unless-stopped
-    ports:
-      - "3001:80"
-    environment:
-      SERVER_NAME: ':80'
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_EXTRA_DIRECTIVES: |
-        cors_origins *
-        anonymous
-    command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
-    volumes:
-      - mercure_data:/data
-      - mercure_config:/config
-
-  database:
-    image: mariadb:10.11.2
-    volumes:
-      - mysql:/var/lib/mysql
-    environment:
-      MYSQL_DATABASE: app
-      MYSQL_USERNAME: app
-      MYSQL_PASSWORD: password
-      MYSQL_ROOT_PASSWORD: password
-    healthcheck:
-      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      interval: 5s
-      timeout: 5s
-      retries: 10
-
-  redis:
-    image: redis:latest
-    volumes:
-      - redis_data:/data
-    command: redis-server --maxmemory 512MB
-    restart: unless-stopped
-
-  # **Optional**
-  # Provides a simple method of viewing the database
-  adminer:
-    image: adminer
-    ports:
-      - "8081:8080"
-
-volumes:
-  mysql:
-  mercure_config:
-  mercure_data:
-  redis_data:
-
-configs:
-  env_file:
-    file: $PWD/.env
-

importmap.php

@@ -28,40 +28,4 @@ return [
     '@hotwired/turbo' => [
         'version' => '7.3.0',
     ],
-    '@stimulus-components/popover' => [
-        'version' => '7.0.0',
-    ],
-    '@stimulus-components/dialog' => [
-        'version' => '1.0.1',
-    ],
-    '@stimulus-components/dropdown' => [
-        'version' => '3.0.0',
-    ],
-    'stimulus-use' => [
-        'version' => '0.52.2',
-    ],
-    'animate.css' => [
-        'version' => '4.1.1',
-    ],
-    'animate.css/animate.min.css' => [
-        'version' => '4.1.1',
-        'type' => 'css',
-    ],
-    'tom-select' => [
-        'version' => '2.4.3',
-    ],
-    '@orchidjs/sifter' => [
-        'version' => '1.1.0',
-    ],
-    '@orchidjs/unicode-variants' => [
-        'version' => '1.1.2',
-    ],
-    'tom-select/dist/css/tom-select.default.min.css' => [
-        'version' => '2.4.3',
-        'type' => 'css',
-    ],
-    'tom-select/dist/css/tom-select.default.css' => [
-        'version' => '2.4.3',
-        'type' => 'css',
-    ],
 ];

migrations/Version20250610195448.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20250610195448 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE download ADD created_at DATETIME NULL, ADD updated_at DATETIME NULL
-        SQL);
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE download DROP created_at, DROP updated_at
-        SQL);
-    }
-}

migrations/Version20250610222503.php

@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20250610222503 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE monitor ADD parent_id INT DEFAULT NULL
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE monitor ADD CONSTRAINT FK_E1159985727ACA70 FOREIGN KEY (parent_id) REFERENCES monitor (id)
-        SQL);
-        $this->addSql(<<<'SQL'
-            CREATE INDEX IDX_E1159985727ACA70 ON monitor (parent_id)
-        SQL);
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE monitor DROP FOREIGN KEY FK_E1159985727ACA70
-        SQL);
-        $this->addSql(<<<'SQL'
-            DROP INDEX IDX_E1159985727ACA70 ON monitor
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE monitor DROP parent_id
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE download CHANGE created_at created_at DATETIME DEFAULT NULL, CHANGE updated_at updated_at DATETIME DEFAULT NULL
-        SQL);
-    }
-}

migrations/Version20250708033046.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20250708033046 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE monitor ADD only_future TINYINT(1) NOT NULL DEFAULT 1
-        SQL);
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE monitor DROP only_future
-        SQL);
-    }
-}

migrations/Version20250709161037.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20250709161037 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE download CHANGE batch_id episode_id VARCHAR(255) DEFAULT NULL
-        SQL);
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE download CHANGE episode_id batch_id VARCHAR(255) DEFAULT NULL
-        SQL);
-    }
-}

migrations/Version20250709200956.php

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

nomad.deploy.hcl

@@ -1,129 +0,0 @@
-variable "image_tag" {
-  type        = string
-  description = "Docker image tag to deploy."
-  default     = "latest"
-}
-
-job "torsearch" {
-  datacenters = [ "home" ]
-  type = "service"
-
-  group "app" {
-    count = 2
-
-    update {
-      max_parallel     = 4
-      min_healthy_time = "30s"
-      healthy_deadline = "3m"
-      auto_revert = true
-    }
-
-    network {
-      port "app" {
-        to = 80
-      }
-    }
-
-    task "app" {
-      driver = "docker"
-
-      config {
-        image = "registry.caldwell.digital/home/torsearch-app:${var.image_tag}"
-        ports = ["app"]
-      }
-
-      env {
-        MERCURE_PUBLISHER_JWT_KEY = "!ChangeThisMercureHubJWTSecretKey!"
-        MERCURE_SUBSCRIBER_JWT_KEY = "!ChangeThisMercureHubJWTSecretKey!"
-      }
-
-      service {
-        name = "torsearch-app"
-        provider = "nomad"
-        port = "app"
-
-        meta {
-          nomad_ingress_enabled  = true
-          nomad_ingress_hostname = "torsearch-nomad.caldwell.digital"
-        }
-      }
-    }
-  }
-
-  group "worker" {
-    count = 2
-    update {
-      max_parallel     = 4
-      min_healthy_time = "30s"
-      healthy_deadline = "3m"
-      auto_revert = true
-    }
-
-    volume "media" {
-      type = "host"
-      source = "media"
-      read_only = false
-    }
-
-    task "worker" {
-      driver = "docker"
-
-      volume_mount {
-        volume      = "media"
-        destination = "/var/download"
-        read_only = false
-      }
-
-      config {
-        image = "registry.caldwell.digital/home/torsearch-worker:${var.image_tag}"
-        args = [
-          "-vv"
-        ]
-      }
-
-      service {
-        name = "torsearch-worker"
-        provider = "nomad"
-      }
-    }
-  }
-
-  group "scheduler" {
-    count = 1
-
-    update {
-      max_parallel     = 2
-      min_healthy_time = "30s"
-      healthy_deadline = "3m"
-      auto_revert = true
-    }
-
-    volume "media" {
-      type = "host"
-      source = "media"
-      read_only = false
-    }
-
-    task "scheduler" {
-      driver = "docker"
-
-      volume_mount {
-        volume      = "media"
-        destination = "/var/download"
-        read_only = false
-      }
-
-      config {
-        image = "registry.caldwell.digital/home/torsearch-scheduler:${var.image_tag}"
-        args = [
-          "-vv"
-        ]
-      }
-
-      service {
-        name = "torsearch-scheduler"
-        provider = "nomad"
-      }
-    }
-  }
-}

src/Base/Config/AppConfig.php

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

src/Base/Config/Auth/OidcConfig.php

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

src/Base/Config/AuthConfig.php

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

src/Base/Config/ConfigInterface.php

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

src/Base/Config/SmtpConfig.php

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

src/Base/ConfigResolver.php

@@ -1,81 +0,0 @@
-<?php
-
-namespace App\Base;
-
-use App\Base\Config\AppConfig;
-use App\Base\Config\AuthConfig;
-use App\Base\Config\SmtpConfig;
-use Psr\Log\LoggerInterface;
-use Symfony\Contracts\Cache\TagAwareCacheInterface;
-
-final class ConfigResolver
-{
-    private array $messages = [];
-
-    public function __construct(
-        private readonly LoggerInterface $logger,
-        private readonly TagAwareCacheInterface $cache,
-        private readonly AuthConfig $authConfig,
-        private readonly SmtpConfig $smtpConfig,
-        private readonly AppConfig $appConfig,
-    ) {}
-
-    public function validate(): bool
-    {
-        if ("prod" === strtolower($this->appConfig->getAppEnv())) {
-            return $this->cache->get('app.valid_config', function () {
-                return $this->doValidate();
-            });
-        } else {
-            return $this->doValidate();
-        }
-    }
-
-    private function doValidate(): bool
-    {
-        $valid = true;
-
-        if (false === $this->appConfig->isValid()) {
-            $this->messages += $this->appConfig->getMessages();
-            $valid = false;
-        }
-
-        if (false === $this->authConfig->isValid()) {
-            $this->messages += $this->authConfig->getMessages();
-            $valid = false;
-        }
-
-        if (false === $this->smtpConfig->isValid()) {
-            $this->messages += $this->smtpConfig->getMessages();
-            $valid = false;
-        }
-
-        if (false === $valid) {
-            foreach ($this->messages as $message) {
-                $this->logger->error('> [ConfigResolver] ' . $message);
-            }
-        }
-
-        return $valid;
-    }
-
-    public function getMessages(): array
-    {
-        return $this->messages;
-    }
-
-    public function getAuthConfig(): AuthConfig
-    {
-        return $this->authConfig;
-    }
-
-    public function authIs(string $method): bool
-    {
-        return $this->authConfig->isMethod($method);
-    }
-
-    public function getAuthMethod(): string
-    {
-        return $this->authConfig->getAuthMethod();
-    }
-}

src/Base/Framework/Command/UserResetPasswordCommand.php

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

src/Base/Framework/Controller/AlertController.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Base\Framework\Controller;
-
-use App\Base\Service\Broadcaster;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Attribute\Route;
-
-final class AlertController extends AbstractController
-{
-    public function __construct(
-        private readonly Broadcaster $broadcaster,
-    ) {}
-
-    #[Route('/alert', name: 'app_alert')]
-    public function index(): Response
-    {
-        $this->broadcaster->alert(
-            'Added to queue',
-            'This is a testy test!'
-        );
-
-        return $this->json([
-            'Success' => 'Published'
-        ]);
-    }
-}

src/Base/Framework/Controller/IndexController.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Base\Framework\Controller;
-
-use App\Monitor\Action\Handler\MonitorTvShowHandler;
-use App\Tmdb\Tmdb;
-use App\User\Framework\Entity\User;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Mailer\MailerInterface;
-use Symfony\Component\Mime\Email;
-use Symfony\Component\Routing\Attribute\Route;
-
-final class IndexController extends AbstractController
-{
-    public function __construct(
-        private readonly Tmdb $tmdb,
-        private readonly MonitorTvShowHandler $monitorTvShowHandler,
-    ) {}
-
-    #[Route('/', name: 'app_index')]
-    public function index(Request $request): Response
-    {
-        /** @var User $user */
-        $user = $this->getUser();
-        return $this->render('index/index.html.twig', [
-            'active_downloads' => $this->getUser()->getActiveDownloads(),
-            'recent_downloads' => $this->getUser()->getDownloads(),
-            'popular_movies' => $this->tmdb->popularMovies(1, 6),
-            '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/Framework/EventListener/KernelRequestValidateConfig.php

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

src/Base/Service/Broadcaster.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Base\Service;
-
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
-use Twig\Environment;
-
-readonly class Broadcaster
-{
-    public function __construct(
-        #[Autowire(service: 'twig')]
-        private Environment $renderer,
-        private HubInterface $hub,
-        private RequestStack $requestStack,
-    ) {
-    }
-
-    public function alert(string $title, string $message, string $type = "success"): void
-    {
-        $userAlertTopic = $this->requestStack->getCurrentRequest()->getSession()->get('mercure_alert_topic');
-        $update = new Update(
-            $userAlertTopic,
-            $this->renderer->render('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => $title,
-                'message' => $message,
-                'type' => $type,
-            ])
-        );
-        $this->hub->publish($update);
-    }
-
-    public function systemAlert(string $title, string $message, string $type = "warning"): void
-    {
-        $update = new Update(
-            'system_alerts',
-            $this->renderer->render('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => $title,
-                'message' => $message,
-                'type' => $type,
-            ])
-        );
-        $this->hub->publish($update);
-    }
-}

src/Base/Util/EpisodeId.php

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

src/Command/ConfigSetCommand.php

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

src/Command/SeedDatabaseCommand.php

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

src/Command/StartupStatusCommand.php

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

src/Controller/AlertController.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Mercure\HubInterface;
+use Symfony\Component\Mercure\Update;
+use Symfony\Component\Routing\Attribute\Route;
+use Twig\Environment;
+
+final class AlertController extends AbstractController
+{
+    public function __construct(
+        #[Autowire(service: 'twig')] private readonly Environment $renderer,
+        private readonly HubInterface $hub,
+    ) {}
+
+    #[Route('/alert', name: 'app_alert')]
+    public function index(): Response
+    {
+        $update = new Update(
+            'alerts',
+            $this->renderer->render('Alert.stream.html.twig', [
+                'alert_id' => 1,
+                'title' => 'Added to queue',
+                'message' => 'This is a testy test!',
+            ])
+        );
+
+        $this->hub->publish($update);
+        return $this->json([
+            'Success' => 'Published'
+        ]);
+    }
+}

src/Controller/IndexController.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Controller;
+
+use App\Download\Framework\Repository\DownloadRepository;
+use App\Tmdb\Tmdb;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+
+final class IndexController extends AbstractController
+{
+    public function __construct(
+        private readonly DownloadRepository $downloadRepository,
+        private readonly Tmdb $tmdb,
+    ) {}
+
+    #[Route('/', name: 'app_index')]
+    public function index(Request $request): Response
+    {
+        $request->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
+
+        return $this->render('index/index.html.twig', [
+            'active_downloads' => $this->getUser()->getActiveDownloads(),
+            'recent_downloads' => $this->getUser()->getDownloads(),
+            'popular_movies' => $this->tmdb->popularMovies(1, 6),
+            'popular_tvshows' => $this->tmdb->popularTvShows(1, 6),
+        ]);
+    }
+}

src/Controller/SearchController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Search\Framework\Controller;
+namespace App\Controller;
 
 use App\Search\Action\Handler\GetMediaInfoHandler;
 use App\Search\Action\Handler\SearchHandler;
@@ -14,7 +14,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
-final class WebController extends AbstractController
+final class SearchController extends AbstractController
 {
     public function __construct(
         private SearchHandler $searchHandler,
@@ -33,12 +33,12 @@ final class WebController extends AbstractController
         ]);
     }
 
-    #[Route('/result/{mediaType}/{imdbId}/{season}', name: 'app_search_result')]
+    #[Route('/result/{mediaType}/{tmdbId}', name: 'app_search_result')]
     public function result(
         GetMediaInfoInput $input,
-        ?int $season = null,
     ): Response {
         $result = $this->getMediaInfoHandler->handle($input->toCommand());
+        $this->warmDownloadOptionCache($result->media);
 
         return $this->render('search/result.html.twig', [
             'results' => $result,

src/Controller/TorrentioController.php

@@ -1,27 +1,28 @@
 <?php
 
-namespace App\Torrentio\Framework\Controller;
+namespace App\Controller;
 
-use App\Base\Service\Broadcaster;
 use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\Torrentio\Action\Input\GetMovieOptionsInput;
 use App\Torrentio\Action\Input\GetTvShowOptionsInput;
-use App\Torrentio\Exception\TorrentioRateLimitException;
 use Carbon\Carbon;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Mercure\HubInterface;
+use Symfony\Component\Mercure\Update;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 
-final class WebController extends AbstractController
+final class TorrentioController extends AbstractController
 {
     public function __construct(
         private readonly GetMovieOptionsHandler $getMovieOptionsHandler,
         private readonly GetTvShowOptionsHandler $getTvShowOptionsHandler,
-        private readonly Broadcaster $broadcaster,
+        private readonly HubInterface $hub,
+        private readonly \Twig\Environment $renderer,
     ) {}
 
     #[Route('/torrentio/movies/{tmdbId}/{imdbId}', name: 'app_torrentio_movies')]
@@ -53,24 +54,13 @@ final class WebController extends AbstractController
             $input->episode,
         );
 
-        try {
+        return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
-//            return $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());
-                $results = $this->getTvShowOptionsHandler->handle($input->toCommand());
+            return $this->render('torrentio/tvshows.html.twig', [
-                return $this->render('torrentio/tvshows.html.twig', [
+                'results' => $results,
-                    'results' => $results,
+            ]);
-                ]);
+        });
-//            });
-        } catch (TorrentioRateLimitException $exception) {
-            $this->broadcaster->alert('Warning', 'Torrentio has rate limited your requests. Please wait a few minutes before trying again.', 'warning');
-            return $this->render('bare.html.twig',
-                [],
-                new Response('Too many requests',
-                    Response::HTTP_TOO_MANY_REQUESTS,
-                    ['Retry-After' => 4000]
-                )
-            );
-        }
     }
 
     #[Route('/torrentio/tvshows/clear/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_clear_torrentio_tvshows')]
@@ -85,10 +75,14 @@ final class WebController extends AbstractController
         );
         $cache->delete($cacheId);
 
-        $this->broadcaster->alert(
+        $this->hub->publish(new Update(
-            title: 'Success',
+            $request->getSession()->get('mercure_alert_topic'),
-            message: 'Torrentio cache Cleared.'
+            $this->renderer->render('Alert.stream.html.twig', [
-        );
+                'alert_id' => uniqid(),
+                'title' => 'Success',
+                'message' => 'Torrentio cache Cleared.',
+            ])
+        ));
 
         return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));

src/Download/Action/Command/DeleteDownloadCommand.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Download\Action\Command;
-
-use OneToMany\RichBundle\Contract\CommandInterface;
-
-/**
- * @implements CommandInterface<DeleteDownloadCommand>
- */
-class DeleteDownloadCommand implements CommandInterface
-{
-    public function __construct(
-        public int $downloadId,
-    ) {}
-}

src/Download/Action/Command/DownloadSeasonCommand.php

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

src/Download/Action/Command/PauseDownloadCommand.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Download\Action\Command;
-
-use OneToMany\RichBundle\Contract\CommandInterface;
-
-/**
- * @implements CommandInterface<PauseDownloadCommand>
- */
-class PauseDownloadCommand implements CommandInterface
-{
-    public function __construct(
-        public int $downloadId,
-    ) {}
-}

src/Download/Action/Command/ResumeDownloadCommand.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Download\Action\Command;
-
-use OneToMany\RichBundle\Contract\CommandInterface;
-
-/**
- * @implements CommandInterface<ResumeDownloadCommand>
- */
-class ResumeDownloadCommand implements CommandInterface
-{
-    public function __construct(
-        public int $downloadId,
-    ) {}
-}

src/Download/Action/Handler/DeleteDownloadHandler.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Download\Action\Handler;
-
-use App\Download\Action\Command\DeleteDownloadCommand;
-use App\Download\Action\Result\DeleteDownloadResult;
-use App\Download\Framework\Repository\DownloadRepository;
-use OneToMany\RichBundle\Contract\CommandInterface;
-use OneToMany\RichBundle\Contract\HandlerInterface;
-use OneToMany\RichBundle\Contract\ResultInterface;
-
-/** @implements HandlerInterface<DeleteDownloadCommand, DeleteDownloadResult> */
-readonly class DeleteDownloadHandler implements HandlerInterface
-{
-    public function __construct(
-        private DownloadRepository $downloadRepository,
-    ) {}
-
-    public function handle(CommandInterface $command): ResultInterface
-    {
-        $download = $this->downloadRepository->find($command->downloadId);
-        $this->downloadRepository->delete($command->downloadId);
-
-        return new DeleteDownloadResult(200, 'Success', $download);
-    }
-}

src/Download/Action/Handler/DownloadMediaHandler.php

@@ -38,9 +38,7 @@ readonly class DownloadMediaHandler implements HandlerInterface
         }
 
         try {
-            if ($download->getStatus() !== 'Paused') {
+            $this->downloadRepository->updateStatus($download->getId(), 'In Progress');
-                $this->downloadRepository->updateStatus($download->getId(), 'In Progress');
-            }
 
             $this->downloader->download(
                 $command->mediaType,
@@ -49,9 +47,7 @@ readonly class DownloadMediaHandler implements HandlerInterface
                 $download->getId()
             );
 
-            if ($download->getStatus() !== 'Paused') {
+            $this->downloadRepository->updateStatus($download->getId(), 'Complete');
-                $this->downloadRepository->updateStatus($download->getId(), 'Complete');
-            }
 
         } catch (\Throwable $exception) {
             throw new UnrecoverableMessageHandlingException($exception->getMessage(), 500);

src/Download/Action/Handler/DownloadSeasonHandler.php

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

src/Download/Action/Handler/PauseDownloadHandler.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Download\Action\Handler;
-
-use App\Download\Action\Command\PauseDownloadCommand;
-use App\Download\Action\Result\PauseDownloadResult;
-use App\Download\Framework\Entity\Download;
-use App\Download\Framework\Repository\DownloadRepository;
-use OneToMany\RichBundle\Contract\CommandInterface;
-use OneToMany\RichBundle\Contract\HandlerInterface;
-use OneToMany\RichBundle\Contract\ResultInterface;
-use Symfony\Contracts\Cache\CacheInterface;
-
-/** @implements HandlerInterface<PauseDownloadCommand, PauseDownloadResult> */
-readonly class PauseDownloadHandler implements HandlerInterface
-{
-    public function __construct(
-        private DownloadRepository $downloadRepository,
-        private CacheInterface $cache,
-    ) {}
-
-    public function handle(CommandInterface $command): ResultInterface
-    {
-        /** @var Download $download */
-        $download = $this->downloadRepository->find($command->downloadId);
-
-        $this->cache->get('download.pause.' . $download->getId(), function () {
-            return true;
-        });
-
-        return new PauseDownloadResult(200, 'Success', $download);
-    }
-}

src/Download/Action/Handler/ResumeDownloadHandler.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Download\Action\Handler;
-
-use App\Download\Action\Command\DownloadMediaCommand;
-use App\Download\Action\Command\ResumeDownloadCommand;
-use App\Download\Action\Result\ResumeDownloadResult;
-use App\Download\Framework\Entity\Download;
-use App\Download\Framework\Repository\DownloadRepository;
-use OneToMany\RichBundle\Contract\CommandInterface;
-use OneToMany\RichBundle\Contract\HandlerInterface;
-use OneToMany\RichBundle\Contract\ResultInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
-
-/** @implements HandlerInterface<ResumeDownloadCommand, ResumeDownloadResult> */
-readonly class ResumeDownloadHandler implements HandlerInterface
-{
-    public function __construct(
-        private DownloadRepository $downloadRepository,
-        private MessageBusInterface $messageBus,
-    ) {}
-
-    public function handle(CommandInterface $command): ResultInterface
-    {
-        /** @var Download $download */
-        $download = $this->downloadRepository->find($command->downloadId);
-
-        $this->messageBus->dispatch(new DownloadMediaCommand(
-            $download->getUrl(),
-            $download->getTitle(),
-            $download->getFilename(),
-            $download->getMediaType(),
-            $download->getImdbId(),
-            $download->getUser()->getId(),
-            $download->getId()
-        ));
-
-        return new ResumeDownloadResult(200, 'Success', $download);
-    }
-}

src/Download/Action/Input/DeleteDownloadInput.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Download\Action\Input;
-
-use App\Download\Action\Command\DeleteDownloadCommand;
-use OneToMany\RichBundle\Attribute\SourceRoute;
-use OneToMany\RichBundle\Contract\CommandInterface;
-use OneToMany\RichBundle\Contract\InputInterface;
-
-/** @implements InputInterface<DeleteDownloadInput> */
-class DeleteDownloadInput implements InputInterface
-{
-    public function __construct(
-        #[SourceRoute('downloadId')]
-        public int $downloadId,
-    ) {}
-
-    public function toCommand(): CommandInterface
-    {
-        return new DeleteDownloadCommand(
-            $this->downloadId,
-        );
-    }
-}

src/Download/Action/Input/DownloadMediaInput.php

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

src/Download/Action/Input/DownloadSeasonInput.php

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