fix: entrypoint

.env

@@ -37,33 +37,4 @@ MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
 MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 ###< symfony/messenger ###
 
-APP_URL=
-APP_SECRET=
-
-# 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
-DATABASE_URL=
-
-# 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"
-
-# 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 you TMDB API key
-# This is used to provide rich search results
-# when searching for media and rendering the
-# Popular Movies and TV Shows section.
-TMDB_API=
-
-MERCURE_JWT_SECRET=
-
-# Use your own Redis instance or use the
-# below value to use the container included
-# in the example compose.yml file.
-REDIS_HOST=
-
+REDIS_HOST=redis://redis

.gitignore

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

Dockerfile

@@ -1,10 +1,18 @@
-FROM registry.caldwell.digital/library/php:8.4-apache
+FROM dunglas/frankenphp:php8.4
 
-RUN apt-get update && \
-    apt-get install libldap2-dev -y && \
-    rm -rf /var/lib/apt/lists/* && \
-    docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
-    docker-php-ext-install ldap
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-COPY ./bash/vhost.conf /etc/apache2/sites-enabled/vhost.conf
-RUN rm /etc/apache2/sites-enabled/000-default.conf
+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" ]
+
+COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile

Dockerfile.prod

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

assets/bootstrap.js

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

assets/controllers/download_list_controller.js

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

assets/controllers/monitor_controller.js

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

assets/controllers/monitor_list_controller.js

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

assets/icons/ic/twotone-cancel.svg

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

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

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

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

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

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

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

assets/styles/app.css

@@ -11,3 +11,40 @@
         font-size: var(--text-xl);
     }
 }
+
+/* Prevent scrolling while dialog is open */
+body:has(dialog[data-dialog-target="dialog"][open]) {
+    overflow: hidden;
+}
+
+/* Customize the dialog backdrop */
+dialog {
+    box-shadow: 0 0 0 100vw rgb(0 0 0 / 0.5);
+}
+
+@keyframes fade-in {
+    0% {
+        opacity: 0;
+    }
+    100% {
+        opacity: 1;
+    }
+}
+
+@keyframes fade-out {
+    0% {
+        opacity: 1;
+    }
+    100% {
+        opacity: 0;
+    }
+}
+
+/* Add animations */
+dialog[data-dialog-target="dialog"][open] {
+    animation: fade-in 200ms forwards;
+}
+
+dialog[data-dialog-target="dialog"][closing] {
+    animation: fade-out 200ms forwards;
+}

bash/app/wget_download.sh

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

bash/caddy/Caddyfile

@@ -2,5 +2,5 @@ dev.caldwell.digital:443
 
 tls /etc/ssl/wildcard.crt /etc/ssl/wildcard.pem
 
-reverse_proxy php:80
+reverse_proxy app:80
 

bash/entrypoint.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Sleep for a second to ensure DB is awake and ready
-SLEEP_TIME=$(shuf -i 2-5 -n 1)
-echo "> Sleeping for ${SLEEP_TIME} seconds to wait for the database"
-echo "> If there are errors after the migration runs, it's possible another container (scheduler, worker, etc.) already ran the migrations"
-sleep $SLEEP_TIME
-
-# Provision database
-php /var/www/bin/console doctrine:migrations:migrate --no-interaction
-php /var/www/bin/console db:seed
-
-# Start Apache in the foreground
-echo "Starting Apache..."
-exec apachectl -D FOREGROUND
-
-exec "$@"
-

bash/vhost.conf

@@ -1,23 +0,0 @@
-<VirtualHost *:80>
-    ServerName localhost
-
-    DocumentRoot /var/www/public
-    DirectoryIndex /index.php
-
-    <LocationMatch "/hub/">
-        ProxyPass http://mercure:80/
-        ProxyPassReverse http://mercure:80/
-    </LocationMatch>
-
-    <Directory /var/www/public>
-        AllowOverride None
-        Order Allow,Deny
-        Allow from All
-
-        FallbackResource /index.php
-    </Directory>
-
-    <Directory /var/www/public/bundles>
-        FallbackResource disabled
-    </Directory>
-</VirtualHost>

compose.yml

@@ -12,6 +12,43 @@ services:
       - $PWD/bash/caddy:/etc/caddy
       - $PWD/bash/certs:/etc/ssl
 
+
+  app:
+    build: .
+    restart: unless-stopped
+    volumes:
+      - $PWD:/app
+      - $PWD/var/download:/var/download
+      - mercure_data:/data
+      - mercure_config:/config
+    tty: true
+    environment:
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+    depends_on:
+      database:
+        condition: service_healthy
+
+
+  worker:
+    build: .
+    restart: unless-stopped
+    volumes:
+      - $PWD:/app
+      - $PWD/var/download:/var/download
+    tty: true
+    command: php /app/bin/console messenger:consume async -vv --time-limit=3600 --limit=10
+
+
+  scheduler:
+    build: .
+    restart: unless-stopped
+    volumes:
+      - $PWD:/app
+    command: php /app/bin/console messenger:consume scheduler_monitor -vv
+    tty: true
+
+
   redis:
     image: redis:latest
     volumes:
@@ -19,42 +56,6 @@ services:
     command: redis-server --maxmemory 512MB
     restart: unless-stopped
 
-  php:
-    build: .
-    volumes:
-      - ./:/var/www
-
-  worker:
-    build: .
-    volumes:
-      - ./:/var/www
-      - ./var/download:/var/download
-    command: php ./bin/console messenger:consume async -vvv --time-limit=3600
-
-  scheduler:
-    build: .
-    volumes:
-      - ./:/var/www
-      - ./var/download:/var/download
-    command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600
-
-  mercure:
-    image: dunglas/mercure
-    restart: unless-stopped
-    ports:
-      - "3000:80"
-    environment:
-      SERVER_NAME: ':80'
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_EXTRA_DIRECTIVES: |
-        cors_origins *
-        anonymous
-    command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
-    volumes:
-      - mercure_data:/data
-      - mercure_config:/config
-
 
   database:
     image: mariadb:10.11.2
@@ -67,12 +68,19 @@ services:
       MYSQL_USERNAME: app
       MYSQL_PASSWORD: password
       MYSQL_ROOT_PASSWORD: password
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      interval: 5s
+      timeout: 5s
+      retries: 10
+
 
   adminer:
     image: adminer
     ports:
       - "8081:8080"
 
+
 volumes:
   mysql:
   mercure_data:

composer.json

@@ -9,6 +9,7 @@
         "ext-iconv": "*",
         "1tomany/rich-bundle": "^1.8",
         "aimeos/map": "^3.12",
+        "chrisullyott/php-filesize": "^4.2",
         "doctrine/dbal": "^3",
         "doctrine/doctrine-bundle": "^2.14",
         "doctrine/doctrine-fixtures-bundle": "^4.1",
@@ -22,28 +23,29 @@
         "p3k/emoji-detector": "^1.2",
         "php-tmdb/api": "^4.1",
         "predis/predis": "^2.4",
-        "symfony/asset": "7.2.*",
-        "symfony/console": "7.2.*",
-        "symfony/doctrine-messenger": "7.2.*",
-        "symfony/dotenv": "7.2.*",
-        "symfony/filesystem": "7.2.*",
-        "symfony/finder": "7.2.*",
+        "runtime/frankenphp-symfony": "^0.2.0",
+        "symfony/asset": "7.3.*",
+        "symfony/console": "7.3.*",
+        "symfony/doctrine-messenger": "7.3.*",
+        "symfony/dotenv": "7.3.*",
+        "symfony/filesystem": "7.3.*",
+        "symfony/finder": "7.3.*",
         "symfony/flex": "^2",
-        "symfony/form": "7.2.*",
-        "symfony/framework-bundle": "7.2.*",
-        "symfony/ldap": "7.2.*",
+        "symfony/form": "7.3.*",
+        "symfony/framework-bundle": "7.3.*",
+        "symfony/ldap": "7.3.*",
         "symfony/mercure-bundle": "^0.3.9",
-        "symfony/messenger": "7.2.*",
-        "symfony/runtime": "7.2.*",
-        "symfony/scheduler": "7.2.*",
-        "symfony/security-bundle": "7.2.*",
+        "symfony/messenger": "7.3.*",
+        "symfony/runtime": "7.3.*",
+        "symfony/scheduler": "7.3.*",
+        "symfony/security-bundle": "7.3.*",
         "symfony/stimulus-bundle": "^2.24",
-        "symfony/twig-bundle": "7.2.*",
+        "symfony/twig-bundle": "7.3.*",
         "symfony/ux-icons": "^2.24",
         "symfony/ux-live-component": "^2.24",
         "symfony/ux-turbo": "^2.24",
         "symfony/ux-twig-component": "^2.24",
-        "symfony/yaml": "7.2.*",
+        "symfony/yaml": "7.3.*",
         "symfonycasts/tailwind-bundle": "^0.10.0",
         "twig/extra-bundle": "^2.12|^3.0",
         "twig/twig": "^2.12|^3.0"
@@ -89,7 +91,7 @@
         "post-update-cmd": [
             "@auto-scripts"
         ],
-        "sym": "docker compose exec php ./bin/console"
+        "sym": "docker compose exec app ./bin/console"
     },
     "conflict": {
         "symfony/symfony": "*"
@@ -97,13 +99,13 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "7.2.*"
+            "require": "7.3.*"
         }
     },
     "require-dev": {
         "phpstan/phpstan": "^2.1",
         "symfony/maker-bundle": "^1.62",
-        "symfony/stopwatch": "7.2.*",
-        "symfony/web-profiler-bundle": "7.2.*"
+        "symfony/stopwatch": "7.3.*",
+        "symfony/web-profiler-bundle": "7.3.*"
     }
 }

config/packages/messenger.yaml

@@ -10,10 +10,22 @@ framework:
                 options:
                     use_notify: true
                     check_delayed_interval: 60000
+                    queue_name: default
                 retry_strategy:
                     max_retries: 1
                     multiplier: 1
 
+            media_cache:
+                dsn: '%env(MESSENGER_TRANSPORT_DSN)%'
+                options:
+                    use_notify: true
+                    check_delayed_interval: 60000
+                    queue_name: media_cache
+                retry_strategy:
+                    max_retries: 1
+                    multiplier: 1
+
+
             failed: 'doctrine://default?queue_name=failed'
 
         default_bus: messenger.bus.default
@@ -29,6 +41,7 @@ framework:
             '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:
 #    framework:

config/packages/property_info.yaml

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

config/services.yaml

@@ -5,14 +5,15 @@
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
     # Media
+    media.base_path: '/var/download'
     media.default_movies_dir: movies
     media.default_tvshows_dir: tvshows
     media.movies_path: '/var/download/%env(default:media.default_movies_dir:MOVIES_PATH)%'
     media.tvshows_path: '/var/download/%env(default:media.default_tvshows_dir:TVSHOWS_PATH)%'
 
     # Mercure
-    app.mercure.url: 'http://mercure/.well-known/mercure'
-    app.mercure.public_url: '%env(APP_URL)%/hub/.well-known/mercure'
+    app.mercure.url: 'http://app/.well-known/mercure'
+    app.mercure.public_url: '%env(APP_URL)%/.well-known/mercure'
 
     # Cache
     app.cache.adapter: '%env(default:app.cache.adapter.default:CACHE_ADAPTER)%'

deploy.compose.yml

@@ -1,42 +1,57 @@
 services:
-  php:
-    image: registry.caldwell.digital/home/torsearch/app:${TAG}
+  app:
+    image: registry.caldwell.digital/home/torsearch-app:${TAG}
     ports:
-      - "8001:80"
-    deploy:
-      replicas: 2
-
-  worker:
-    image: registry.caldwell.digital/home/torsearch/app:${TAG}
-    volumes:
-      - /mnt/media/downloads:/var/download
-    command: php ./bin/console messenger:consume async -v --time-limit=3600 --limit=10
-    deploy:
-      replicas: 2
-
-  scheduler:
-    image: registry.caldwell.digital/home/torsearch/app:${TAG}
-    volumes:
-      - /mnt/media/downloads:/var/download
-    command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600
-
-  mercure:
-    image: dunglas/mercure
-    restart: unless-stopped
-    ports:
-      - "3000:80"
+      - '8001:80'
     environment:
-      SERVER_NAME: ':80'
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
       MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_EXTRA_DIRECTIVES: |
-        cors_origins *
-        anonymous
-    command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
+    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:
+

docker/Dockerfile.app

@@ -1,16 +1,22 @@
-FROM registry.caldwell.digital/library/php:8.4-apache
+FROM dunglas/frankenphp
 
-RUN apt-get update && \
-    apt-get install libldap2-dev -y && \
-    rm -rf /var/lib/apt/lists/* && \
-    docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
-    docker-php-ext-install ldap
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-COPY --chown=www-data:www-data . /var/www
-COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
-COPY ./bash/vhost.conf /etc/apache2/sites-enabled/vhost.conf
-RUN rm /etc/apache2/sites-enabled/000-default.conf
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
 
-HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
+COPY . /app
+COPY --chmod=775 docker/app/entrypoint.sh /usr/local/bin/docker-entrypoint
+COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile
 
-ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+ENTRYPOINT [ "/usr/local/bin/docker-entrypoint" ]
+
+CMD [ "frankenphp", "run", "--config", "/etc/frankenphp/Caddyfile" ]
+
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]

docker/Dockerfile.scheduler

@@ -0,0 +1,18 @@
+FROM dunglas/frankenphp:php8.4-alpine
+
+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
+
+COPY . /app
+
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
+
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0

docker/Dockerfile.worker

@@ -1,12 +1,20 @@
-FROM registry.caldwell.digital/library/php:8.4-apache
+FROM dunglas/frankenphp:php8.4-alpine
 
-RUN apt-get update && \
-    apt-get install libldap2-dev -y && \
-    rm -rf /var/lib/apt/lists/* && \
-    docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
-    docker-php-ext-install ldap
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-COPY --chown=www-data:www-data . /var/www
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
 
-COPY ./bash/vhost.conf /etc/apache2/sites-enabled/vhost.conf
-RUN rm /etc/apache2/sites-enabled/000-default.conf
+RUN apk add --no-cache wget
+
+COPY . /app
+
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]
+
+HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD return 0

docker/app/Caddyfile

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

docker/app/entrypoint.sh

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

docker/app/messenger-worker@.service

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

docs/examples/.env

@@ -3,8 +3,9 @@
 # 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://torsearch-test.caldwell.digital"
+APP_URL="https://torsearch.idocode.io"
 APP_SECRET="70169beadfbc8101c393cbfbba27a313"
+APP_ENV=prod
 
 # Use the DATABASE_URL below to use the MariaDB container
 # provided in the example.compose.yml file, or remove this
@@ -18,13 +19,17 @@ DATABASE_URL="mysql://root:password@database:3306/app?serverVersion=10.6.19.2-Ma
 # This key is never saved anywhere
 # else and is passed to Torrentio
 # to retrieve download options
-REAL_DEBRID_KEY=""
+#REAL_DEBRID_KEY=""
 
 # Enter you TMDB API key
 # This is used to provide rich search results
 # when searching for media and rendering the
 # Popular Movies and TV Shows section.
-TMDB_API=""
+#TMDB_API=
+
+REAL_DEBRID_KEY="QYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ"
+TMDB_API=eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiI0ZTJjYjJhOGUzOGJhNjdiNjVhOGU1NGM0ZWI1MzhmOCIsIm5iZiI6MTczNzkyNjA0NC41NjQsInN1YiI6IjY3OTZhNTljYzdiMDFiNzJjNzIzZWM5YiIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.e8DbNe9qrSBC1y-ANRv-VWBAtls-ZS2r7aNCiI68mpw
+
 
 MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
 

docs/examples/compose.yml

@@ -1,32 +1,36 @@
 services:
-  # This container runs the actual web app in a php:8.4-apache
-  # base container. If not running behind a reverse proxy,
-  # inject your SSL certificates into this container
+  # The "entrypoint" into the application. This reverse proxy
+  # proxies traffic back to their respective services. If not
+  # running behind a reverse proxy inject your SSL certificates
+  # into this container.
+  # This container runs the actual web app in a php:8.4-fpm
+  # base container.
   app:
-    image: registry.caldwell.digital/home/torsearch:test-app
+    image: code.caldwell.digital/home/torsearch-app:latest
     ports:
-      - "8006:80"
+      - '8006:80'
     env_file:
       - .env
     depends_on:
       database:
         condition: service_healthy
 
-  # Downloads happen asynchronously in this container. Replicate
-  # this container to run multiple downloads simultaneously.
+  # 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
+  # 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: registry.caldwell.digital/home/torsearch:test-worker
+    image: code.caldwell.digital/home/torsearch-worker:latest
     volumes:
-      - ./downloads/movies:/var/download/movies
-      - ./downloads/tvshows:/var/download/tvshows
-    command: php ./bin/console messenger:consume async -v --time-limit=3600 --limit=10
+      - /mnt/media/downloads/movies:/var/download/movies
+      - /mnt/media/downloads/tvshows:/var/download/tvshows
+    command: -vvv
     env_file:
       - .env
+    restart: always
     depends_on:
       app:
         condition: service_healthy
@@ -37,12 +41,12 @@ services:
   # This container runs a Symfony worker process.
   # See: https://symfony.com/doc/current/messenger.html
   scheduler:
-    image: registry.caldwell.digital/home/torsearch:test-worker
+    image: code.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
       - ./downloads:/var/download
-    command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600
     env_file:
       - .env
+    restart: always
     depends_on:
       app:
         condition: service_healthy
@@ -79,9 +83,19 @@ services:
       MYSQL_ROOT_PASSWORD: password
     healthcheck:
       test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      timeout: 10s
+      interval: 5s
+      timeout: 5s
       retries: 10
 
+  redis:
+    image: redis:latest
+    volumes:
+      - redis_data:/data
+    command: redis-server --maxmemory 512MB
+    restart: unless-stopped
+
+  # **Optional**
+  # Provides a simple method of viewing the database
   adminer:
     image: adminer
     ports:
@@ -91,3 +105,4 @@ volumes:
   mysql:
   mercure_config:
   mercure_data:
+  redis_data:

docs/examples/swarm.compose.yml

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

importmap.php

@@ -28,4 +28,16 @@ return [
     '@hotwired/turbo' => [
         'version' => '7.3.0',
     ],
+    '@stimulus-components/popover' => [
+        'version' => '7.0.0',
+    ],
+    '@stimulus-components/dialog' => [
+        'version' => '1.0.1',
+    ],
+    '@stimulus-components/dropdown' => [
+        'version' => '3.0.0',
+    ],
+    'stimulus-use' => [
+        'version' => '0.52.2',
+    ],
 ];

migrations/Version20250519193350.php

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

src/Command/SeedDatabaseCommand.php

@@ -53,6 +53,7 @@ class SeedDatabaseCommand extends Command
                 ->setName($preference['name'])
                 ->setDescription($preference['description'])
                 ->setEnabled($preference['enabled'])
+                ->setType($preference['type'])
             );
         }
 
@@ -66,26 +67,37 @@ class SeedDatabaseCommand extends Command
                 'id' => 'codec',
                 'name' => 'Codec',
                 'description' => null,
-                'enabled' => true
+                'enabled' => true,
+                'type' => 'media',
             ],
             [
                 'id' => 'resolution',
                 'name' => 'Resolution',
                 'description' => null,
-                'enabled' => true
+                'enabled' => true,
+                'type' => 'media',
             ],
             [
                 'id' => 'language',
                 'name' => 'Language',
                 'description' => null,
-                'enabled' => true
+                'enabled' => true,
+                'type' => 'media',
             ],
             [
                 'id' => 'provider',
                 'name' => 'Provider',
                 'description' => null,
-                'enabled' => true
-            ]
+                'enabled' => true,
+                'type' => 'media',
+            ],
+            [
+                'id' => 'movie_folder',
+                'name' => 'Create new folder for Movies',
+                'description' => 'When downloading a movie, store it in a new folder in your base \'movies\' folder. (e.g.: .../movies/Inception/Inception.2160p.h265.mkv)',
+                'enabled' => true,
+                'type' => 'download'
+            ],
         ];
     }
 

src/Controller/AlertController.php

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

src/Controller/SearchController.php

@@ -6,18 +6,20 @@ use App\Search\Action\Handler\GetMediaInfoHandler;
 use App\Search\Action\Handler\SearchHandler;
 use App\Search\Action\Input\GetMediaInfoInput;
 use App\Search\Action\Input\SearchInput;
-use Carbon\Carbon;
+use App\Tmdb\TmdbResult;
+use App\Torrentio\Action\Command\GetMovieOptionsCommand;
+use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Cache\ItemInterface;
 
 final class SearchController extends AbstractController
 {
     public function __construct(
         private SearchHandler $searchHandler,
         private GetMediaInfoHandler $getMediaInfoHandler,
+        private MessageBusInterface $bus,
     ) {}
 
     #[Route('/search', name: 'app_search', methods: ['GET'])]
@@ -31,11 +33,14 @@ final class SearchController extends AbstractController
         ]);
     }
 
-    #[Route('/result/{mediaType}/{tmdbId}', name: 'app_search_result')]
+    #[Route('/result/{mediaType}/{imdbId}', name: 'app_search_result')]
     public function result(
         GetMediaInfoInput $input,
     ): Response {
         $result = $this->getMediaInfoHandler->handle($input->toCommand());
+
+        $this->warmDownloadOptionCache($result->media);
+
         return $this->render('search/result.html.twig', [
             'results' => $result,
             'filter' => [
@@ -48,4 +53,32 @@ final class SearchController extends AbstractController
             ]
         ]);
     }
+
+    private function warmDownloadOptionCache(TmdbResult $result)
+    {
+        if ($result->mediaType === 'tvshows') {
+            // dispatches a job to get the download options
+            // for each episode and load them in cache
+            foreach ($result->episodes as $season => $episodes) {
+                // Only do the first 2 seasons, so we reduce
+                // getting rate-limited by Torrentio
+                if ($season > 2) {
+                    return;
+                }
+                foreach ($episodes as $episode) {
+                    $this->bus->dispatch(new GetTvShowOptionsCommand(
+                        tmdbId: $result->tmdbId,
+                        imdbId: $result->imdbId,
+                        season: $season,
+                        episode: $episode['episode_number'],
+                    ));
+                }
+            }
+        } elseif ($result->mediaType === 'movies') {
+            $this->bus->dispatch(new GetMovieOptionsCommand(
+                $result->tmdbId,
+                $result->imdbId,
+            ));
+        }
+    }
 }

src/Controller/TorrentioController.php

@@ -6,12 +6,11 @@ use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\Torrentio\Action\Input\GetMovieOptionsInput;
 use App\Torrentio\Action\Input\GetTvShowOptionsInput;
+use App\Util\Broadcaster;
 use Carbon\Carbon;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
@@ -21,8 +20,7 @@ final class TorrentioController extends AbstractController
     public function __construct(
         private readonly GetMovieOptionsHandler $getMovieOptionsHandler,
         private readonly GetTvShowOptionsHandler $getTvShowOptionsHandler,
-        private readonly HubInterface $hub,
-        private readonly \Twig\Environment $renderer,
+        private readonly Broadcaster $broadcaster,
     ) {}
 
     #[Route('/torrentio/movies/{tmdbId}/{imdbId}', name: 'app_torrentio_movies')]
@@ -54,13 +52,13 @@ final class TorrentioController extends AbstractController
             $input->episode,
         );
 
-        return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
-            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
+//        return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
+//            $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
             $results = $this->getTvShowOptionsHandler->handle($input->toCommand());
             return $this->render('torrentio/tvshows.html.twig', [
                 'results' => $results,
             ]);
-        });
+//        });
     }
 
     #[Route('/torrentio/tvshows/clear/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_clear_torrentio_tvshows')]
@@ -75,14 +73,10 @@ final class TorrentioController extends AbstractController
         );
         $cache->delete($cacheId);
 
-        $this->hub->publish(new Update(
-            $request->getSession()->get('mercure_alert_topic'),
-            $this->renderer->render('Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => 'Torrentio cache Cleared.',
-            ])
-        ));
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: 'Torrentio cache Cleared.'
+        );
 
         return $cache->get($cacheId, function (ItemInterface $item) use ($input) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));

src/Download/Action/Command/DeleteDownloadCommand.php

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

src/Download/Action/Command/PauseDownloadCommand.php

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

src/Download/Action/Command/ResumeDownloadCommand.php

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

src/Download/Action/Handler/DeleteDownloadHandler.php

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

src/Download/Action/Handler/DownloadMediaHandler.php

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

src/Download/Action/Handler/PauseDownloadHandler.php

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

src/Download/Action/Handler/ResumeDownloadHandler.php

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

src/Download/Action/Input/DeleteDownloadInput.php

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

src/Download/Action/Input/PauseDownloadInput.php

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

src/Download/Action/Input/ResumeDownloadInput.php

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

src/Download/Action/Result/DeleteDownloadResult.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Download\Action\Result;
+
+use App\Download\Framework\Entity\Download;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/** @implements ResultInterface<DownloadMediaResult> */
+class DeleteDownloadResult implements ResultInterface
+{
+    public function __construct(
+        public int $status,
+        public string $message,
+        public Download $download,
+    ) {}
+}

src/Download/Action/Result/PauseDownloadResult.php

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

src/Download/Action/Result/ResumeDownloadResult.php

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

src/Download/Downloader/DownloaderInterface.php

@@ -10,11 +10,11 @@ use App\Message\DownloadTvShowMessage;
 interface DownloaderInterface
 {
     /**
-     * @param string $baseDir
+     * @param string $mediaType
      * @param string $title
      * @param string $url
      * @return void
      * Downloads the requested file.
      */
-    public function download(string $baseDir, string $title, string $url, ?int $downloadId): void;
+    public function download(string $mediaType, string $title, string $url, ?int $downloadId): void;
 }

src/Download/Downloader/ProcessDownloader.php

@@ -3,33 +3,49 @@
 namespace App\Download\Downloader;
 
 use App\Download\Framework\Entity\Download;
+use App\Monitor\Service\MediaFiles;
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
+use Symfony\Contracts\Cache\CacheInterface;
 
 class ProcessDownloader implements DownloaderInterface
 {
+    /**
+     * @var RedisAdapter $cache
+     */
+
     public function __construct(
         private EntityManagerInterface $entityManager,
+        private MediaFiles $mediaFiles,
+        private CacheInterface $cache,
     ) {}
 
     /**
      * @inheritDoc
      */
-    public function download(string $baseDir, string $title, string $url, ?int $downloadId): void
+    public function download(string $mediaType, string $title, string $url, ?int $downloadId): void
     {
         /** @var Download $downloadEntity */
         $downloadEntity = $this->entityManager->getRepository(Download::class)->find($downloadId);
-        $downloadEntity->setProgress(0);
         $this->entityManager->flush();
 
-        $process = new Process([
-            '/bin/sh',
-            '/var/www/bash/app/wget_download.sh',
-            $baseDir,
-            $title,
-            $url
-        ]);
+        $downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
+        $path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
+
+        $processArgs = ['wget', $url];
+
+        if ($downloadEntity->getStatus() === 'Paused') {
+            $downloadEntity->setStatus('In Progress');
+            $processArgs = ['wget', '-c', $url];
+        } else {
+            $downloadEntity->setProgress(0);
+        }
+
+        fwrite(STDOUT, implode(" ", $processArgs));
+
+        $process = (new Process($processArgs))->setWorkingDirectory($path);
 
         $process->setTimeout(1800); // 30 min
         $process->setIdleTimeout(600); // 10 min
@@ -39,7 +55,18 @@ class ProcessDownloader implements DownloaderInterface
         try {
             $progress = 0;
             $this->entityManager->flush();
-            $process->wait(function ($type, $buffer) use ($progress, $downloadEntity): void {
+
+            $process->wait(function ($type, $buffer) use ($progress, $downloadEntity, $process): void {
+                // The PauseDownloadHandler will set this to 'true'
+                $doPause = $this->cache->getItem('download.pause.' . $downloadEntity->getId());
+
+                if (true === $doPause->isHit() && true === $doPause->get()) {
+                    $downloadEntity->setStatus('Paused');
+                    $this->cache->deleteItem('download.pause.' . $downloadEntity->getId());
+                    $this->entityManager->flush();
+                    $process->stop();
+                }
+
                 if (Process::ERR === $type) {
                     $pregMatchOutput = [];
                     preg_match('/[\d]+%/', $buffer, $pregMatchOutput);
@@ -54,11 +81,29 @@ class ProcessDownloader implements DownloaderInterface
                 }
                 fwrite(STDOUT, $buffer);
             });
-            $downloadEntity->setProgress(100);
+            if ($downloadEntity->getStatus() !== 'Paused') {
+                $downloadEntity->setProgress(100);
+            }
         } catch (ProcessFailedException $exception) {
             $downloadEntity->setStatus('Failed');
         }
 
         $this->entityManager->flush();
     }
+
+    public function getDownloadPath(string $mediaType, string $title, array $downloadPreferences): string
+    {
+        if ($mediaType === 'movies') {
+            if ((bool) $downloadPreferences['movie_folder']->getPreferenceValue() === true) {
+                return $this->mediaFiles->createMovieDirectory($title);
+            }
+            return $this->mediaFiles->getMoviesPath();
+        }
+
+        if ($mediaType === 'tvshows') {
+            return $this->mediaFiles->createTvShowDirectory($title);
+        }
+
+        throw new \Exception("There is no download path for media type: $mediaType");
+    }
 }

src/Download/Framework/Controller/ApiController.php

@@ -2,13 +2,17 @@
 
 namespace App\Download\Framework\Controller;
 
+use App\Download\Action\Handler\DeleteDownloadHandler;
+use App\Download\Action\Handler\PauseDownloadHandler;
+use App\Download\Action\Handler\ResumeDownloadHandler;
+use App\Download\Action\Input\DeleteDownloadInput;
 use App\Download\Action\Input\DownloadMediaInput;
+use App\Download\Action\Input\PauseDownloadInput;
+use App\Download\Action\Input\ResumeDownloadInput;
 use App\Download\Framework\Repository\DownloadRepository;
+use App\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
@@ -17,12 +21,11 @@ class ApiController extends AbstractController
     public function __construct(
         private DownloadRepository $downloadRepository,
         private MessageBusInterface $bus,
-        private readonly HubInterface $hub,
+        private readonly Broadcaster $broadcaster,
     ) {}
 
     #[Route('/api/download', name: 'api_download', methods: ['POST'])]
     public function download(
-        Request $request,
         DownloadMediaInput $input,
     ): Response {
         $download = $this->downloadRepository->insert(
@@ -45,15 +48,53 @@ class ApiController extends AbstractController
             return $this->json(['error' => $exception->getMessage()], Response::HTTP_INTERNAL_SERVER_ERROR);
         }
 
-        $this->hub->publish(new Update(
-            $request->getSession()->get('mercure_alert_topic'),
-            $this->renderView('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => '"' . $input->title . '" added to Queue',
-            ])
-        ));
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: "$input->title added to Queue."
+        );
 
         return $this->json(['status' => 200, 'message' => 'Added to Queue']);
     }
-}
+
+    #[Route('/api/download/{downloadId}', name: 'api_download_delete', methods: ['DELETE'])]
+    public function deleteDownload(
+        DeleteDownloadInput $input,
+        DeleteDownloadHandler $handler,
+    ): Response {
+        $result = $handler->handle($input->toCommand());
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: "{$result->download->getTitle()} has been deleted.",
+        );
+
+        return $this->json(['status' => 200, 'message' => 'Download Deleted']);
+    }
+
+    #[Route('/api/download/{downloadId}/pause', name: 'api_download_pause', methods: ['PATCH'])]
+    public function pauseDownload(
+        PauseDownloadInput $input,
+        PauseDownloadHandler $handler,
+    ): Response {
+        $result = $handler->handle($input->toCommand());
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: "{$result->download->getTitle()} has been Paused.",
+        );
+
+        return $this->json(['status' => 200, 'message' => 'Download Paused']);
+    }
+
+    #[Route('/api/download/{downloadId}/resume', name: 'api_download_resume', methods: ['PATCH'])]
+    public function resumeDownload(
+        ResumeDownloadInput $input,
+        ResumeDownloadHandler $handler,
+    ): Response {
+        $result = $handler->handle($input->toCommand());
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: "{$result->download->getTitle()} has been Resumed.",
+        );
+
+        return $this->json(['status' => 200, 'message' => 'Download Resumed']);
+    }
+}

src/Download/Framework/Entity/Download.php

@@ -3,8 +3,11 @@
 namespace App\Download\Framework\Entity;
 
 use App\Download\Framework\Repository\DownloadRepository;
+use App\Torrentio\Result\ResultFactory;
+use App\Torrentio\Result\TorrentioResult;
 use App\User\Framework\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
+use Nihilarr\PTN;
 use Symfony\UX\Turbo\Attribute\Broadcast;
 
 #[ORM\Entity(repositoryClass: DownloadRepository::class)]
@@ -162,4 +165,16 @@ class Download
 
         return $this;
     }
+
+    public function getPtn(): object
+    {
+        $ptn = (object) (new PTN())->parse($this->filename);
+
+        if ($this->mediaType === "tvshows") {
+            $ptn->season = str_pad($ptn->season, 2, "0", STR_PAD_LEFT);
+            $ptn->episode = str_pad($ptn->episode, 2, "0", STR_PAD_LEFT);
+        }
+
+        return $ptn;
+    }
 }

src/Download/Framework/Repository/DownloadRepository.php

@@ -25,27 +25,31 @@ class DownloadRepository extends ServiceEntityRepository
         $this->paginator = $paginator;
     }
 
-    public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10)
+    public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10, string $term = ""): Paginator
     {
         $query = $this->createQueryBuilder('d')
             ->andWhere('d.status IN (:statuses)')
             ->andWhere('d.user = :user')
+            ->andWhere('(d.title LIKE :term OR d.filename LIKE :term OR d.imdbId LIKE :term OR d.status LIKE :term OR d.mediaType LIKE :term)')
             ->orderBy('d.id', 'DESC')
             ->setParameter('statuses', ['Complete'])
             ->setParameter('user', $user)
+            ->setParameter('term', '%' . $term . '%')
             ->getQuery();
 
         return $this->paginator->paginate($query, $pageNumber, $perPage);
     }
 
-    public function getActivePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 5)
+    public function getActivePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 5, string $term = ""): Paginator
     {
         $query = $this->createQueryBuilder('d')
             ->andWhere('d.status IN (:statuses)')
             ->andWhere('d.user = :user')
+            ->andWhere('(d.title LIKE :term OR d.filename LIKE :term OR d.imdbId LIKE :term OR d.status LIKE :term OR d.mediaType LIKE :term)')
             ->orderBy('d.id', 'ASC')
-            ->setParameter('statuses', ['New', 'In Progress'])
+            ->setParameter('statuses', ['New', 'In Progress', 'Paused'])
             ->setParameter('user', $user)
+            ->setParameter('term', '%' . $term . '%')
             ->getQuery();
 
         return $this->paginator->paginate($query, $pageNumber, $perPage);

src/Monitor/Action/Command/DeleteMonitorCommand.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Monitor\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+
+/** @implements CommandInterface<DeleteMonitorCommand> */
+class DeleteMonitorCommand implements CommandInterface
+{
+    public function __construct(
+        public string $monitorId,
+    ) {}
+}

src/Monitor/Action/Handler/DeleteMonitorHandler.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Monitor\Action\Handler;
+
+use App\Monitor\Action\Command\AddMonitorCommand;
+use App\Monitor\Action\Command\DeleteMonitorCommand;
+use App\Monitor\Action\Result\AddMonitorResult;
+use App\Monitor\Action\Result\DeleteMonitorResult;
+use App\Monitor\Framework\Entity\Monitor;
+use App\Monitor\Framework\Repository\MonitorRepository;
+use App\User\Framework\Repository\UserRepository;
+use DateTimeImmutable;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/** @implements HandlerInterface<DeleteMonitorCommand, DeleteMonitorResult> */
+readonly class DeleteMonitorHandler implements HandlerInterface
+{
+    public function __construct(
+        private MonitorRepository $monitorRepository,
+    ) {}
+
+    public function handle(CommandInterface $command): ResultInterface
+    {
+        $monitor = $this->monitorRepository->find($command->monitorId);
+        $this->monitorRepository->getEntityManager()->remove($monitor);
+        $this->monitorRepository->getEntityManager()->flush();
+
+        return new DeleteMonitorResult(
+            status: 'OK',
+            result: [],
+            monitor: $monitor
+        );
+    }
+}

src/Monitor/Action/Input/DeleteMonitorInput.php

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

src/Monitor/Action/Result/DeleteMonitorResult.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Monitor\Action\Result;
+
+use App\Monitor\Framework\Entity\Monitor;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+class DeleteMonitorResult implements ResultInterface
+{
+    public function __construct(
+        public string $status,
+        public array $result,
+        public Monitor $monitor,
+    ) {}
+}

src/Monitor/Framework/Controller/ApiController.php

@@ -2,23 +2,23 @@
 
 namespace App\Monitor\Framework\Controller;
 
+use App\Download\Action\Input\DeleteDownloadInput;
 use App\Monitor\Action\Handler\AddMonitorHandler;
+use App\Monitor\Action\Handler\DeleteMonitorHandler;
 use App\Monitor\Action\Input\AddMonitorInput;
+use App\Monitor\Action\Input\DeleteMonitorInput;
+use App\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Mercure\HubInterface;
 use Symfony\Component\Mercure\Update;
 use Symfony\Component\Routing\Attribute\Route;
-use Twig\Environment;
 
 class ApiController extends AbstractController
 {
     public function __construct(
-        #[Autowire(service: 'twig')]
-        private readonly Environment $renderer,
-        private readonly HubInterface $hub,
-        private readonly Security $security,
+        private readonly Broadcaster $broadcaster,
     ) {}
 
     #[Route('/api/monitor', name: 'api_monitor', methods: ['POST'])]
@@ -28,15 +28,34 @@ class ApiController extends AbstractController
         HubInterface $hub,
     ) {
         $command = $input->toCommand();
-        $command->userId = $this->security->getUser()->getId();
+        $command->userId = $this->getUser()->getId();
         $response = $handler->handle($command);
 
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: "New monitor added for {$input->title}",
+        );
+
+        return $this->json([
+            'status' => 200,
+            'message' => $response
+        ]);
+    }
+
+    #[Route('/api/monitor/{monitorId}', name: 'api_monitor_delete', methods: ['DELETE'])]
+    public function deleteMonitor(
+        DeleteMonitorInput $input,
+        DeleteMonitorHandler $handler,
+        HubInterface $hub,
+    ) {
+        $response = $handler->handle($input->toCommand());
+
         $hub->publish(new Update(
             'alerts',
-            $this->renderer->render('Alert.stream.html.twig', [
+            $this->renderer->render('broadcast/Alert.stream.html.twig', [
                 'alert_id' => uniqid(),
                 'title' => 'Success',
-                'message' => "New monitor added for {$input->title}",
+                'message' => "New monitor added for {$response->monitor->getTitle()}",
             ])
         ));
 

src/Monitor/Framework/Controller/WebController.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Monitor\Framework\Controller;
+
+use App\Download\Action\Input\DeleteDownloadInput;
+use App\Monitor\Action\Handler\AddMonitorHandler;
+use App\Monitor\Action\Handler\DeleteMonitorHandler;
+use App\Monitor\Action\Input\AddMonitorInput;
+use App\Monitor\Action\Input\DeleteMonitorInput;
+use App\Monitor\Framework\Repository\MonitorRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Mercure\HubInterface;
+use Symfony\Component\Mercure\Update;
+use Symfony\Component\Routing\Attribute\Route;
+use Twig\Environment;
+
+class WebController extends AbstractController
+{
+    public function __construct(
+        #[Autowire(service: 'twig')]
+        private readonly Environment $renderer,
+    ) {}
+
+    #[Route('/monitors', name: 'app_monitors', methods: ['GET'])]
+    public function addMonitor()
+    {
+        return $this->render('monitor/index.html.twig');
+    }
+}

src/Monitor/Framework/Entity/Monitor.php

@@ -7,7 +7,9 @@ use App\User\Framework\Entity\User;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Ignore;
+use Symfony\UX\Turbo\Attribute\Broadcast;
 
+#[Broadcast(template: 'broadcast/Monitor.stream.html.twig')]
 #[ORM\Entity(repositoryClass: MonitorRepository::class)]
 class Monitor
 {

src/Monitor/Framework/Repository/MonitorRepository.php

@@ -21,7 +21,7 @@ class MonitorRepository extends ServiceEntityRepository
         $this->paginator = $paginator;
     }
 
-    public function getUserMonitorsPaginated(UserInterface $user, int $page, int $perPage)
+    public function getUserMonitorsPaginated(UserInterface $user, int $page, int $perPage, string $searchTerm): Paginator
     {
         $query = $this->createQueryBuilder('m')
             ->andWhere('m.status IN (:statuses)')

src/Monitor/Service/MediaFiles.php

@@ -3,14 +3,19 @@
 namespace App\Monitor\Service;
 
 use Aimeos\Map;
+use App\Download\Framework\Entity\Download;
+use Nihilarr\PTN;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
+use Symfony\Component\Finder\SplFileInfo;
 
 class MediaFiles
 {
     private Finder $finder;
 
+    private string $basePath;
+
     private string $moviesPath;
 
     private string $tvShowsPath;
@@ -18,6 +23,9 @@ class MediaFiles
     private Filesystem $filesystem;
 
     public function __construct(
+        #[Autowire(param: 'media.base_path')]
+        string $basePath,
+
         #[Autowire(param: 'media.movies_path')]
         string $moviesPath,
 
@@ -27,11 +35,28 @@ class MediaFiles
         Filesystem $filesystem,
     ) {
         $this->finder = new Finder();
+        $this->basePath = $basePath;
         $this->moviesPath = $moviesPath;
         $this->tvShowsPath = $tvShowsPath;
         $this->filesystem = $filesystem;
     }
 
+    public function getPathByType(string $mediaType): string
+    {
+        if ('movies' === $mediaType) {
+            return $this->moviesPath;
+        } elseif ('tvshows' === $mediaType) {
+            return $this->tvShowsPath;
+        }
+
+        throw new \Exception(sprintf('A path for media type %s does not exist.', $mediaType));
+    }
+
+    public function getBasePath(): string
+    {
+        return $this->basePath;
+    }
+
     public function getMoviesPath(): string
     {
         return $this->moviesPath;
@@ -83,4 +108,116 @@ class MediaFiles
 
         return Map::from($results);
     }
+
+    public function createMovieDirectory(string $path): string
+    {
+        $path = $this->moviesPath . DIRECTORY_SEPARATOR . $path;
+
+        if (false === $this->filesystem->exists($path)) {
+            $this->filesystem->mkdir($path);
+        }
+
+        return $path;
+    }
+
+    public function createTvShowDirectory(string $path): string
+    {
+        $path = $this->tvShowsPath . DIRECTORY_SEPARATOR . $path;
+
+        if (false === $this->filesystem->exists($path)) {
+            $this->filesystem->mkdir($path);
+        }
+
+        return $path;
+    }
+
+    public function createDirectory(string $path): string
+    {
+        if (false === $this->filesystem->exists($path)) {
+            $this->filesystem->mkdir($path);
+        }
+
+        return $path;
+    }
+
+    public function episodeExists(string $tvshowTitle, int $seasonNumber, int $episodeNumber)
+    {
+        $existingEpisodes = $this->getEpisodes($tvshowTitle, false);
+
+        if ($existingEpisodes->isEmpty()) {
+            return false;
+        }
+
+        /** @var SplFileInfo $episode */
+        foreach ($existingEpisodes as $episode) {
+            $ptn = (object) (new PTN())->parse($episode->getFilename());
+
+            if (!property_exists($episode, 'season') || !property_exists($episode, 'episode')) {
+                continue;
+            }
+
+            if ($ptn->season === $seasonNumber && $ptn->episode === $episodeNumber) {
+                return $episode;
+            }
+        }
+
+        return false;
+    }
+
+    public function movieExists(string $title)
+    {
+        $filepath = $this->moviesPath . DIRECTORY_SEPARATOR . $title;
+        $directoryExists = $this->filesystem->exists($filepath);
+
+        if (false === $directoryExists) {
+            return false;
+        }
+
+        if (false === $this->finder->in($filepath)->files()->hasResults()) {
+            return false;
+        }
+
+        $files = Map::from($this->finder->in($filepath)->files())->filter(function (SplFileInfo $file) {
+            $validExtensions = ['mkv', 'mp4', 'mpeg'];
+            return in_array($file->getExtension(), $validExtensions);
+        })->values();
+
+        if (false === $files->isEmpty()) {
+            return $files[0];
+        }
+
+        return false;
+    }
+
+    public function getDownloadPath(Download $download): string
+    {
+        $basePath = $this->getBasePath();
+
+        if ($download->getMediaType() === 'movies') {
+            $basePath = $this->getMoviesPath();
+            if ($download->getUser()->hasUserPreference('movie_folder')) {
+                $basePath .= DIRECTORY_SEPARATOR . $download->getTitle();
+            }
+        } elseif ($download->getMediaType() === 'tvshows') {
+            $basePath = $this->getTvShowsPath() . DIRECTORY_SEPARATOR . $download->getTitle();
+        }
+
+        $filepath = $basePath . DIRECTORY_SEPARATOR . $download->getFilename();
+
+        if (false === $this->filesystem->exists($filepath)) {
+            throw new \Exception(sprintf('File %s does not exist.', $filepath));
+        }
+
+        return $filepath;
+    }
+
+    public function renameFile(string $oldFile, string $newFile)
+    {
+        $this->filesystem->rename($oldFile, $newFile);
+    }
+
+    public function setFilePermissions(string $filepath, int $permissions)
+    {
+        $this->filesystem->chmod($filepath, $permissions);
+    }
 }

src/Search/Action/Command/GetMediaInfoCommand.php

@@ -8,7 +8,7 @@ use OneToMany\RichBundle\Contract\CommandInterface;
 class GetMediaInfoCommand implements CommandInterface
 {
     public function __construct(
-        public string $tmdbId,
+        public string $imdbId,
         public string $mediaType,
     ) {}
 }

src/Search/Action/Handler/GetMediaInfoHandler.php

@@ -18,7 +18,7 @@ class GetMediaInfoHandler implements HandlerInterface
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $media = $this->tmdb->mediaDetails($command->tmdbId, $command->mediaType);
+        $media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
 
         return new GetMediaInfoResult($media);
     }

src/Search/Action/Input/GetMediaInfoInput.php

@@ -12,8 +12,8 @@ use OneToMany\RichBundle\Contract\InputInterface;
 class GetMediaInfoInput implements InputInterface
 {
     public function __construct(
-        #[SourceRoute('tmdbId')]
-        public string $tmdbId,
+        #[SourceRoute('imdbId')]
+        public string $imdbId,
 
         #[SourceRoute('mediaType')]
         public string $mediaType,
@@ -21,6 +21,6 @@ class GetMediaInfoInput implements InputInterface
 
     public function toCommand(): CommandInterface
     {
-        return new GetMediaInfoCommand($this->tmdbId, $this->mediaType);
+        return new GetMediaInfoCommand($this->imdbId, $this->mediaType);
     }
 }

src/Tmdb/Tmdb.php

@@ -133,9 +133,12 @@ class Tmdb
             if (!$result instanceof Movie && !$result instanceof Tv) {
                 continue;
             }
+
             $results[] = $this->parseResult($result);
         }
 
+        $results = array_filter($results, fn ($result) => null !== $result->imdbId);
+
         return $results;
     }
 
@@ -143,7 +146,16 @@ class Tmdb
     {
         $finder = new Find($this->client);
         $result = $finder->findBy($id, ['external_source' => 'imdb_id']);
-        return $this->parseResult($result);
+
+        if (count($result['movie_results']) > 0) {
+            return $result['movie_results'][0]['id'];
+        } elseif (count($result['tv_results']) > 0) {
+            return $result['tv_results'][0]['id'];
+        } elseif (count($result['tv_episode_results']) > 0) {
+            return $result['tv_episode_results'][0]['show_id'];
+        }
+
+        throw new \Exception("No results found for $id");
     }
 
     public function movieDetails(string $id)
@@ -183,6 +195,8 @@ class Tmdb
 
     public function mediaDetails(string $id, string $type)
     {
+        $id = $this->find($id);
+
         if ($type === "movies") {
             return $this->movieDetails($id);
         } else {

src/Torrentio/Action/Handler/GetMovieOptionsHandler.php

@@ -2,6 +2,7 @@
 
 namespace App\Torrentio\Action\Handler;
 
+use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Result\GetMovieOptionsResult;
 use App\Torrentio\Client\Torrentio;
@@ -14,12 +15,15 @@ class GetMovieOptionsHandler implements HandlerInterface
     public function __construct(
         private readonly Tmdb $tmdb,
         private readonly Torrentio $torrentio,
+        private readonly MediaFiles $mediaFiles
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
+        $media = $this->tmdb->mediaDetails($command->imdbId, 'movies');
         return new GetMovieOptionsResult(
-            media: $this->tmdb->mediaDetails($command->tmdbId, 'movies'),
+            media: $media,
+            file: $this->mediaFiles->movieExists($media->title),
             results: $this->torrentio->search($command->imdbId, 'movies'),
         );
     }

src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php

@@ -2,6 +2,7 @@
 
 namespace App\Torrentio\Action\Handler;
 
+use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
@@ -16,12 +17,18 @@ class GetTvShowOptionsHandler implements HandlerInterface
     public function __construct(
         private readonly Tmdb $tmdb,
         private readonly Torrentio $torrentio,
+        private readonly MediaFiles $mediaFiles,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
+        $media = $this->tmdb->episodeDetails($command->tmdbId, $command->season, $command->episode);
+        $parentShow = $this->tmdb->mediaDetails($command->imdbId, 'tvshows');
+        $file = $this->mediaFiles->episodeExists($parentShow->title, $command->season, $command->episode);
+
         return new GetTvShowOptionsResult(
-            media: $this->tmdb->episodeDetails($command->tmdbId, $command->season, $command->episode),
+            media: $media,
+            file: $file,
             season: $command->season,
             episode: $command->episode,
             results: $this->torrentio->fetchEpisodeResults(

src/Torrentio/Action/Result/GetMovieOptionsResult.php

@@ -9,6 +9,7 @@ class GetMovieOptionsResult implements ResultInterface
 {
     public function __construct(
         public TmdbResult $media,
+        public bool|\SplFileInfo $file,
         public array $results
     ) {}
 }

src/Torrentio/Action/Result/GetTvShowOptionsResult.php

@@ -4,11 +4,13 @@ namespace App\Torrentio\Action\Result;
 
 use App\Tmdb\TmdbResult;
 use OneToMany\RichBundle\Contract\ResultInterface;
+use Symfony\Component\Finder\SplFileInfo;
 
 class GetTvShowOptionsResult implements ResultInterface
 {
     public function __construct(
         public TmdbResult $media,
+        public bool|SplFileInfo $file,
         public string $season,
         public string $episode,
         public array $results

src/Torrentio/Client/Torrentio.php

@@ -4,20 +4,15 @@ namespace App\Torrentio\Client;
 
 use App\Torrentio\Client\Rule\DownloadOptionFilter\Resolution;
 use App\Torrentio\Client\Rule\RuleEngine;
-use App\Torrentio\MediaResult;
 use App\Torrentio\Result\ResultFactory;
 use Carbon\Carbon;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 
-/**
- * ToDo: Fix
- */
 class Torrentio
 {
     private string $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/{imdbCode}.json';
-//    private string $baseUrl = 'https://torrentio.strem.fun/providers=yts,eztv,rarbg,1337x,thepiratebay,kickasstorrents,torrentgalaxy,magnetdl,horriblesubs|sort=qualitysize|qualityfilter=480p,cam,unknown|debridoptions=nodownloadlinks|realdebrid=QYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ/stream/{imdbCode}.json';
 
     private string $searchUrl;
 
@@ -44,26 +39,6 @@ class Torrentio
         return $this->parse($results, $filter);
     }
 
-    public function searchBySeriesSeason(MediaResult $series): MediaResult
-    {
-        $imdbCode = $series->imdbId;
-//        foreach ($series->episodes as $season => $episodes) {
-//            foreach ($episodes as $key => $episode) {
-//                $cacheKey = "torrentio.$series->imdbId.$season.{$episode['episode_number']}";
-//                $downloadOptions = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode, $season, $episode) {
-//                    $item->expiresAt(new \DateTimeImmutable("today 11:59 pm"));
-//                    $response = file_get_contents(str_replace('{imdbCode}', "$imdbCode:$season:{$episode['episode_number']}", $this->searchUrl));
-//                    return json_decode(
-//                        $response,
-//                        true
-//                    );
-//                });
-//                $series->episodes[$season][$key]['download_options'] = $this->parse($downloadOptions, []);
-//            }
-//        }
-        return $series;
-    }
-
     public function fetchEpisodeResults(string $imdbId, int $season, int $episode): array
     {
         $cacheKey = "torrentio.$imdbId.$season.$episode";

src/Twig/Components/DownloadList.php

@@ -16,15 +16,14 @@ final class DownloadList extends AbstractController
 {
     use DefaultActionTrait;
 
+    use PaginateTrait;
+
+    #[LiveProp(writable: true)]
+    public string $term = "";
+
     #[LiveProp(writable: true)]
     public string $type;
 
-    #[LiveProp(writable: true)]
-    public int $pageNumber = 1;
-
-    #[LiveProp(writable: true)]
-    public int $perPage = 5;
-
     #[LiveProp(writable: true)]
     public bool $isWidget = true;
 
@@ -35,17 +34,11 @@ final class DownloadList extends AbstractController
     public function getDownloads()
     {
         if ($this->type === "active") {
-            return $this->downloadRepository->getActivePaginated($this->getUser(), $this->pageNumber, $this->perPage);
+            return $this->downloadRepository->getActivePaginated($this->getUser(), $this->pageNumber, $this->perPage, $this->term);
         } elseif ($this->type === "complete") {
-            return $this->downloadRepository->getCompletePaginated($this->getUser(), $this->pageNumber, $this->perPage);
+            return $this->downloadRepository->getCompletePaginated($this->getUser(), $this->pageNumber, $this->perPage, $this->term);
         }
 
         return [];
     }
-
-    #[LiveAction]
-    public function paginate(#[LiveArg] int $page)
-    {
-        $this->pageNumber = $page;
-    }
 }

src/Twig/Components/DownloadListRow.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Twig\Components;
+
+use App\Download\Framework\Entity\Download;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent]
+final class DownloadListRow
+{
+    public Download $download;
+
+    public bool $isWidget = true;
+}

src/Twig/Components/Modal.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Twig\Components;
+
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent]
+final class Modal
+{
+}

src/Twig/Components/MonitorList.php

@@ -3,14 +3,27 @@
 namespace App\Twig\Components;
 
 use App\Monitor\Framework\Repository\MonitorRepository;
+use Doctrine\ORM\Query\Expr\OrderBy;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\Attribute\LiveAction;
-use Symfony\UX\LiveComponent\Attribute\LiveArg;
-use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+use Symfony\UX\LiveComponent\Attribute\LiveProp;
+use Symfony\UX\LiveComponent\DefaultActionTrait;
 
-#[AsTwigComponent]
+#[AsLiveComponent]
 final class MonitorList extends AbstractController
 {
+    use DefaultActionTrait;
+
+    use PaginateTrait;
+
+    #[LiveProp(writable: true)]
+    public string $term = "";
+
+    #[LiveProp(writable: true)]
+    public string $type;
+
+    #[LiveProp(writable: true)]
     public bool $isWidget = true;
 
     public function __construct(
@@ -18,8 +31,40 @@ final class MonitorList extends AbstractController
     ) {}
 
     #[LiveAction]
-    public function getUserMonitors(#[LiveArg] int $page = 1, #[LiveArg] int $perPage = 5)
+    public function getMonitors()
     {
-        return $this->monitorRepository->getUserMonitorsPaginated($this->getUser(), $page, $perPage);
+        if ($this->type === "active") {
+            return $this->getActiveUserMonitors();
+        } elseif ($this->type === "complete") {
+            return $this->getCompleteUserMonitors();
+        }
+
+        return [];
+    }
+
+    #[LiveAction]
+    public function getActiveUserMonitors()
+    {
+        return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
+            ->andWhere('m.status IN (:statuses)')
+            ->andWhere('(m.title LIKE :term OR m.imdbId LIKE :term OR m.monitorType LIKE :term OR m.status LIKE :term)')
+            ->setParameter('statuses', ['New', 'In Progress'])
+            ->setParameter('term', '%'.$this->term.'%')
+            ->orderBy('m.id', 'DESC')
+            ->getQuery()
+        );
+    }
+
+    #[LiveAction]
+    public function getCompleteUserMonitors()
+    {
+        return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
+            ->andWhere('m.status = :status')
+            ->andWhere('(m.title LIKE :term OR m.imdbId LIKE :term OR m.monitorType LIKE :term OR m.status LIKE :term)')
+            ->setParameter('status', 'Complete')
+            ->setParameter('term', '%'.$this->term.'%')
+            ->orderBy('m.id', 'DESC')
+            ->getQuery()
+        );
     }
 }

src/Twig/Components/MonitorListRow.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Twig\Components;
+
+use App\Monitor\Framework\Entity\Monitor;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent]
+final class MonitorListRow
+{
+    public Monitor $monitor;
+}

src/Twig/Components/PaginateTrait.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Twig\Components;
+
+use App\Util\Paginator;
+use Doctrine\ORM\Query;
+use Symfony\UX\LiveComponent\Attribute\LiveAction;
+use Symfony\UX\LiveComponent\Attribute\LiveArg;
+use Symfony\UX\LiveComponent\Attribute\LiveProp;
+
+trait PaginateTrait
+{
+    #[LiveProp(writable: true)]
+    public int $pageNumber = 1;
+
+    #[LiveProp(writable: true)]
+    public int $perPage = 5;
+
+    #[LiveAction]
+    public function paginate(#[LiveArg] int $page)
+    {
+        $this->pageNumber = $page;
+    }
+
+    private function asPaginator(Query $query): Paginator
+    {
+        return (new Paginator())
+            ->paginate($query, $this->pageNumber, $this->perPage);
+    }
+}

src/Twig/Extensions/MonitorExtension.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Twig\Extensions;
+
+use App\Monitor\Framework\Entity\Monitor;
+use Twig\Attribute\AsTwigFilter;
+
+class MonitorExtension
+{
+    #[AsTwigFilter('monitor_type')]
+    public function type(string $type)
+    {
+        $types = [
+            'tvshows' => 'Show',
+            'tvseason' => 'Season',
+            'tvepisode' => 'Episode',
+        ];
+
+        return $types[$type] ?? '-';
+    }
+
+    #[AsTwigFilter('monitor_media_id')]
+    public function mediaId(Monitor $monitor)
+    {
+        if ($monitor->getMonitorType() === "tvseason") {
+            return "S". str_pad($monitor->getSeason(), 2, "0", STR_PAD_LEFT);
+        }
+
+        if ($monitor->getMonitorType() === "tvepisode") {
+            return "S". str_pad($monitor->getSeason(), 2, "0", STR_PAD_LEFT) .
+                "E". str_pad($monitor->getEpisode(), 2, "0", STR_PAD_LEFT);
+        }
+
+        return "-";
+    }
+}

src/Twig/Extensions/UtilExtension.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Twig\Extensions;
+
+use App\Monitor\Framework\Entity\Monitor;
+use App\Monitor\Service\MediaFiles;
+use ChrisUllyott\FileSize;
+use Twig\Attribute\AsTwigFilter;
+
+class UtilExtension
+{
+
+    public function __construct(
+        private readonly MediaFiles $mediaFiles,
+    ) {}
+
+    #[AsTwigFilter('filesize')]
+    public function type(string|int $size)
+    {
+        return (new FileSize($size))->asAuto();
+    }
+
+    #[AsTwigFilter('strip_media_path')]
+    public function stripMediaPath(string $path)
+    {
+        return str_replace(
+            $this->mediaFiles->getBasePath() . DIRECTORY_SEPARATOR,
+            '',
+            $path
+        );
+    }
+}

src/User/Action/Command/SaveUserDownloadPreferencesCommand.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\User\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+
+/** @implements CommandInterface<SaveUserMediaPreferencesCommand> */
+class SaveUserDownloadPreferencesCommand implements CommandInterface
+{
+    public function __construct(
+        public string $movie_folder,
+    ) {}
+}

src/User/Action/Handler/SaveUserDownloadPreferencesHandler.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\User\Action\Handler;
+
+use App\User\Action\Command\SaveUserMediaPreferencesCommand;
+use App\User\Action\Result\SaveUserDownloadPreferencesResult;
+use App\User\Action\Result\SaveUserMediaPreferencesResult;
+use App\User\Framework\Entity\User;
+use App\User\Framework\Entity\UserPreference;
+use App\User\Framework\Repository\PreferencesRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use OneToMany\RichBundle\Contract\CommandInterface as C;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface as R;
+use Symfony\Bundle\SecurityBundle\Security;
+
+/** @implements HandlerInterface<SaveUserMediaPreferencesCommand> */
+class SaveUserDownloadPreferencesHandler implements HandlerInterface
+{
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+        private readonly PreferencesRepository $preferenceRepository,
+        private readonly Security $token,
+    ) {}
+
+    public function handle(C $command): R
+    {
+        /** @var User $user */
+        $user = $this->token->getUser();
+
+        foreach ($command as $preference => $value) {
+            if ($user->hasUserPreference($preference)) {
+                $user->updateUserPreference($preference, $value);
+                $this->entityManager->flush();
+                continue;
+            }
+
+            $preference = $this->preferenceRepository->find($preference);
+
+            $user->addUserPreference(
+                (new UserPreference())
+                    ->setUser($user)
+                    ->setPreference($preference)
+                    ->setPreferenceValue($value)
+            );
+        }
+
+        $this->entityManager->flush();
+
+        return new SaveUserDownloadPreferencesResult($user->getDownloadPreferences());
+    }
+}

src/User/Action/Input/SaveUserDownloadPreferencesInput.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\User\Action\Input;
+
+use App\User\Action\Command\SaveUserDownloadPreferencesCommand;
+use OneToMany\RichBundle\Attribute\SourceRequest;
+use OneToMany\RichBundle\Attribute\SourceSecurity;
+use OneToMany\RichBundle\Contract\CommandInterface as C;
+use OneToMany\RichBundle\Contract\InputInterface;
+
+/** @implements InputInterface<SaveUserDownloadPreferencesInput, SaveUserDownloadPreferencesCommand> */
+class SaveUserDownloadPreferencesInput implements InputInterface
+{
+    public function __construct(
+        #[SourceSecurity]
+        public mixed $userId,
+
+        #[SourceRequest('movie_folder', nullify: true)]
+        public bool $movieFolder,
+    ) {}
+
+    public function toCommand(): C
+    {
+        return new SaveUserDownloadPreferencesCommand(
+            $this->movieFolder,
+        );
+    }
+}

src/User/Action/Result/SaveUserDownloadPreferencesResult.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\User\Action\Result;
+
+use Doctrine\Common\Collections\Collection;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/** @implements ResultInterface */
+class SaveUserDownloadPreferencesResult implements ResultInterface
+{
+    public function __construct(
+        public array $downloadPreferences,
+    ) {}
+}

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

@@ -2,10 +2,8 @@
 
 namespace App\User\Framework\Controller\Web;
 
-use App\User\Action\Handler\RegisterUserHandler;
 use App\User\Framework\Repository\UserRepository;
 use Doctrine\Common\Collections\ArrayCollection;
-use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;

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

@@ -4,44 +4,30 @@ declare(strict_types=1);
 
 namespace App\User\Framework\Controller\Web;
 
-use Aimeos\Map;
+use App\User\Action\Handler\SaveUserDownloadPreferencesHandler;
 use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
+use App\User\Action\Input\SaveUserDownloadPreferencesInput;
 use App\User\Action\Input\SaveUserMediaPreferencesInput;
-use App\User\Framework\Entity\User;
-use App\User\Framework\Entity\UserPreference;
 use App\User\Framework\Repository\PreferencesRepository;
-use App\Util\CountryCodes;
+use App\Util\Broadcaster;
 use App\Util\CountryLanguages;
 use App\Util\ProviderList;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Mercure\HubInterface;
-use Symfony\Component\Mercure\Update;
 use Symfony\Component\Routing\Attribute\Route;
 
 class PreferencesController extends AbstractController
 {
     public function __construct(
         private readonly PreferencesRepository $preferencesRepository,
-        private readonly SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler,
-        private readonly Security $security,
-        private readonly HubInterface $hub,
+        private readonly Broadcaster $broadcaster,
     ) {}
-    #[Route('/media/preferences', 'app_media_preferences', methods: ['GET'])]
+
+    #[Route('/user/preferences', 'app_user_preferences', methods: ['GET'])]
     public function mediaPreferences(): Response
     {
-        $enabledPreferences = $this->preferencesRepository->findEnabled();
-
-        if ($this->security->getUser()->getUserPreferences()->count() !== count($enabledPreferences)) {
-            $this->setUserPreferences($this->security->getUser(), $enabledPreferences);
-        }
-
-        $userPreferences = $this->security->getUser()->getUserPreferences()->toArray();
-        $userPreferences = Map::from($userPreferences)
-            ->rekey(fn($preference) => $preference->getPreference()->getId());
-
+        $mediaPreferences = $this->getUser()->getMediaPreferences();
+        $downloadPreferences = $this->getUser()->getDownloadPreferences();
         $languages = CountryLanguages::$languages;
         sort($languages);
 
@@ -51,31 +37,29 @@ class PreferencesController extends AbstractController
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
                 'providers' => ProviderList::$providers,
-                'userPreferences' => $userPreferences->toArray(),
+                'mediaPreferences' => $mediaPreferences,
+                'downloadPreferences' => $downloadPreferences,
             ]
         );
     }
 
-    #[Route('/media/preferences', 'app_save_media_preferences', methods: ['POST'])]
+    #[Route('/user/preferences/media', 'app_save_media_preferences', methods: ['POST'])]
     public function saveMediaPreferences(
-        Request $request,
         SaveUserMediaPreferencesInput $input,
+        SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler,
     ): Response
     {
-        $userPreferences = $this->saveUserMediaPreferencesHandler->handle($input->toCommand())->userPreferences;
-        $userPreferences = Map::from($userPreferences)->rekey(fn($preference) => $preference->getPreference()->getId());
+        $saveUserMediaPreferencesHandler->handle($input->toCommand());
+        $mediaPreferences = $this->getUser()->getMediaPreferences();
+        $downloadPreferences = $this->getUser()->getDownloadPreferences();
 
         $languages = CountryLanguages::$languages;
         sort($languages);
 
-        $this->hub->publish(new Update(
-            $request->getSession()->get('mercure_alert_topic'),
-            $this->renderView('broadcast/Alert.stream.html.twig', [
-                'alert_id' => uniqid(),
-                'title' => 'Success',
-                'message' => 'Your media preferences have been saved.',
-            ])
-        ));
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: 'Your media preferences have been saved.'
+        );
 
         return $this->render(
             'user/preferences.html.twig',
@@ -83,22 +67,38 @@ class PreferencesController extends AbstractController
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
                 'providers' => ProviderList::$providers,
-                'userPreferences' => $userPreferences->toArray(),
+                'mediaPreferences' => $mediaPreferences,
+                'downloadPreferences' => $downloadPreferences,
             ]
         );
     }
 
-    private function setUserPreferences(User $user, array $preferences): void
+    #[Route('/user/preferences/download', 'app_save_download_preferences', methods: ['POST'])]
+    public function saveDownloadPreferences(
+        SaveUserDownloadPreferencesInput $input,
+        SaveUserDownloadPreferencesHandler $saveUserDownloadPreferencesHandler,
+    ): Response
     {
-        foreach ($preferences as $preference) {
-            if (false === $user->hasUserPreference($preference->getId())) {
-                $user->addUserPreference((new UserPreference())
-                    ->setUser($user)
-                    ->setPreference($preference)
-                    ->setPreferenceValue(null)
-                );
-            }
-        }
-        $this->preferencesRepository->getEntityManager()->flush();
+        $downloadPreferences = $saveUserDownloadPreferencesHandler->handle($input->toCommand())->downloadPreferences;
+        $mediaPreferences = $this->getUser()->getMediaPreferences();
+
+        $languages = CountryLanguages::$languages;
+        sort($languages);
+
+        $this->broadcaster->alert(
+            title: 'Success',
+            message: 'Your download preferences have been saved.'
+        );
+
+        return $this->render(
+            'user/preferences.html.twig',
+            [
+                'preferences' => $this->preferencesRepository->findEnabled(),
+                'languages' => $languages,
+                'providers' => ProviderList::$providers,
+                'mediaPreferences' => $mediaPreferences,
+                'downloadPreferences' => $downloadPreferences,
+            ]
+        );
     }
 }

src/User/Framework/Entity/Preference.php

@@ -14,6 +14,9 @@ class Preference
     #[ORM\Column]
     private ?string $id = null;
 
+    #[ORM\Column(length: 255, nullable: true)]
+    private ?string $type = null;
+
     #[ORM\Column(length: 255, nullable: true)]
     private ?string $name = null;
 
@@ -57,6 +60,17 @@ class Preference
         return $this;
     }
 
+    public function getType(): ?string
+    {
+        return $this->type;
+    }
+
+    public function setType(string $type): static
+    {
+        $this->type = $type;
+        return $this;
+    }
+
     public function getDescription(): ?string
     {
         return $this->description;

src/User/Framework/Entity/User.php

@@ -204,7 +204,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
         return $this;
     }
 
-    public function getUserPreferenceValues()
+    public function getUserPreferenceValues(string $type = 'all'): array
     {
         return Map::from($this->userPreferences)
             ->rekey(fn(UserPreference $userPreference) => $userPreference->getPreference()->getId())
@@ -213,7 +213,6 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
                     return $userPreference->getPreferenceValue();
                 }
                 foreach ($userPreference->getPreference()->getPreferenceOptions() as $preferenceOption) {
-//                    dd((int) $userPreference->getPreferenceValue(), $preferenceOption->getId(), $preferenceOption->getValue());
                     if ($preferenceOption->getId() === (int) $userPreference->getPreferenceValue()) {
                         return $preferenceOption->getValue();
                     }
@@ -273,6 +272,24 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
         return $this->downloads;
     }
 
+    public function getMediaPreferences()
+    {
+        return Map::from($this->userPreferences)
+            ->rekey(fn(UserPreference $userPreference) => $userPreference->getPreference()->getId())
+            ->filter(fn(UserPreference $userPreference) => $userPreference->getPreference()->getType() === 'media')
+            ->toArray()
+            ;
+    }
+
+    public function getDownloadPreferences()
+    {
+        return Map::from($this->userPreferences)
+            ->rekey(fn(UserPreference $userPreference) => $userPreference->getPreference()->getId())
+            ->filter(fn(UserPreference $userPreference) => $userPreference->getPreference()->getType() === 'download')
+            ->toArray()
+            ;
+    }
+
     /**
      * @return Collection<int, Download>
      */

src/Util/Broadcaster.php

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

symfony.lock

@@ -2,6 +2,15 @@
     "1tomany/rich-bundle": {
         "version": "v1.8.3"
     },
+    "doctrine/deprecations": {
+        "version": "1.1",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "1.0",
+            "ref": "87424683adc81d7dc305eefec1fced883084aab9"
+        }
+    },
     "doctrine/doctrine-bundle": {
         "version": "2.14",
         "recipe": {
@@ -169,6 +178,18 @@
             "config/packages/messenger.yaml"
         ]
     },
+    "symfony/property-info": {
+        "version": "7.3",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "7.3",
+            "ref": "dae70df71978ae9226ae915ffd5fad817f5ca1f7"
+        },
+        "files": [
+            "config/packages/property_info.yaml"
+        ]
+    },
     "symfony/routing": {
         "version": "7.2",
         "recipe": {

tailwind.config.js

@@ -4,8 +4,33 @@ module.exports = {
     "./assets/**/*.js",
     "./templates/**/*.html.twig",
   ],
+  safelist: [
+      "bg-blue-300",
+      "bg-orange-300",
+      "bg-fuchsia-300",
+      "bg-green-400",
+      "bg-purple-400",
+      "bg-orange-400",
+      "bg-blue-600",
+      "bg-rose-600",
+      "transition-opacity",
+      "ease-in",
+      "duration-700",
+      "opacity-100"
+  ],
   theme: {
-    extend: {},
+      extend: {
+          animation: {
+              fade: 'fadeIn .3s ease-in-out',
+          },
+
+          keyframes: {
+              fadeIn: {
+                  from: { opacity: 0 },
+                  to: { opacity: 1 },
+              },
+          },
+      },
   },
   plugins: [],
 }

templates/broadcast/Download.stream.html.twig

@@ -5,36 +5,40 @@
 
     <turbo-stream action="append" target="active_downloads">
         <template>
-            <tr data-download-list-target="download" id="ad_download_{{ entity.id }}">
-                <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
-                    {{ entity.title }}
-                </td>
-                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-50">
-                    {% if entity.progress < 100 %}
-                        <div class="w-[3.25ch] h-[3.25ch] bg-purple-600 rounded-full block text-center table-cell align-middle text-xs text-gray-50">
-                            {{ entity.progress }}
-                        </div>
-                    {% else %}
-                        <twig:StatusBadge color="green" status="Complete" />
-                    {% endif %}
-                </td>
-            </tr>
+            <twig:DownloadListRow download="{{ entity }}" />
         </template>
     </turbo-stream>
 {% endblock %}
 
 {% block update %}
     {% if entity.status != "Complete" %}
-        <turbo-stream action="update" target="ad_download_{{ id }}">
+        <turbo-stream action="update" target="download_progress_{{ id }}">
             <template>
-                <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
-                    {{ entity.title }}
-                </td>
-                <td class="px-6 py-4 whitespace-nowrap text-sm text-end text-gray-800 dark:text-gray-50">
-                    <div class="border-2 border-green-700 rounded-md w-full h-6 align-middle overflow-hidden">
-                        <div class="text-green-700 rounded-sm text-bold text-gray-950 text-center bg-green-600 h-5" style="width:{{ entity.progress }}%">{{ entity.progress }}%</div>
-                    </div>
-                </td>
+                <div class="text-black text-center rounded-sm text-bold bg-green-300 h-5 relative z-10"
+                     style="width:{{ entity.progress }}%">
+                </div>
+                <div class="absolute text-black text-center"
+                     style="z-index: 400;margin-top: -1.25rem; margin-left: 1.2rem">
+                    {{ entity.progress }}%
+                </div>
+                </div>
+            </template>
+        </turbo-stream>
+        <turbo-stream action="update" target="action_buttons_{{ id }}">
+            <template>
+                {% if entity.status == "In Progress" and entity.progress < 100 %}
+                    <button id="pause_{{ entity.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'pauseDownload', 'click', {id: entity.id}) }}>
+                        <twig:ux:icon name="icon-park-twotone:pause-one" width="16.75px" height="16.75px" class="rounded-full" />
+                    </button>
+                {% elseif entity.status == "Paused" %}
+                    <button id="resume_{{ entity.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'resumeDownload', 'click', {id: entity.id}) }}>
+                        <twig:ux:icon name="icon-park-twotone:play" width="16.75px" height="16.75px" class="rounded-full" />
+                    </button>
+                {% endif %}
+                {% set delete_button = component('ux:icon', {name: 'ic:twotone-cancel', width: '17.5px', class: 'rounded-full align-middle text-red-600' }) %}
+                <twig:Modal heading="But wait!" button_text="{{ delete_button }}" submit_action="{{ stimulus_action('download_list', 'deleteDownload', 'click', {id: entity.id}) }}" show_cancel show_submit>
+                    Are you sure you want to delete <span class="font-bold">{{ entity.filename }}</span>?
+                </twig:Modal>
             </template>
         </turbo-stream>
     {% else %}
@@ -44,6 +48,9 @@
         <turbo-stream action="remove" target="ad_download_{{ id }}">
         </turbo-stream>
 
+        <turbo-stream action="remove" target="action_buttons_{{ id }}">
+        </turbo-stream>
+
         <turbo-stream action="prepend" target="alert_list">
             <template>
                 <twig:Alert title="Finished downloading" message="{{ entity.title }}" alert_id="{{ entity.id }}" data-controller="alert" />
@@ -52,14 +59,7 @@
 
         <turbo-stream action="prepend" target="complete_downloads">
             <template>
-                <tr  id="ad_download_{{ entity.id }}">
-                    <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
-                        {{ entity.title }}
-                    </td>
-                    <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-50">
-                        <twig:StatusBadge color="green" status="Complete" />
-                    </td>
-                </tr>
+                <twig:DownloadListRow download="{{ entity }}" />
             </template>
         </turbo-stream>
     {% endif %}

templates/broadcast/Monitor.stream.html.twig

@@ -0,0 +1,29 @@
+{# Learn how to use Turbo Streams: https://github.com/symfony/ux-turbo#broadcast-doctrine-entities-update #}
+{% block create %}
+    <turbo-stream action="remove" target="active_monitors_no_monitors">
+    </turbo-stream>
+
+    <turbo-stream action="prepend" target="monitors">
+        <template>
+            <twig:MonitorListRow monitor="{{ entity }}" />
+        </template>
+    </turbo-stream>
+{% endblock %}
+
+{% block update %}
+    <turbo-stream action="replace" target="monitor_{{ id }}">
+        <template>
+            <twig:MonitorListRow monitor="{{ entity }}" />
+        </template>
+    </turbo-stream>
+{% endblock %}
+
+{% block remove %}
+    <turbo-stream action="remove" target="monitor_{{ id }}"></turbo-stream>
+
+    <turbo-stream action="prepend" target="alert_list">
+        <template>
+            <twig:Alert title="Success" message="Your Monitor for '{{ entity.title }}' has been removed." alert_id="monitor_alert_{{ entity.id }}" data-controller="alert" />
+        </template>
+    </turbo-stream>
+{% endblock %}

templates/components/DownloadList.html.twig

@@ -1,5 +1,12 @@
 <div{{ attributes.defaults(stimulus_controller('download_list')) }} class="min-w-48" >
     {% set table_body_id = (type == "complete") ? "complete_downloads" : "active_downloads" %}
+
+    {% if this.isWidget == false %}
+        <div class="flex flex-row mb-2 justify-end">
+            <twig:DownloadSearch search_path="app_search" placeholder="Find one of your downloads..." />
+        </div>
+    {% endif %}
+
     <table id="downloads" class="divide-y divide-gray-200 bg-gray-50 overflow-hidden rounded-lg table-auto w-full" {{ turbo_stream_listen('App\\Download\\Framework\\Entity\\Download') }}>
         <thead>
         <tr class="bg-orange-500 bg-filter bg-blur-lg bg-opacity-80 text-gray-950">
@@ -23,42 +30,19 @@
                 class="px-6 py-3 text-start text-xs font-medium text-gray-500 uppercase dark:text-stone-800">
                 Progress
             </th>
+            <th scope="col"
+                class="px-6 py-3 text-start text-xs font-medium text-gray-500 uppercase dark:text-stone-800">
+            </th>
         </tr>
         </thead>
         <tbody id="{{ table_body_id }}" class="divide-y divide-gray-200 dark:divide-gray-50">
         {% if this.downloads.items|length > 0 %}
             {% for download in this.downloads.items %}
-                <tr id="ad_download_{{ download.id }}">
-                    <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 {% if this.isWidget == true %}min-w-[45ch] max-w-[45ch]{% endif %} truncate">
-                        {{ download.title }}
-                    </td>
-
-                    {% if this.isWidget == false %}
-                        <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 truncate">
-                            {{ download.filename }}
-                        </td>
-                        <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 truncate">
-                            {{ download.mediaType }}
-                        </td>
-                    {% endif %}
-
-                    <td class="px-6 py-4 whitespace-nowrap text-sm align-middle text-gray-800 dark:text-gray-50">
-                        {% if download.progress < 100 %}
-                            <div class="border-2 border-green-700 rounded-md w-full h-6 align-middle overflow-hidden">
-                                <div class="text-green-700 rounded-sm text-bold text-gray-950 text-center bg-green-600 h-5" style="width:{{ download.progress }}%">{{ download.progress }}%</div>
-                            </div>
-{#                        <div class="w-[3.25ch] h-[3.25ch] bg-purple-600 rounded-full block text-center table-cell align-middle text-xs text-gray-50">#}
-{#                            {{ download.progress }}#}
-{#                        </div>#}
-                        {% else %}
-                            <twig:StatusBadge color="green" status="Completed" />
-                        {% endif %}
-                    </td>
-                </tr>
+                <twig:DownloadListRow download="{{ download }}" isWidget="{{ this.isWidget }}" />
             {% endfor %}
             {% if this.isWidget == true and this.downloads.items|length > this.perPage %}
                 <tr  id="download_view_all">
-                    <td class="py-2 whitespace-nowrap bg-orange-500 uppercase text-sm font-medium text-center text-white truncate" colspan="100%">
+                    <td class="py-2 whitespace-nowrap bg-orange-300 uppercase text-xs font-medium text-center text-black truncate" colspan="100%">
                         <a href="{{ path('app_downloads') }}">View All Downloads</a>
                     </td>
                 </tr>

templates/components/DownloadListRow.html.twig

@@ -0,0 +1,51 @@
+<tr{{ attributes }} id="ad_download_{{ download.id }}">
+    <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 truncate">
+        <a href="{{ path('app_search_result', {imdbId: download.imdbId, mediaType: download.mediaType}) }}"
+           class="hover:underline mr-1"
+        >
+            {{ download.title }}
+        </a>
+
+        {% if download.mediaType == "tvshows" %}
+            &mdash; <span class="ml-1">(S{{ download.ptn.season }}E{{ download.ptn.episode }})</span>
+        {% endif %}
+    </td>
+
+    {% if isWidget == false %}
+        <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 max-w-[60ch] truncate">
+            {{ download.filename }}
+        </td>
+        <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 truncate">
+            {{ download.mediaType }}
+        </td>
+    {% endif %}
+
+    <td class="px-6 py-4 whitespace-nowrap text-sm align-middle text-gray-800 dark:text-gray-50">
+        {% if download.progress < 100 %}
+            <div id="download_progress_{{ download.id }}" class="border-2 border-green-600 rounded-md text-center w-full h-6 align-middle overflow-hidden">
+                <div class="text-black text-center rounded-sm text-bold bg-green-300 h-5 relative z-10"
+                     style="width:{{ download.progress }}%">
+                </div>
+                <div class="absolute text-black text-center" style="z-index: 400;margin-top: -1.25rem; margin-left: 1.2rem">{{ download.progress }}%</div>
+            </div>
+        {% else %}
+            <twig:StatusBadge color="green" status="Complete" />
+        {% endif %}
+    </td>
+    <td id="action_buttons_{{ download.id }}" class="px-6 py-4 flex flex-row items-center">
+        {% if download.status == 'In Progress' and download.progress < 100 %}
+            <button id="pause_{{ download.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'pauseDownload', 'click', {id: download.id}) }}>
+                <twig:ux:icon name="icon-park-twotone:pause-one" width="16.75px" height="16.75px" class="rounded-full" />
+            </button>
+        {% elseif download.status == 'Paused' %}
+            <button id="resume_{{ download.id }}" class="text-orange-500 mr-1 self-start" {{ stimulus_action('download_list', 'resumeDownload', 'click', {id: download.id}) }}>
+                <twig:ux:icon name="icon-park-twotone:play" width="16.75px" height="16.75px" class="rounded-full" />
+            </button>
+        {% endif %}
+
+        {% set delete_button = component('ux:icon', {name: 'ic:twotone-cancel', height: '17.75px', width: '17.75px', class: 'rounded-full align-middle text-red-600' }) %}
+        <twig:Modal heading="But wait!" button_text="{{ delete_button }}" submit_action="{{ stimulus_action('download_list', 'deleteDownload', 'click', {id: download.id}) }}" show_cancel show_submit>
+            Are you sure you want to delete <span class="font-bold">{{ download.filename }}</span>?
+        </twig:Modal>
+    </td>
+</tr>

templates/components/DownloadSearch.html.twig

@@ -0,0 +1,29 @@
+<div {{ attributes }} class="w-full max-w-sm min-w-[200px]">
+    <div class="relative">
+        <form>
+            <input
+                    data-model="term"
+                    class="w-full bg-transparent
+                          placeholder:text-slate-200 text-gray-50
+                         text-sm border-b border-orange-500 pl-3 pr-28 py-2 transition
+                         duration-300 ease focus:outline-none focus:border-orange-400 hover:border-orange-300
+                         shadow-sm focus:shadow"
+                    placeholder="{{ placeholder ?? 'TV Show, Movie...' }}"
+            />
+            <button
+                    class="absolute top-1 right-1 flex items-center
+                    bg-green-600 py-1 px-2  text-center
+                    text-md text-white transition-all
+                    focus:bg-green-700 active:bg-green-700 hover:bg-green-700
+
+                    text-white bg-green-600 text-xs
+                     rounded-sm
+                    bg-opacity-80
+"
+                    onclick="return false;"
+            >
+                Search
+            </button>
+        </form>
+    </div>
+</div>