wip: semi-working PHP8.5/FrankenPHP w/ async

.dockerignore

@@ -1,15 +0,0 @@
-.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

@@ -13,7 +13,7 @@
 #
 # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
-APP_URL=
+
 ###> symfony/framework-bundle ###
 APP_ENV=prod
 APP_SECRET=
@@ -27,7 +27,6 @@ APP_SECRET=
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
 # DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8"
-DATABASE_URL=
 
 ###< doctrine/doctrine-bundle ###
 MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
@@ -52,23 +51,3 @@ OIDC_CLIENT_ID="Enter your OIDC client id"
 OIDC_CLIENT_SECRET="Enter your OIDC client secret"
 OIDC_BYPASS_FORM_LOGIN=false
 ###< drenso/symfony-oidc-bundle ###
-
-###> symfony/ntfy-notifier ###
-# NTFY_DSN=ntfy://default/TOPIC
-###< symfony/ntfy-notifier ###
-
-NOTIFICATION_TRANSPORT=
-NTFY_DSN=
-
-###> sentry/sentry-symfony ###
-SENTRY_DSN=
-SENTRY_JS_URL=
-###< sentry/sentry-symfony ###
-
-# TMDB 'with_original_language' option
-# - only include media originally
-#   produced in this language
-TMDB_ORIGINAL_LANGUAGE=en
-
-# Cache Torrentio Results
-TORRENTIO_CACHE_RESULTS=true

.env.test

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

.gitea/workflows/ci.yml

@@ -1,102 +0,0 @@
-name: CI
-
-on:
-  push:
-    tags:
-      - "v*"
-
-jobs:
-  build-test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v5
-      
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2 
-        with:
-          php-version: '8.4'
-
-      - name: Install phing
-        run: composer global require phing/phing
-
-      - name: Run composer
-        run: composer install --no-dev --no-scripts --ignore-platform-reqs -o
-  
-      - name: Build tailwind
-        run: APP_ENV=build php bin/console tailwind:build
-
-      - name: Install frontend assets
-        run: APP_ENV=build php bin/console importmap:install
-
-      - name: Compile assets
-        run: APP_ENV=build php bin/console asset-map:compile
-
-      - name: Login to registry
-        uses: docker/login-action@v2
-        with:
-          registry: "${{ vars.REGISTRY_URL }}"
-          username: "${{ vars.REGISTRY_USER }}"
-          password: "${{ vars.REGISTRY_PASS }}"
-
-      - name: Create torsearch-app docker image
-        run: |
-          tag="${{ gitea.REF_NAME }}"
-          tmdb_api="${{ vars.TMDB_API }}"
-          version=${tag:1}
-          docker build --pull -f docker/Dockerfile.app \
-            -t code.caldwell.digital/home/torsearch-app:${version} \
-            -t code.caldwell.digital/home/torsearch-app:latest \
-            --build-arg "APP_VERSION=${version}" \
-            --build-arg "TMDB_API=${tmdb_api}" \
-            .
-          docker push code.caldwell.digital/home/torsearch-app:${version}
-          docker push code.caldwell.digital/home/torsearch-app:latest
-
-      - name: Create torsearch-worker docker image
-        run: |
-          tag="${{ gitea.REF_NAME }}"
-          tmdb_api="${{ vars.TMDB_API }}"
-          version=${tag:1}
-          docker build --pull -f docker/Dockerfile.worker \
-            -t code.caldwell.digital/home/torsearch-worker:${version} \
-            -t code.caldwell.digital/home/torsearch-worker:latest \
-            --build-arg "APP_VERSION=${version}" \
-            --build-arg "TMDB_API=${tmdb_api}" \
-            .
-          docker push code.caldwell.digital/home/torsearch-worker:${version}
-          docker push code.caldwell.digital/home/torsearch-worker:latest
-
-      - name: Create torsearch-scheduler docker image
-        run: |
-          tag="${{ gitea.REF_NAME }}"
-          tmdb_api="${{ vars.TMDB_API }}"
-          version=${tag:1}
-          docker build --pull -f docker/Dockerfile.scheduler \
-            -t code.caldwell.digital/home/torsearch-scheduler:${version} \
-            -t code.caldwell.digital/home/torsearch-scheduler:latest \
-            --build-arg "APP_VERSION=${version}" \
-            --build-arg "TMDB_API=${tmdb_api}" \
-            .
-          docker push code.caldwell.digital/home/torsearch-scheduler:${version}
-          docker push code.caldwell.digital/home/torsearch-scheduler:latest
-
-      - name: Create artifact
-        run: |
-          file="torsearch-${{ gitea.REF_NAME }}.tar.gz"
-          touch $file
-          tar -cvzf $file --exclude=$file .
-
-      - name: Create release
-        uses: akkuman/gitea-release-action@v1
-        with:
-          files: |-
-            "torsearch-${{ gitea.REF_NAME }}.tar.gz"
-
-#      - name: Upload artifact
-#        uses: actions/upload-artifact@v3
-#        with:
-#          name: "torsearch-${{ gitea.REF_NAME }}.tar.gz"
-#          path: "torsearch-${{ gitea.REF_NAME }}.tar.gz"
-#          compression_level: 9

.gitignore

@@ -19,11 +19,3 @@ bolt.db
 phpstan.neon
 ###< phpstan/phpstan ###
 .php-cs-fixer.cache
-
-###> phpunit/phpunit ###
-/phpunit.xml
-/.phpunit.cache/
-###< phpunit/phpunit ###
-
-docs/examples/movies/
-docs/examples/tvshows/

Dockerfile

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

README.md

@@ -4,6 +4,28 @@ and download your favorite movies and tv shows. You can think of it like Stremio
 comparison to Stremio? That's because Torsearch uses the same source for media files that Stremio uses: Torrentio 
 (hence the name: Torsearch).
 
+After two failed attempts at running a media server, I decided to hang up my hat and give up my dream of a self-hosted 
+media server. I figured the days of torrenting were mostly over and everybody ranting & raving about their media collections 
+must be going to Walmart and buying up the bucket of old movies they have. That's until I stumbled across Stremio.
+
+At first, it seemed too good to be true, but I was yearning for something just sketchy enough to try out. What could 
+go wrong with handing over my card information to an unknown organization across the pond? At the end of the day, 
+the cost benefit analysis landed in my favor, and about 30 minutes after purchasing my Real Debrid subscription and 
+setting up Stremio, I was in business.
+
+My mind was blown. I might not have the most "cultured" taste in media, but it had everything I searched for and more! After 
+watching a few movies, I noticed the "Copy Download Link" button. "What's this lil guy do?" I asked myself. Duh, it 
+downloads the f*****g movie. And there's the 💡flashing over my head. There's gotta be a way to automate this, I told myself.
+
+After a month of studying Stremio's code and lots of tinkering, I finally figured it out. Torrentio is the magic behind 
+the scenes. You feed it a Real Debrid API key and an IMDB ID, and it gives you a list of results to download that media. 
+Easy peasy.
+
+In about an hour I had a proof of concept working. It wasn't pretty, but it wasn't supposed to be. That proof-of-concept 
+has blossomed into the beautiful Torsearch that I've been using nearly every day since then. The code in this repo 
+is a complete re-write of the proof-of-concept that started out ugly and ended up even uglier. Knowing the core functionality 
+required to make it work, I was able to re-write the app with some design patterns in place.
+
 ## Pics or didn't happen
 ![Torsearch Homepage](https://code.caldwell.digital/home/torsearch/raw/branch/main/docs/img/torsearch_homepage.png)
 ![TV Show Result](https://code.caldwell.digital/home/torsearch/raw/branch/main/docs/img/torsearch_severance.png)
@@ -15,202 +37,14 @@ comparison to Stremio? That's because Torsearch uses the same source for media f
 - Search for Movies & TV Shows by their name
 - Download directly to your NAS
 - Monitor TV Shows for new episodes and automatically download them
-- Discover new media
-- OIDC
+- Browse popular media and view its download options
+- LDAP or local auth (OIDC coming soon)
 
+## Features on the roadmap
+- Requests - allow users to request new media
+- OIDC auth
+- Prometheus logging
 
 ## Getting Started
-For all pieces to work, you will need to serve the application over HTTPS. Running behind an SSL terminating 
-reverse proxy is the recommended approach.
+1. Clone the repo
 
-1. Create a `compose.yml` file
-```yaml
-services:
-  ### The app contains the application and web server ###
-  app:
-    image: code.caldwell.digital/home/torsearch-app:${TAG}
-    ports:
-      - "${WEB_PORT}:80"
-    env_file: .env
-    depends_on:
-      database:
-        condition: service_healthy
-    volumes:
-      - ${LOCAL_MOVIES_DIR}:/var/download/movies
-      - ${LOCAL_TVSHOWS_DIR}:/var/download/tvshows
-      - mercure_data:/data
-      - mercure_config:/config
-
-
-  ### The worker handles downloads and async jobs ###
-  worker:
-    image: code.caldwell.digital/home/torsearch-worker:${TAG}
-    volumes:
-      - ${LOCAL_MOVIES_DIR}:/var/download/movies
-      - ${LOCAL_TVSHOWS_DIR}:/var/download/tvshows
-    env_file: .env
-    depends_on:
-      - app
-
-
-  ### The scheduler processes monitored media ###
-  scheduler:
-    image: code.caldwell.digital/home/torsearch-scheduler:${TAG}
-    volumes:
-      - ${LOCAL_MOVIES_DIR}:/var/download/movies
-      - ${LOCAL_TVSHOWS_DIR}:/var/download/tvshows
-    env_file: .env
-    depends_on:
-      - app
-
-
-  #!! If using your own database, this can be omitted !!#
-  database:
-    image: mariadb:10.11.2
-    volumes:
-      - mysql:/var/lib/mysql
-    env_file: .env
-    healthcheck:
-      test: ["CMD", "mysqladmin", "ping"]
-      interval: 5s
-      timeout: 5s
-      retries: 10
-
-
-  #!! If using your own redis, this can be omitted !!#
-  redis:
-    image: redis:latest
-    volumes:
-      - redis_data:/data
-    command: redis-server --maxmemory 512MB
-    restart: unless-stopped
-
-
-volumes:
-  mysql:
-  mercure_config:
-  mercure_data:
-  redis_data:
-
-```
-
-2. Create a `.env` file
-```dotenv
-###################
-#    Torsearch    #
-###################
-# The version of Torsearch to run. Docker will this tag.
-TAG=latest
-
-# The port for which the web server (app container) will
-# serve the application on the host.
-WEB_PORT=8004
-
-# The host directories where your media is stored.
-# If you would like to use a docker driver for a network
-# share, update the compose.yml file to reflect that.
-# These are passed into the compose file as bind mounts.
-LOCAL_MOVIES_DIR="./movies"
-LOCAL_TVSHOWS_DIR="./tvshows"
-
-# Set the timezone you're in. This helps render monitored items correctly on the calendar
-TZ=America/Chicago
-
-###################
-#     Symfony     #
-###################
-# The external URL of the application where it can be reached by a browser. Should start with https://
-APP_URL="<enter url>"
-# Requried by Symfony Framework. Feel free to change.
-APP_SECRET="70169beadfbc8101c393cbfbba27a313"
-# Change to 'dev' to show logs in the browser.
-APP_ENV=prod
-
-
-###################
-#     Mercure     #
-###################
-# Mercure is a Caddy module built into the webserver
-# that facilitates the usage of websockets to transmit
-# real time data (download progress, etc.)
-# TBH, I've only run into issues when changing these. If
-# you have problems after changing them, just revert them.
-MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
-MERCURE_PUBLISHER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!"
-MERCURE_SUBSCRIBER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!"
-
-
-###################
-#    Database     #
-###################
-# Use the DATABASE_URL below to use the MariaDB container
-# provided in the example.compose.yml file, or remove this
-# line and fill in the details of your own MySQL/MariaDB server
-MYSQL_USER=app
-MYSQL_PASSWORD="P@ssword123"
-MYSQL_DATABASE=app
-MYSQL_HOST=database
-MYSQL_RANDOM_ROOT_PASSWORD=true
-DATABASE_URL="mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@${MYSQL_HOST}:3306/${MYSQL_DATABASE}?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
-
-
-###################
-#   Real Debrid   #
-###################
-# Enter your Real Debrid API key which is passed to Torrentio to retrieve download options
-REAL_DEBRID_KEY="<enter real debrid api key>"
-
-
-###################
-#      Redis      #
-###################
-# Use your own Redis instance or use the below value to use the
-# container included in the example compose.yml file.
-REDIS_HOST="redis://redis"
-
-
-###################
-#      Auth       #
-###################
-# Options: form_login, oidc, or ldap (experimental)
-# Fill the rest of the configuration based on your choice here
-# No additional config is required for form_login
-AUTH_METHOD=form_login
-
-
-### OIDC ###
-# To use OIDC, set the AUTH_METHOD to oidc and fill in the following properties
-#OIDC_WELL_KNOWN_URL=
-#OIDC_CLIENT_ID=
-#OIDC_CLIENT_SECRET=
-# Allows you to skip the login page and directly rely on your IdP for auth.
-#OIDC_BYPASS_FORM_LOGIN=
-
-```
-
-3. Enter the `APP_URL` in the .env file
-4. Enter the `REAL_DEBRID_KEY` in the .env file
-5. Enter a new `WEB_PORT` if the default doesn't work for you
-4. Run `docker compose up -d`
-4. Visit the app in the browser
-5. Create a user
-6. Visit the Preferences page to set your filter. This filter is used whenever you don't choose a specific file to 
-download (e.g. downloading via Monitor or clicking the "Download Season", "Download Selected", or "Download Episode" buttons).
-7. Start downloading media!
-
-## Having issues?
-Submit an issue in the repo, and I'll try to address it as soon as possible. I do have a full-time job and family, so my 
-time is limited, but I'll do my best!
-
-## Notes
-This is my first contribution to open-source, the community that's given me so much over the years!
-This project has been my personal hobby project for the last 1.5 years. I've written and re-written it several times.
-It's been my testing ground for trying new things, so if the code looks like shit, my bad. I'm a PHP developer by day and 
-tinkerer by night - this was my first go with Symfony/Twig components, tailwind, the Symfony RICH bundle, and a lot more. 
-At some point, I'll put together a contribution guide, so others can hack on it too. 
-
-No AI was used for development (only to generate a list of countries with their flag emojis). If the code is bad, it's my fault.
-
-# Disclaimer
-Torsearch does not host any media; it only combines API results from multiple sources to make browsing them easier.
-Torsearch is not affiliated with Real Debrid, Torrentio, or TMDB.

assets/app.js

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

assets/components/download-list-row.js

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

assets/components/download-option-tr.js

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

assets/components/episode-container.js

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

assets/components/monitor-list-row.js

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

assets/components/movie-container.js

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

assets/components/preview-content-dialog.js

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

assets/components/status-checker-span.js

@@ -1,40 +0,0 @@
-export default class PreviewContentDialog extends HTMLSpanElement {
-    #url;
-    #service;
-    #status;
-
-    #statusTexts = {
-        200: 'up',
-        204: 'up'
-    }
-
-    #statusColors = {
-        200: 'bg-green-500',
-        204: 'bg-green-500'
-    }
-
-    constructor() {
-        super();
-        this.#url = this.getAttribute('url');
-        this.#service = this.getAttribute('service');
-
-        (async () => await this.checkStatus())();
-        setInterval(async () => await this.checkStatus(), 1000 * 60 * 10);
-    }
-
-    async checkStatus() {
-        const response = await fetch(this.#url);
-        this.#status = response.status;
-        this.setAttribute('title', this.getTitle());
-        this.classList.remove('bg-red-500', 'bg-green-500');
-        this.classList.add(this.getColor());
-    }
-
-    getTitle() {
-        return `${this.#service} is ${this.#statusTexts[this.#status] ?? 'down'}`
-    }
-
-    getColor() {
-        return this.#statusColors[this.#status] ?? 'bg-red-500';
-    }
-}

assets/controllers/alert_controller.js

@@ -14,6 +14,5 @@ export default class extends Controller {
             "3000"
         ));
         this.element.addEventListener('mouseover', () => clearTimeout(timer));
-        this.element.querySelector('.modal-close').addEventListener('click', () => this.element.remove());
     }
 }

assets/controllers/discover_media_results_controller.js

@@ -1,54 +0,0 @@
-import { Controller } from '@hotwired/stimulus';
-
-/*
-* The following line makes this controller "lazy": it won't be downloaded until needed
-* See https://symfony.com/bundles/StimulusBundle/current/index.html#lazy-stimulus-controllers
-*/
-
-/* stimulusFetch: 'lazy' */
-export default class extends Controller {
-    static targets = ['poster', 'moreBtn', 'moreLink']
-
-    moreResultsClicks = 0;
-
-    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)
-    }
-
-    moreResults() {
-        const elems = this.posterTargets.filter(poster => poster.classList.contains('hidden'));
-        if (this.moreResultsClicks <= 2) {
-            elems.slice(0, 6).forEach(poster => poster.classList.remove('hidden'));
-            this.moreResultsClicks++;
-
-            if (this.moreResultsClicks === 2) {
-                this.moreBtnTarget.classList.add('hidden');
-                this.moreLinkTarget.classList.remove('hidden');
-            }
-        }
-    }
-}

assets/controllers/download_list_controller.js

@@ -20,43 +20,13 @@ export default class extends Controller {
         // Here you can add event listeners on the element or target elements,
         // add or remove classes, attributes, dispatch custom events, etc.
         // this.fooTarget.addEventListener('click', this._fooBar)
-        // this.element.addEventListener('click', (event) => {
-        //     let previewContentModal = document.querySelector('#previewContentModal');
-        //     // previewContentModal.setHeading(event.target.dataset['title']);
-        //     // previewContentModal.setContent('<p>Testing this here thingy-ma-bob!</p>');
-        //     // previewContentModal.showModal();
-        //     let content, heading = ""
-        //     if (event.target.tagName !== "TR") {
-        //         content = event.target.parentElement.previewContent();
-        //         heading = event.target.parentElement.mediaTitle;
-        //     } else {
-        //         content = event.target.previewContent();
-        //         heading = event.target.mediaTitle;
-        //     }
-        //
-        //     document.dispatchEvent(new CustomEvent('showPreviewContentModal', {detail: {heading: heading, content: content}}))
-        // })
     }
 
     downloadTargetConnected(target) {
         let downloads = this.element.querySelectorAll('tbody tr');
-
-        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}}))
-                }
-            })
-        })
+        if (downloads.length > 5) {
+            target.classList.add('hidden');
+        }
     }
 
     pauseDownload(data) {

assets/controllers/loading_icon_controller.js

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

assets/controllers/monitor_button_controller.js

@@ -13,7 +13,34 @@ export default class extends Controller {
         tmdbId: String,
         imdbId: String,
         title: String,
-        season: Number,
+    }
+
+    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)
     }
 
     toggle() {
@@ -26,13 +53,34 @@ 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',
@@ -42,6 +90,7 @@ export default class extends Controller {
             },
             body: JSON.stringify(body)
         });
+
         return await response.json();
     }
 }

assets/controllers/monitor_list_controller.js

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

assets/controllers/movie_results_controller.js

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

assets/controllers/navbar_controller.js

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

assets/controllers/result_filter_controller.js

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

assets/controllers/search_bar_controller.js

@@ -12,11 +12,6 @@ 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);
     }
@@ -38,21 +33,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) => {
-            console.log(data);
-            if (data.data.overview.length > 60) {
-                data.data.overview = data.data.overview.substring(0, 107) + "...";
+            if (data.data.description.length > 60) {
+                data.data.description = data.data.description.substring(0, 107) + "...";
             }
-
             return `<div class="flex flex-row">
                         <img src="${data.data.poster}" class="w-16 rounded-md">
                         <div class="p-2 flex flex-col">
                             <h2>${data.data.title}</h2>
-                            <p class="max-w-[60ch] text-wrap">${data.data.overview}</p>
+                            <p class="max-w-[60ch] text-wrap">${data.data.description}</p>
                         </div>
-                    </div>`;
+                    </div>
+`
         }
     }
 

assets/controllers/tv_episode_list_controller.js

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

assets/controllers/tv_results_controller.js

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

assets/controllers/upcoming_episodes_controller.js

@@ -1,57 +0,0 @@
-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/bi/camera-video.svg

@@ -1 +0,0 @@
-<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" fill-rule="evenodd" d="M0 5a2 2 0 0 1 2-2h7.5a2 2 0 0 1 1.983 1.738l3.11-1.382A1 1 0 0 1 16 4.269v7.462a1 1 0 0 1-1.406.913l-3.111-1.382A2 2 0 0 1 9.5 13H2a2 2 0 0 1-2-2zm11.5 5.175l3.5 1.556V4.269l-3.5 1.556zM2 4a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1z"/></svg>

assets/icons/bi/cloud-download.svg

@@ -1 +0,0 @@
-<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 16 16"><g fill="currentColor"><path d="M4.406 1.342A5.53 5.53 0 0 1 8 0c2.69 0 4.923 2 5.166 4.579C14.758 4.804 16 6.137 16 7.773C16 9.569 14.502 11 12.687 11H10a.5.5 0 0 1 0-1h2.688C13.979 10 15 8.988 15 7.773c0-1.216-1.02-2.228-2.313-2.228h-.5v-.5C12.188 2.825 10.328 1 8 1a4.53 4.53 0 0 0-2.941 1.1c-.757.652-1.153 1.438-1.153 2.055v.448l-.445.049C2.064 4.805 1 5.952 1 7.318C1 8.785 2.23 10 3.781 10H6a.5.5 0 0 1 0 1H3.781C1.708 11 0 9.366 0 7.318c0-1.763 1.266-3.223 2.942-3.593c.143-.863.698-1.723 1.464-2.383"/><path d="M7.646 15.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 14.293V5.5a.5.5 0 0 0-1 0v8.793l-2.146-2.147a.5.5 0 0 0-.708.708z"/></g></svg>

assets/icons/bi/download.svg

@@ -1 +0,0 @@
-<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 16 16"><g fill="currentColor"><path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5"/><path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708z"/></g></svg>

assets/icons/fluent-mdl2/back.svg

@@ -1 +0,0 @@
-<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 2048 2048"><path fill="currentColor" d="M2048 1088H250l787 787l-90 90L6 1024L947 83l90 90l-787 787h1798z"/></svg>

assets/icons/lets-icons/calendar-add-light.svg

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

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

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

assets/styles/app.css

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

@@ -1,22 +0,0 @@
-# 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

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

compose.yml

@@ -1,5 +1,3 @@
-# This file is used for local development
-# see the docs/examples directory for production examples
 services:
   caddy:
     image: caddy:2.9.1
@@ -25,6 +23,9 @@ services:
       - mercure_data:/data
       - mercure_config:/config
     tty: true
+    ports:
+      - "8001:80"
+    command: "frankenphp php-server --root=/app/public"
     environment:
       TZ: America/Chicago
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
@@ -35,9 +36,7 @@ services:
 
 
   worker:
-    build:
-      dockerfile: docker/Dockerfile.worker
-      context: .
+    build: .
     restart: unless-stopped
     volumes:
       - $PWD:/app
@@ -45,20 +44,18 @@ services:
     tty: true
     environment:
       TZ: America/Chicago
+    command: php /app/bin/console messenger:consume async -vv --time-limit=3600
 
 
   scheduler:
-    build:
-      dockerfile: docker/Dockerfile.scheduler
-      context: .
+    build: .
     restart: unless-stopped
     volumes:
       - $PWD:/app
-      - $PWD/var/download:/var/download
-    tty: true
     environment:
       TZ: America/Chicago
-      WORKER_MONITOR: 2
+    command: php /app/bin/console messenger:consume scheduler_monitor -vv
+    tty: true
 
 
   redis:
@@ -80,9 +77,9 @@ services:
     environment:
       TZ: America/Chicago
       MYSQL_DATABASE: app
-      MYSQL_USER: app
+      MYSQL_USERNAME: app
       MYSQL_PASSWORD: password
-      MYSQL_RANDOM_ROOT_PASSWORD: true
+      MYSQL_ROOT_PASSWORD: password
     healthcheck:
       test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
       interval: 5s
@@ -94,8 +91,6 @@ services:
     image: adminer
     ports:
       - "8081:8080"
-    environment:
-      ADMINER_DEFAULT_SERVER: database
 
 
 volumes:

composer.json

@@ -25,12 +25,8 @@
         "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.*",
@@ -47,16 +43,9 @@
         "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",
@@ -115,7 +104,6 @@
         "post-update-cmd": [
             "@auto-scripts"
         ],
-        "tail": "docker compose exec app ./bin/console tailwind:build --watch",
         "sym": "docker compose exec app ./bin/console"
     },
     "conflict": {
@@ -129,7 +117,6 @@
     },
     "require-dev": {
         "phpstan/phpstan": "^2.1",
-        "phpunit/phpunit": "^12.3",
         "symfony/maker-bundle": "^1.62",
         "symfony/stopwatch": "7.3.*",
         "symfony/web-profiler-bundle": "7.3.*"

config/bundles.php

@@ -23,6 +23,4 @@ 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, 'dev' => true],
-    Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
 ];

config/packages/doctrine.yaml

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

config/packages/messenger.yaml

@@ -15,26 +15,6 @@ 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:
@@ -56,12 +36,12 @@ framework:
         routing:
             # Route your messages to the transports
             # 'App\Message\YourMessage': async
-            'App\Download\Action\Command\DownloadMediaCommand': download
+            'App\Download\Action\Command\DownloadMediaCommand': async
             'App\Download\Action\Command\DownloadSeasonCommand': 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\Monitor\Action\Command\MonitorTvEpisodeCommand': async
+            'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
+            'App\Monitor\Action\Command\MonitorTvShowCommand': async
+            'App\Monitor\Action\Command\MonitorMovieCommand': async
             'App\Torrentio\Action\Command\GetTvShowOptionsCommand': media_cache
 
 # when@test:

config/packages/monolog.yaml

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

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

config/packages/pwa.yaml

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

config/packages/security.yaml

@@ -45,7 +45,6 @@ security:
     # Easy way to control access for large sections of your site
     # Note: Only the *first* access control that matches will be used
     access_control:
-        - { path: ^/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

@@ -1,43 +0,0 @@
-when@prod: &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:
-            release: 'torsearch@%app.version%'
-            enable_logs: true
-            traces_sample_rate: 1
-            profiles_sample_rate: 1
-            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
-
-when@dev: *prod

config/packages/twig.yaml

@@ -1,7 +1,6 @@
 twig:
     globals:
         version: '%app.version%'
-        sentry_javascript_url: '%sentry.javascript_url%'
     file_name_pattern: '*.twig'
     date:
         format: 'm/d/Y'

config/routes.yaml

@@ -6,22 +6,6 @@ controllersBase:
     defaults:
         schemes: [ 'https' ]
 
-controllersDiscover:
-    resource:
-        path: ../src/Discover/Framework/Controller/
-        namespace: App\Discover\Framework\Controller
-    type: attribute
-    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.0.0-dev'
+    app.default.version: '0.dev'
     app.default.timezone: 'America/Chicago'
 
     # Auth
@@ -44,17 +44,6 @@ 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)%'
-
-    # Sentry
-    sentry.dsn: '%env(SENTRY_DSN)%'
-    sentry.javascript_url: '%env(SENTRY_JS_URL)%'
-
-    # Torrentio
-    torrentio.cache_results: '%env(bool:TORRENTIO_CACHE_RESULTS)%'
-
 services:
     # default configuration for services in *this* file
     _defaults:

deploy.compose.yml

@@ -0,0 +1,58 @@
+services:
+  app:
+    image: registry.caldwell.digital/home/torsearch-app:${TAG}
+    ports:
+      - '8001:80'
+    environment:
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+    tty: true
+    deploy:
+      replicas: 2
+    volumes:
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
+      - mercure_data:/data
+      - mercure_config:/config
+    depends_on:
+      - database
+
+
+  worker:
+    image: registry.caldwell.digital/home/torsearch-worker:${TAG}
+    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:
+      - app
+
+
+  scheduler:
+    image: registry.caldwell.digital/home/torsearch-scheduler:${TAG}
+    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,7 +10,6 @@ templates
 var
 vendor
 build.xml
-.git
 .env
 .env.local
 composer.json

docker/Dockerfile.app

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

docker/Dockerfile.base.app

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

@@ -1,40 +0,0 @@
-#####
-# 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,28 +1,21 @@
-###
-# 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.
-###
+FROM dunglas/frankenphp:php8.4-alpine
 
-# Default to latest, but should pass in a version
-ARG APP_VERSION="latest"
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-# 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
+ARG APP_VERSION="0.dev"
+ENV APP_VERSION="${APP_VERSION}"
 
-# Start with our base worker image
-FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
 
-# Set the APP_VERSION in the image
-ARG APP_VERSION="latest"
-ENV APP_VERSION=${APP_VERSION}
+COPY . /app
 
-ARG TMDB_API=""
-ENV TMDB_API="${TMDB_API}"
+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
-
-# To retain backwards compatibility, default to async & download transports
-CMD [ "--monitor" ]
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0

docker/Dockerfile.worker

@@ -1,28 +1,23 @@
-###
-# 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.
-###
+FROM dunglas/frankenphp:php8.4-alpine
 
-# Default to latest, but should pass in a version
-ARG APP_VERSION="latest"
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-# 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
+ARG APP_VERSION="0.dev"
+ENV APP_VERSION="${APP_VERSION}"
 
-# Start with our base worker image
-FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
 
-# Set the APP_VERSION in the image
-ARG APP_VERSION="latest"
-ENV APP_VERSION=${APP_VERSION}
+RUN apk add --no-cache wget
 
-ARG TMDB_API=""
-ENV TMDB_API="${TMDB_API}"
+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" ]
 
-# To retain backwards compatibility, default to async & download transports
-CMD [ "--async", "--download" ]
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0

docker/app/Caddyfile

@@ -3,6 +3,8 @@
 
 	frankenphp {
 		{$FRANKENPHP_CONFIG}
+		num_threads 10
+		max_threads 20
 	}
 }
 

docker/worker/async.conf

@@ -1,10 +0,0 @@
-[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

@@ -1,10 +0,0 @@
-[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

@@ -1,10 +0,0 @@
-[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

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

docs/examples/.env

@@ -1,92 +1,58 @@
-###################
-#    Torsearch    #
-###################
-# The version of Torsearch to run. Docker will this tag.
-TAG=latest
-
-# The port for which the web server (app container) will
-# serve the application on the host.
-WEB_PORT=8004
-
-# The host directories where your media is stored.
-# If you would like to use a docker driver for a network
-# share, update the compose.yml file to reflect that.
-LOCAL_MOVIES_DIR="./movies"
-LOCAL_TVSHOWS_DIR="./tvshows"
-
-# Set the timezone you're in. This helps render monitored items correctly on the calendar
-TZ=America/Chicago
-
-###################
-#     Symfony     #
-###################
-# The external URL of the application where it can be reached by a browser.
-APP_URL="<enter url>"
-# Requried by Symfony Framework. Feel free to change.
+# App must be served over HTTPS (requirement of Mercure)
+# Either serve behind an SSL terminating reverse proxy
+# or pass your certificates into the 'app' container.
+# Please omit any trailing slashes. The APP_URL is
+# used to generate the Mercure URL behind the scenes.
+APP_URL="https://dev.caldwell.digital"
 APP_SECRET="70169beadfbc8101c393cbfbba27a313"
-# Change to 'dev' to show logs in the browser.
 APP_ENV=prod
 
-
-###################
-#     Mercure     #
-###################
 # Mercure is a Caddy module built into the webserver
 # that facilitates the usage of websockets to transmit
 # real time data (download progress, etc.)
-# TBH, I've only run into issues when changing these. If
-# you have problems after changing them, just revert them.
 MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
-MERCURE_PUBLISHER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!"
-MERCURE_SUBSCRIBER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!"
 
-
-###################
-#    Database     #
-###################
 # Use the DATABASE_URL below to use the MariaDB container
 # provided in the example.compose.yml file, or remove this
 # line and fill in the details of your own MySQL/MariaDB server
-MYSQL_USER=app
-MYSQL_PASSWORD="P@ssword123"
-MYSQL_DATABASE=app
-MYSQL_HOST=database
-MYSQL_RANDOM_ROOT_PASSWORD=true
-DATABASE_URL="mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@${MYSQL_HOST}:3306/${MYSQL_DATABASE}?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
+DATABASE_URL="mysql://root:password@database:3306/app?serverVersion=10.6.19.2-MariaDB&charset=utf8mb4"
 
+# Fill in your MySQL/MariaDB connection details
+#DATABASE_URL="mysql://<mysql user>:<mysql pass>@<mysql host>:3306/<mysql db name>?serverVersion=10.6.19.2-MariaDB&charset=utf8mb4"
 
-###################
-#   Real Debrid   #
-###################
-# Enter your Real Debrid API key is passed to Torrentio to retrieve download options
-REAL_DEBRID_KEY="<enter real debrid api key>"
+# Enter your Real Debrid API key
+# This key is never saved anywhere
+# else and is passed to Torrentio
+# to retrieve download options
+REAL_DEBRID_KEY=""
 
+# Enter your TMDB API key
+# This is used to provide rich search results
+# when searching for media and rendering the
+# Popular Movies and TV Shows section.
+TMDB_API=""
 
-###################
-#      Redis      #
-###################
-# Use your own Redis instance or use the below value to use the
-# container included in the example compose.yml file.
+# Use your own Redis instance or use the
+# below value to use the container included
+# in the example compose.yml file.
 REDIS_HOST="redis://redis"
 
-
-###################
-#      Auth       #
-###################
-# Options: form_login, oidc, or ldap (experimental)
-# Fill the rest of the configuration based on your choice here
-# No additional config is required for form_login
+### Auth ###
+# Change to "oidc" to and provide the required
+# environment variables below to use OIDC auth.
 AUTH_METHOD=form_login
 
-### OIDC ###
-#OIDC_WELL_KNOWN_URL=
-#OIDC_CLIENT_ID=
-#OIDC_CLIENT_SECRET=
-# Allows you to skip the login page and directly rely on your IdP for auth.
-#OIDC_BYPASS_FORM_LOGIN=
+# OIDC
+OIDC_WELL_KNOWN_URL=
+OIDC_CLIENT_ID=
+OIDC_CLIENT_SECRET=
+# Allows you to skip the login page and directly
+# rely on your IdP for auth.
+OIDC_BYPASS_FORM_LOGIN=
 
-### LDAP (*** Experimental! ***) ###
-# LDAP Config: To use LDAP, enter the below fields and run 'php bin/console config:set auth.method ldap'
+
+# LDAP Config: To use LDAP, enter the below fields
+# and run 'php bin/console config:set auth.method ldap'
 # (LDAP is still in progress and not ready for use)
 #LDAP_HOST=
 #LDAP_PORT=

docs/examples/compose.yml

@@ -1,56 +1,78 @@
 services:
-  ### The app contains the application and web server ###
   app:
-    image: code.caldwell.digital/home/torsearch-app:${TAG}
+    image: code.caldwell.digital/home/torsearch-app:latest
     ports:
-      - "${WEB_PORT}:80"
-    env_file: .env
+      - '8006:80'
+    env_file:
+      - .env
+    volumes:
+      - ./downloads/movies:/var/download/movies
+      - ./downloads/tvshows:/var/download/tvshows
+    environment:
+      TZ: America/Chicago
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
     depends_on:
       database:
         condition: service_healthy
-    volumes:
-      - ${LOCAL_MOVIES_DIR}:/var/download/movies
-      - ${LOCAL_TVSHOWS_DIR}:/var/download/tvshows
-      - mercure_data:/data
-      - mercure_config:/config
 
-
-  ### The worker handles downloads and async jobs ###
+  # Downloads happen in this container. Replicate this
+  # container to run multiple downloads simultaneously.
+  # Map your "movies" folder to /var/download/movies
+  # Map your "TV shows" folder to /var/download/tvshows
+  # If your folders are on another machine, use an NFS volume.
+  # This container runs a Symfony worker process.
+  # See: https://symfony.com/doc/current/messenger.html
   worker:
-    image: code.caldwell.digital/home/torsearch-worker:${TAG}
+    image: code.caldwell.digital/home/torsearch-worker:latest
     volumes:
-      - ${LOCAL_MOVIES_DIR}:/var/download/movies
-      - ${LOCAL_TVSHOWS_DIR}:/var/download/tvshows
-    env_file: .env
+      - ./downloads/movies:/var/download/movies
+      - ./downloads/tvshows:/var/download/tvshows
+    environment:
+      TZ: America/Chicago
+    command: -vv --time-limit=3600 --limit=10
+    env_file:
+      - .env
+    restart: always
     depends_on:
-      - app
+      app:
+        condition: service_healthy
 
-
-  ### The scheduler processes monitored media ###
+  # This container handles the monitoring for new media. When new
+  # monitors are added, jobs are periodically dispatched to this
+  # container, and the desired media is searched for and downloaded.
+  # This container runs a Symfony worker process.
+  # See: https://symfony.com/doc/current/messenger.html
   scheduler:
-    image: code.caldwell.digital/home/torsearch-scheduler:${TAG}
+    image: code.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
-      - ${LOCAL_MOVIES_DIR}:/var/download/movies
-      - ${LOCAL_TVSHOWS_DIR}:/var/download/tvshows
-    env_file: .env
+      - ./downloads/movies:/var/download/movies
+      - ./downloads/tvshows:/var/download/tvshows
+    env_file:
+      - .env
+    command: -vv
+    environment:
+      TZ: America/Chicago
+    restart: always
     depends_on:
-      - app
+      app:
+        condition: service_healthy
 
-
-  #!! If using your own database, this can be omitted !!#
   database:
     image: mariadb:10.11.2
     volumes:
       - mysql:/var/lib/mysql
-    env_file: .env
+    environment:
+      MYSQL_DATABASE: app
+      MYSQL_USERNAME: app
+      MYSQL_PASSWORD: password
+      MYSQL_ROOT_PASSWORD: password
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping"]
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
       interval: 5s
       timeout: 5s
       retries: 10
 
-
-  #!! If using your own redis, this can be omitted !!#
   redis:
     image: redis:latest
     volumes:
@@ -58,6 +80,12 @@ services:
     command: redis-server --maxmemory 512MB
     restart: unless-stopped
 
+  # **Optional**
+  # Provides a simple method of viewing the database
+  adminer:
+    image: adminer
+    ports:
+      - "8081:8080"
 
 volumes:
   mysql:

importmap.php

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

migrations/Version20250724042107.php

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

migrations/Version20250823173128.php

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

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

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

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

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

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

migrations/Version20251106045808.php

@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20251106045808 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql(<<<'SQL'
-            ALTER TABLE monitor ADD poster 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'
-            ALTER TABLE monitor DROP poster
-        SQL);
-    }
-}

nomad.deploy.hcl

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

phpunit.dist.xml

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

psalm.xml

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

public/test.php

@@ -0,0 +1,60 @@
+<?php
+
+require_once '../vendor/autoload.php';
+
+use App\Torrentio\Result\ResultFactory;
+
+$realDebridKey = "";
+$tasks = [];
+$results = [];
+$start = microtime(true);
+for ($i = 1; $i <= 20; $i++) {
+    $tasks[] = \Async\spawn(function () use ($i, &$results, &$realDebridKey) {
+        $baseUrl = "https://torrentio.strem.fun/providers%253Dyts%252Ceztv%252Crarbg%252C1337x%252Cthepiratebay%252Ckickasstorrents%252Ctorrentgalaxy%252Cmagnetdl%252Chorriblesubs%252Cnyaasi%7Csort%253Dqualitysize%7Cqualityfilter%253D480p%252Cscr%252Ccam%7Crealdebrid={$realDebridKey}/stream/movie/tt0412142:1:$i.json";
+        $options = \json_decode(file_get_contents($baseUrl), true);
+
+        foreach ($options['streams'] as $stream) {
+            if (!str_starts_with($stream['url'], "https")) {
+                continue;
+            }
+
+            if (
+                array_key_exists('behaviorHints', $stream) &&
+                array_key_exists('bingeGroup', $stream['behaviorHints'])
+            ) {
+                $bingeGroup = $stream['behaviorHints']['bingeGroup'];
+            } else {
+                $bingeGroup = '-';
+            }
+
+            $result = ResultFactory::map(
+                $stream['url'],
+                $stream['title'],
+                $bingeGroup
+            );
+
+            $results[] = $result;
+        }
+    });
+}
+\Async\awaitAll($tasks);
+$end = microtime(true) - $start;
+dd($end, $results);
+
+//
+//
+//// Spawn multiple concurrent coroutines
+//Async\spawn(function() {
+//    echo "Starting coroutine 1\n";
+//    sleep(2); // Non-blocking in async context
+//    echo "Coroutine 1 completed\n";
+//});
+//
+//Async\spawn(function() {
+//    echo "Starting coroutine 2\n";
+//    sleep(1); // Non-blocking in async context
+//    echo "Coroutine 2 completed\n";
+//});
+//
+//echo "All coroutines started\n";
+

src/Base/ConfigResolver.php

@@ -2,27 +2,16 @@
 
 namespace App\Base;
 
-use App\Base\Dto\AppVersionDto;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
-use Symfony\Component\HttpFoundation\RequestStack;
-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,
-        private readonly RequestStack $requestStack,
-
         #[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,
 
@@ -49,24 +38,6 @@ 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,
-
-        #[Autowire(param: 'sentry.dsn')]
-        private ?string $sentryDsn = null,
-
-        #[Autowire(param: 'sentry.environment')]
-        private ?string $sentryEnvironment = null,
-
-        #[Autowire(param: 'sentry.javascript_url')]
-        private ?string $sentryJavascriptUrl = null,
-
-        #[Autowire(param: 'torrentio.cache_results')]
-        private ?bool $torrentioCacheResults = null,
     ) {}
 
     public function validate(): bool
@@ -83,12 +54,6 @@ 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;
     }
 
@@ -115,18 +80,6 @@ final class ConfigResolver
         return $this->authOidcBypassFormLogin;
     }
 
-    public function isTorrentioCacheEnabled(): bool
-    {
-        return $this->torrentioCacheResults;
-    }
-
-    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 [
@@ -139,13 +92,4 @@ final class ConfigResolver
             ]
         ];
     }
-
-    public function getSentryConfig()
-    {
-        return [
-            'dsn' => $this->sentryDsn,
-            'environment' => $this->sentryEnvironment,
-            'javascript_url' => $this->sentryJavascriptUrl,
-        ];
-    }
 }

src/Base/Dto/AppVersionDto.php

@@ -1,24 +0,0 @@
-<?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,5 +6,4 @@ enum MediaType: string
 {
     case Movie = 'movies';
     case TvShow = 'tvshows';
-    case TvEpisode = 'tvepisode';
 }

src/Base/Framework/Command/InitWorker.php

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

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

src/Base/Framework/Controller/IndexController.php

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

src/Base/Service/Broadcaster.php

@@ -2,53 +2,33 @@
 
 namespace App\Base\Service;
 
-use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Mercure\HubInterface;
 use Symfony\Component\Mercure\Update;
-use Symfony\Component\Notifier\Notification\Notification;
-use Symfony\Component\Notifier\NotifierInterface;
 use Twig\Environment;
 
 readonly class Broadcaster
 {
     public function __construct(
-        #[Autowire(param: 'notification.transport')]
-        private string $notificationTransport,
         #[Autowire(service: 'twig')]
         private Environment $renderer,
         private HubInterface $hub,
         private RequestStack $requestStack,
-        private NotifierInterface $notifier,
-        private LoggerInterface $logger,
     ) {}
 
-    public function alert(string $title, string $message, string $type = "success", bool $sendPush = false, ?string $mercureAlertTopic = null): void
+    public function alert(string $title, string $message, string $type = "success"): void
     {
-        try {
-            $userAlertTopic = $mercureAlertTopic ?? $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) {
-            $this->logger->error('Unable to publish alert: ' . $exception->getMessage());
-        }
-
-        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());
-            }
-        }
+        $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);
     }
 }

src/Base/Service/MediaFiles.php

@@ -4,7 +4,7 @@ namespace App\Base\Service;
 
 use Aimeos\Map;
 use App\Download\Framework\Entity\Download;
-use App\Base\Util\PTN;
+use Nihilarr\PTN;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Filesystem\Filesystem;
@@ -168,37 +168,6 @@ class MediaFiles
         return false;
     }
 
-    /**
-     * @param string $tvshowTitle
-     * @return array<SplFileInfo>|false
-     */
-    public function tvshowExists(string $tvshowTitle): Map|false
-    {
-        $existingEpisodes = $this->getEpisodes($tvshowTitle, false);
-
-        if ($existingEpisodes->isEmpty()) {
-            return false;
-        }
-
-        $episodes = new Map;
-        /** @var SplFileInfo $episode */
-        foreach ($existingEpisodes as $episode) {
-            $ptn = (object) (new PTN())->parse($episode->getFilename());
-
-            if (!property_exists($ptn, 'season') || !property_exists($ptn, 'episode')) {
-                continue;
-            }
-
-            $episodes->push($episode);
-        }
-
-        if ($episodes->count() > 0) {
-            return $episodes;
-        }
-
-        return false;
-    }
-
     public function movieExists(string $title)
     {
         $filepath = $this->moviesPath . DIRECTORY_SEPARATOR . $title;

src/Base/Util/ImdbMatcher.php

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

src/Base/Util/PTN.php

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

src/Base/Util/Paginator.php

@@ -33,6 +33,7 @@ class Paginator
     public function paginate($query, int $page = 1, int $limit = 5): Paginator
     {
         $paginator = new OrmPaginator($query);
+
         $paginator
             ->getQuery()
             ->setFirstResult($limit * ($page - 1))

src/Discover/Framework/Controller/WebController.php

@@ -1,141 +0,0 @@
-<?php
-
-namespace App\Discover\Framework\Controller;
-
-use App\Base\Enum\MediaType;
-use App\Tmdb\TmdbClient;
-use App\Tmdb\TmdbMovieGenre;
-use App\Tmdb\TmdbTvShowGenre;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Attribute\Route;
-
-#[Route('/discover')]
-class WebController extends AbstractController
-{
-    #[Route('/', name: 'app.discover')]
-    public function index(TmdbClient $tmdb)
-    {
-        $movies = $tmdb->popularMovies(18);
-        $tvshows = $tmdb->popularTvShows(18);
-
-        return $this->render('discover/index.html.twig', [
-            'movies' => $movies,
-            'shows' => $tvshows,
-        ]);
-    }
-
-    #[Route('/{mediaType}/{genreId?}', name: 'app.discover.browse')]
-    public function browse(string $mediaType, ?string $genreId, TmdbClient $tmdb)
-    {
-        if (null === $genreId) {
-            if (MediaType::tryFrom($mediaType) === null) {
-                return new Response(status: 404);
-            }
-            return $this->render('discover/browse.html.twig', [
-                'genres' => self::getGenres($mediaType),
-                'media_type' => $mediaType,
-            ]);
-        }
-
-        if (MediaType::tryFrom($mediaType) === null) {
-            return new Response(status: 404);
-        }
-
-        if (TmdbMovieGenre::tryFrom($genreId) === null &&
-            TmdbTvShowGenre::tryFrom($genreId) === null
-        ) {
-            return new Response(status: 404);
-        }
-
-        $results = match ($mediaType) {
-            MediaType::Movie->value => $tmdb->discoverMovies(
-                [TmdbMovieGenre::from($genreId)->value]
-            ),
-            MediaType::TvShow->value => $tmdb->discoverTvShows(
-                [TmdbTvShowGenre::from($genreId)->value]
-            ),
-        };
-
-        return $this->render('discover/browse_genre.html.twig', [
-            'media' => $results,
-            'genre' => TmdbMovieGenre::from($genreId)->name,
-            'genre_id' => $genreId,
-            'media_type' => $mediaType,
-        ]);
-    }
-
-    #[Route('/{mediaType}/{genreId}', name: 'app.discover.browse_genre')]
-    public function browseGenre(string $mediaType, string $genreId, TmdbClient $tmdb)
-    {
-        if (MediaType::tryFrom($mediaType) === null) {
-            return new Response(status: 404);
-        }
-
-        if (TmdbMovieGenre::tryFrom($genreId) === null &&
-            TmdbTvShowGenre::tryFrom($genreId) === null
-        ) {
-            return new Response(status: 404);
-        }
-
-        $results = match ($mediaType) {
-            MediaType::Movie->value => $tmdb->discoverMovies(
-                [TmdbMovieGenre::from($genreId)->value]
-            ),
-            MediaType::TvShow->value => $tmdb->discoverTvShows(
-                [TmdbTvShowGenre::from($genreId)->value]
-            ),
-        };
-
-        return $this->render('discover/browse.html.twig', [
-            'media' => $results,
-            'media_type' => $mediaType,
-        ]);
-    }
-
-    private static function getGenres(string $mediaType): array
-    {
-        return match ($mediaType) {
-            MediaType::Movie->value => [
-                'Action' => TmdbMovieGenre::Action->value,
-                'Adventure' => TmdbMovieGenre::Adventure->value,
-                'Animation' => TmdbMovieGenre::Animation->value,
-                'Comedy' => TmdbMovieGenre::Comedy->value,
-                'Crime' => TmdbMovieGenre::Crime->value,
-                'Documentary' => TmdbMovieGenre::Documentary->value,
-                'Drama' => TmdbMovieGenre::Drama->value,
-                'Family' => TmdbMovieGenre::Family->value,
-                'Fantasy' => TmdbMovieGenre::Fantasy->value,
-                'History' => TmdbMovieGenre::History->value,
-                'Horror' => TmdbMovieGenre::Horror->value,
-                'Music' => TmdbMovieGenre::Music->value,
-                'Mystery' => TmdbMovieGenre::Mystery->value,
-                'Romance' => TmdbMovieGenre::Romance->value,
-                'Science Fiction' => TmdbMovieGenre::ScienceFiction->value,
-                'TV Movie' => TmdbMovieGenre::TvMovie->value,
-                'Thriller' => TmdbMovieGenre::Thriller->value,
-                'War' => TmdbMovieGenre::War->value,
-                'Western' => TmdbMovieGenre::Western->value,
-            ],
-            MediaType::TvShow->value => [
-                'Action & Adventure' => TmdbTvShowGenre::ActionAndAdventure->value,
-                'Animation' => TmdbTvShowGenre::Animation->value,
-                'Comedy' => TmdbTvShowGenre::Comedy->value,
-                'Crime' => TmdbTvShowGenre::Crime->value,
-                'Documentary' => TmdbTvShowGenre::Documentary->value,
-                'Drama' => TmdbTvShowGenre::Drama->value,
-                'Family' => TmdbTvShowGenre::Family->value,
-                'Kids' => TmdbTvShowGenre::Kids->value,
-                'Mystery' => TmdbTvShowGenre::Mystery->value,
-                'News' => TmdbTvShowGenre::News->value,
-                'Reality' => TmdbTvShowGenre::Reality->value,
-                'Sci-Fi & Fantasy' => TmdbTvShowGenre::SciFiAndFantasy->value,
-                'Soap' => TmdbTvShowGenre::Soap->value,
-                'Talk' => TmdbTvShowGenre::Talk->value,
-                'War & Politics' => TmdbTvShowGenre::WarAndPolitics->value,
-                'Western' => TmdbTvShowGenre::Western->value,
-            ],
-            default => [],
-        };
-    }
-}

src/Download/Action/Command/DownloadMediaCommand.php

@@ -17,6 +17,5 @@ class DownloadMediaCommand implements CommandInterface
         public string $imdbId,
         public int $userId,
         public ?int $downloadId = null,
-        public ?string $mercureAlertTopic = null,
     ) {}
 }

src/Download/Action/Handler/DeleteDownloadHandler.php

@@ -4,22 +4,17 @@ 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,
     ) {}
@@ -36,13 +31,6 @@ 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

@@ -2,45 +2,30 @@
 
 namespace App\Download\Action\Handler;
 
-use App\Base\Enum\MediaType;
-use App\Base\Service\Broadcaster;
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Download\Action\Result\DownloadMediaResult;
-use App\Download\DownloadEvents;
-use App\Download\Framework\Entity\Download;
 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, private Broadcaster $broadcaster,
+        private DownloadRepository $downloadRepository,
+        private UserRepository $userRepository,
     ) {}
 
     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(
-                $user,
+                $this->userRepository->find($command->userId),
                 $command->url,
                 $command->title,
                 $command->filename,
@@ -52,16 +37,6 @@ readonly class DownloadMediaHandler implements HandlerInterface
             $download = $this->downloadRepository->find($command->downloadId);
         }
 
-        try {
-            $this->validateDownloadUrl($download->getUrl());
-        } catch (\Throwable $exception) {
-            $download->setProgress(100);
-            $download->setStatus('Failed');
-            $this->downloadRepository->getEntityManager()->flush();
-            $this->sendFailedDownloadAlert($download, $command->mercureAlertTopic, $exception->getMessage());
-            return new DownloadMediaResult(400, $exception->getMessage());
-        }
-
         try {
             if ($download->getStatus() !== 'Paused') {
                 $this->downloadRepository->updateStatus($download->getId(), 'In Progress');
@@ -82,39 +57,6 @@ 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.");
     }
-
-    public function validateDownloadUrl(string $downloadUrl)
-    {
-        $badFileSizes = [
-            2119075, // copyright infringement
-        ];
-
-        $badFileLocations = [
-            'https://torrentio.strem.fun/videos/failed_infringement_v2.mp4' => 'Removed for Copyright Infringement.',
-            'https://torrentio.strem.fun/videos/downloading_v2.mp4' => 'Your torrent is downloading to your debrid provider.'
-        ];
-
-        $headers = get_headers($downloadUrl, true);
-        if (array_key_exists($headers['Location'], $badFileLocations)) {
-            throw new \Exception($badFileLocations[$headers['Location']]);
-        }
-    }
-
-    private function sendFailedDownloadAlert(Download $download, string $mercureAlertTopic, ?string $message = null): void
-    {
-        $this->broadcaster->alert(
-            title: 'Download Failed',
-            message: $message ?? "{$download->getTitle()} failed to download.",
-            type: 'warning',
-            mercureAlertTopic: $mercureAlertTopic
-        );
-    }
 }

src/Download/Action/Handler/DownloadSeasonHandler.php

@@ -3,21 +3,18 @@
 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\Download\Framework\Entity\Download;
-use App\Download\Framework\Repository\DownloadRepository;
-use App\Tmdb\TmdbClient;
+use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\User\Dto\UserPreferencesFactory;
 use App\User\Framework\Repository\UserRepository;
-use App\Base\Util\PTN;
+use Nihilarr\PTN;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -28,19 +25,18 @@ use Symfony\Component\Messenger\MessageBusInterface;
 readonly class DownloadSeasonHandler implements HandlerInterface
 {
     public function __construct(
-        private MediaFiles              $mediaFiles,
-        private LoggerInterface         $logger,
-        private TmdbClient              $tmdb,
-        private MessageBusInterface     $bus,
+        private MediaFiles $mediaFiles,
+        private LoggerInterface $logger,
+        private Tmdb $tmdb,
+        private MessageBusInterface $bus,
         private DownloadOptionEvaluator $downloadOptionEvaluator,
         private GetTvShowOptionsHandler $getTvShowOptionsHandler,
-        private UserRepository          $userRepository, private DownloadRepository $downloadRepository,
+        private UserRepository $userRepository,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $series = $this->tmdb->tvshowDetails($command->imdbId);
-
+        $series = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
         $this->logger->info('> [DownloadTvSeasonHandler] Executing DownloadTvSeasonHandler for "' . $series->title . '" season ' . $command->season);
 
         $episodesInSeason = Map::from($series->episodes[$command->season]);
@@ -48,14 +44,14 @@ readonly class DownloadSeasonHandler implements HandlerInterface
 
         $downloadCommands = [];
         foreach ($episodesInSeason as $episode) {
-            $this->logger->info('> [DownloadTvSeasonHandler] ...Evaluating episode ' . $episode->episodeNumber);
+            $this->logger->info('> [DownloadTvSeasonHandler] ...Evaluating episode ' . $episode['episode_number']);
 
             $results = $this->getTvShowOptionsHandler->handle(
                 new GetTvShowOptionsCommand(
                     $series->tmdbId,
                     $command->imdbId,
                     $command->season,
-                    $episode->episodeNumber
+                    $episode['episode_number']
                 )
             );
 
@@ -69,17 +65,14 @@ readonly class DownloadSeasonHandler implements HandlerInterface
 
             if (null !== $result) {
                 $this->logger->info('> [DownloadTvSeasonHandler] ......Found 1 matching result');
-                $this->logger->info('> [DownloadTvSeasonHandler] ......Dispatching DownloadMediaCommand for "' . $series->title . '" season ' . $command->season . ' episode ' . $episode->episodeNumber);
-                $download = $this->createDownload($command, $result->url, $series->title, $result->filename, $episode->episodeNumber);
-                $this->logger->info('> [DownloadTvSeasonHandler] ......Created Download entity with id ' . $download->getId());
+                $this->logger->info('> [DownloadTvSeasonHandler] ......Dispatching DownloadMediaCommand for "' . $series->title . '" season ' . $command->season . ' episode ' . $episode['episode_number']);
                 $downloadCommand = new DownloadMediaCommand(
-                    $download->getUrl(),
-                    $download->getTitle(),
-                    $download->getFilename(),
-                    $download->getMediaType(),
-                    $download->getImdbId(),
-                    $download->getUser()->getId(),
-                    $download->getId()
+                    $result->url,
+                    $series->title,
+                    $result->filename,
+                    'tvshows',
+                    $command->imdbId,
+                    $command->userId,
                 );
                 $this->bus->dispatch($downloadCommand);
                 $downloadCommands[] = $downloadCommand;
@@ -95,27 +88,19 @@ readonly class DownloadSeasonHandler implements HandlerInterface
         );
     }
 
-    private function createDownload(DownloadSeasonCommand $command, string $url, string $title, string $filename, int $episodeNumber): Download
+    private function getDownloadedEpisodes(string $title)
     {
-        $download = new Download();
-        $download->setUrl($url);
-        $download->setTitle($title);
-        $download->setFilename($filename);
-        $download->setImdbId($command->imdbId);
-        $download->setMediaType(MediaType::TvShow->value);
-        $download->setEpisodeId($this->getEpisodeNumber($command->season, $episodeNumber));
-        $download->setUser($this->userRepository->find($command->userId));
-        $this->downloadRepository->getEntityManager()->persist($download);
-        $this->downloadRepository->getEntityManager()->flush();
-        return $download;
-    }
-
-    private function getEpisodeNumber(int $season, int $episode): string
-    {
-        return sprintf(
-            "S%sE%s",
-            str_pad($season, 2, "0", STR_PAD_LEFT),
-            str_pad($episode, 2, "0", STR_PAD_LEFT)
-        );
+        // Check current episodes
+        $downloadedEpisodes = $this->mediaFiles
+            ->getEpisodes($title)
+            ->map(fn($episode) => (object) (new PTN())->parse($episode))
+            ->filter(fn ($episode) =>
+                property_exists($episode, 'episode')
+                && property_exists($episode, 'season')
+                && null !== $episode->episode
+                && null !== $episode->season
+            )
+            ->rekey(fn($episode) => $episode->episode);
+        $this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
     }
 }

src/Download/Action/Handler/MonitorHandlerTrait.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Download\Action\Handler;
-
-use Aimeos\Map;
-use App\Monitor\Framework\Entity\Monitor;
-use App\Monitor\Framework\Repository\MonitorRepository;
-use App\Tmdb\Dto\TmdbEpisodeDto;
-use App\Tmdb\TmdbClient;
-use Carbon\Carbon;
-use DateTimeImmutable;
-use Psr\Log\LoggerInterface;
-
-trait MonitorHandlerTrait
-{
-    private MonitorRepository $monitorRepository;
-    private LoggerInterface $logger;
-    private TmdbClient $tmdb;
-
-    private function episodeReleasedAfterMonitorCreated(
-        string|DateTimeImmutable $monitorStartDate,
-        TmdbEpisodeDto $episodeInShow
-    ): bool {
-        $monitorStartDate = Carbon::parse($monitorStartDate)->setTime(0, 0);
-        $episodeAirDate = Carbon::parse($episodeInShow->airDate);
-        return $episodeAirDate >= $monitorStartDate;
-    }
-
-    private function episodeExists(TmdbEpisodeDto $episodeInShow, Map $downloadedEpisodes): bool
-    {
-        return $downloadedEpisodes->filter(
-                fn(object $episode) => $episode->episode === $episodeInShow->episodeNumber
-                    && $episode->season === $episodeInShow->seasonNumber
-            )->count() > 0;
-    }
-
-    private function monitorExists(Monitor $monitor, TmdbEpisodeDto $episode): bool
-    {
-        return $this->monitorRepository->findOneBy([
-                'imdbId' => $monitor->getImdbId(),
-                'title' => $monitor->getTitle(),
-                'monitorType' => 'tvepisode',
-                'season' => $episode->seasonNumber,
-                'episode' => $episode->episodeNumber,
-                'status' => ['New', 'Active', 'In Progress']
-            ]) !== null;
-    }
-
-    private function refreshData(Monitor $monitor)
-    {
-        if (null === $monitor->getPoster()) {
-            $this->logger->info('> [MonitorTvShowHandler] Refreshing poster for "' . $monitor->getTitle() . '"');
-            $poster = $this->tmdb->tvshowDetails($monitor->getImdbId())->poster;
-            if (null !== $poster && "" !== $poster) {
-                $monitor->setPoster($poster);
-            }
-        }
-    }
-}

src/Download/Action/Input/DownloadMediaInput.php

@@ -10,8 +10,6 @@ use OneToMany\RichBundle\Contract\InputInterface;
 /** @implements InputInterface<DownloadMediaInput> */
 class DownloadMediaInput implements InputInterface
 {
-    public ?string $mercureAlertTopic = null;
-
     public function __construct(
         #[SourceRequest('url')]
         public string $url,
@@ -46,7 +44,6 @@ class DownloadMediaInput implements InputInterface
             $this->imdbId,
             $this->userId,
             $this->downloadId,
-            $this->mercureAlertTopic,
         );
     }
 }

src/Download/DownloadEvents.php

@@ -1,34 +0,0 @@
-<?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.',
-        };
-    }
-}