fix: adds more sentry config

.dockerignore

@@ -0,0 +1,15 @@
+.git
+.idea
+.phpunit.cache
+.php-cs-fixer.cache
+.env.test
+.gitignore
+bolt.db
+bash
+build.xml
+deploy.compose.yml
+phpstan.dist.neon
+phpunit.dist.xml
+nomad.deploy.hcl
+deployment.properties
+var/download/*

.env

@@ -51,3 +51,14 @@ 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_DSN=
+
+###> sentry/sentry-symfony ###
+SENTRY_DSN=
+###< sentry/sentry-symfony ###

.env.test

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

.gitignore

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

Dockerfile

@@ -1,19 +1,10 @@
-FROM dunglas/frankenphp:php8.4
+FROM code.caldwell.digital/home/torsearch-base:php8.4
 
 ENV SERVER_NAME=":80"
 ENV CADDY_GLOBAL_OPTIONS="auto_https off"
 ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
-ENV APP_VERSION="0.0.1"
-
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
-
-RUN apt update && apt install -y wget
+ENV APP_VERSION="0.0.0-dev"
 
 HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
 
-COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile
+COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile

assets/app.js

@@ -18,11 +18,3 @@ var observer = new MutationObserver(function(mutations) {
 });
 
 observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
-
-const ptr = PullToRefresh.init({
-    mainElement: 'body',
-    onRefresh() {
-        window.location.reload();
-    }
-});
-

assets/bootstrap.js

@@ -1,5 +1,9 @@
+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';
@@ -14,6 +18,9 @@ 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

@@ -0,0 +1,111 @@
+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,6 +1,15 @@
 export default class DownloadOptionTr extends HTMLTableRowElement {
-    H264_CODECS = ['h264', 'h.264', 'x264']
-    H265_CODECS = ['h265', 'h.265', 'x265', 'hevc']
+    H264_CODECS = {
+        'h264': 'h264',
+        'h.264': 'h264',
+        'x264': 'h264',
+    }
+    H265_CODECS = {
+        'h265': 'h265',
+        'h.265': 'h265',
+        'x265': 'h265',
+        'hevc': 'h265',
+    }
 
     #downloadBtnEl;
     #selectEpisodeInputEl;
@@ -53,13 +62,6 @@ export default class DownloadOptionTr extends HTMLTableRowElement {
 
     filter({ detail: { activeFilter } }) {
         const optionHeader = document.querySelector(`[data-option-id="${this.dataset['localId']}"]`)
-        const props = {
-            "resolution": this.resolution.trim(),
-            "codec": this.codec.trim(),
-            "provider": this.provider.trim(),
-            "languages": this.languages,
-            "quality": this.quality,
-        }
 
         let include = true;
         this.classList.add('r-tablerow');
@@ -69,25 +71,24 @@ export default class DownloadOptionTr extends HTMLTableRowElement {
 
         this.querySelector('input[type="checkbox"]').checked = false;
 
-        for (let [key, value] of Object.entries(activeFilter)) {
-            if (value === "" || key === "season") {
-                continue;
-            }
-            if (key === "codec" && value === "h264") {
-                if (!this.H264_CODECS.includes(props[key].toLowerCase())) {
-                    include = false;
-                }
-            } else if (key === "codec" && value === "h265") {
-                if (!this.H265_CODECS.includes(props[key].toLowerCase())) {
-                    include = false;
-                }
-            } else if (key === "language") {
-                if (!props["languages"].includes(value)) {
-                    include = false;
-                }
-            } else if (props[key] !== value) {
-                include = false;
-            }
+        if (!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) {
@@ -121,4 +122,66 @@ export default class DownloadOptionTr extends HTMLTableRowElement {
                 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/monitor-list-row.js

@@ -0,0 +1,115 @@
+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/preview-content-dialog.js

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

@@ -20,13 +20,43 @@ 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) {
-            target.classList.add('hidden');
-        }
+
+        downloads.forEach(download => {
+            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) {

assets/controllers/loading_icon_controller.js

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

assets/controllers/monitor_button_controller.js

@@ -13,34 +13,7 @@ export default class extends Controller {
         tmdbId: String,
         imdbId: String,
         title: String,
-    }
-
-    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)
+        season: Number,
     }
 
     toggle() {
@@ -53,34 +26,13 @@ export default class extends Controller {
             imdbId: this.imdbIdValue,
             title: this.titleValue,
             monitorType: 'tvshows',
+            season: this.seasonValue
         });
         if (this.hasDialogOutlet) {
             this.dialogOutlet.close();
         }
     }
 
-    async monitorSeason() {
-        await this.makeMonitor({
-            tmdbId: this.tmdbIdValue,
-            imdbId: this.imdbIdValue,
-            title: this.titleValue,
-            monitorType: 'tvseason',
-            season: this.resultFilterOutlet.activeFilter['season'],
-        });
-    }
-
-    async monitorEpisode() {
-        // ToDo: figure out how to set episode
-        await this.makeMonitor({
-            tmdbId: this.tmdbIdValue,
-            imdbId: this.imdbIdValue,
-            title: this.titleValue,
-            monitorType: 'tvepisode',
-            season: this.resultFilterOutlet.activeFilter['season'],
-            episode: '',
-        });
-    }
-
     async makeMonitor(body) {
         const response = await fetch('/api/monitor', {
             method: 'POST',
@@ -90,7 +42,6 @@ export default class extends Controller {
             },
             body: JSON.stringify(body)
         });
-
         return await response.json();
     }
 }

assets/controllers/monitor_list_controller.js

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

@@ -13,7 +13,6 @@ export default class extends Controller {
     };
 
     static targets = ['list']
-    static outlets = ['loading-icon']
 
     options = []
     optionsLoaded = false
@@ -28,7 +27,6 @@ export default class extends Controller {
         this.options = this.element.querySelectorAll('tbody tr');
         this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
         this.resultCountEl.innerText = this.options.length;
-        this.loadingIconOutlet.toggleIcon();
         document.dispatchEvent(new CustomEvent('optionsLoaded', {detail: {options: this.options}}));
     }
 }

assets/controllers/result_filter_controller.js

@@ -12,15 +12,17 @@ export default class extends Controller {
     seasons = []
 
     activeFilter = {
-        "resolution": "",
-        "codec": "",
-        "language": "",
-        "provider": "",
-        "quality": "",
+        "resolution": [],
+        "codec": [],
+        "language": [],
+        "provider": [],
+        "quality": [],
     }
 
+    defaultOptions = '<option value="-">-</option>';
+
     static outlets = ['tv-episode-list']
-    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'selectAll', 'downloadSelected']
+    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'selectAll', 'downloadSelected', 'currentSeason']
     static values = {
         'imdbId': String,
         'media-type': String,
@@ -29,22 +31,27 @@ export default class extends Controller {
     }
 
     async connect() {
+        await this.setInitialFilter();
+        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();
-
-        document.addEventListener('optionsLoaded', this.loadOptions.bind(this));
     }
 
     // Event is fired from movies/tvshows controllers to populate this data
     async loadOptions({detail: { options }}) {
         await options.forEach((option) => {
-            this.addLanguages(option);
-            this.addProviders(option);
-            this.addQualities(option);
+            option.filter({detail: {activeFilter: this.activeFilter }});
         })
-        await this.filter();
     }
 
     selectAllEpisodes() {
@@ -59,93 +66,15 @@ export default class extends Controller {
         document.dispatchEvent(new CustomEvent('downloadSelectedEpisodes', {}));
     }
 
-    addLanguages(option) {
-        const languages = Object.assign([], option.languages);
-        languages.forEach((language) => {
-            if (!this.languages.includes(language)) {
-                this.languages.push(language);
-            }
-        });
-
-        const preferred = this.languageTarget.dataset.preferred;
-        if (preferred) {
-            this.languageTarget.innerHTML = '<option value="'+preferred+'" selected>'+preferred+'</option>';
-            this.languageTarget.innerHTML += '<option value="">n/a</option>';
-        } else {
-            this.languageTarget.innerHTML = '<option value="">n/a</option>';
-        }
-
-        this.languageTarget.innerHTML += this.languages.sort()
-            .map((language) => {
-                const preferred = this.languageTarget.dataset.preferred;
-                if (preferred === language) {
-                    return;
-                }
-                return '<option value="'+language+'">'+language+'</option>';
-            })
-            .join();
-    }
-
-    addProviders(option) {
-        if (!this.providers.includes(option.provider)) {
-            this.providers.push(option.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();
-
-    }
-
-    addQualities(option) {
-        if (!this.qualities.includes(option.quality)) {
-            if (option.quality.toLowerCase() in this.reverseMappedQualitiesValue) {
-                this.qualities.push(option.quality);
-            }
-        }
-
-        const preferred = this.qualityTarget.dataset.preferred;
-        if (preferred) {
-            this.qualityTarget.innerHTML = '<option value="'+preferred+'" selected>'+preferred+'</option>';
-            this.qualityTarget.innerHTML += '<option value="">n/a</option>';
-        } else {
-            this.qualityTarget.innerHTML = '<option value="">n/a</option>';
-        }
-
-        this.qualityTarget.innerHTML += this.qualities.sort()
-            .map((quality) => {
-                const preferred = this.qualityTarget.dataset.preferred;
-                if (preferred === quality) {
-                    return;
-                }
-                return '<option value="' + quality + '">' + quality + '</option>'
-            })
-            .join();
-    }
-
-    async filter() {
+    filter() {
         const downloadSeasonSpan = document.querySelector("#downloadSeasonModal");
 
         this.activeFilter = {
-            "resolution": this.resolutionTarget.value,
-            "codec": this.codecTarget.value,
-            "language": this.languageTarget.value,
-            "provider": this.providerTarget.value,
-            "quality": this.qualityTarget.value,
+            "resolution": this.#fetchValuesFromNodeList(this.resolutionTarget.selectedOptions),
+            "codec": this.#fetchValuesFromNodeList(this.codecTarget.selectedOptions),
+            "language": this.#fetchValuesFromNodeList(this.languageTarget.selectedOptions),
+            "provider": this.#fetchValuesFromNodeList(this.providerTarget.selectedOptions),
+            "quality": this.#fetchValuesFromNodeList(this.qualityTarget.selectedOptions),
         }
 
         if ("tvshows" === this.mediaTypeValue) {
@@ -165,7 +94,9 @@ export default class extends Controller {
     }
 
     setSeason(event) {
+        console.log('hurrrr');
         this.tvEpisodeListOutlet.setSeason(event.target.value);
+        this.currentSeasonTarget.innerText = event.target.value;
     }
 
     downloadSeason() {
@@ -175,4 +106,16 @@ export default class extends Controller {
             }
         })
     }
+
+    #fetchValuesFromNodeList(nodeList) {
+        return [...nodeList].map(option => option.value)
+    }
+
+    #serializeSelectOptions(options) {
+        return this.defaultOptions + options.sort()
+            .map((option) => {
+                return '<option value="' + option + '">' + option + '</option>'
+            })
+            .join();
+    }
 }

assets/controllers/search_bar_controller.js

@@ -12,6 +12,11 @@ export default class extends Controller {
             const autocompleteController = this.application.getControllerForElementAndIdentifier(this.element, 'symfony--ux-autocomplete--autocomplete')
             window.location.href = `/search?term=${autocompleteController.tomSelect.lastValue}`
         }
+        document.querySelector("#search-button").addEventListener('click', (event) => {
+            event.preventDefault();
+            const autocompleteController = this.application.getControllerForElementAndIdentifier(this.element, 'symfony--ux-autocomplete--autocomplete')
+            window.location.href = `/search?term=${autocompleteController.tomSelect.lastQuery}`
+        });
         this.element.addEventListener('autocomplete:pre-connect', this._onPreConnect);
         this.element.addEventListener('autocomplete:connect', this._onConnect);
     }
@@ -33,21 +38,21 @@ export default class extends Controller {
             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>
-`;
+            </span>`;
         }
         event.detail.options.render.option = (data, escape) => {
-            if (data.data.description.length > 60) {
-                data.data.description = data.data.description.substring(0, 107) + "...";
+            console.log(data);
+            if (data.data.overview.length > 60) {
+                data.data.overview = data.data.overview.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>
+                            <p class="max-w-[60ch] text-wrap">${data.data.overview}</p>
                         </div>
-                    </div>
-`
+                    </div>`;
         }
     }
 

assets/controllers/tv_results_controller.js

@@ -19,7 +19,6 @@ export default class extends Controller {
     };
 
     static targets = ['list', 'count', 'episodeSelector',]
-    static outlets = ['loading-icon']
 
     options = []
 
@@ -30,7 +29,6 @@ export default class extends Controller {
                 option.querySelector('.download-btn').dataset['title'] = this.titleValue
             );
             this.element.options[0].querySelector('input[type="checkbox"]').checked = true;
-            this.loadingIconOutlet.increaseCount();
             document.dispatchEvent(new CustomEvent('optionsLoaded', {detail: {options: this.element.options}}));
         } else {
             this.countTarget.innerText = 0;

assets/controllers/upcoming_episodes_controller.js

@@ -0,0 +1,57 @@
+import { Controller } from '@hotwired/stimulus';
+import { Calendar } from '@fullcalendar/core';
+import dayGridPlugin from '@fullcalendar/daygrid';
+import timeGridPlugin from '@fullcalendar/timegrid';
+
+
+/* stimulusFetch: 'lazy' */
+export default class extends Controller {
+    calendar = null;
+
+    initialize() {
+
+    }
+
+    connect() {
+        this.calendar = new Calendar(this.element, {
+            plugins: [ dayGridPlugin, timeGridPlugin ],
+            initialView: 'dayGridMonth',
+            headerToolbar: {
+                left: 'prev,next today',
+                center: 'title',
+                right: 'dayGridMonth,timeGridWeek,timeGridDay'
+            },
+            editable: true, // Allow events to be dragged and resized
+            events: '/api/events', // Symfony route to fetch events
+            eventDrop: function(info) {
+                // Handle event drop (e.g., update event in database via AJAX)
+            },
+            eventResize: function(info) {
+                // Handle event resize (e.g., update event in database via AJAX)
+            }
+        });
+        this.calendar.render();
+        // this.calendar = new Calendar(this.element, {
+        //     plugins: [ dayGridPlugin, timeGridPlugin, listPlugin ],
+        //     initialView: 'dayGridMonth',
+        //     headerToolbar: {
+        //         left: 'prev,next today',
+        //         center: 'title',
+        //         right: 'dayGridMonth,timeGridWeek,listWeek'
+        //     }
+        // });
+        // this.calendar.render();
+        // calendar.render();
+    }
+
+    // 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/icons/lets-icons/calendar-add-light.svg

@@ -0,0 +1 @@
+<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none" stroke="currentColor"><path d="M19.5 9.5v-.8c0-1.12 0-1.68-.218-2.108a2 2 0 0 0-.874-.874C17.98 5.5 17.42 5.5 16.3 5.5H7.7c-1.12 0-1.68 0-2.108.218a2 2 0 0 0-.874.874C4.5 7.02 4.5 7.58 4.5 8.7v.8m15 0v6.8c0 1.12 0 1.68-.218 2.108a2 2 0 0 1-.874.874c-.428.218-.988.218-2.108.218H7.7c-1.12 0-1.68 0-2.108-.218a2 2 0 0 1-.874-.874C4.5 17.98 4.5 17.42 4.5 16.3V9.5m15 0h-15"/><path stroke-linecap="round" d="M8.5 3.5v4m7-4v4M12 17v-5m2.5 2.5h-5"/></g></svg>

assets/icons/solar/calendar-linear.svg

@@ -0,0 +1 @@
+<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none"><path stroke="currentColor" stroke-width="1.5" d="M2 12c0-3.771 0-5.657 1.172-6.828S6.229 4 10 4h4c3.771 0 5.657 0 6.828 1.172S22 8.229 22 12v2c0 3.771 0 5.657-1.172 6.828S17.771 22 14 22h-4c-3.771 0-5.657 0-6.828-1.172S2 17.771 2 14z"/><path stroke="currentColor" stroke-linecap="round" stroke-width="1.5" d="M7 4V2.5M17 4V2.5M2.5 9h19"/><path fill="currentColor" d="M18 17a1 1 0 1 1-2 0a1 1 0 0 1 2 0m0-4a1 1 0 1 1-2 0a1 1 0 0 1 2 0m-5 4a1 1 0 1 1-2 0a1 1 0 0 1 2 0m0-4a1 1 0 1 1-2 0a1 1 0 0 1 2 0m-5 4a1 1 0 1 1-2 0a1 1 0 0 1 2 0m0-4a1 1 0 1 1-2 0a1 1 0 0 1 2 0"/></g></svg>

assets/icons/zondicons/checkmark.svg

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

assets/styles/app.css

@@ -27,6 +27,11 @@
     }
 }
 
+:root {
+    --fc-border-color: #a65b27;
+    --fc-page-bg-color: #a65b27;
+}
+
 /* Prevent scrolling while dialog is open */
 body:has(dialog[data-dialog-target="dialog"][open]) {
     overflow: hidden;
@@ -55,6 +60,10 @@ dialog {
     }
 }
 
+dialog[open] {
+    animation: fade-in 100ms ease-in forwards;
+}
+
 /* Add animations */
 dialog[data-dialog-target="dialog"][open] {
     animation: fade-in 200ms forwards;
@@ -68,6 +77,16 @@ dialog[data-dialog-target="dialog"][closing] {
     @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
 }
@@ -123,7 +142,7 @@ dialog[data-dialog-target="dialog"][closing] {
 
 #search .ts-dropdown {
     background: unset;
-    @apply bg-orange-500/80 backdrop-filter backdrop-blur-md text-white border border-orange-500 rounded-md
+    @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 {
@@ -148,3 +167,42 @@ dialog[data-dialog-target="dialog"][closing] {
     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;
+}
+
+/** FullCalendar **/
+#upcoming_episodes_calendar .fc-event-main .fc-event-title-container {
+    cursor: pointer !important;
+}
+.fc-col-header-cell {
+    @apply bg-orange-500/60 text-white;
+}

bash/build_base.sh

@@ -0,0 +1,22 @@
+# torsearch-app is built from this base
+export APP_FRANKENPHP_TAG=php8.4
+
+#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" .
+docker build -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" .
+docker push code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG}
+docker push code.caldwell.digital/home/torsearch-base:latest
+
+# torsearch-worker & torsearch-scheduler are built from this base
+export WORKER_FRANKENPHP_TAG=php8.4-alpine
+
+#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" .
+docker build -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" .
+docker push code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG}
+docker push code.caldwell.digital/home/torsearch-base-worker:latest
+
+# torsearch-worker-supervisord
+export ALPINE_VERSION=3.22
+
+#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .
+docker build -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .
+docker push code.caldwell.digital/home/torsearch-base-worker-supervisord:latest

bin/phpunit

@@ -0,0 +1,23 @@
+#!/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

@@ -33,7 +33,9 @@ services:
 
 
   worker:
-    build: .
+    build:
+      dockerfile: docker/Dockerfile.worker
+      context: .
     restart: unless-stopped
     volumes:
       - $PWD:/app
@@ -41,18 +43,19 @@ services:
     tty: true
     environment:
       TZ: America/Chicago
-    command: php /app/bin/console messenger:consume async -vv --time-limit=3600
-
 
   scheduler:
-    build: .
+    build:
+      dockerfile: docker/Dockerfile.scheduler
+      context: .
     restart: unless-stopped
     volumes:
       - $PWD:/app
+      - $PWD/var/download:/var/download
+    tty: true
     environment:
       TZ: America/Chicago
-    command: php /app/bin/console messenger:consume scheduler_monitor -vv
-    tty: true
+      WORKER_MONITOR: 2
 
 
   redis:
@@ -88,6 +91,8 @@ services:
     image: adminer
     ports:
       - "8081:8080"
+    environment:
+      ADMINER_DEFAULT_SERVER: database
 
 
 volumes:

composer.json

@@ -25,8 +25,12 @@
         "p3k/emoji-detector": "^1.2",
         "php-http/cache-plugin": "^2.0",
         "php-tmdb/api": "^4.1",
+        "phpdocumentor/reflection-docblock": "^5.6",
+        "phpstan/phpdoc-parser": "^2.1",
         "predis/predis": "^2.4",
         "runtime/frankenphp-symfony": "^0.2.0",
+        "sentry/sentry-symfony": "^5.6",
+        "spatie/icalendar-generator": "^3.0",
         "spomky-labs/pwa-bundle": "^1.2",
         "stof/doctrine-extensions-bundle": "^1.14",
         "symfony/asset": "7.3.*",
@@ -43,9 +47,16 @@
         "symfony/mailer": "7.3.*",
         "symfony/mercure-bundle": "^0.3.9",
         "symfony/messenger": "7.3.*",
+        "symfony/monolog-bundle": "^3.10",
+        "symfony/notifier": "7.3.*",
+        "symfony/ntfy-notifier": "7.3.*",
+        "symfony/object-mapper": "7.3.*",
+        "symfony/property-access": "7.3.*",
+        "symfony/property-info": "7.3.*",
         "symfony/runtime": "7.3.*",
         "symfony/scheduler": "7.3.*",
         "symfony/security-bundle": "7.3.*",
+        "symfony/serializer": "7.3.*",
         "symfony/stimulus-bundle": "^2.24",
         "symfony/twig-bundle": "7.3.*",
         "symfony/ux-autocomplete": "^2.27",
@@ -104,6 +115,7 @@
         "post-update-cmd": [
             "@auto-scripts"
         ],
+        "tail": "docker compose exec app ./bin/console tailwind:build --watch",
         "sym": "docker compose exec app ./bin/console"
     },
     "conflict": {
@@ -117,6 +129,7 @@
     },
     "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

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

config/packages/doctrine.yaml

@@ -41,7 +41,13 @@ doctrine:
                 is_bundle: false
                 dir: '%kernel.project_dir%/src/Monitor/Framework/Entity'
                 prefix: 'App\Monitor\Framework\Entity'
-                alias: Download
+                alias: Monitor
+            EventLog:
+                type: attribute
+                is_bundle: false
+                dir: '%kernel.project_dir%/src/EventLog/Framework/Entity'
+                prefix: 'App\EventLog\Framework\Entity'
+                alias: EventLog
         controller_resolver:
             auto_mapping: false
 

config/packages/messenger.yaml

@@ -15,6 +15,26 @@ framework:
                     max_retries: 1
                     multiplier: 1
 
+            download:
+                dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
+                options:
+                    use_notify: true
+                    check_delayed_interval: 60000
+                    queue_name: download
+                retry_strategy:
+                    max_retries: 3
+                    multiplier: 1
+
+            monitor:
+                dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
+                options:
+                    use_notify: true
+                    check_delayed_interval: 60000
+                    queue_name: monitor
+                retry_strategy:
+                    max_retries: 1
+                    multiplier: 1
+
             media_cache:
                 dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
                 options:
@@ -36,12 +56,12 @@ framework:
         routing:
             # Route your messages to the transports
             # 'App\Message\YourMessage': async
-            'App\Download\Action\Command\DownloadMediaCommand': async
+            'App\Download\Action\Command\DownloadMediaCommand': download
             'App\Download\Action\Command\DownloadSeasonCommand': async
-            'App\Monitor\Action\Command\MonitorTvEpisodeCommand': async
-            'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
-            'App\Monitor\Action\Command\MonitorTvShowCommand': async
-            'App\Monitor\Action\Command\MonitorMovieCommand': async
+            'App\Monitor\Action\Command\MonitorTvEpisodeCommand': monitor
+            'App\Monitor\Action\Command\MonitorTvSeasonCommand': monitor
+            'App\Monitor\Action\Command\MonitorTvShowCommand': monitor
+            'App\Monitor\Action\Command\MonitorMovieCommand': monitor
             'App\Torrentio\Action\Command\GetTvShowOptionsCommand': media_cache
 
 # when@test:

config/packages/monolog.yaml

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

config/packages/notifier.yaml

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

@@ -45,6 +45,7 @@ security:
     # Easy way to control access for large sections of your site
     # Note: Only the *first* access control that matches will be used
     access_control:
+        - { path: ^/monitors/ical/, roles: PUBLIC_ACCESS }
         - { path: ^/reset-password, roles: PUBLIC_ACCESS }
         - { path: ^/getting-started, roles: PUBLIC_ACCESS }
         - { path: ^/register, roles: PUBLIC_ACCESS }

config/packages/sentry.yaml

@@ -0,0 +1,39 @@
+when@prod:
+    sentry:
+        register_error_listener: true # Disables the ErrorListener to avoid duplicated log in sentry
+        register_error_handler: true # Disables the ErrorListener, ExceptionListener and FatalErrorListener integrations of the base PHP SDK
+
+        options:
+            traces_sample_rate: .25
+            profiles_sample_rate: .25
+            attach_stacktrace: true
+
+        tracing:
+            enabled: true
+            dbal: # DB queries
+                enabled: true
+            cache: # cache pools
+                enabled: true
+            twig: # templating engine
+                enabled: true
+
+    services:
+        # (Optionally) Configure the breadcrumb handler as a service (needed for the breadcrumb Monolog handler)
+        Sentry\Monolog\BreadcrumbHandler:
+            arguments:
+                - '@Sentry\State\HubInterface'
+                - !php/const Monolog\Logger::INFO # Configures the level of messages to capture as breadcrumbs
+    monolog:
+        handlers:
+            # (Optionally) Register the breadcrumb handler as a Monolog handler
+            sentry_breadcrumbs:
+                type: service
+                name: sentry_breadcrumbs
+                id: Sentry\Monolog\BreadcrumbHandler
+            # Register the handler as a Monolog handler to capture messages as events
+            sentry:
+                type: sentry
+                level: !php/const Monolog\Logger::ERROR # Configures the level of messages to capture as events
+                hub_id: Sentry\State\HubInterface
+                fill_extra_context: true # Enables sending monolog context to Sentry
+                process_psr_3_messages: false # Disables the resolution of PSR-3 placeholders in reported messages

config/routes.yaml

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

config/services.yaml

@@ -32,7 +32,7 @@ parameters:
     app.cache.redis.host.default: 'redis://redis'
 
     # Various configs
-    app.default.version: '0.dev'
+    app.default.version: '0.0.0-dev'
     app.default.timezone: 'America/Chicago'
 
     # Auth
@@ -44,6 +44,10 @@ parameters:
     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
     _defaults:

deploy.compose.yml

@@ -2,11 +2,10 @@ services:
   app:
     image: registry.caldwell.digital/home/torsearch-app:${TAG}
     ports:
-      - '8001:80'
+      - "${SWARM_PORT}:80"
     environment:
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
       MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-    tty: true
     deploy:
       replicas: 2
     volumes:
@@ -14,8 +13,6 @@ services:
       - /mnt/media/downloads/tvshows:/var/download/tvshows
       - mercure_data:/data
       - mercure_config:/config
-    depends_on:
-      - database
 
 
   worker:
@@ -23,8 +20,6 @@ services:
     volumes:
       - /mnt/media/downloads/movies:/var/download/movies
       - /mnt/media/downloads/tvshows:/var/download/tvshows
-    restart: always
-    command: -vv --time-limit=3600 --limit=10
     deploy:
       replicas: 2
     depends_on:
@@ -36,23 +31,10 @@ services:
     volumes:
       - /mnt/media/downloads/movies:/var/download/movies
       - /mnt/media/downloads/tvshows:/var/download/tvshows
-    restart: always
-    command: -vv
     depends_on:
       - app
 
 
-  redis:
-    image: redis:latest
-    volumes:
-      - redis_data:/data
-    command: redis-server --maxmemory 512MB
-    restart: unless-stopped
-
-
 volumes:
-  mysql:
   mercure_config:
   mercure_data:
-  redis_data:
-

deployment.properties

@@ -10,6 +10,7 @@ templates
 var
 vendor
 build.xml
+.git
 .env
 .env.local
 composer.json

docker/Dockerfile.app

@@ -1,19 +1,8 @@
-FROM dunglas/frankenphp
+FROM code.caldwell.digital/home/torsearch-base:php8.4
 
-ENV SERVER_NAME=":80"
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
-
-ARG APP_VERSION="0.dev"
+ARG APP_VERSION="0.0.0-dev"
 ENV APP_VERSION="${APP_VERSION}"
 
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
-
 COPY . /app
 COPY --chmod=775 docker/app/entrypoint.sh /usr/local/bin/docker-entrypoint
 COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile

docker/Dockerfile.base.app

@@ -0,0 +1,14 @@
+ARG FRANKENPHP_TAG
+
+FROM dunglas/frankenphp:${FRANKENPHP_TAG}
+
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache

docker/Dockerfile.base.worker

@@ -0,0 +1,40 @@
+#####
+# This version of Torsearch runs the scheduler, downloader, and worker
+# in a single container. Each process is managerd by supervisord
+# and can be configured via environment variables and more
+# than one of these containers cans till be run.
+#####
+ARG ALPINE_VERSION="3.22"
+FROM alpine:${ALPINE_VERSION} AS build_stage
+
+RUN apk add --no-cache \
+  curl \
+  php84 \
+  php84-ctype \
+  php84-curl \
+  php84-dom \
+  php84-fileinfo \
+  php84-fpm \
+  php84-gd \
+  php84-mbstring \
+  php84-mysqli \
+  php84-opcache \
+  php84-openssl \
+  php84-pdo_mysql \
+  php84-tokenizer \
+  php84-xml \
+  supervisor
+
+RUN ln -s /usr/bin/php84 /usr/bin/php
+
+RUN mkdir -p /etc/supervisor/conf.d
+
+# We start supervisord and supervisord starts
+# respective service in the configuration file.
+ENTRYPOINT ["/app/bin/console", "init:worker"]
+
+# Message transports can be enabled by passing them as command options.
+# Inlcluding a number with the option will start that amount of processes
+# for the transport. Not supplying a number will default to 1.
+# --download --monitor OR --download 2 --monitor
+

docker/Dockerfile.scheduler

@@ -1,21 +1,24 @@
-FROM dunglas/frankenphp:php8.4-alpine
+###
+# This version of Torsearch can run the scheduler, downloader, and
+# worker in one container. Each process is managerd by supervisord
+# and can be configured via environment variables, and more than
+# one of these containers can still be run.
+###
 
-ENV SERVER_NAME=":80"
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+# Default to latest, but should pass in a version
+ARG APP_VERSION="latest"
 
-ARG APP_VERSION="0.dev"
-ENV APP_VERSION="${APP_VERSION}"
+# Set aside the actual app image so we can copy the app from there
+FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS app_image
 
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
+# Start with our base worker image
+FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
 
-COPY . /app
+# Set the APP_VERSION in the image
+ENV APP_VERSION=${APP_VERSION}
 
-ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
+# Copy the actual application code from the previously built app
+COPY --chown=1000:1000 --from=app_image /app /app
 
-HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0
+# To retain backwards compatibility, default to async & download transports
+CMD [ "--monitor" ]

docker/Dockerfile.worker

@@ -1,23 +1,24 @@
-FROM dunglas/frankenphp:php8.4-alpine
+###
+# This version of Torsearch can run the scheduler, downloader, and
+# worker in one container. Each process is managerd by supervisord
+# and can be configured via environment variables, and more than
+# one of these containers can still be run.
+###
 
-ENV SERVER_NAME=":80"
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+# Default to latest, but should pass in a version
+ARG APP_VERSION="latest"
 
-ARG APP_VERSION="0.dev"
-ENV APP_VERSION="${APP_VERSION}"
+# Set aside the actual app image so we can copy the app from there
+FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS app_image
 
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
+# Start with our base worker image
+FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
 
-RUN apk add --no-cache wget
+# Set the APP_VERSION in the image
+ENV APP_VERSION=${APP_VERSION}
 
-COPY . /app
+# Copy the actual application code from the previously built app
+COPY --chown=1000:1000 --from=app_image /app /app
 
-ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]
-
-HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0
+# To retain backwards compatibility, default to async & download transports
+CMD [ "--async", "--download" ]

docker/worker/async.conf

@@ -0,0 +1,10 @@
+[program:torsearch-worker]
+command=/app/bin/console messenger:consume async -vv --time-limit 3600
+numprocs=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

docker/worker/download.conf

@@ -0,0 +1,10 @@
+[program:torsearch-downloader]
+command=/app/bin/console messenger:consume download -vv --time-limit 3600
+numprocs=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

docker/worker/monitor.conf

@@ -0,0 +1,10 @@
+[program:torsearch-scheduler]
+command=/app/bin/console messenger:consume scheduler_monitor monitor -vv --time-limit 21600
+numprocs=1
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=true
+startretries=3
+process_name=%(program_name)s_%(process_num)02d

docker/worker/supervisord.conf

@@ -0,0 +1,5 @@
+[supervisord]
+nodaemon=true
+logfile=/dev/null
+logfile_maxbytes=0
+pidfile=/run/supervisord.pid

importmap.php

@@ -67,4 +67,7 @@ return [
     'pulltorefreshjs' => [
         'version' => '0.1.22',
     ],
+    '@ungap/custom-elements' => [
+        'version' => '1.3.0',
+    ],
 ];

migrations/Version20250823173128.php

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

migrations/Version20250831013403.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250831013403 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'
+            DROP TABLE IF EXISTS  sessions
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE user_preference CHANGE preference_value preference_value VARCHAR(1024) DEFAULT NULL
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            CREATE TABLE sessions (sess_id VARBINARY(128) NOT NULL, sess_data LONGBLOB NOT NULL, sess_lifetime INT UNSIGNED NOT NULL, sess_time INT UNSIGNED NOT NULL, INDEX sess_lifetime_idx (sess_lifetime), PRIMARY KEY(sess_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_bin` ENGINE = InnoDB COMMENT = '' 
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE user_preference CHANGE preference_value preference_value VARCHAR(255) DEFAULT NULL
+        SQL);
+    }
+}

migrations/Version20251101194723.php

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

migrations/Version20251101211617.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20251101211617 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 event_log (id INT AUTO_INCREMENT NOT NULL, type VARCHAR(255) DEFAULT NULL, message LONGTEXT DEFAULT NULL, context JSON DEFAULT NULL COMMENT '(DC2Type:json)', PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            DROP TABLE event_log
+        SQL);
+    }
+}

migrations/Version20251102004627.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20251102004627 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 event_log ADD user_id INT DEFAULT NULL
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE event_log ADD CONSTRAINT FK_9EF0AD16A76ED395 FOREIGN KEY (user_id) REFERENCES user (id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_9EF0AD16A76ED395 ON event_log (user_id)
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE event_log DROP FOREIGN KEY FK_9EF0AD16A76ED395
+        SQL);
+        $this->addSql(<<<'SQL'
+            DROP INDEX IDX_9EF0AD16A76ED395 ON event_log
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE event_log DROP user_id
+        SQL);
+    }
+}

migrations/Version20251102221034.php

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

phpunit.dist.xml

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

psalm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="true"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/Base/ConfigResolver.php

@@ -2,16 +2,25 @@
 
 namespace App\Base;
 
+use App\Base\Dto\AppVersionDto;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 final class ConfigResolver
 {
+    const SEMVER_REGEX = '/^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/';
+
     private array $messages = [];
 
     public function __construct(
+        private readonly DenormalizerInterface $denormalizer,
+
         #[Autowire(param: 'app.url')]
         private readonly ?string $appUrl = null,
 
+        #[Autowire(param: 'app.version')]
+        private readonly ?string $appVersion = null,
+
         #[Autowire(param: 'app.debrid.real_debrid.key')]
         private readonly ?string $realDebridApiKey = null,
 
@@ -38,6 +47,12 @@ final class ConfigResolver
 
         #[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
@@ -54,6 +69,12 @@ final class ConfigResolver
             $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;
     }
 
@@ -80,6 +101,13 @@ final class ConfigResolver
         return $this->authOidcBypassFormLogin;
     }
 
+    public function getAppVersion(): AppVersionDto
+    {
+        $matches = [];
+        preg_match(self::SEMVER_REGEX, $this->appVersion, $matches);
+        return $this->denormalizer->denormalize($matches, AppVersionDto::class);
+    }
+
     public function getAuthConfig(): array
     {
         return [

src/Base/Dto/AppVersionDto.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Base\Dto;
+
+use Symfony\Component\Serializer\Attribute\SerializedPath;
+
+class AppVersionDto
+{
+    #[SerializedPath('[1]')]
+    public string|int $major = 0;
+    #[SerializedPath('[2]')]
+    public string|int $minor = 0;
+    #[SerializedPath('[3]')]
+    public string|int $patch = 0;
+    #[SerializedPath('[4]')]
+    public ?string $pre = null;
+    #[SerializedPath('[5]')]
+    public ?string $build = null;
+
+    public function __toString()
+    {
+        return 'v' . $this->major . '.' . $this->minor . '.' . $this->patch . ($this->pre ? '-' . $this->pre : '') . ($this->build ? '+' . $this->build : '');
+    }
+}

src/Base/Enum/MediaType.php

@@ -6,4 +6,5 @@ enum MediaType: string
 {
     case Movie = 'movies';
     case TvShow = 'tvshows';
+    case TvEpisode = 'tvepisode';
 }

src/Base/Framework/Command/InitWorker.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Base\Framework\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Twig\Environment;
+
+class InitWorker extends Command
+{
+    public function __construct(
+        private Environment $twig,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setName('init:worker')
+            ->addOption('async', null, InputOption::VALUE_OPTIONAL, 'Run the async worker.',false)
+            ->addOption('download', null, InputOption::VALUE_OPTIONAL, 'Run the download worker.', false)
+            ->addOption('monitor', null, InputOption::VALUE_OPTIONAL, 'Run the monitor worker.', false)
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $configFile = $this->twig->render("config/supervisord.conf.twig", []);
+
+        if ($this->optionExists($input, $output, 'async')) {
+            $configFile .= $this->twig->render("config/async.conf.twig", [
+                'replicas' => $this->getOptionValue('async', $input),
+            ]) . "\n\n";
+        }
+
+        if ($this->optionExists($input, $output, 'download')) {
+            $configFile .= $this->twig->render("config/download.conf.twig", [
+                'replicas' => $this->getOptionValue('download', $input),
+            ]). "\n\n";
+        }
+
+        if ($this->optionExists($input, $output, 'monitor')) {
+            $configFile .= $this->twig->render("config/monitor.conf.twig", [
+                'replicas' => $this->getOptionValue('monitor', $input),
+            ]). "\n\n";
+        }
+
+        if ("" !== $configFile) {
+            $output->writeln("[init:worker] Writing /etc/supervisor/conf.d/supervisord.conf");
+            file_put_contents("/etc/supervisor/conf.d/supervisord.conf", $configFile);
+
+            $output->writeln("[init:worker] Starting supervisord");
+            shell_exec("/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf");
+            return Command::SUCCESS;
+        }
+
+        $output->writeln("[init:worker] No workers selected. Exiting.");
+        return Command::FAILURE;
+    }
+
+    private function optionExists(InputInterface $input, OutputInterface $output, string $option): bool
+    {
+        if ($input->getOption($option) !== false) {
+            $value = $input->getOption($option) ?? 1;
+            $output->writeln("[init:worker] transport: $option // $value // input var");;
+            return true;
+        }
+
+        $optionKey = 'WORKER_' . strtoupper($option);
+        if (array_key_exists($optionKey, $_SERVER) && $_SERVER[$optionKey] !== null && $_SERVER[$optionKey] !== '') {
+            $output->writeln("[init:worker] transport: $option // $_SERVER[$optionKey] // env var");
+            return true;
+        }
+
+        return false;
+    }
+
+    private function getOptionValue(string $option, InputInterface $input): int
+    {
+        if ($input->getOption($option) !== false) {
+            return $input->getOption($option) ?? 1;
+        }
+
+        $optionKey = 'WORKER_' . strtoupper($option);
+        return $_SERVER[$optionKey];
+    }
+}

src/Base/Framework/Command/SeedDatabaseCommand.php

@@ -135,6 +135,13 @@ class SeedDatabaseCommand extends Command
                 'enabled' => true,
                 'type' => 'download'
             ],
+            [
+                'id' => 'enable_ical_up_ep',
+                'name' => 'Enable a publicly available iCal calendar?',
+                'description' => 'Enable a publicly accessible iCal URL for your upcoming episodes.',
+                'enabled' => false,
+                'type' => 'calendar'
+            ],
         ];
     }
 }

src/Base/Framework/Controller/IndexController.php

@@ -2,33 +2,31 @@
 
 namespace App\Base\Framework\Controller;
 
+use App\Monitor\Action\Command\MonitorTvShowCommand;
 use App\Monitor\Action\Handler\MonitorTvShowHandler;
-use App\Tmdb\Tmdb;
-use App\User\Framework\Entity\User;
+use App\Tmdb\TmdbClient;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Mime\Email;
 use Symfony\Component\Routing\Attribute\Route;
 
 final class IndexController extends AbstractController
 {
     public function __construct(
-        private readonly Tmdb $tmdb,
-        private readonly MonitorTvShowHandler $monitorTvShowHandler,
+        private readonly TmdbClient $tmdb,
     ) {}
 
     #[Route('/', name: 'app_index')]
     public function index(Request $request): Response
     {
-        /** @var User $user */
-        $user = $this->getUser();
         return $this->render('index/index.html.twig', [
             'active_downloads' => $this->getUser()->getActiveDownloads(),
             'recent_downloads' => $this->getUser()->getDownloads(),
-            'popular_movies' => $this->tmdb->popularMovies(1, 6),
-            'popular_tvshows' => $this->tmdb->popularTvShows(1, 6),
+            'popular_movies' => $this->tmdb->popularMovies(),
+            'popular_tvshows' => $this->tmdb->popularTvShows(),
         ]);
     }
 
@@ -48,4 +46,11 @@ final class IndexController extends AbstractController
             'message' => 'Email sent!'
         ]);
     }
+
+    #[Route('/test')]
+    public function monitorTvShow(MonitorTvShowHandler $handler): Response
+    {
+//        $handler->handle(new MonitorTvShowCommand(82));
+        return $this->render('index/test.html.twig', []);
+    }
 }

src/Base/Service/Broadcaster.php

@@ -2,33 +2,53 @@
 
 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"): void
+    public function alert(string $title, string $message, string $type = "success", bool $sendPush = false): void
     {
-        $userAlertTopic = $this->requestStack->getCurrentRequest()->getSession()->get('mercure_alert_topic');
-        $update = new Update(
-            $userAlertTopic,
-            $this->renderer->render('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => $title,
-                'message' => $message,
-                'type' => $type,
-            ])
-        );
-        $this->hub->publish($update);
+        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/Service/MediaFiles.php

@@ -4,7 +4,7 @@ namespace App\Base\Service;
 
 use Aimeos\Map;
 use App\Download\Framework\Entity\Download;
-use Nihilarr\PTN;
+use App\Base\Util\PTN;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Filesystem\Filesystem;

src/Base/Util/ImdbMatcher.php

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

src/Base/Util/PTN.php

@@ -0,0 +1,246 @@
+<?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/Download/Action/Handler/DeleteDownloadHandler.php

@@ -4,17 +4,22 @@ namespace App\Download\Action\Handler;
 
 use App\Download\Action\Command\DeleteDownloadCommand;
 use App\Download\Action\Result\DeleteDownloadResult;
+use App\Download\DownloadEvents;
 use App\Download\Framework\Repository\DownloadRepository;
+use App\EventLog\Action\Command\AddEventLogCommand;
 use App\Library\Action\Command\DeleteMediaFileCommand;
 use App\Library\Action\Handler\DeleteMediaFileHandler;
+use App\Monitor\MonitorEvents;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 /** @implements HandlerInterface<DeleteDownloadCommand, DeleteDownloadResult> */
 readonly class DeleteDownloadHandler implements HandlerInterface
 {
     public function __construct(
+        private MessageBusInterface $bus,
         private DownloadRepository $downloadRepository,
         private DeleteMediaFileHandler $deleteMediaFileHandler,
     ) {}
@@ -31,6 +36,13 @@ readonly class DeleteDownloadHandler implements HandlerInterface
         }
         $this->downloadRepository->delete($command->downloadId);
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $download->getUser(),
+            DownloadEvents::DOWNLOAD_DELETED->type(),
+            DownloadEvents::DOWNLOAD_DELETED->message(),
+            (array) $download
+        ));
+
         return new DeleteDownloadResult(
             status: 200,
             message: 'Success',

src/Download/Action/Handler/DownloadMediaHandler.php

@@ -4,18 +4,22 @@ namespace App\Download\Action\Handler;
 
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Download\Action\Result\DownloadMediaResult;
+use App\Download\DownloadEvents;
 use App\Download\Framework\Repository\DownloadRepository;
 use App\Download\Downloader\DownloaderInterface;
+use App\EventLog\Action\Command\AddEventLogCommand;
 use App\User\Framework\Repository\UserRepository;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 /** @implements HandlerInterface<DownloadMediaCommand, DownloadMediaResult> */
 readonly class DownloadMediaHandler implements HandlerInterface
 {
     public function __construct(
+        private MessageBusInterface $bus,
         private DownloaderInterface $downloader,
         private DownloadRepository $downloadRepository,
         private UserRepository $userRepository,
@@ -23,9 +27,17 @@ readonly class DownloadMediaHandler implements HandlerInterface
 
     public function handle(CommandInterface $command): ResultInterface
     {
+        $user = $this->userRepository->find($command->userId);
+        $this->bus->dispatch(new AddEventLogCommand(
+            $user,
+            DownloadEvents::DOWNLOAD_STARTED->type(),
+            DownloadEvents::DOWNLOAD_STARTED->message(),
+            (array) $command
+        ));
+
         if (null === $command->downloadId) {
             $download = $this->downloadRepository->insert(
-                $this->userRepository->find($command->userId),
+                $user,
                 $command->url,
                 $command->title,
                 $command->filename,
@@ -57,6 +69,12 @@ readonly class DownloadMediaHandler implements HandlerInterface
             throw new UnrecoverableMessageHandlingException($exception->getMessage(), 500);
         }
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $user,
+            DownloadEvents::DOWNLOAD_FINISHED->type(),
+            DownloadEvents::DOWNLOAD_FINISHED->message(),
+            (array) $command
+        ));
         return new DownloadMediaResult(200, "Success.");
     }
 }

src/Download/Action/Handler/DownloadSeasonHandler.php

@@ -3,18 +3,19 @@
 namespace App\Download\Action\Handler;
 
 use Aimeos\Map;
+use App\Base\Enum\MediaType;
 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\Tmdb\TmdbClient;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\User\Dto\UserPreferencesFactory;
 use App\User\Framework\Repository\UserRepository;
-use Nihilarr\PTN;
+use App\Base\Util\PTN;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -27,7 +28,7 @@ readonly class DownloadSeasonHandler implements HandlerInterface
     public function __construct(
         private MediaFiles $mediaFiles,
         private LoggerInterface $logger,
-        private Tmdb $tmdb,
+        private TmdbClient $tmdb,
         private MessageBusInterface $bus,
         private DownloadOptionEvaluator $downloadOptionEvaluator,
         private GetTvShowOptionsHandler $getTvShowOptionsHandler,
@@ -36,7 +37,8 @@ readonly class DownloadSeasonHandler implements HandlerInterface
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $series = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
+        $series = $this->tmdb->tvshowDetails($command->imdbId);
+
         $this->logger->info('> [DownloadTvSeasonHandler] Executing DownloadTvSeasonHandler for "' . $series->title . '" season ' . $command->season);
 
         $episodesInSeason = Map::from($series->episodes[$command->season]);

src/Download/DownloadEvents.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Download;
+
+enum DownloadEvents
+{
+    case DOWNLOAD_ADDED;
+    case DOWNLOAD_STARTED;
+    case DOWNLOAD_FINISHED;
+    case DOWNLOAD_DELETED;
+    case DOWNLOAD_ERROR;
+
+    public function type(): string
+    {
+        return match ($this) {
+            self::DOWNLOAD_ADDED => 'download_added',
+            self::DOWNLOAD_STARTED => 'download_started',
+            self::DOWNLOAD_FINISHED => 'download_finished',
+            self::DOWNLOAD_DELETED => 'download_deleted',
+            self::DOWNLOAD_ERROR => 'download_error',
+        };
+    }
+
+    public function message(): string
+    {
+        return match ($this) {
+            self::DOWNLOAD_ADDED => 'A new download has been added.',
+            self::DOWNLOAD_STARTED => 'A download has started.',
+            self::DOWNLOAD_FINISHED => 'A download has finished.',
+            self::DOWNLOAD_DELETED => 'A download has been deleted.',
+            self::DOWNLOAD_ERROR => 'A download has encountered an error.',
+        };
+    }
+}

src/Download/DownloadOptionEvaluator.php

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

src/Download/Downloader/ProcessDownloader.php

@@ -2,10 +2,14 @@
 
 namespace App\Download\Downloader;
 
+use App\Base\Service\Broadcaster;
 use App\Base\Service\MediaFiles;
+use App\Download\DownloadEvents;
 use App\Download\Framework\Entity\Download;
+use App\EventLog\Action\Command\AddEventLogCommand;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
 use Symfony\Contracts\Cache\CacheInterface;
@@ -16,9 +20,11 @@ class ProcessDownloader implements DownloaderInterface
      * @var RedisAdapter $cache
      */
     public function __construct(
+        private MessageBusInterface $bus,
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
         private CacheInterface $cache,
+        private readonly Broadcaster $broadcaster,
     ) {}
 
     /**
@@ -82,9 +88,16 @@ class ProcessDownloader implements DownloaderInterface
             });
             if ($downloadEntity->getStatus() !== 'Paused') {
                 $downloadEntity->setProgress(100);
+                $this->alertComplete($downloadEntity);
             }
         } catch (ProcessFailedException $exception) {
             $downloadEntity->setStatus('Failed');
+            $this->bus->dispatch(new AddEventLogCommand(
+                $downloadEntity->getUser()->getId(),
+                DownloadEvents::DOWNLOAD_ERROR->type(),
+                DownloadEvents::DOWNLOAD_ERROR->message() . ': ' . $exception->getMessage(),
+                (array) $downloadEntity
+            ));
         }
 
         $this->entityManager->flush();
@@ -105,4 +118,15 @@ 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

@@ -11,7 +11,9 @@ 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\DownloadEvents;
 use App\Download\Framework\Repository\DownloadRepository;
+use App\EventLog\Action\Command\AddEventLogCommand;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -41,6 +43,13 @@ class ApiController extends AbstractController
         $input->downloadId = $download->getId();
         $input->userId = $this->getUser()->getId();
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $this->getUser(),
+            DownloadEvents::DOWNLOAD_ADDED->type(),
+            DownloadEvents::DOWNLOAD_ADDED->message(),
+            (array) $download
+        ));
+
         try {
             $this->bus->dispatch($input->toCommand());
         } catch (\Throwable $exception) {

src/Download/Framework/Entity/Download.php

@@ -6,7 +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 Nihilarr\PTN;
+use App\Base\Util\PTN;
 use Symfony\Component\Serializer\Attribute\Ignore;
 use Symfony\UX\Turbo\Attribute\Broadcast;
 

src/Download/Framework/Repository/DownloadRepository.php

@@ -7,7 +7,7 @@ use App\Download\Framework\Entity\Download;
 use App\User\Framework\Entity\User;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
-use Nihilarr\PTN;
+use App\Base\Util\PTN;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**

src/EventLog/Action/Command/AddEventLogCommand.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\EventLog\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+/** @implements CommandInterface<AddEventLogCommand> */
+class AddEventLogCommand implements CommandInterface
+{
+    public function __construct(
+        public UserInterface $user,
+        public string $type,
+        public string $message,
+        public array $context,
+    ) {}
+}

src/EventLog/Action/Handler/AddEventLogHandler.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\EventLog\Action\Handler;
+
+use App\EventLog\Framework\Repository\EventLogRepository;
+use App\EventLog\Action\Command\AddEventLogCommand;
+use App\EventLog\Action\Result\AddEventLogResult;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/*** @implements HandlerInterface<AddEventLogCommand> */
+class AddEventLogHandler implements HandlerInterface
+{
+    public function __construct(
+        private EventLogRepository $repository,
+    ) {}
+
+    public function handle(CommandInterface $command): ResultInterface
+    {
+        $eventLog = $this->repository->insert(
+            user: $command->user,
+            type: $command->type,
+            message: $command->message,
+            context: $command->context
+        );
+        return new AddEventLogResult($eventLog);
+    }
+}

src/EventLog/Action/Input/AddEventLogInput.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\EventLog\Action\Input;
+
+use App\EventLog\Action\Command\AddEventLogCommand;
+use OneToMany\RichBundle\Attribute\SourceQuery;
+use OneToMany\RichBundle\Attribute\SourceRequest;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\InputInterface;
+
+/** @implements InputInterface<AddEventLogCommand> */
+class AddEventLogInput implements InputInterface
+{
+    public function __construct(
+        #[SourceQuery('type')]
+        #[SourceRequest('type')]
+        public string $type,
+        
+        #[SourceQuery('message')]
+        #[SourceRequest('message')]
+        public string $message,
+        
+        #[SourceQuery('context')]
+        #[SourceRequest('context')]
+        public array $context = []
+    ){}
+
+    public function toCommand(): CommandInterface
+    {
+        return new AddEventLogCommand(
+            $this->type,
+            $this->message,
+            $this->context
+        );
+    }
+}

src/EventLog/Action/Result/AddEventLogResult.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\EventLog\Action\Result;
+
+use App\EventLog\Framework\Entity\EventLog;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/** @implements ResultInterface<AddEventLogResult> */
+class AddEventLogResult implements ResultInterface
+{
+    public function __construct(
+        public EventLog $eventLog,
+    ) {}
+}

src/EventLog/Framework/Controller/EventLogController.php

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

src/EventLog/Framework/Entity/EventLog.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\EventLog\Framework\Entity;
+
+use App\EventLog\Framework\Repository\EventLogRepository;
+use App\User\Framework\Entity\User;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Mapping as ORM;
+use Gedmo\Timestampable\Traits\TimestampableEntity;
+
+#[ORM\Entity(repositoryClass: EventLogRepository::class)]
+class EventLog
+{
+    use TimestampableEntity;
+
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(nullable: true)]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 255, nullable: true)]
+    private ?string $type = null;
+
+    #[ORM\Column(type: Types::TEXT, nullable: true)]
+    private ?string $message = null;
+
+    #[ORM\Column(type: Types::JSON, nullable: true)]
+    private ?array $context = null;
+
+    #[ORM\ManyToOne(inversedBy: 'eventLogs')]
+    private ?User $user = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getType(): ?string
+    {
+        return $this->type;
+    }
+
+    public function setType(?string $type): self
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    public function getMessage(): ?string
+    {
+        return $this->message;
+    }
+
+    public function setMessage(?string $message): self
+    {
+        $this->message = $message;
+        return $this;
+    }
+
+    public function getContext(): ?array
+    {
+        return $this->context;
+    }
+
+    public function setContext(?array $context): self
+    {
+        $this->context = $context;
+        return $this;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function setUser(?User $user): static
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+}

src/EventLog/Framework/Repository/EventLogRepository.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\EventLog\Framework\Repository;
+
+use App\EventLog\Framework\Entity\EventLog;
+use App\User\Framework\Entity\User;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<EventLog>
+ */
+class EventLogRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, EventLog::class);
+    }
+
+    public function insert(
+        User $user,
+        string $type,
+        string $message,
+        array $context = []
+    ): EventLog {
+        $eventLog = new EventLog()
+            ->setUser($user)
+            ->setType($type)
+            ->setMessage($message)
+            ->setContext($context);
+        $this->getEntityManager()->persist($eventLog);
+        $this->getEntityManager()->flush();
+        return $eventLog;
+    }
+}

src/Library/Action/Handler/LibrarySearchHandler.php

@@ -6,7 +6,7 @@ use App\Base\Service\MediaFiles;
 use App\Library\Action\Command\LibrarySearchCommand;
 use App\Library\Action\Result\LibrarySearchResult;
 use App\Library\Dto\MediaFileDto;
-use Nihilarr\PTN;
+use App\Base\Util\PTN;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;

src/Monitor/Action/Handler/AddMonitorHandler.php

@@ -2,20 +2,24 @@
 
 namespace App\Monitor\Action\Handler;
 
+use App\EventLog\Action\Command\AddEventLogCommand;
 use App\Monitor\Action\Command\AddMonitorCommand;
 use App\Monitor\Action\Result\AddMonitorResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Monitor\MonitorEvents;
 use App\User\Framework\Repository\UserRepository;
 use DateTimeImmutable;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 /** @implements HandlerInterface<AddMonitorCommand> */
 readonly class AddMonitorHandler implements HandlerInterface
 {
     public function __construct(
+        private MessageBusInterface $bus,
         private MonitorRepository $movieMonitorRepository,
         private UserRepository $userRepository,
     ) {}
@@ -35,6 +39,13 @@ readonly class AddMonitorHandler implements HandlerInterface
             ->setSearchCount(0)
             ->setStatus('New');
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $user,
+            MonitorEvents::MONITOR_ADDED->type(),
+            MonitorEvents::MONITOR_ADDED->message(),
+            (array) $monitor
+        ));
+
         $this->movieMonitorRepository->getEntityManager()->persist($monitor);
         $this->movieMonitorRepository->getEntityManager()->flush();
 

src/Monitor/Action/Handler/DeleteMonitorHandler.php

@@ -2,22 +2,22 @@
 
 namespace App\Monitor\Action\Handler;
 
-use App\Monitor\Action\Command\AddMonitorCommand;
+use App\Download\DownloadEvents;
+use App\EventLog\Action\Command\AddEventLogCommand;
 use App\Monitor\Action\Command\DeleteMonitorCommand;
-use App\Monitor\Action\Result\AddMonitorResult;
 use App\Monitor\Action\Result\DeleteMonitorResult;
-use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use App\User\Framework\Repository\UserRepository;
-use DateTimeImmutable;
+use App\Monitor\MonitorEvents;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 /** @implements HandlerInterface<DeleteMonitorCommand, DeleteMonitorResult> */
 readonly class DeleteMonitorHandler implements HandlerInterface
 {
     public function __construct(
+        private MessageBusInterface $bus,
         private MonitorRepository $monitorRepository,
     ) {}
 
@@ -27,6 +27,13 @@ readonly class DeleteMonitorHandler implements HandlerInterface
         $this->monitorRepository->getEntityManager()->remove($monitor);
         $this->monitorRepository->getEntityManager()->flush();
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $monitor->getUser(),
+            MonitorEvents::MONITOR_DELETED->type(),
+            MonitorEvents::MONITOR_DELETED->message(),
+            (array) $monitor
+        ));
+
         return new DeleteMonitorResult(
             status: 'OK',
             result: [],

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -5,12 +5,13 @@ 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\EventLog\Action\Command\AddEventLogCommand;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Result\MonitorTvEpisodeResult;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use App\Tmdb\Tmdb;
+use App\Monitor\MonitorEvents;
+use App\Tmdb\TmdbClient;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\User\Dto\UserPreferencesFactory;
@@ -33,7 +34,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
-        private Tmdb $tmdb,
+        private TmdbClient $tmdb,
         private DownloadRepository $downloadRepository,
     ) {}
 
@@ -43,8 +44,31 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
             $monitor = $this->monitorRepository->find($command->movieMonitorId);
             $this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler for ' . $monitor->getTitle() . ' season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode());
 
-            $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
-            if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::today('UTC')) {
+            $this->bus->dispatch(new AddEventLogCommand(
+                $monitor->getUser(),
+                MonitorEvents::MONITOR_STARTED->type(),
+                MonitorEvents::MONITOR_STARTED->message(),
+                (array) $command
+            ));
+
+            $episodeData = $this->tmdb->tvEpisodeDetails($monitor->getTmdbId(), $monitor->getImdbId(), $monitor->getSeason(), $monitor->getEpisode());
+
+            if (null === $episodeData->airDate || "" === $episodeData->airDate) {
+                $this->logger->info('> [MonitorTvEpisodeHandler] ...Episode does not have an air date, skipping for now');
+                return new MonitorTvEpisodeResult(
+                    status: 'OK',
+                    result: [
+                        'message' => 'No change',
+                        'monitor' => $monitor,
+                    ]
+                );
+            }
+
+            if (null === $monitor->getAirDate()) {
+                $monitor->setAirDate(Carbon::parse($episodeData->airDate));
+            }
+
+            if (Carbon::createFromTimestamp($episodeData->airDate) > Carbon::today('UTC')) {
                 $this->logger->info('> [MonitorTvEpisodeHandler] ...Episode has not aired yet, skipping for now');
                 return new MonitorTvEpisodeResult(
                     status: 'OK',
@@ -101,12 +125,25 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
             $this->logger->error('> [MonitorTvEpisodeHandler] ...Exception thrown: ' . $exception->getMessage());
             $this->logger->error($exception->getMessage());
             $monitor->setStatus('Active');
+            $this->bus->dispatch(new AddEventLogCommand(
+                $monitor->getUser(),
+                MonitorEvents::MONITOR_ERROR->type(),
+                MonitorEvents::MONITOR_ERROR->message() . ': ' . $exception->getMessage(),
+                (array) $monitor
+            ));
         }
 
         $monitor->setLastSearch(new DateTimeImmutable());
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
         $this->monitorRepository->getEntityManager()->flush();
 
+        $this->bus->dispatch(new AddEventLogCommand(
+            $monitor->getUser(),
+            MonitorEvents::MONITOR_FINISHED->type(),
+            MonitorEvents::MONITOR_FINISHED->message(),
+            (array) $monitor
+        ));
+
         return new MonitorTvEpisodeResult(
             status: 'OK',
             result: [

src/Monitor/Action/Handler/MonitorTvSeasonHandler.php

@@ -9,10 +9,10 @@ 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\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
-use Nihilarr\PTN;
+use App\Base\Util\PTN;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -26,7 +26,7 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
         private LoggerInterface $logger,
-        private Tmdb $tmdb,
+        private TmdbClient $tmdb,
         private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
     ) {}
 
@@ -50,7 +50,7 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
 
         // Compare against list from TMDB
         $episodesInSeason = Map::from(
-            $this->tmdb->tvDetails($monitor->getTmdbId())->episodes[$monitor->getSeason()]
+            $this->tmdb->tvshowDetails($monitor->getImdbId())->episodes[$monitor->getSeason()]
         )->rekey(fn($episode) => $episode['episode_number']);
         $this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($episodesInSeason) . ' episodes in season ' . $monitor->getSeason() . ' for title: ' . $monitor->getTitle());
 

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -9,11 +9,12 @@ 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\Tmdb\Tmdb;
+use App\Tmdb\Dto\TmdbEpisodeDto;
+use App\Tmdb\TmdbClient;
 use Carbon\Carbon;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
-use Nihilarr\PTN;
+use App\Base\Util\PTN;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -28,8 +29,9 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
         private MediaFiles $mediaFiles,
         private LoggerInterface $logger,
-        private Tmdb $tmdb,
-    ) {}
+        private TmdbClient $tmdb,
+    ) {
+    }
 
     public function handle(CommandInterface $command): ResultInterface
     {
@@ -39,76 +41,77 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         // Check current episodes
         $downloadedEpisodes = $this->mediaFiles
             ->getEpisodes($monitor->getTitle())
-            ->map(fn($episode) => (object) (new PTN())->parse($episode))
-            ->filter(fn ($episode) =>
-                property_exists($episode, 'episode')
+            ->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
-            )
-        ;
+            );
+
         $this->logger->info('> [MonitorTvShowHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
 
         // Compare against list from TMDB
         $episodesInShow = Map::from(
-            $this->tmdb->tvDetails($monitor->getTmdbId())->episodes
-        )->flat(1);
+            $this->tmdb->tvshowDetails($monitor->getImdbId())->episodes
+        )->flat(1)
+            ->filter(fn(TmdbEpisodeDto $episode) => $episode->seasonNumber >= $monitor->getSeason())
+            ->values();
 
         $this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes for title: ' . $monitor->getTitle());
 
         $episodeMonitors = [];
-        if ($downloadedEpisodes->count() !== $episodesInShow->count()) {
-            // 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'));
-                if (false === $episodeInFuture) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
-                    continue;
-                }
-
-                // Check if the episode is already downloaded
-                $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
-                $this->logger->info('> [MonitorTvShowHandler] ...Episode exists? ' . (true === $episodeExists ? 'YES' : 'NO'));
-                if (true === $episodeExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
-                    continue;
-                }
-
-                // Check for existing monitors
-                $monitorExists = $this->monitorExists($monitor, $episode);
-                $this->logger->info('> [MonitorTvShowHandler] ...Monitor exists? ' . (true === $monitorExists ? 'YES' : 'NO'));
-                if (true === $monitorExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
-                    continue;
-                }
-
-                // Create the monitor
-                $episodeMonitor = (new Monitor())
-                    ->setParent($monitor)
-                    ->setUser($monitor->getUser())
-                    ->setTmdbId($monitor->getTmdbId())
-                    ->setImdbId($monitor->getImdbId())
-                    ->setTitle($monitor->getTitle())
-                    ->setMonitorType('tvepisode')
-                    ->setSeason($episode['season_number'])
-                    ->setEpisode($episode['episode_number'])
-                    ->setCreatedAt(new DateTimeImmutable())
-                    ->setSearchCount(0)
-                    ->setStatus('New');
-
-                $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
-                $this->monitorRepository->getEntityManager()->flush();
-
-                $episodeMonitors[] = $episodeMonitor;
-
-                // Immediately run the monitor
-                $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
-                $this->monitorTvEpisodeHandler->handle($command);
-                $this->logger->info('> [MonitorTvShowHandler] ...Dispatching MonitorTvEpisodeCommand');
+        // Dispatch Episode commands for each missing Episode
+        foreach ($episodesInShow as $episode) {
+            /** @var TmdbEpisodeDto $episode */
+            // Only monitor future episodes
+            $this->logger->info('> [MonitorTvShowHandler] Evaluating "' . $monitor->getTitle() . '", season "' . $episode->seasonNumber . '" episode "' . $episode->episodeNumber . '"');
+            $episodeInFuture = $this->episodeReleasedAfterMonitorCreated($monitor->getCreatedAt(), $episode);
+            $this->logger->info('> [MonitorTvShowHandler] ...Released after monitor started? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
+            if (false === $episodeInFuture) {
+                $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                continue;
             }
+
+            // Check if the episode is already downloaded
+            $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
+            $this->logger->info('> [MonitorTvShowHandler] ...Episode exists? ' . (true === $episodeExists ? 'YES' : 'NO'));
+            if (true === $episodeExists) {
+                $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                continue;
+            }
+
+            // Check for existing monitors
+            $monitorExists = $this->monitorExists($monitor, $episode);
+            $this->logger->info('> [MonitorTvShowHandler] ...Monitor exists? ' . (true === $monitorExists ? 'YES' : 'NO'));
+            if (true === $monitorExists) {
+                $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
+                continue;
+            }
+
+            // Create the monitor
+            $episodeMonitor = (new Monitor())
+                ->setParent($monitor)
+                ->setUser($monitor->getUser())
+                ->setTmdbId($monitor->getTmdbId())
+                ->setImdbId($monitor->getImdbId())
+                ->setTitle($monitor->getTitle())
+                ->setMonitorType('tvepisode')
+                ->setSeason($episode->seasonNumber)
+                ->setEpisode($episode->episodeNumber)
+                ->setAirDate($episode->airDate !== null && $episode->airDate !== "" ? Carbon::parse($episode->airDate) : null)
+                ->setCreatedAt(new DateTimeImmutable())
+                ->setSearchCount(0)
+                ->setStatus('New');
+
+            $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
+            $this->monitorRepository->getEntityManager()->flush();
+
+            $episodeMonitors[] = $episodeMonitor;
+
+            // Immediately run the monitor
+            $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
+            $this->monitorTvEpisodeHandler->handle($command);
+            $this->logger->info('> [MonitorTvShowHandler] ...Dispatching MonitorTvEpisodeCommand');
         }
 
         // Set the status to Active, so it will be re-executed.
@@ -126,29 +129,31 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         );
     }
 
-    private function episodeReleasedAfterMonitorCreated(string|DateTimeImmutable $monitorStartDate, array $episodeInShow): bool
-    {
+    private function episodeReleasedAfterMonitorCreated(
+        string|DateTimeImmutable $monitorStartDate,
+        TmdbEpisodeDto $episodeInShow
+    ): bool {
         $monitorStartDate = Carbon::parse($monitorStartDate)->setTime(0, 0);
-        $episodeAirDate = Carbon::parse($episodeInShow['air_date']);
+        $episodeAirDate = Carbon::parse($episodeInShow->airDate);
         return $episodeAirDate >= $monitorStartDate;
     }
 
-    private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
+    private function episodeExists(TmdbEpisodeDto $episodeInShow, Map $downloadedEpisodes): bool
     {
         return $downloadedEpisodes->filter(
-            fn (object $episode) => $episode->episode === $episodeInShow['episode_number']
-                && $episode->season === $episodeInShow['season_number']
+                fn(object $episode) => $episode->episode === $episodeInShow->episodeNumber
+                    && $episode->season === $episodeInShow->seasonNumber
             )->count() > 0;
     }
 
-    private function monitorExists(Monitor $monitor, array $episode): bool
+    private function monitorExists(Monitor $monitor, TmdbEpisodeDto $episode): bool
     {
         return $this->monitorRepository->findOneBy([
                 'imdbId' => $monitor->getImdbId(),
                 'title' => $monitor->getTitle(),
                 'monitorType' => 'tvepisode',
-                'season' => $episode['season_number'],
-                'episode' => $episode['episode_number'],
+                'season' => $episode->seasonNumber,
+                'episode' => $episode->episodeNumber,
                 'status' => ['New', 'Active', 'In Progress']
             ]) !== null;
     }

src/Monitor/Dto/UpcomingEpisode.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Monitor\Dto;
-
-use Carbon\Carbon;
-
-class UpcomingEpisode
-{
-    public function __construct(
-        public string $title,
-        public string $airDate {
-            get => Carbon::parse($this->airDate)->format('m/d/Y');
-        },
-        public string $episodeTitle,
-        public int $episodeNumber,
-    ) {}
-}

src/Monitor/Framework/Controller/ApiController.php

@@ -2,11 +2,13 @@
 
 namespace App\Monitor\Framework\Controller;
 
+use Aimeos\Map;
 use App\Base\Service\Broadcaster;
 use App\Monitor\Action\Handler\AddMonitorHandler;
 use App\Monitor\Action\Handler\DeleteMonitorHandler;
 use App\Monitor\Action\Input\AddMonitorInput;
 use App\Monitor\Action\Input\DeleteMonitorInput;
+use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Framework\Scheduler\MonitorDispatcher;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
@@ -65,4 +67,45 @@ class ApiController extends AbstractController
             'message' => 'Manually dispatched MonitorDispatcher'
         ]);
     }
+
+    #[Route('/api/monitor/upcoming-episodes', name: 'api.monitor.upcoming-episodes', methods: ['GET'])]
+    public function upcomingEpisodes(MonitorRepository $repository): Response
+    {
+        $colors = [
+            'blue' => '#007bff',
+            'indigo' => '#6610f2',
+            'purple' => '#6f42c1',
+            'pink' => '#e83e8c',
+            'red' => '#dc3545',
+            'orange' => '#fd7e14',
+            'yellow' => '#ffc107',
+            'green' => '#28a745',
+            'teal' => '#20c997',
+            'cyan' => '#17a2b8',
+        ];
+
+        $eventColors = [];
+        $monitors = $repository->whereAirDateNotNull();
+        $monitors = Map::from($monitors)->map(function ($monitor) use (&$eventColors, $colors) {
+            if (!array_key_exists($monitor->getImdbId(), $eventColors)) {
+                $eventColors[$monitor->getImdbId()] = $colors[array_rand($colors)];
+            }
+            return [
+                'id' => $monitor->getId(),
+                'title' => $monitor->getTitle() . ' (S' . str_pad($monitor->getSeason(), 2, '0', STR_PAD_LEFT) . 'E' . str_pad($monitor->getEpisode(), 2, '0', STR_PAD_LEFT) . ')',
+                'start' => $monitor->getAirDate()->format('Y-m-d H:i:s'),
+                'groupId' => $monitor->getImdbId(),
+                'allDay' => true,
+                'backgroundColor' => $eventColors[$monitor->getImdbId()],
+                'borderColor' => $eventColors[$monitor->getImdbId()],
+            ];
+        });
+
+        return $this->json([
+            'status' => 200,
+            'data' => [
+                'episodes' => $monitors->toArray(),
+            ]
+        ]);
+    }
 }

src/Monitor/Framework/Controller/CalendarController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Monitor\Framework\Controller;
+
+use Aimeos\Map;
+use App\Monitor\Framework\Repository\MonitorRepository;
+use App\User\Framework\Entity\User;
+use Spatie\IcalendarGenerator\Components\Calendar;
+use Spatie\IcalendarGenerator\Components\Event;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
+
+class CalendarController extends AbstractController
+{
+    #[IsGranted('PUBLIC_ACCESS')]
+    #[Route('/monitors/ical/{email:user}/upcoming-episodes.ics', name: 'app.monitors.ical')]
+    public function icalAction(MonitorRepository $monitorRepository, User $user)
+    {
+        if (false === $user->hasICalEnabled()) {
+            return new Response('Calendar not found.', 404);
+        }
+
+        $calendar = Calendar::create()
+             ->name('Upcoming Episodes')
+             ->refreshInterval(10);
+
+        $monitors = $monitorRepository->whereAirDateNotNull();
+        $calendar->event(Map::from($monitors)->map(function ($monitor) {
+            return new Event($monitor->getTitle())
+                ->startsAt($monitor->getAirDate())
+                ->fullDay();
+        })->toArray());
+
+        return new Response($calendar->get(), 200, [
+            'Content-Type' => 'text/calendar',
+            'Content-Disposition' => 'inline; filename="upcoming-episodes.ics"',
+        ]);
+    }
+}

src/Monitor/Framework/Controller/WebController.php

@@ -28,4 +28,10 @@ class WebController extends AbstractController
     {
         return $this->render('monitor/index.html.twig');
     }
+
+    #[Route('/monitors/upcoming-episodes', name: 'app.monitor.upcoming-episodes', methods: ['GET'])]
+    public function upcomingEpisodes()
+    {
+        return $this->render('monitor/upcoming-episodes.html.twig');
+    }
 }

src/Monitor/Framework/Entity/Monitor.php

@@ -56,6 +56,9 @@ class Monitor
     #[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: true)]
     private ?\DateTimeInterface $lastSearch = null;
 
+    #[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: true)]
+    private ?\DateTime $airDate = null;
+
     #[ORM\Column]
     private ?\DateTimeImmutable $createdAt = null;
 
@@ -65,7 +68,7 @@ class Monitor
     #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
     private ?self $parent = null;
 
-    #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')]
+    #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent', cascade: ['remove'])]
     private Collection $children;
 
     public function __construct()
@@ -257,6 +260,17 @@ class Monitor
         return $this;
     }
 
+    public function getAirDate(): ?\DateTimeInterface
+    {
+        return $this->airDate;
+    }
+
+    public function setAirDate(?\DateTimeInterface $airDate): static
+    {
+        $this->airDate = $airDate;
+        return $this;
+    }
+
     public function removeChild(self $child): static
     {
         if ($this->children->removeElement($child)) {

src/Monitor/Framework/Repository/MonitorRepository.php

@@ -33,4 +33,12 @@ class MonitorRepository extends ServiceEntityRepository
 
         return $this->paginator->paginate($query, $page, $perPage);
     }
+
+    public function whereAirDateNotNull()
+    {
+        $query = $this->createQueryBuilder('m')
+            ->andWhere('m.airDate IS NOT NULL')
+            ->getQuery();
+        return $query->getResult();
+    }
 }

src/Monitor/MonitorEvents.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Monitor;
+
+enum MonitorEvents
+{
+    case MONITOR_ADDED;
+    case MONITOR_STARTED;
+    case MONITOR_FINISHED;
+    case MONITOR_DELETED;
+    case MONITOR_ERROR;
+
+    public function type(): string
+    {
+        return match ($this) {
+            self::MONITOR_ADDED => 'monitor_added',
+            self::MONITOR_STARTED => 'monitor_started',
+            self::MONITOR_FINISHED => 'monitor_finished',
+            self::MONITOR_DELETED => 'monitor_deleted',
+            self::MONITOR_ERROR => 'monitor_error',
+        };
+    }
+
+    public function message(): string
+    {
+        return match ($this) {
+            self::MONITOR_ADDED => 'A new monitor has been added.',
+            self::MONITOR_STARTED => 'A monitor has started.',
+            self::MONITOR_FINISHED => 'A monitor has finished.',
+            self::MONITOR_DELETED => 'A monitor has been deleted',
+            self::MONITOR_ERROR => 'A monitor has encountered an error.',
+        };
+    }
+}

src/Search/Action/Handler/GetMediaInfoHandler.php

@@ -2,9 +2,11 @@
 
 namespace App\Search\Action\Handler;
 
+use App\Base\Enum\MediaType;
 use App\Search\Action\Command\GetMediaInfoCommand;
 use App\Search\Action\Result\GetMediaInfoResult;
-use App\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
+use App\Tmdb\TmdbResult;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -13,13 +15,30 @@ use OneToMany\RichBundle\Contract\ResultInterface;
 class GetMediaInfoHandler implements HandlerInterface
 {
     public function __construct(
-        private readonly Tmdb $tmdb,
+        private readonly TmdbClient $tmdb,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
+        $handlers = [
+            MediaType::Movie->value => 'getMovieDetails',
+            MediaType::TvShow->value => 'getTvshowDetails',
+        ];
+        $handler = $handlers[$command->mediaType];
+        $media = $this->$handler($command);
+        $relatedMedia = $this->tmdb->relatedMedia($media->tmdbId, $command->mediaType);
 
-        return new GetMediaInfoResult($media, $command->season, $command->episode);
+        return new GetMediaInfoResult($media, $relatedMedia, $command->season, $command->episode);
+    }
+
+    private function getMovieDetails(CommandInterface $command): TmdbResult
+    {
+        return $this->tmdb->movieDetails($command->imdbId);
+    }
+
+    private function getTvshowDetails(CommandInterface $command): TmdbResult
+    {
+        $media = $this->tmdb->tvshowDetails($command->imdbId);
+        return $media;
     }
 }

src/Search/Action/Handler/SearchHandler.php

@@ -2,8 +2,10 @@
 
 namespace App\Search\Action\Handler;
 
+use App\Search\Action\Result\RedirectToMediaResult;
 use App\Search\Action\Result\SearchResult;
-use App\Tmdb\Tmdb;
+use App\Tmdb\TmdbClient;
+use App\Tmdb\TmdbResult;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -12,11 +14,18 @@ use OneToMany\RichBundle\Contract\ResultInterface;
 class SearchHandler implements HandlerInterface
 {
     public function __construct(
-        private Tmdb $tmdb,
+        private TmdbClient $tmdb,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
+        $result = $this->tmdb->search($command->term);
+        if ($result instanceof TmdbResult) {
+            return new RedirectToMediaResult(
+                imdbId: $result->imdbId,
+                mediaType: $result->mediaType,
+            );
+        }
         return new SearchResult(
             term: $command->term,
             results: $this->tmdb->search($command->term)