wip: imports hlsjs

.env

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

.env.test

@@ -1,3 +0,0 @@
-# define your env variables for the test env here
-KERNEL_CLASS='App\Kernel'
-APP_SECRET='$ecretf0rt3st'

.gitignore

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

assets/app.js

@@ -1,4 +1,5 @@
 import './bootstrap.js';
+import Hls from "./vendor/hls.js/hls.js.index.js";
 /*
  * Welcome to your app's main JavaScript file!
  *
@@ -6,7 +7,6 @@ import './bootstrap.js';
  * which should already be in your base.html.twig.
  */
 import './styles/app.css';
-import PullToRefresh from 'pulltorefreshjs';
 
 console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉');
 
@@ -19,10 +19,29 @@ var observer = new MutationObserver(function(mutations) {
 
 observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
 
-const ptr = PullToRefresh.init({
+document.addEventListener("DOMContentLoaded", () => {
-    mainElement: 'body',
+    const videoUrl = "http://127.0.0.1:11470/hlsv2/2b76fe2ec12c83d264076fb859923c5d/master.m3u8?mediaURL=https%3A%2F%2Ftorrentio.strem.fun%2Frealdebrid%2FQYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ%2F6bf1938db882f6fcbb0dafa6e7326230e7f4eae0%2Fnull%2F3%2FSurvivor.S48E01.1080p.HEVC.x265-MeGusta.mkv%26videoCodecs%3Dh264%26videoCodecs%3Dh265%26videoCodecs%3Dhevc%26videoCodecs%3Dvp9%26audioCodecs%3Daac%26audioCodecs%3Dmp3%26audioCodecs%3Dopus%26maxAudioChannels%3D2";
-    onRefresh() {
+
-        window.location.reload();
+    var video = document.getElementById('video');
-    }
+    if (Hls.isSupported()) {
-});
+        var hls = new Hls({
+            debug: true,
+        });
+        hls.loadSource(videoUrl);
+        hls.attachMedia(video);
+        hls.on(Hls.Events.MEDIA_ATTACHED, function () {
+            video.muted = true;
+            video.play();
+        });
+    }
+        // hls.js is not supported on platforms that do not have Media Source Extensions (MSE) enabled.
+        // When the browser has built-in HLS support (check using `canPlayType`), we can provide an HLS manifest (i.e. .m3u8 URL) directly to the video element through the `src` property.
+// This is using the built-in support of the plain video element, without using hls.js.
+    else if (video.canPlayType('application/vnd.apple.mpegurl')) {
+        video.src = videoUrl;
+        video.addEventListener('canplay', function () {
+            video.play();
+        });
+    }
+})
 

assets/bootstrap.js

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

assets/components/download-list-row.js

@@ -1,111 +0,0 @@
-export default class DownloadListRow extends HTMLTableRowElement {
-    constructor() {
-        super();
-        this.downloadId = this.getAttribute('download-id');
-        this.imdbId = this.getAttribute('imdb-id');
-        this.mediaTitle = this.getAttribute('media-title');
-        this.url = this.getAttribute('url');
-        this.filename = this.getAttribute('filename');
-        this.status = this.getAttribute('status');
-        this.progress = this.getAttribute('progress');
-        this.mediaType = this.getAttribute('media-type');
-        this.episodeId = this.getAttribute('episode-id');
-        this.createdAt = this.getAttribute('created-at');
-        this.updatedAt = this.getAttribute('updated-at');
-
-        // this.previewContent = this.previewContent.bind(this);
-    }
-
-    static get observedAttributes() {
-        return ['download-id', 'imdb-id', 'media-title', 'url', 'filename', 'status', 'progress', 'media-type', 'episode-id', 'created-at', 'updated-at'];
-    }
-
-    attributeChangedCallback(name, oldValue, newValue) {
-        if (oldValue !== newValue) {
-            this[name] = newValue;
-            this.setAttribute(name, newValue);
-            this.setPreviewContent();
-        }
-    }
-
-    setPreviewContent() {
-        this.previewContent = `
-        <table class="table-auto flex flex-row">
-            <thead>
-                <tr class="flex flex-col">
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">ID</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">IMDB ID</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Title</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">URL</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Filename</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Status</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Progress</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Media Type</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Episode ID</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Created At</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Updated At</div>
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr class="flex flex-col">
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('download-id') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('imdb-id') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('media-title') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('url') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('filename') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('status') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('progress') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('media-type') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('episode-id') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('created-at') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('updated-at') ?? "-"}</div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-        `;
-    }
-}

assets/components/download-option-tr.js

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

assets/components/episode-container.js

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

assets/components/monitor-list-row.js

@@ -1,115 +0,0 @@
-export default class MonitorListRow extends HTMLTableRowElement {
-    constructor() {
-        super();
-        this.downloadId = this.getAttribute('monitor-id');
-        this.imdbId = this.getAttribute('imdb-id');
-        this.mediaTitle = this.getAttribute('media-title');
-        this.url = this.getAttribute('url');
-        this.filename = this.getAttribute('filename');
-        this.status = this.getAttribute('status');
-        this.progress = this.getAttribute('progress');
-        this.mediaType = this.getAttribute('media-type');
-        this.episodeId = this.getAttribute('episode-id');
-        this.createdAt = this.getAttribute('created-at');
-        this.updatedAt = this.getAttribute('updated-at');
-    }
-
-    static get observedAttributes() {
-        return ['download-id', 'imdb-id', 'media-title', 'url', 'filename', 'status', 'progress', 'media-type', 'episode-id', 'created-at', 'updated-at'];
-    }
-
-    attributeChangedCallback(name, oldValue, newValue) {
-        if (oldValue !== newValue) {
-            this[name] = newValue;
-            this.setAttribute(name, newValue);
-            this.setPreviewContent();
-        }
-    }
-
-    setPreviewContent() {
-        this.previewContent = `
-        <table class="table-auto flex flex-row">
-            <thead>
-                <tr class="flex flex-col">
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">ID</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">IMDB ID</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Title</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Season</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Episode</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Status</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Search Count</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Media Type</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Episode ID</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Created At</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Updated At</div>
-                    </th>
-                    <th class="px-4 py-2">
-                      <div class="dark:text-orange-500 text-right whitespace-nowrap ">Downloaded At</div>
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr class="flex flex-col">
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('monitor-id') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('imdb-id') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('media-title') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('season') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('episode') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('status') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('search-count') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('media-type') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('episode-id') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('created-at') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('last-search') ?? "-"}</div>
-                    </td>
-                    <td class="px-4 py-2">
-                      <div class="text-left dark:text-white whitespace-nowrap font-normal">${this.getAttribute('downloaded-at') ?? "-"}</div>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-        `;
-    }
-}

assets/components/movie-container.js

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

assets/components/preview-content-dialog.js

@@ -1,35 +0,0 @@
-export default class PreviewContentDialog extends HTMLDialogElement {
-    #headingEl;
-    #contentEl;
-    #closeBtnEl;
-
-    constructor() {
-        super();
-        this.#headingEl = this.querySelector('.modal-heading');
-        this.#contentEl = this.querySelector('.modal-content');
-        this.#closeBtnEl = this.querySelector('.modal-close');
-
-        this.setHeading = this.setHeading.bind(this);
-        this.setContent = this.setContent.bind(this);
-
-        this.#closeBtnEl.addEventListener('click', () => this.close());
-        document.addEventListener('hidePreviewContentModal', () => this.close());
-        document.addEventListener('showPreviewContentModal',  (event) => {
-            this.display(event.detail);
-        });
-    }
-
-    setHeading(heading) {
-        this.#headingEl.innerHTML = heading;
-    }
-
-    setContent(content) {
-        this.#contentEl.innerHTML = content;
-    }
-
-    display({ heading, content }) {
-        this.setHeading(heading);
-        this.setContent(content);
-        this.showModal();
-    }
-}

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

@@ -7,7 +7,7 @@ import { getComponent } from '@symfony/ux-live-component';
 
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
-    static targets = ['download', 'deleteFileInput']
+    static targets = ['download']
 
     async initialize() {
         this.component = await getComponent(this.element);
@@ -20,43 +20,13 @@ export default class extends Controller {
         // 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)
-        // this.element.addEventListener('click', (event) => {
-        //     let previewContentModal = document.querySelector('#previewContentModal');
-        //     // previewContentModal.setHeading(event.target.dataset['title']);
-        //     // previewContentModal.setContent('<p>Testing this here thingy-ma-bob!</p>');
-        //     // previewContentModal.showModal();
-        //     let content, heading = ""
-        //     if (event.target.tagName !== "TR") {
-        //         content = event.target.parentElement.previewContent();
-        //         heading = event.target.parentElement.mediaTitle;
-        //     } else {
-        //         content = event.target.previewContent();
-        //         heading = event.target.mediaTitle;
-        //     }
-        //
-        //     document.dispatchEvent(new CustomEvent('showPreviewContentModal', {detail: {heading: heading, content: content}}))
-        // })
     }
 
     downloadTargetConnected(target) {
         let downloads = this.element.querySelectorAll('tbody tr');
-
+        if (downloads.length > 5) {
-        downloads.forEach(download => {
+            target.classList.add('hidden');
-            download.addEventListener('click', (event) => {
+        }
-                let content, heading = ""
-                if (event.target.tagName !== "TR") {
-                    content = event.target.parentElement.previewContent;
-                    heading = "Download # " + event.target.parentElement.downloadId + " - \"" + event.target.parentElement.mediaTitle + "\"";
-                } else {
-                    content = event.target.previewContent;
-                    heading = "Download # " + event.target.downloadId + " - \"" + event.target.mediaTitle + "\"";
-                }
-
-                if (null !== content && undefined !== content && "" !== content) {
-                    document.dispatchEvent(new CustomEvent('showPreviewContentModal', {detail: {heading: heading, content: content}}))
-                }
-            })
-        })
     }
 
     pauseDownload(data) {
@@ -72,8 +42,7 @@ export default class extends Controller {
     }
 
     deleteDownload(data) {
-        const deleteFileInput = document.querySelector(`#delete_file_${data.params.id}`)
+        fetch(`/api/download/${data.params.id}`, {method: 'DELETE'})
-        fetch(`/api/download/${data.params.id}?deleteFile=${deleteFileInput.checked}`, {method: 'DELETE'})
             .then(res => res.json())
             .then(json => console.debug(json));
     }

assets/controllers/hamburger_controller.js

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

assets/controllers/loading_icon_controller.js

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

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_list_controller.js

@@ -6,29 +6,6 @@ import { Controller } from '@hotwired/stimulus';
 */
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
-    static targets = ['monitorList']
-
-    monitorListTargetConnected(target) {
-        let monitors = this.element.querySelectorAll('tbody tr');
-
-        monitors.forEach(monitor => {
-            monitor.addEventListener('click', (event) => {
-                let content, heading = ""
-                if (event.target.tagName !== "TR") {
-                    content = event.target.parentElement.previewContent;
-                    heading = "Monitor for \"" + event.target.parentElement.mediaTitle+ "\"";
-                } else {
-                    content = event.target.previewContent;
-                    heading = "Monitor for \"" + event.target.mediaTitle + "\"";
-                }
-
-                if (null !== content && undefined !== content && "" !== content) {
-                    document.dispatchEvent(new CustomEvent('showPreviewContentModal', {detail: {heading: heading, content: content}}))
-                }
-            })
-        })
-    }
-
     deleteMonitor(data) {
         fetch(`/api/monitor/${data.params.id}`, {method: 'DELETE'})
             .then(res => res.json())

assets/controllers/movie_results_controller.js

@@ -6,6 +6,9 @@ import { Controller } from '@hotwired/stimulus';
 */
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
+    H264_CODECS = ['h264', 'h.264', 'x264']
+    H265_CODECS = ['h265', 'h.265', 'x265', 'hevc']
+
     static values = {
         title: String,
         tmdbId: String,
@@ -13,22 +16,80 @@ export default class extends Controller {
     };
 
     static targets = ['list']
-    static outlets = ['loading-icon']
 
     options = []
     optionsLoaded = false
-    resultCountEl = null
 
     async connect() {
-        this.resultCountEl = document.querySelector('#movie_results_count');
+        await this.setOptions();
     }
 
-    async listTargetConnected() {
+    async setOptions() {
-        this.optionsLoaded = true;
+        if (false === this.optionsLoaded) {
-        this.options = this.element.querySelectorAll('tbody tr');
+            this.optionsLoaded = true;
-        this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
+            await fetch(`/torrentio/movies/${this.tmdbIdValue}/${this.imdbIdValue}`)
-        this.resultCountEl.innerText = this.options.length;
+                .then(res => res.text())
-        this.loadingIconOutlet.toggleIcon();
+                .then(response => {
-        document.dispatchEvent(new CustomEvent('optionsLoaded', {detail: {options: this.options}}));
+                    this.element.innerHTML = response;
+                    this.options = this.element.querySelectorAll('tbody tr');
+                    this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
+                });
+        }
+    }
+
+    // Keeps compatible with Filter & TV Shows
+    isActive() {
+        return true;
+    }
+
+    async filter(activeFilter) {
+        let firstIncluded = true;
+        let count = 0;
+        let selectedCount = 0;
+
+        this.options.forEach((option) => {
+            const props = {
+                "resolution": option.querySelector('#resolution').textContent.trim(),
+                "codec": option.querySelector('#codec').textContent.trim(),
+                "provider": option.querySelector('#provider').textContent.trim(),
+                "languages": JSON.parse(option.dataset['languages']),
+            }
+
+            let include = true;
+            option.classList.remove('hidden');
+            option.querySelector('input[type="checkbox"]').checked = false;
+
+            for (let [key, value] of Object.entries(activeFilter)) {
+                if (value === "" || key === "season") {
+                    continue;
+                }
+                if (key === "codec" && value === "h264") {
+                    if (!this.H264_CODECS.includes(props[key].toLowerCase())) {
+                        include = false;
+                    }
+                } else if (key === "codec" && value === "h265") {
+                    if (!this.H265_CODECS.includes(props[key].toLowerCase())) {
+                        include = false;
+                    }
+                } else if (key === "language") {
+                    if (!props["languages"].includes(value)) {
+                        include = false;
+                    }
+                } else if (props[key] !== value) {
+                    include = false;
+                }
+            }
+
+            if (false === include) {
+                option.classList.add('hidden');
+            } else if (true === firstIncluded) {
+                count = 1;
+                selectedCount = selectedCount + 1;
+                option.querySelector('input[type="checkbox"]').checked = true;
+                firstIncluded = false;
+            } else {
+                count = count + 1;
+            }
+        });
     }
 }

assets/controllers/navbar_controller.js

@@ -10,22 +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('animate__slideInLeft');
-        this.element.classList.toggle('fixed');
-        this.element.classList.toggle('z-20');
     }
 }

assets/controllers/result_filter_controller.js

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

assets/controllers/search_bar_controller.js

@@ -1,64 +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}`
-        }
-        document.querySelector("#search-button").addEventListener('click', (event) => {
-            event.preventDefault();
-            const autocompleteController = this.application.getControllerForElementAndIdentifier(this.element, 'symfony--ux-autocomplete--autocomplete')
-            window.location.href = `/search?term=${autocompleteController.tomSelect.lastQuery}`
-        });
-        this.element.addEventListener('autocomplete:pre-connect', this._onPreConnect);
-        this.element.addEventListener('autocomplete:connect', this._onConnect);
-    }
-
-    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

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

assets/controllers/tv_results_controller.js

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

assets/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/icons/zondicons/checkmark.svg

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

assets/styles/app.css

@@ -23,7 +23,7 @@
         @apply bg-green-950 hover:bg-green-900 border-green-500
     }
     .alert-warning {
-        @apply bg-yellow-500 hover:bg-yellow-600 border-yellow-400 text-black
+        @apply bg-yellow-500/70 hover:bg-yellow-600 border-yellow-400 text-black
     }
 }
 
@@ -55,10 +55,6 @@ dialog {
     }
 }
 
-dialog[open] {
-    animation: fade-in 100ms ease-in forwards;
-}
-
 /* Add animations */
 dialog[data-dialog-target="dialog"][open] {
     animation: fade-in 200ms forwards;
@@ -67,129 +63,3 @@ dialog[data-dialog-target="dialog"][open] {
 dialog[data-dialog-target="dialog"][closing] {
     animation: fade-out 200ms forwards;
 }
-
-.text-input {
-    @apply bg-gray-50 text-gray-50 px-2 py-1 bg-transparent border-b-2 border-orange-400
-}
-
-.text-input[multiple="multiple"] {
-    @apply bg-transparent backdrop-filter backdrop-blur-md text-white border border-orange-500 rounded-md
-}
-
-.text-input option[checked="checked"],
-.text-input option[checked],
-.text-input option[selected] {
-    @apply bg-orange-500/60
-}
-
-.submit-button {
-    @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 z-20
-}
-
-#search .ts-dropdown .ts-dropdown-content .option.active {
-    background: unset;
-    @apply bg-orange-500/80 text-black font-bold rounded-md
-}
-
-.progress {
-    display: grid;
-    grid-template: 1fr / 1fr;
-    place-items: center;
-}
-.progress > * {
-    grid-column: 1 / 1;
-    grid-row: 1 / 1;
-}
-.progress .background {
-    z-index: 1;
-    place-self: start;
-}
-.progress .number {
-    z-index: 2;
-    background: transparent;
-}
-
-#filter {
-    .ts-wrapper {
-        box-shadow: none !important;
-        padding: 0;
-
-        .ts-control {
-            border: none !important;
-            box-shadow: none !important;
-            @apply bg-orange-500/60 backdrop-filter backdrop-blur-md;
-        }
-
-        .item[data-ts-item] {
-            background-image: none !important;
-            border: none;
-            box-shadow: none;
-            text-shadow: none;
-            @apply bg-orange-500 rounded-ms font-bold text-black;
-        }
-
-        @apply border border-orange-500 bg-transparent rounded-ms;
-    }
-
-    .ts-wrapper.plugin-remove_button:not(.rtl) .item .remove {
-        @apply border-l border-l-orange-600 !important;
-    }
-}
-
-.filter-label {
-    @apply flex flex-col gap-1 justify-between;
-}

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
-}

bin/phpunit

@@ -1,23 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (!ini_get('date.timezone')) {
-    ini_set('date.timezone', 'UTC');
-}
-
-if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
-    if (PHP_VERSION_ID >= 80000) {
-        require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
-    } else {
-        define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
-        require PHPUNIT_COMPOSER_INSTALL;
-        PHPUnit\TextUI\Command::main();
-    }
-} else {
-    if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
-        echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
-        exit(1);
-    }
-
-    require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
-}

compose.yml

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

composer.json

@@ -16,18 +16,15 @@
         "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",
-        "spomky-labs/pwa-bundle": "^1.2",
         "stof/doctrine-extensions-bundle": "^1.14",
         "symfony/asset": "7.3.*",
         "symfony/console": "7.3.*",
@@ -38,29 +35,22 @@
         "symfony/flex": "^2",
         "symfony/form": "7.3.*",
         "symfony/framework-bundle": "7.3.*",
-        "symfony/http-client": "7.3.*",
         "symfony/ldap": "7.3.*",
-        "symfony/mailer": "7.3.*",
         "symfony/mercure-bundle": "^0.3.9",
         "symfony/messenger": "7.3.*",
-        "symfony/notifier": "7.3.*",
-        "symfony/ntfy-notifier": "7.3.*",
         "symfony/runtime": "7.3.*",
         "symfony/scheduler": "7.3.*",
         "symfony/security-bundle": "7.3.*",
         "symfony/stimulus-bundle": "^2.24",
         "symfony/twig-bundle": "7.3.*",
-        "symfony/ux-autocomplete": "^2.27",
         "symfony/ux-icons": "^2.24",
         "symfony/ux-live-component": "^2.24",
         "symfony/ux-turbo": "^2.24",
         "symfony/ux-twig-component": "^2.24",
         "symfony/yaml": "7.3.*",
-        "symfonycasts/reset-password-bundle": "^1.23",
         "symfonycasts/tailwind-bundle": "^0.10.0",
         "twig/extra-bundle": "^2.12|^3.0",
-        "twig/twig": "^2.12|^3.0",
+        "twig/twig": "^2.12|^3.0"
-        "web-token/jwt-library": "^4.0"
     },
     "config": {
         "allow-plugins": {
@@ -106,7 +96,6 @@
         "post-update-cmd": [
             "@auto-scripts"
         ],
-        "tail": "docker compose exec app ./bin/console tailwind:build --watch",
         "sym": "docker compose exec app ./bin/console"
     },
     "conflict": {
@@ -120,7 +109,6 @@
     },
     "require-dev": {
         "phpstan/phpstan": "^2.1",
-        "phpunit/phpunit": "^12.3",
         "symfony/maker-bundle": "^1.62",
         "symfony/stopwatch": "7.3.*",
         "symfony/web-profiler-bundle": "7.3.*"

config/bundles.php

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

config/packages/doctrine.yaml

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

config/packages/drenso_oidc.yaml

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

config/packages/mailer.yaml

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

config/packages/messenger.yaml

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

config/packages/notifier.yaml

@@ -1,13 +0,0 @@
-framework:
-    notifier:
-        chatter_transports:
-        texter_transports:
-            ntfy: '%notification.ntfy.dsn%'
-        channel_policy:
-            # use chat/slack, chat/telegram, sms/twilio or sms/nexmo
-            urgent: ['email']
-            high: ['email']
-            medium: ['email']
-            low: ['email']
-        admin_recipients:
-            - { email: admin@example.com }

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

@@ -1,23 +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' ]
-
-controllersLibrary:
-    resource:
-        path: ../src/Library/Framework/Controller/
-        namespace: App\Library\Framework\Controller
-    type: attribute
-    defaults:
-        schemes: [ 'https' ]
-
-controllersSearch:
-    resource:
-        path: ../src/Search/Framework/Controller/
-        namespace: App\Search\Framework\Controller
     type: attribute
     defaults:
         schemes: [ 'https' ]
@@ -45,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,16 +4,6 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
-    # App
-    app.url: '%env(APP_URL)%'
-    app.version: '%env(default:app.default.version:APP_VERSION)%'
-
-    # Debrid Services
-    app.debrid.real_debrid.key: '%env(REAL_DEBRID_KEY)%'
-
-    # TMDB Key
-    app.meta_provider.tmdb.key: '%env(TMDB_API)%'
-
     # Media
     media.base_path: '/var/download'
     media.default_movies_dir: movies
@@ -35,18 +25,7 @@ parameters:
     app.default.version: '0.dev'
     app.default.timezone: 'America/Chicago'
 
-    # Auth
+    app.version: '%env(default:app.default.version:APP_VERSION)%'
-    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)%'
-
-    # Notifications
-    notification.transport: '%env(NOTIFICATION_TRANSPORT)%'
-    notification.ntfy.dsn: '%env(NTFY_DSN)%'
 
 services:
     # default configuration for services in *this* file

deploy.compose.yml

@@ -6,6 +6,7 @@ services:
     environment:
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
       MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+    tty: true
     deploy:
       replicas: 2
     volumes:
@@ -15,10 +16,6 @@ services:
       - mercure_config:/config
     depends_on:
       - database
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "tcp://192.168.1.197:12202"
 
 
   worker:
@@ -32,10 +29,6 @@ services:
       replicas: 2
     depends_on:
       - app
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "tcp://192.168.1.197:12203"
 
 
   scheduler:
@@ -47,11 +40,6 @@ services:
     command: -vv
     depends_on:
       - app
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "tcp://192.168.1.197:12204"
-
 
 
   redis:

docs/examples/.env

@@ -3,15 +3,10 @@
 # or pass your certificates into the 'app' container.
 # Please omit any trailing slashes. The APP_URL is
 # used to generate the Mercure URL behind the scenes.
-APP_URL="https://dev.caldwell.digital"
+APP_URL="https://torsearch.idocode.io"
 APP_SECRET="70169beadfbc8101c393cbfbba27a313"
 APP_ENV=prod
 
-# Mercure is a Caddy module built into the webserver
-# that facilitates the usage of websockets to transmit
-# real time data (download progress, etc.)
-MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
-
 # Use the DATABASE_URL below to use the MariaDB container
 # provided in the example.compose.yml file, or remove this
 # line and fill in the details of your own MySQL/MariaDB server
@@ -24,48 +19,39 @@ DATABASE_URL="mysql://root:password@database:3306/app?serverVersion=10.6.19.2-Ma
 # This key is never saved anywhere
 # else and is passed to Torrentio
 # to retrieve download options
-REAL_DEBRID_KEY=""
+#REAL_DEBRID_KEY=""
 
-# Enter your TMDB API key
+# Enter you TMDB API key
 # This is used to provide rich search results
 # when searching for media and rendering the
 # Popular Movies and TV Shows section.
-TMDB_API=""
+#TMDB_API=
+
+REAL_DEBRID_KEY="QYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ"
+TMDB_API=eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiI0ZTJjYjJhOGUzOGJhNjdiNjVhOGU1NGM0ZWI1MzhmOCIsIm5iZiI6MTczNzkyNjA0NC41NjQsInN1YiI6IjY3OTZhNTljYzdiMDFiNzJjNzIzZWM5YiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.e8DbNe9qrSBC1y-ANRv-VWBAtls-ZS2r7aNCiI68mpw
+
+
+MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
 
 # Use your own Redis instance or use the
 # below value to use the container included
 # in the example compose.yml file.
 REDIS_HOST="redis://redis"
 
-### Auth ###
-# Change to "oidc" to and provide the required
-# environment variables below to use OIDC auth.
-AUTH_METHOD=form_login
-
-# OIDC
-OIDC_WELL_KNOWN_URL=
-OIDC_CLIENT_ID=
-OIDC_CLIENT_SECRET=
-# Allows you to skip the login page and directly
-# rely on your IdP for auth.
-OIDC_BYPASS_FORM_LOGIN=
-
-
 # LDAP Config: To use LDAP, enter the below fields
 # and run 'php bin/console config:set auth.method ldap'
-# (LDAP is still in progress and not ready for use)
+LDAP_HOST=
-#LDAP_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: -vvv
-      TZ: America/Chicago
-    command: -vv --time-limit=3600 --limit=10
     env_file:
       - .env
     restart: always
@@ -46,18 +43,35 @@ services:
   scheduler:
     image: code.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
-      - ./downloads/movies:/var/download/movies
+      - ./downloads:/var/download
-      - ./downloads/tvshows:/var/download/tvshows
     env_file:
       - .env
-    command: -vv
-    environment:
-      TZ: America/Chicago
     restart: always
     depends_on:
       app:
         condition: service_healthy
 
+  # This container facilitates viewing the progress of downloads
+  # in realtime. It also handles sending alerts and notifications.
+  # The MERCURE_PUBLISHER_JWT key & MERCURE_SUBSCRIBER_JWT_KEY should
+  # match the MERCURE_JWT_SECRET environment variable.
+  mercure:
+    image: dunglas/mercure
+    restart: unless-stopped
+    ports:
+      - "3001:80"
+    environment:
+      SERVER_NAME: ':80'
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_EXTRA_DIRECTIVES: |
+        cors_origins *
+        anonymous
+    command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
+    volumes:
+      - mercure_data:/data
+      - mercure_config:/config
+
   database:
     image: mariadb:10.11.2
     volumes:

importmap.php

@@ -40,34 +40,7 @@ return [
     'stimulus-use' => [
         'version' => '0.52.2',
     ],
-    'animate.css' => [
+    'hls.js' => [
-        'version' => '4.1.1',
+        'version' => '1.6.5',
-    ],
-    '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',
-    ],
-    'pulltorefreshjs' => [
-        'version' => '0.1.22',
-    ],
-    '@ungap/custom-elements' => [
-        'version' => '1.3.0',
     ],
 ];

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);
-    }
-}

migrations/Version20250724042107.php

@@ -1,41 +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 Version20250724042107 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            ALTER TABLE preference_option DROP FOREIGN KEY FK_607C52FD81022C0
-        SQL);
-        $this->addSql(<<<'SQL'
-            DROP TABLE preference_option
-        SQL);
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            CREATE TABLE preference_option (id INT AUTO_INCREMENT NOT NULL, preference_id VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, name VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, value VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, enabled TINYINT(1) NOT NULL, INDEX IDX_607C52FD81022C0 (preference_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = '' 
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE preference_option ADD CONSTRAINT FK_607C52FD81022C0 FOREIGN KEY (preference_id) REFERENCES preference (id)
-        SQL);
-    }
-}

phpunit.dist.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         colors="true"
-         failOnDeprecation="true"
-         failOnNotice="true"
-         failOnWarning="true"
-         bootstrap="tests/bootstrap.php"
-         cacheDirectory=".phpunit.cache"
->
-    <php>
-        <ini name="display_errors" value="1" />
-        <ini name="error_reporting" value="-1" />
-        <server name="APP_ENV" value="test" force="true" />
-        <server name="SHELL_VERBOSITY" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Project Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <source ignoreSuppressionOfDeprecations="true"
-            ignoreIndirectDeprecations="true"
-            restrictNotices="true"
-            restrictWarnings="true"
-    >
-        <include>
-            <directory>src</directory>
-        </include>
-
-        <deprecationTrigger>
-            <method>Doctrine\Deprecations\Deprecation::trigger</method>
-            <method>Doctrine\Deprecations\Deprecation::delegateTriggerToBackend</method>
-            <function>trigger_deprecation</function>
-        </deprecationTrigger>
-    </source>
-
-    <extensions>
-    </extensions>
-</phpunit>

src/Base/ConfigResolver.php

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

src/Base/Framework/Command/UserResetPasswordCommand.php

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

src/Base/Service/Broadcaster.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Base\Service;
-
-use Psr\Log\LoggerInterface;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
-use Symfony\Component\Notifier\Notification\Notification;
-use Symfony\Component\Notifier\NotifierInterface;
-use Twig\Environment;
-
-readonly class Broadcaster
-{
-    public function __construct(
-        #[Autowire(param: 'notification.transport')]
-        private string $notificationTransport,
-        #[Autowire(service: 'twig')]
-        private Environment $renderer,
-        private HubInterface $hub,
-        private RequestStack $requestStack,
-        private NotifierInterface $notifier,
-        private LoggerInterface $logger,
-    ) {}
-
-    public function alert(string $title, string $message, string $type = "success", bool $sendPush = false): void
-    {
-        try {
-            $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);
-        } catch (\Throwable $exception) {
-            // ToDo: look for better handling to get message to end user
-        }
-
-        if (true === $sendPush && in_array($this->notificationTransport, ['ntfy'])) {
-            try {
-                $notification = new Notification($title, ['push'])->content($message);
-                $this->notifier->send($notification);
-            } catch (\Throwable $exception) {
-                $this->logger->error('Unable to send push notification: ' . $exception->getMessage());
-            }
-        }
-    }
-}

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/Base/Util/ImdbMatcher.php

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

src/Base/Util/PTN.php

@@ -1,246 +0,0 @@
-<?php
-/**
- * Parse Torrent Name (PTN)
- *
- * PHP port of parse-torrent-name written in Python.
- *
- * Javascript version by jzjzjzj
- * https://github.com/jzjzjzj/parse-torrent-name
- *
- * Python version by divijbindlish
- * https://github.com/divijbindlish/parse-torrent-name
- *
- * Copyright (c) 2014 - 2018, British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package   PTN
- * @author    Drew Smith
- * @copyright copyright (c) 2018, Nihilarr (https://www.nihilarr.com)
- * @license	 http://opensource.org/licenses/MIT	MIT License
- * @link      https://gitlab.com/nihilarr/parse-torrent-name
- * @version   0.0.1
- */
-
-namespace App\Base\Util;
-
-class PTN {
-
-    public $torrent;
-    public $excess_raw;
-    public $group_raw;
-    public $start;
-    public $end;
-    public $title_raw;
-    public $parts;
-
-    public $patterns = array(
-        array('season' => '(s?([0-9]{1,3}))[ex]'),
-        array('episode' => '([ex]([0-9]{1,3})(?:[^0-9]|$))'),
-        array('year' => '([\[\(]?((?:19[0-9]|20[01])[0-9])[\]\)]?)'),
-        array('resolution' => '([0-9]{3,4}p)'),
-        array('quality' => '((?:PPV\.)?[HP]DTV|(?:HD)?CAM|B[DR]Rip|(?:HD-?)?TS|(?:PPV )?WEB-?DL(?: DVDRip)?|HDRip|DVDRip|DVDRIP|CamRip|W[EB]BRip|BluRay|DvDScr|hdtv|telesync)'),
-        array('codec' => '(xvid|[hx]\.?26[45])'),
-        array('audio' => '(MP3|DD5\.?1|Dual[\- ]Audio|LiNE|DTS|AAC[.-]LC|AAC(?:\.?2\.0)?|AC3(?:\.5\.1)?)'),
-        array('group' => '(- ?([^-]+(?:-={[^-]+-?$)?))$'),
-        array('region' => 'R[0-9]'),
-        array('extended' => '(EXTENDED(:?.CUT)?)'),
-        array('hardcoded' => 'HC'),
-        array('proper' => 'PROPER'),
-        array('repack' => 'REPACK'),
-        array('container' => '(MKV|AVI|MP4)'),
-        array('widescreen' => 'WS'),
-        array('website' => '^(\[ ?([^\]]+?) ?\])'),
-        array('language' => '(rus\.eng|ita\.eng)'),
-        array('sbs' => '(?:Half-)?SBS'),
-        array('unrated' => 'UNRATED'),
-        array('size' => '(\d+(?:\.\d+)?(?:GB|MB))'),
-        array('3d' => '3D')
-    );
-
-    public $types = array(
-        'season' => 'integer',
-        'episode' => 'integer',
-        'year' => 'integer',
-        'extended' => 'boolean',
-        'hardcoded' => 'boolean',
-        'proper' => 'boolean',
-        'repack' => 'boolean',
-        'widescreen' => 'boolean',
-        'unrated' => 'boolean',
-        '3d' => 'boolean'
-    );
-
-    public function __construct() {}
-
-    public function parse($name) {
-        $this->parts = array();
-        $this->torrent = array('name' => $name);
-        $this->excess_raw = $name;
-        $this->group_raw = '';
-        $this->start = 0;
-        $this->end = null;
-        $this->title_raw = null;
-
-        foreach($this->patterns as $patterns_single) {
-            foreach($patterns_single as $key => $pattern) {
-                if(!in_array($key, array('season', 'episode', 'website'))) {
-                    $pattern = "\b{$pattern}\b";
-                }
-
-                $clean_name = str_replace('_', ' ', $this->torrent['name']);
-                if(preg_match("/{$pattern}/i", $clean_name, $match) == 0) break;
-
-                $index = array();
-                if(is_array($match)) {
-                    array_shift($match);
-                }
-                if(sizeof($match) == 0) break;
-                if(sizeof($match) > 1) {
-                    $index['raw'] = 0;
-                    $index['clean'] = 1;
-                }
-                else {
-                    $index['raw'] = 0;
-                    $index['clean'] = 0;
-                }
-
-                if(isset($this->types[$key]) && $this->types[$key] == 'boolean') {
-                    $clean = true;
-                }
-                else {
-                    $clean = $match[$index['clean']];
-                    if(isset($this->types[$key]) && $this->types[$key] == 'integer') {
-                        $clean = (int)$clean;
-                    }
-                }
-
-                if($key == 'group') {
-                    if((isset($this->patterns[5][1]) && preg_match_all("/{$this->patterns[5][1]}/i", $clean)) ||
-                        (isset($this->patterns[4][1]) && preg_match_all("/{$this->patterns[4][1]}/", $clean))) {
-                        break;
-                    }
-                    if(preg_match('/[^ ]+ [^ ]+ .+/', $clean)) {
-                        $key = 'episodeName';
-                    }
-                }
-                if($key == 'episode') {
-                    $sub_pattern = $this->escape_regex($match[$index['raw']]);
-                    $this->torrent['map'] = preg_replace("/{$sub_pattern}/", '{episode}', $this->torrent['name']);
-                }
-
-                $this->part($key, $match, $match[$index['raw']], $clean);
-            }
-        }
-
-        $raw = $this->torrent['name'];
-        if(!is_null($this->end)) {
-            $raw = explode('(', substr($raw, $this->start, $this->end - $this->start));
-            $raw = $raw[0];
-        }
-
-        $clean = preg_replace("/^ -/", '', $raw);
-        if(strpos($clean, ' ') === false && strpos($clean, '.') !== false) {
-            $clean = str_replace('.', ' ', $clean);
-        }
-        $clean = str_replace('_', ' ', $clean);
-        $clean = trim(preg_replace("/([\[\(_]|- )$/", '', $clean));
-
-        $this->part('title', array(), $raw, $clean);
-
-        $clean = preg_replace("/(^[-\. ()]+)|([-\. ]+$)/", '', $this->excess_raw);
-        $clean = preg_replace("/[\(\)\/]/", ' ', $clean);
-        $match = preg_split("/\.\.+| +/", $clean);
-        if(sizeof($match) > 0 && is_array($match[0])) {
-            $match = $match[0];
-        }
-
-        $clean = $match;
-        $clean = array_filter($clean, function($var) {
-            return $var != '-' ? true : false;
-        });
-        $clean = array_filter($clean, function($var) {
-            return trim($var, '-');
-        });
-        $clean = array_values($clean);
-
-        if(sizeof($clean) > 0) {
-            $group_pattern = $clean[sizeof($clean) - 1] . $this->group_raw;
-            if(strpos($this->torrent['name'], $group_pattern) == strlen($this->torrent['name']) - strlen($group_pattern)) {
-                $this->late('group', array_pop($clean) . $this->group_raw);
-            }
-
-            if(isset($this->torrent['map']) && sizeof($clean) > 0) {
-                $episode_name_pattern = '{episode}' . preg_replace("/_+$/", '', $clean[0]);
-
-                if(strpos($this->torrent['map'], $episode_name_pattern) != -1) {
-                    $this->late('episodeName', array_shift($clean));
-                }
-            }
-        }
-
-        if(sizeof($clean) != 0) {
-            if(sizeof($clean) == 1) {
-                $clean = $clean[0];
-            }
-            $this->part('excess', array(), $this->excess_raw, $clean);
-        }
-        return $this->parts;
-    }
-
-    private function escape_regex($subject) {
-        return preg_replace("/[\-\[\]{}()*+?.,\\\^$|#\s]/", "\\\\$&", $subject);
-    }
-
-    private function part($name, $match, $raw, $clean) {
-        # The main core instructuions
-        $this->parts[$name] = $clean;
-
-        if(sizeof($match) > 0) {
-            # The instructions for extracting title
-            $index = strpos($this->torrent['name'], $match[0]);
-            if($index == 0) {
-                $this->start = strlen($match[0]);
-            }
-            elseif(is_null($this->end) || $index < $this->end) {
-                $this->end = $index;
-            }
-        }
-        if($name != 'excess') {
-            if($name == 'group') {
-                $this->group_raw = $raw;
-            }
-
-            if(!is_null($raw)) {
-                $this->excess_raw = str_replace($raw, '', $this->excess_raw);
-            }
-        }
-    }
-
-    private function late($name, $clean) {
-        if($name == 'group') {
-            $this->part($name, array(), null, $clean);
-        }
-        elseif($name == 'episodeName') {
-            $clean = preg_replace("/[\._]/", ' ', $clean);
-            $clean = preg_replace("/_+$/", '', $clean);
-            $this->part($name, array(), null, trim($clean));
-        }
-    }
-}

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,21 +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,
-        UserRepository $userRepository,
+        PreferenceOptionRepository $preferenceOptionRepository,
     ) {
         parent::__construct();
         $this->preferenceRepository = $preferenceRepository;
-        $this->userRepository = $userRepository;
+        $this->preferenceOptionRepository = $preferenceOptionRepository;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
@@ -37,7 +33,7 @@ class SeedDatabaseCommand extends Command
         $io = new SymfonyStyle($input, $output);
 
         $this->seedPreferences($io);
-        $this->updateUserPreferences($io);
+        $this->seedPreferenceOptions($io);
 
         return Command::SUCCESS;
     }
@@ -48,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 [
@@ -121,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',
@@ -137,4 +100,72 @@ class SeedDatabaseCommand extends Command
             ],
         ];
     }
+
+    private function seedPreferenceOptions(SymfonyStyle $io)
+    {
+        $io->info('[SeedDatabaseCommand] > Seeding preference options...');
+        $options = $this->getPreferenceOptions();
+
+        foreach ($options as $option) {
+            if ($this->preferenceOptionRepository->findBy([
+                'preference' => $option['preference_id'],
+                'name' => $option['name'],
+                'value' => $option['value'],
+                'enabled' => $option['enabled'],
+            ])) {
+                continue;
+            }
+            $this->preferenceOptionRepository->getEntityManager()->persist(
+                (new \App\User\Framework\Entity\PreferenceOption())
+                    ->setPreference($this->preferenceRepository->find($option['preference_id']))
+                    ->setName($option['name'])
+                    ->setValue($option['value'])
+                    ->setEnabled($option['enabled'])
+            );
+        }
+
+        $this->preferenceOptionRepository->getEntityManager()->flush();
+    }
+
+    private function getPreferenceOptions(): array
+    {
+        return [
+            [
+                'preference_id' => 'resolution',
+                'name' => '720p',
+                'value' => '720p',
+                'enabled' => true
+            ],
+            [
+                'preference_id' => 'resolution',
+                'name' => '1080p',
+                'value' => '1080p',
+                'enabled' => true
+            ],
+            [
+                'preference_id' => 'resolution',
+                'name' => '2160p',
+                'value' => '2160p',
+                'enabled' => true
+            ],
+            [
+                'preference_id' => 'codec',
+                'name' => '-',
+                'value' => '-',
+                'enabled' => true
+            ],
+            [
+                'preference_id' => 'codec',
+                'name' => 'h264',
+                'value' => 'h264',
+                'enabled' => true
+            ],
+            [
+                'preference_id' => 'codec',
+                'name' => 'h265/HEVC',
+                'value' => 'h265',
+                'enabled' => true
+            ]
+        ];
+    }
 }

src/Command/StartupStatusCommand.php

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

src/Controller/AlertController.php

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

src/Controller/IndexController.php

@@ -1,16 +1,14 @@
 <?php
 
-namespace App\Base\Framework\Controller;
+namespace App\Controller;
 
+use App\Download\Framework\Repository\DownloadRepository;
 use App\Monitor\Action\Command\MonitorTvShowCommand;
 use App\Monitor\Action\Handler\MonitorTvShowHandler;
 use App\Tmdb\Tmdb;
-use App\User\Framework\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Mailer\MailerInterface;
-use Symfony\Component\Mime\Email;
 use Symfony\Component\Routing\Attribute\Route;
 
 final class IndexController extends AbstractController
@@ -23,8 +21,6 @@ final class IndexController extends AbstractController
     #[Route('/', name: 'app_index')]
     public function index(Request $request): Response
     {
-        /** @var User $user */
-        $user = $this->getUser();
         return $this->render('index/index.html.twig', [
             'active_downloads' => $this->getUser()->getActiveDownloads(),
             'recent_downloads' => $this->getUser()->getDownloads(),
@@ -33,29 +29,10 @@ final class IndexController extends AbstractController
         ]);
     }
 
-    #[Route('/email')]
+    #[Route('/test', name: 'app_test')]
-    public function sendEmail(MailerInterface $mailer): Response
+    public function test()
     {
-        $email = (new Email())
+        $result = $this->monitorTvShowHandler->handle(new MonitorTvShowCommand(355));
-            ->to('brock@caldwell.digital')
+        return $this->json($result);
-            ->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!'
-        ]);
-    }
-
-    #[Route('/test')]
-    public function monitorTvShow(): Response
-    {
-        $this->monitorTvShowHandler->handle(new MonitorTvShowCommand(96));
-        return $this->json([
-            'Success' => 'Monitor added'
-        ]);
     }
 }

src/Controller/SearchController.php

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

src/Controller/TorrentioController.php

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

src/Download/Action/Command/DeleteDownloadCommand.php

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

src/Download/Action/Command/DownloadSeasonCommand.php

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

src/Download/Action/Handler/DeleteDownloadHandler.php

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

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

src/Download/Action/Input/DeleteDownloadInput.php

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

src/Download/Action/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,
-        );
-    }
-}

src/Download/Action/Result/DeleteDownloadResult.php

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

src/Download/Action/Result/DeleteMediaFileResult.php

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

src/Download/Action/Result/DownloadSeasonResult.php

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

src/Download/DownloadOptionEvaluator.php

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

src/Download/Downloader/ProcessDownloader.php

@@ -2,9 +2,8 @@
 
 namespace App\Download\Downloader;
 
-use App\Base\Service\Broadcaster;
-use App\Base\Service\MediaFiles;
 use App\Download\Framework\Entity\Download;
+use App\Monitor\Service\MediaFiles;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Process\Exception\ProcessFailedException;
@@ -16,11 +15,11 @@ class ProcessDownloader implements DownloaderInterface
     /**
      * @var RedisAdapter $cache
      */
+
     public function __construct(
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
         private CacheInterface $cache,
-        private readonly Broadcaster $broadcaster,
     ) {}
 
     /**
@@ -35,11 +34,11 @@ class ProcessDownloader implements DownloaderInterface
         $downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
         $path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
 
-        $processArgs = ['wget', '-O', $downloadEntity->getFilename(), $url];
+        $processArgs = ['wget', $url];
 
         if ($downloadEntity->getStatus() === 'Paused') {
             $downloadEntity->setStatus('In Progress');
-            $processArgs = ['wget', '-c', '-O', $downloadEntity->getFilename(), $url];
+            $processArgs = ['wget', '-c', $url];
         } else {
             $downloadEntity->setProgress(0);
         }
@@ -84,7 +83,6 @@ class ProcessDownloader implements DownloaderInterface
             });
             if ($downloadEntity->getStatus() !== 'Paused') {
                 $downloadEntity->setProgress(100);
-                $this->alertComplete($downloadEntity);
             }
         } catch (ProcessFailedException $exception) {
             $downloadEntity->setStatus('Failed');
@@ -108,15 +106,4 @@ class ProcessDownloader implements DownloaderInterface
 
         throw new \Exception("There is no download path for media type: $mediaType");
     }
-
-    private function alertComplete(Download $download): void
-    {
-        if ("tvshows" === $download->getMediaType()) {
-            $message = '"' . $download->getTitle() . '" - ' . $download->getEpisodeId() . ' has finished downloading.';
-        } else {
-            $message = '"' . $download->getTitle() . '" has finished downloading.';
-        }
-
-        $this->broadcaster->alert('Success', $message, sendPush: true);
-    }
 }

src/Download/Framework/Controller/ApiController.php

@@ -2,16 +2,15 @@
 
 namespace App\Download\Framework\Controller;
 
-use App\Base\Service\Broadcaster;
 use App\Download\Action\Handler\DeleteDownloadHandler;
 use App\Download\Action\Handler\PauseDownloadHandler;
 use App\Download\Action\Handler\ResumeDownloadHandler;
 use App\Download\Action\Input\DeleteDownloadInput;
 use App\Download\Action\Input\DownloadMediaInput;
-use App\Download\Action\Input\DownloadSeasonInput;
 use App\Download\Action\Input\PauseDownloadInput;
 use App\Download\Action\Input\ResumeDownloadInput;
 use App\Download\Framework\Repository\DownloadRepository;
+use App\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -36,8 +35,10 @@ class ApiController extends AbstractController
             $input->filename,
             $input->imdbId,
             $input->mediaType,
-            $input->episodeId,
+            "",
         );
+        $this->downloadRepository->getEntityManager()->persist($download);
+        $this->downloadRepository->getEntityManager()->flush();
         $input->downloadId = $download->getId();
         $input->userId = $this->getUser()->getId();
 
@@ -66,7 +67,7 @@ class ApiController extends AbstractController
             message: "{$result->download->getTitle()} has been deleted.",
         );
 
-        return $this->json($result);
+        return $this->json(['status' => 200, 'message' => 'Download Deleted']);
     }
 
     #[Route('/api/download/{downloadId}/pause', name: 'api_download_pause', methods: ['PATCH'])]
@@ -96,18 +97,4 @@ class ApiController extends AbstractController
 
         return $this->json(['status' => 200, 'message' => 'Download Resumed']);
     }
-
-    #[Route('/api/download/season/{imdbId}/{season}', name: 'api_download_season', methods: ['GET'])]
-    public function downloadSeason(
-        DownloadSeasonInput $input,
-    ): Response {
-        $input->userId = $this->getUser()->getId();
-        $this->bus->dispatch($input->toCommand());
-        $this->broadcaster->alert(
-            title: 'Success',
-            message: "Your download for season $input->season has been added to the queue.",
-        );
-
-        return $this->json(['status' => 200, 'message' => 'Download Resumed']);
-    }
 }

src/Download/Framework/Entity/Download.php

@@ -6,8 +6,7 @@ use App\Download\Framework\Repository\DownloadRepository;
 use App\User\Framework\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Timestampable\Traits\TimestampableEntity;
-use App\Base\Util\PTN;
+use Nihilarr\PTN;
-use Symfony\Component\Serializer\Attribute\Ignore;
 use Symfony\UX\Turbo\Attribute\Broadcast;
 
 #[ORM\Entity(repositoryClass: DownloadRepository::class)]
@@ -43,9 +42,8 @@ class Download
     private ?int $progress = null;
 
     #[ORM\Column(length: 255, nullable: true)]
-    private ?string $episodeId = null;
+    private ?string $batchId = null;
 
-    #[Ignore]
     #[ORM\ManyToOne(inversedBy: 'downloads')]
     private ?User $user = null;
 
@@ -145,14 +143,14 @@ class Download
         return $this;
     }
 
-    public function getEpisodeId(): ?string
+    public function getBatchId(): ?string
     {
-        return $this->episodeId;
+        return $this->batchId;
     }
 
-    public function setEpisodeId(?string $episodeId): static
+    public function setBatchId(?string $batchId): static
     {
-        $this->episodeId = $episodeId;
+        $this->batchId = $batchId;
 
         return $this;
     }

src/Download/Framework/Repository/DownloadRepository.php

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

src/Enum/MediaType.php

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

src/Library/Action/Command/DeleteMediaFileCommand.php

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

src/Library/Action/Command/LibrarySearchCommand.php

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

src/Library/Action/Handler/DeleteMediaFileHandler.php

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

src/Library/Action/Handler/LibrarySearchHandler.php

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

src/Library/Action/Input/DeleteMediaFileInput.php

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

src/Library/Action/Input/LibrarySearchInput.php

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

src/Library/Action/Result/DeleteMediaFileResult.php

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

src/Library/Action/Result/LibrarySearchResult.php

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

src/Library/Dto/MediaFileDto.php

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

src/Library/Framework/Controller/Api.php

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

src/Monitor/Action/Handler/MonitorMovieHandler.php

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

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

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

src/Monitor/Action/Handler/MonitorTvSeasonHandler.php

@@ -3,16 +3,16 @@
 namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
-use App\Base\Service\MediaFiles;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
 use App\Monitor\Action\Command\MonitorTvSeasonCommand;
 use App\Monitor\Action\Result\MonitorTvSeasonResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
-use App\Base\Util\PTN;
+use Nihilarr\PTN;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -3,17 +3,17 @@
 namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
-use App\Base\Service\MediaFiles;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
 use App\Monitor\Action\Result\MonitorTvShowResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use Carbon\Carbon;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
-use App\Base\Util\PTN;
+use Nihilarr\PTN;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -47,7 +47,6 @@ readonly class MonitorTvShowHandler implements HandlerInterface
                 && null !== $episode->season
             )
         ;
-
         $this->logger->info('> [MonitorTvShowHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
 
         // Compare against list from TMDB
@@ -62,27 +61,26 @@ readonly class MonitorTvShowHandler implements HandlerInterface
             // Dispatch Episode commands for each missing Episode
             foreach ($episodesInShow as $episode) {
                 // Only monitor future episodes
-                $this->logger->info('> [MonitorTvShowHandler] Evaluating "' . $monitor->getTitle() . '", season "' . $episode['season_number'] . '" episode "' . $episode['episode_number'] . '"');
                 $episodeInFuture = $this->episodeReleasedAfterMonitorCreated($monitor->getCreatedAt(), $episode);
-                $this->logger->info('> [MonitorTvShowHandler] ...Released after monitor started? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
+                $this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
                 if (false === $episodeInFuture) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for title: ' . 'for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ', skipping');
                     continue;
                 }
 
                 // Check if the episode is already downloaded
                 $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
-                $this->logger->info('> [MonitorTvShowHandler] ...Episode exists? ' . (true === $episodeExists ? 'YES' : 'NO'));
+                $this->logger->info('> [MonitorTvShowHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
                 if (true === $episodeExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] Episode exists for title: ' . $monitor->getTitle() . ', skipping');
                     continue;
                 }
 
                 // Check for existing monitors
                 $monitorExists = $this->monitorExists($monitor, $episode);
-                $this->logger->info('> [MonitorTvShowHandler] ...Monitor exists? ' . (true === $monitorExists ? 'YES' : 'NO'));
+                $this->logger->info('> [MonitorTvShowHandler] Monitor exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $monitorExists ? 'YES' : 'NO'));
                 if (true === $monitorExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] Monitor exists for title: ' . $monitor->getTitle() . ', skipping');
                     continue;
                 }
 
@@ -108,7 +106,7 @@ readonly class MonitorTvShowHandler implements HandlerInterface
                 // Immediately run the monitor
                 $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
                 $this->monitorTvEpisodeHandler->handle($command);
-                $this->logger->info('> [MonitorTvShowHandler] ...Dispatching MonitorTvEpisodeCommand');
+                $this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
             }
         }