wip: base stream class

.env

@@ -38,3 +38,6 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 ###< symfony/messenger ###
 
 REDIS_HOST=redis://redis
+
+MOVIES_PATH=/var/download/movies
+TVSHOWS_PATH=/var/download/tvshows

.gitignore

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

Dockerfile

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

Dockerfile.prod

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

assets/bootstrap.js

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

assets/controllers/download_list_controller.js

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

assets/controllers/monitor_controller.js

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

assets/controllers/monitor_list_controller.js

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

assets/icons/ic/twotone-cancel.svg

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

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

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

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

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

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

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

assets/styles/app.css

@@ -10,44 +10,4 @@
     h2 {
         font-size: var(--text-xl);
     }
-    .rounded-ms {
-        border-radius: 0.275rem;
-    }
-}
-
-/* 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

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

bash/entrypoint.sh

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

bash/nginx.conf

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

compose.yml

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

composer.json

@@ -9,7 +9,6 @@
         "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",
@@ -23,30 +22,28 @@
         "p3k/emoji-detector": "^1.2",
         "php-tmdb/api": "^4.1",
         "predis/predis": "^2.4",
-        "runtime/frankenphp-symfony": "^0.2.0",
+        "symfony/asset": "7.2.*",
-        "stof/doctrine-extensions-bundle": "^1.14",
+        "symfony/console": "7.2.*",
-        "symfony/asset": "7.3.*",
+        "symfony/doctrine-messenger": "7.2.*",
-        "symfony/console": "7.3.*",
+        "symfony/dotenv": "7.2.*",
-        "symfony/doctrine-messenger": "7.3.*",
+        "symfony/filesystem": "7.2.*",
-        "symfony/dotenv": "7.3.*",
+        "symfony/finder": "7.2.*",
-        "symfony/filesystem": "7.3.*",
-        "symfony/finder": "7.3.*",
         "symfony/flex": "^2",
-        "symfony/form": "7.3.*",
+        "symfony/form": "7.2.*",
-        "symfony/framework-bundle": "7.3.*",
+        "symfony/framework-bundle": "7.2.*",
-        "symfony/ldap": "7.3.*",
+        "symfony/ldap": "7.2.*",
         "symfony/mercure-bundle": "^0.3.9",
-        "symfony/messenger": "7.3.*",
+        "symfony/messenger": "7.2.*",
-        "symfony/runtime": "7.3.*",
+        "symfony/runtime": "7.2.*",
-        "symfony/scheduler": "7.3.*",
+        "symfony/scheduler": "7.2.*",
-        "symfony/security-bundle": "7.3.*",
+        "symfony/security-bundle": "7.2.*",
         "symfony/stimulus-bundle": "^2.24",
-        "symfony/twig-bundle": "7.3.*",
+        "symfony/twig-bundle": "7.2.*",
         "symfony/ux-icons": "^2.24",
         "symfony/ux-live-component": "^2.24",
         "symfony/ux-turbo": "^2.24",
         "symfony/ux-twig-component": "^2.24",
-        "symfony/yaml": "7.3.*",
+        "symfony/yaml": "7.2.*",
         "symfonycasts/tailwind-bundle": "^0.10.0",
         "twig/extra-bundle": "^2.12|^3.0",
         "twig/twig": "^2.12|^3.0"
@@ -100,13 +97,13 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "7.3.*"
+            "require": "7.2.*"
         }
     },
     "require-dev": {
         "phpstan/phpstan": "^2.1",
         "symfony/maker-bundle": "^1.62",
-        "symfony/stopwatch": "7.3.*",
+        "symfony/stopwatch": "7.2.*",
-        "symfony/web-profiler-bundle": "7.3.*"
+        "symfony/web-profiler-bundle": "7.2.*"
     }
 }

config/bundles.php

@@ -18,5 +18,4 @@ return [
     Symfony\UX\Turbo\TurboBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
-    Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
 ];

config/packages/messenger.yaml

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

config/packages/property_info.yaml

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

config/packages/stof_doctrine_extensions.yaml

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

config/packages/twig.yaml

@@ -1,7 +1,5 @@
 twig:
     file_name_pattern: '*.twig'
-    date:
-        timezone: '%env(default:app.default.timezone:TZ)%'
 
 when@test:
     twig:

config/services.yaml

@@ -5,15 +5,14 @@
 # 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.movies_path: '%env(default:media.default_movies_dir:MOVIES_PATH)%'
     media.tvshows_path: '/var/download/%env(default:media.default_tvshows_dir:TVSHOWS_PATH)%'
 
     # Mercure
-    app.mercure.url: 'http://app/.well-known/mercure'
+    app.mercure.url: 'http://mercure/.well-known/mercure'
-    app.mercure.public_url: '%env(APP_URL)%/.well-known/mercure'
+    app.mercure.public_url: '%env(APP_URL)%/hub/.well-known/mercure'
 
     # Cache
     app.cache.adapter: '%env(default:app.cache.adapter.default:CACHE_ADAPTER)%'
@@ -21,9 +20,6 @@ parameters:
     app.cache.adapter.default: 'filesystem'
     app.cache.redis.host.default: 'redis://redis'
 
-    # Various configs
-    app.default.timezone: 'America/Chicago'
-
 services:
     # default configuration for services in *this* file
     _defaults:

deploy.compose.yml

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

docker/Dockerfile.app

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

docker/Dockerfile.scheduler

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

docker/Dockerfile.web

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

docker/Dockerfile.worker

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

docker/app/Caddyfile

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

docker/app/entrypoint.sh

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

docker/app/messenger-worker@.service

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

docs/examples/.env

@@ -19,17 +19,13 @@ 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

@@ -27,7 +27,7 @@ services:
     volumes:
       - /mnt/media/downloads/movies:/var/download/movies
       - /mnt/media/downloads/tvshows:/var/download/tvshows
-    command: -vvv
+    command: -v --time-limit=3600 --limit=10
     env_file:
       - .env
     restart: always
@@ -44,6 +44,7 @@ services:
     image: code.caldwell.digital/home/torsearch-scheduler:latest
     volumes:
       - ./downloads:/var/download
+    command: -vv --time-limit=3600
     env_file:
       - .env
     restart: always
@@ -83,8 +84,7 @@ services:
       MYSQL_ROOT_PASSWORD: password
     healthcheck:
       test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
-      interval: 5s
+      timeout: 10s
-      timeout: 5s
       retries: 10
 
   redis:

docs/examples/swarm.compose.yml

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

importmap.php

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

migrations/Version20250610195448.php

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

migrations/Version20250610222503.php

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

nomad.deploy.hcl

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

src/Controller/AlertController.php

@@ -2,25 +2,34 @@
 
 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(
-        private readonly Broadcaster $broadcaster,
+        #[Autowire(service: 'twig')] private readonly Environment $renderer,
+        private readonly HubInterface $hub,
     ) {}
 
     #[Route('/alert', name: 'app_alert')]
     public function index(): Response
     {
-        $this->broadcaster->alert(
+        $update = new Update(
-            'Added to queue',
+            'alerts',
-            'This is a testy test!'
+            $this->renderer->render('Alert.stream.html.twig', [
+                'alert_id' => 1,
+                'title' => 'Added to queue',
+                'message' => 'This is a testy test!',
+            ])
         );
 
+        $this->hub->publish($update);
         return $this->json([
             'Success' => 'Published'
         ]);

src/Controller/IndexController.php

@@ -12,12 +12,15 @@ use Symfony\Component\Routing\Attribute\Route;
 final class IndexController extends AbstractController
 {
     public function __construct(
+        private readonly DownloadRepository $downloadRepository,
         private readonly Tmdb $tmdb,
     ) {}
 
     #[Route('/', name: 'app_index')]
     public function index(Request $request): Response
     {
+        $request->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
+
         return $this->render('index/index.html.twig', [
             'active_downloads' => $this->getUser()->getActiveDownloads(),
             'recent_downloads' => $this->getUser()->getDownloads(),

src/Controller/SearchController.php

@@ -33,12 +33,11 @@ final class SearchController extends AbstractController
         ]);
     }
 
-    #[Route('/result/{mediaType}/{imdbId}', name: 'app_search_result')]
+    #[Route('/result/{mediaType}/{tmdbId}', 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', [

src/Controller/TorrentioController.php

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

src/Download/Action/Command/DeleteDownloadCommand.php

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

src/Download/Action/Command/PauseDownloadCommand.php

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

src/Download/Action/Command/ResumeDownloadCommand.php

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

src/Download/Action/Handler/DeleteDownloadHandler.php

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

src/Download/Action/Handler/DownloadMediaHandler.php

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

src/Download/Action/Handler/PauseDownloadHandler.php

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

src/Download/Action/Handler/ResumeDownloadHandler.php

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

src/Download/Action/Input/DeleteDownloadInput.php

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

src/Download/Action/Input/PauseDownloadInput.php

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

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

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

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

@@ -1,16 +0,0 @@
-<?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/ProcessDownloader.php

@@ -5,21 +5,14 @@ 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,
     ) {}
 
     /**
@@ -29,23 +22,16 @@ class ProcessDownloader implements DownloaderInterface
     {
         /** @var Download $downloadEntity */
         $downloadEntity = $this->entityManager->getRepository(Download::class)->find($downloadId);
+        $downloadEntity->setProgress(0);
         $this->entityManager->flush();
 
         $downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
         $path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
 
-        $processArgs = ['wget', $url];
+        $process = (new Process([
-
+            'wget',
-        if ($downloadEntity->getStatus() === 'Paused') {
+            $url
-            $downloadEntity->setStatus('In Progress');
+        ]))->setWorkingDirectory($path);
-            $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
@@ -55,18 +41,7 @@ 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);
@@ -81,9 +56,7 @@ class ProcessDownloader implements DownloaderInterface
                 }
                 fwrite(STDOUT, $buffer);
             });
-            if ($downloadEntity->getStatus() !== 'Paused') {
+            $downloadEntity->setProgress(100);
-                $downloadEntity->setProgress(100);
-            }
         } catch (ProcessFailedException $exception) {
             $downloadEntity->setStatus('Failed');
         }

src/Download/Framework/Controller/ApiController.php

@@ -2,17 +2,14 @@
 
 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 App\Download\Stream;
 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;
 
@@ -21,11 +18,12 @@ class ApiController extends AbstractController
     public function __construct(
         private DownloadRepository $downloadRepository,
         private MessageBusInterface $bus,
-        private readonly Broadcaster $broadcaster,
+        private readonly HubInterface $hub,
     ) {}
 
     #[Route('/api/download', name: 'api_download', methods: ['POST'])]
     public function download(
+        Request $request,
         DownloadMediaInput $input,
     ): Response {
         $download = $this->downloadRepository->insert(
@@ -48,53 +46,28 @@ class ApiController extends AbstractController
             return $this->json(['error' => $exception->getMessage()], Response::HTTP_INTERNAL_SERVER_ERROR);
         }
 
-        $this->broadcaster->alert(
+        $this->hub->publish(new Update(
-            title: 'Success',
+            $request->getSession()->get('mercure_alert_topic'),
-            message: "$input->title added to Queue."
+            $this->renderView('broadcast/Alert.stream.html.twig', [
-        );
+                'alert_id' => uniqid(),
+                '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'])]
+    #[Route('/stream', 'app_stream', methods: ['GET'])]
-    public function deleteDownload(
+    public function streamVideo()
-        DeleteDownloadInput $input,
+    {
-        DeleteDownloadHandler $handler,
+        $stream = new Stream(
-    ): Response {
+            'https://torrentio.strem.fun/realdebrid/QYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ/e8b22517328a9704bf8400b8b98cfc22836ad1e4/null/3/Ted.2012.UNRATED.1080p.BluRay.x265-RARBG.mp4',
-        $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']);
+        return $stream->start();
     }
-
+}
-    #[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

@@ -5,16 +5,12 @@ namespace App\Download\Framework\Entity;
 use App\Download\Framework\Repository\DownloadRepository;
 use App\User\Framework\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
-use Gedmo\Timestampable\Traits\TimestampableEntity;
-use Nihilarr\PTN;
 use Symfony\UX\Turbo\Attribute\Broadcast;
 
 #[ORM\Entity(repositoryClass: DownloadRepository::class)]
 #[Broadcast(template: 'broadcast/Download.stream.html.twig')]
 class Download
 {
-    use TimestampableEntity;
-
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column]
@@ -166,16 +162,4 @@ 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,31 +25,27 @@ class DownloadRepository extends ServiceEntityRepository
         $this->paginator = $paginator;
     }
 
-    public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10, string $term = ""): Paginator
+    public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10)
     {
         $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, string $term = ""): Paginator
+    public function getActivePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 5)
     {
         $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', 'Paused'])
+            ->setParameter('statuses', ['New', 'In Progress'])
             ->setParameter('user', $user)
-            ->setParameter('term', '%' . $term . '%')
             ->getQuery();
 
         return $this->paginator->paginate($query, $pageNumber, $perPage);

src/Download/Stream.php

@@ -0,0 +1,137 @@
+<?php
+
+namespace App\Download;
+
+class Stream
+{
+
+    private $path = "";
+    private $stream = "";
+    private $buffer = 512;
+    private $start  = -1;
+    private $end    = -1;
+    private $size   = null;
+    private $httpString = "";
+    private $contentType = "video/mp4";
+    private $cacheControl = "max-age=2592000, public";
+    private $expires = null;
+    private $lastModified = null;
+
+    function __construct($filePath, $options){
+        $this->path = $filePath;
+        $this->httpString = isset($options['is_https']) ? (($options['is_https'] == true) ? "HTTPS/1.1" : "HTTP/1.1") : "HTTP/1.1";
+        $this->size = isset($options['video_size']) ? $options['video_size'] : $this->size;
+        $this->buffer = isset($options['video_buffer']) ? $options['video_buffer'] : $this->buffer;
+        $this->contentType = isset($options['content_type']) ? $options['content_type'] : $this->contentType;
+        $this->cacheControl = isset($options['cache_control']) ? $options['cache_control'] : $this->cacheControl;
+        $this->expires = isset($options['expires']) ? $options['expires'] : gmdate('D, d M Y H:i:s', time()+2592000).' GMT';
+        $this->lastModified = isset($options['last_modified']) ? $options['last_modified'] : gmdate('D, d M Y H:i:s', @filemtime($this->path)).' GMT';
+    }
+
+    private function open(){
+        if (!($this->stream = fopen($this->path, 'rb'))) {
+            die('Could not open stream for reading');
+        }
+    }
+
+    private function setHeader(){
+        // if (isset($_SERVER['RANGE'])) {
+        //     print_r($_SERVER);
+        //     die();
+        // }
+
+        ob_get_clean();
+        header("Content-Type: ".$this->contentType);
+        header("Cache-Control: ".$this->cacheControl);
+        header("Expires: ".$this->expires);
+        header("Last-Modified: ".$this->lastModified);
+        $this->start = 0;
+        $this->size = ($this->size == null || $this->size <= 0) ? $this->getContentLengthFromURL($this->path) : $this->size;
+        $this->end  = $this->size - 1;
+
+        header("Accept-Ranges: bytes");
+
+
+        if (isset($_SERVER['HTTP_RANGE'])) {
+            // header("Accept-Ranges: 0-".$this->end);
+
+            $c_start = $this->start;
+            $c_end = $this->end;
+
+            list(, $range) = explode('=', $_SERVER['HTTP_RANGE'], 2);
+            if (strpos($range, ',') !== false) {
+                header($this->httpString.' 416 Requested Range Not Satisfiable');
+                header("Content-Range: bytes ".$this->start."-".$this->end."/".$this->size);
+                header("X-ERROR-ERROR: TRUE");
+                exit;
+            }
+            if ($range == '-') {
+                $c_start = $this->size - substr($range, 1);
+            }else{
+                $range = explode('-', $range);
+                $c_start = $range[0];
+
+                $c_end = (isset($range[1]) && is_numeric($range[1])) ? $range[1] : $c_end;
+            }
+            $c_end = ($c_end > $this->end) ? $this->end : $c_end;
+            if ($c_start > $c_end || $c_start > $this->size - 1 || $c_end >= $this->size) {
+                header($this->httpString.' 416 Requested Range Not Satisfiable');
+                header("Content-Range: bytes ".$this->start."-".$this->end."/".$this->size);
+                header("X-ERROR-ERROR: TRUE");
+                exit;
+            }
+            $this->start = $c_start;
+            $this->end = $c_end;
+            $length = $this->end - $this->start + 1;
+            fseek($this->stream, $this->start, SEEK_CUR);
+            header($this->httpString.' 206 Partial Content', true, 206);
+            header("Content-Length: ".$length);
+            header("Content-Range: bytes ".$this->start."-".$this->end."/".$this->size);
+        }
+        else
+        {
+            header("Accept-Ranges: bytes");
+            header("Content-Length: ".$this->size);
+        }
+
+    }
+
+    private function end(){
+        fclose($this->stream);
+        exit;
+    }
+
+    private function stream(){
+        $i = $this->start;
+        set_time_limit(0);
+        while(!feof($this->stream) && $i <= $this->end) {
+            $bytesToRead = $this->buffer;
+            if(($i+$bytesToRead) > $this->end) {
+                $bytesToRead = $this->end - $i + 1;
+            }
+            $data = fread($this->stream, $bytesToRead);
+            echo $data;
+            flush();
+            $i += $bytesToRead;
+        }
+    }
+
+    function start(){
+        $this->open();
+        $this->setHeader();
+        $this->stream();
+        $this->end();
+    }
+
+    function getContentLengthFromURL($url){
+        $arrayHeaders = get_headers($url,true);
+        $arrayHeaders = array_change_key_case($arrayHeaders, CASE_LOWER);
+        if(isset($arrayHeaders['content-length'])){
+            if(is_numeric($arrayHeaders['content-length']) && $arrayHeaders['content-length'] > 0){
+                return $arrayHeaders['content-length'];
+            }
+        }
+        return null;
+    }
+
+}

src/Monitor/Action/Command/DeleteMonitorCommand.php

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

@@ -1,36 +0,0 @@
-<?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/Handler/MonitorTvEpisodeHandler.php

@@ -5,13 +5,10 @@ namespace App\Monitor\Action\Handler;
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Result\MonitorMovieResult;
-use App\Monitor\Action\Result\MonitorTvEpisodeResult;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Service\MonitorOptionEvaluator;
-use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
-use Carbon\Carbon;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use OneToMany\RichBundle\Contract\CommandInterface;
@@ -30,26 +27,12 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
-        private Tmdb $tmdb,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
         $this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler');
         $monitor = $this->monitorRepository->find($command->movieMonitorId);
-
-        $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
-        if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::now()) {
-            $this->logger->info('> [MonitorTvEpisodeHandler] Episode has not aired yet, skipping for now');
-            return new MonitorTvEpisodeResult(
-                status: 'OK',
-                result: [
-                    'message' => 'No change',
-                    'monitor' => $monitor,
-                ]
-            );
-        }
-
         $monitor->setStatus('In Progress');
         $this->monitorRepository->getEntityManager()->flush();
 
@@ -88,7 +71,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
         $this->entityManager->flush();
 
-        return new MonitorTvEpisodeResult(
+        return new MonitorMovieResult(
             status: 'OK',
             result: [
                 'monitor' => $monitor,

src/Monitor/Action/Handler/MonitorTvSeasonHandler.php

@@ -3,9 +3,9 @@
 namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
+use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
-use App\Monitor\Action\Command\MonitorTvSeasonCommand;
+use App\Monitor\Action\Result\MonitorMovieResult;
-use App\Monitor\Action\Result\MonitorTvSeasonResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Service\MediaFiles;
@@ -17,14 +17,16 @@ use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 
-/** @implements HandlerInterface<MonitorTvSeasonCommand> */
+/** @implements HandlerInterface<MonitorMovieCommand> */
 readonly class MonitorTvSeasonHandler implements HandlerInterface
 {
     public function __construct(
         private MonitorRepository $monitorRepository,
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
+        private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private Tmdb $tmdb,
         private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
@@ -39,42 +41,33 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
         $downloadedEpisodes = $this->mediaFiles
             ->getEpisodes($monitor->getTitle())
             ->map(fn($episode) => (object) (new PTN())->parse($episode))
-            ->filter(fn ($episode) =>
-                property_exists($episode, 'episode')
-                && property_exists($episode, 'season')
-                && null !== $episode->episode
-                && null !== $episode->season
-            )
             ->rekey(fn($episode) => $episode->episode);
         $this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
 
         // Compare against list from TMDB
         $episodesInSeason = Map::from(
-            $this->tmdb->tvDetails($monitor->getTmdbId())->episodes[$monitor->getSeason()]
+            $this->tmdb->tvDetails($monitor->getTmdbId())
+                ->episodes[$monitor->getSeason()]
         )->rekey(fn($episode) => $episode['episode_number']);
         $this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($episodesInSeason) . ' episodes in season ' . $monitor->getSeason() . ' for title: ' . $monitor->getTitle());
 
-        if ($downloadedEpisodes->count() !== $episodesInSeason->count()) {
+        // Dispatch Episode commands for each missing Episode
-            // Dispatch Episode commands for each missing Episode
+        foreach ($episodesInSeason as $episode) {
-            foreach ($episodesInSeason as $episode) {
+            $monitorCheck = $this->monitorRepository->findOneBy([
-                // Check if the episode is already downloaded
+                'imdbId' => $monitor->getImdbId(),
-                $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
+                'title' => $monitor->getTitle(),
-                $this->logger->info('> [MonitorTvSeasonHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
+                'monitorType' => 'tvepisode',
-                if (true === $episodeExists) {
+                'season' => $monitor->getSeason(),
-                    $this->logger->info('> [MonitorTvSeasonHandler] Episode exists for title: ' . $monitor->getTitle() . ', skipping');
+                'episode' => $episode['episode_number'],
-                    continue;
+                'status' => ['New', 'Active', 'In Progress']
-                }
+            ]);
 
-                // Check for existing monitors
+            $this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $monitor->getSeason() . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (null !== $monitorCheck ? 'YES' : 'NO'));
-                $monitorExists = $this->monitorExists($monitor, $episode);
-                $this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $monitorExists ? 'YES' : 'NO'));
-                if (true === $monitorExists) {
-                    $this->logger->info('> [MonitorTvSeasonHandler] Monitor exists for title: ' . $monitor->getTitle() . ', skipping');
-                    continue;
-                }
 
+            if (!array_key_exists($episode['episode_number'], $downloadedEpisodes->toArray())
+                && null === $monitorCheck
+            ) {
                 $episodeMonitor = (new Monitor())
-                    ->setParent($monitor)
                     ->setUser($monitor->getUser())
                     ->setTmdbId($monitor->getTmdbId())
                     ->setImdbId($monitor->getImdbId())
@@ -95,38 +88,16 @@ readonly class MonitorTvSeasonHandler implements HandlerInterface
             }
         }
 
-        // Set the status to Active, so it will be re-executed.
-        $monitor->setStatus('Active');
         $monitor->setLastSearch(new DateTimeImmutable());
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
-
+        $monitor->setStatus('Complete');
         $this->entityManager->flush();
 
-        return new MonitorTvSeasonResult(
+        return new MonitorMovieResult(
             status: 'OK',
             result: [
                 'monitor' => $monitor,
             ]
         );
     }
-
-    private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
-    {
-        return $downloadedEpisodes->filter(
-                fn (object $episode) => $episode->episode === $episodeInShow['episode_number']
-                    && $episode->season === $episodeInShow['season_number']
-            )->count() > 0;
-    }
-
-    private function monitorExists(Monitor $monitor, array $episode): bool
-    {
-        return $this->monitorRepository->findOneBy([
-                'imdbId' => $monitor->getImdbId(),
-                'title' => $monitor->getTitle(),
-                'monitorType' => 'tvepisode',
-                'season' => $episode['season_number'],
-                'episode' => $episode['episode_number'],
-                'status' => ['New', 'Active', 'In Progress']
-            ]) !== null;
-    }
 }

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -5,7 +5,7 @@ namespace App\Monitor\Action\Handler;
 use Aimeos\Map;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
-use App\Monitor\Action\Result\MonitorTvShowResult;
+use App\Monitor\Action\Result\MonitorTvEpisodeResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Service\MediaFiles;
@@ -17,6 +17,7 @@ use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 /** @implements HandlerInterface<MonitorMovieCommand> */
 readonly class MonitorTvShowHandler implements HandlerInterface
@@ -24,8 +25,8 @@ readonly class MonitorTvShowHandler implements HandlerInterface
     public function __construct(
         private MonitorRepository $monitorRepository,
         private EntityManagerInterface $entityManager,
-        private MonitorTvEpisodeHandler $monitorTvEpisodeHandler,
         private MediaFiles $mediaFiles,
+        private MessageBusInterface $bus,
         private LoggerInterface $logger,
         private Tmdb $tmdb,
     ) {}
@@ -38,97 +39,55 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         // Check current episodes
         $downloadedEpisodes = $this->mediaFiles
             ->getEpisodes($monitor->getTitle())
-            ->map(fn($episode) => (object) (new PTN())->parse($episode))
+            ->map(fn($episode) => (object) (new PTN())->parse($episode));
-            ->filter(fn ($episode) =>
-                property_exists($episode, 'episode')
-                && property_exists($episode, 'season')
-                && null !== $episode->episode
-                && null !== $episode->season
-            )
-        ;
         $this->logger->info('> [MonitorTvShowHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
 
         // Compare against list from TMDB
         $episodesInShow = Map::from(
-            $this->tmdb->tvDetails($monitor->getTmdbId())->episodes
+            $this->tmdb->tvDetails($monitor->getTmdbId())
+                ->episodes
         )->flat(1);
+        $this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes in season ' . $monitor->getSeason() . ' for title: ' . $monitor->getTitle());
 
-        $this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes for title: ' . $monitor->getTitle());
+        // Dispatch Episode commands for each missing Episode
+        foreach ($episodesInShow as $episode) {
+            $episodeAlreadyDownloaded = $downloadedEpisodes->find(
+                fn($ep) => $ep->episode === $episode['episode_number'] && $ep->season === $episode['season_number']
+            );
+            $episodeAlreadyDownloaded = !is_null($episodeAlreadyDownloaded);
 
-        if ($downloadedEpisodes->count() !== $episodesInShow->count()) {
+            if (false === $episodeAlreadyDownloaded) {
-            // Dispatch Episode commands for each missing Episode
+                $monitor = (new Monitor())
-            foreach ($episodesInShow as $episode) {
-                // Check if the episode is already downloaded
-                $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
-                $this->logger->info('> [MonitorTvShowHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
-                if (true === $episodeExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] Episode exists for title: ' . $monitor->getTitle() . ', skipping');
-                    continue;
-                }
-
-                // Check for existing monitors
-                $monitorExists = $this->monitorExists($monitor, $episode);
-                $this->logger->info('> [MonitorTvShowHandler] Monitor exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $monitorExists ? 'YES' : 'NO'));
-                if (true === $monitorExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] Monitor exists for title: ' . $monitor->getTitle() . ', skipping');
-                    continue;
-                }
-
-                // Create the monitor
-                $episodeMonitor = (new Monitor())
-                    ->setParent($monitor)
                     ->setUser($monitor->getUser())
                     ->setTmdbId($monitor->getTmdbId())
                     ->setImdbId($monitor->getImdbId())
                     ->setTitle($monitor->getTitle())
-                    ->setMonitorType('tvepisode')
+                    ->setMonitorType('tvshow')
                     ->setSeason($episode['season_number'])
                     ->setEpisode($episode['episode_number'])
                     ->setCreatedAt(new DateTimeImmutable())
                     ->setSearchCount(0)
                     ->setStatus('New');
 
-                $this->monitorRepository->getEntityManager()->persist($episodeMonitor);
+                $this->monitorRepository->getEntityManager()->persist($monitor);
                 $this->monitorRepository->getEntityManager()->flush();
 
-                // Immediately run the monitor
+                $command = new MonitorTvEpisodeCommand($monitor->getId());
-                $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
+                $this->bus->dispatch($command);
-                $this->monitorTvEpisodeHandler->handle($command);
+                $this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode() . ' for title: ' . $monitor->getTitle());
-                $this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
             }
         }
 
-        // Set the status to Active, so it will be re-executed.
-        $monitor->setStatus('Active');
         $monitor->setLastSearch(new DateTimeImmutable());
         $monitor->setSearchCount($monitor->getSearchCount() + 1);
+        $monitor->setStatus('Complete');
         $this->entityManager->flush();
 
-        return new MonitorTvShowResult(
+        return new MonitorTvEpisodeResult(
             status: 'OK',
             result: [
                 'monitor' => $monitor,
             ]
         );
     }
-
-    private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
-    {
-        return $downloadedEpisodes->filter(
-            fn (object $episode) => $episode->episode === $episodeInShow['episode_number']
-                && $episode->season === $episodeInShow['season_number']
-            )->count() > 0;
-    }
-
-    private function monitorExists(Monitor $monitor, array $episode): bool
-    {
-        return $this->monitorRepository->findOneBy([
-                'imdbId' => $monitor->getImdbId(),
-                'title' => $monitor->getTitle(),
-                'monitorType' => 'tvepisode',
-                'season' => $episode['season_number'],
-                'episode' => $episode['episode_number'],
-                'status' => ['New', 'Active', 'In Progress']
-            ]) !== null;
-    }
 }

src/Monitor/Action/Input/DeleteMonitorInput.php

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

@@ -1,15 +0,0 @@
-<?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/Action/Result/MonitorTvSeasonResult.php

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

src/Monitor/Action/Result/MonitorTvShowResult.php

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

src/Monitor/Framework/Controller/ApiController.php

@@ -2,23 +2,21 @@
 
 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(
-        private readonly Broadcaster $broadcaster,
+        #[Autowire(service: 'twig')]
+        private readonly Environment $renderer,
     ) {}
 
     #[Route('/api/monitor', name: 'api_monitor', methods: ['POST'])]
@@ -31,31 +29,12 @@ class ApiController extends AbstractController
         $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('broadcast/Alert.stream.html.twig', [
                 'alert_id' => uniqid(),
                 'title' => 'Success',
-                'message' => "New monitor added for {$response->monitor->getTitle()}",
+                'message' => "New monitor added for {$input->title}",
             ])
         ));
 

src/Monitor/Framework/Controller/WebController.php

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

@@ -4,14 +4,10 @@ namespace App\Monitor\Framework\Entity;
 
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\User\Framework\Entity\User;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 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
 {
@@ -58,17 +54,6 @@ class Monitor
     #[ORM\Column(nullable: true)]
     private ?\DateTimeImmutable $downloadedAt = null;
 
-    #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
-    private ?self $parent = null;
-
-    #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')]
-    private Collection $children;
-
-    public function __construct()
-    {
-        $this->children = new ArrayCollection();
-    }
-
     public function getId(): ?int
     {
         return $this->id;
@@ -217,46 +202,4 @@ class Monitor
 
         return $this;
     }
-
-    public function getParent(): ?self
-    {
-        return $this->parent;
-    }
-
-    public function setParent(?self $parent): static
-    {
-        $this->parent = $parent;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection<int, self>
-     */
-    public function getChildren(): Collection
-    {
-        return $this->children;
-    }
-
-    public function addChild(self $child): static
-    {
-        if (!$this->children->contains($child)) {
-            $this->children->add($child);
-            $child->setParent($this);
-        }
-
-        return $this;
-    }
-
-    public function removeChild(self $child): static
-    {
-        if ($this->children->removeElement($child)) {
-            // set the owning side to null (unless already changed)
-            if ($child->getParent() === $this) {
-                $child->setParent(null);
-            }
-        }
-
-        return $this;
-    }
 }

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, string $searchTerm): Paginator
+    public function getUserMonitorsPaginated(UserInterface $user, int $page, int $perPage)
     {
         $query = $this->createQueryBuilder('m')
             ->andWhere('m.status IN (:statuses)')

src/Monitor/Framework/Scheduler/MonitorDispatcher.php

@@ -11,7 +11,7 @@ use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Scheduler\Attribute\AsCronTask;
 
-#[AsCronTask('0 * * * *', schedule: 'monitor')]
+#[AsCronTask('* * * * *', schedule: 'monitor')]
 class MonitorDispatcher
 {
     public function __construct(

src/Monitor/Service/MediaFiles.php

@@ -3,19 +3,14 @@
 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;
@@ -23,9 +18,6 @@ class MediaFiles
     private Filesystem $filesystem;
 
     public function __construct(
-        #[Autowire(param: 'media.base_path')]
-        string $basePath,
-
         #[Autowire(param: 'media.movies_path')]
         string $moviesPath,
 
@@ -35,7 +27,6 @@ class MediaFiles
         Filesystem $filesystem,
     ) {
         $this->finder = new Finder();
-        $this->basePath = $basePath;
         $this->moviesPath = $moviesPath;
         $this->tvShowsPath = $tvShowsPath;
         $this->filesystem = $filesystem;
@@ -52,11 +43,6 @@ class MediaFiles
         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;
@@ -139,85 +125,4 @@ class MediaFiles
 
         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($ptn, 'season') || !property_exists($ptn, '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 $imdbId,
+        public string $tmdbId,
         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->imdbId, $command->mediaType);
+        $media = $this->tmdb->mediaDetails($command->tmdbId, $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('imdbId')]
+        #[SourceRoute('tmdbId')]
-        public string $imdbId,
+        public string $tmdbId,
 
         #[SourceRoute('mediaType')]
         public string $mediaType,
@@ -21,6 +21,6 @@ class GetMediaInfoInput implements InputInterface
 
     public function toCommand(): CommandInterface
     {
-        return new GetMediaInfoCommand($this->imdbId, $this->mediaType);
+        return new GetMediaInfoCommand($this->tmdbId, $this->mediaType);
     }
 }

src/Tmdb/Tmdb.php

@@ -133,12 +133,9 @@ 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;
     }
 
@@ -146,16 +143,7 @@ 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)
@@ -195,8 +183,6 @@ 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,7 +2,6 @@
 
 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;
@@ -15,15 +14,12 @@ 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: $media,
+            media: $this->tmdb->mediaDetails($command->tmdbId, 'movies'),
-            file: $this->mediaFiles->movieExists($media->title),
             results: $this->torrentio->search($command->imdbId, 'movies'),
         );
     }

src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php

@@ -2,7 +2,6 @@
 
 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;
@@ -17,18 +16,12 @@ 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: $media,
+            media: $this->tmdb->episodeDetails($command->tmdbId, $command->season, $command->episode),
-            file: $file,
             season: $command->season,
             episode: $command->episode,
             results: $this->torrentio->fetchEpisodeResults(

src/Torrentio/Action/Result/GetMovieOptionsResult.php

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

src/Torrentio/Action/Result/GetTvShowOptionsResult.php

@@ -4,13 +4,11 @@ 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/Twig/Components/DownloadList.php

@@ -16,14 +16,15 @@ 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;
 
@@ -34,11 +35,17 @@ final class DownloadList extends AbstractController
     public function getDownloads()
     {
         if ($this->type === "active") {
-            return $this->downloadRepository->getActivePaginated($this->getUser(), $this->pageNumber, $this->perPage, $this->term);
+            return $this->downloadRepository->getActivePaginated($this->getUser(), $this->pageNumber, $this->perPage);
         } elseif ($this->type === "complete") {
-            return $this->downloadRepository->getCompletePaginated($this->getUser(), $this->pageNumber, $this->perPage, $this->term);
+            return $this->downloadRepository->getCompletePaginated($this->getUser(), $this->pageNumber, $this->perPage);
         }
 
         return [];
     }
+
+    #[LiveAction]
+    public function paginate(#[LiveArg] int $page)
+    {
+        $this->pageNumber = $page;
+    }
 }

src/Twig/Components/DownloadListRow.php

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

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

src/Twig/Components/MonitorList.php

@@ -3,27 +3,14 @@
 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\LiveProp;
+use Symfony\UX\LiveComponent\Attribute\LiveArg;
-use Symfony\UX\LiveComponent\DefaultActionTrait;
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
 
-#[AsLiveComponent]
+#[AsTwigComponent]
 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(
@@ -31,40 +18,8 @@ final class MonitorList extends AbstractController
     ) {}
 
     #[LiveAction]
-    public function getMonitors()
+    public function getUserMonitors(#[LiveArg] int $page = 1, #[LiveArg] int $perPage = 5)
     {
-        if ($this->type === "active") {
+        return $this->monitorRepository->getUserMonitorsPaginated($this->getUser(), $page, $perPage);
-            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', 'Active'])
-            ->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

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

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

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

@@ -1,32 +0,0 @@
-<?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/Framework/Controller/Web/LoginController.php

@@ -2,8 +2,10 @@
 
 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

@@ -9,20 +9,23 @@ use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
 use App\User\Action\Input\SaveUserDownloadPreferencesInput;
 use App\User\Action\Input\SaveUserMediaPreferencesInput;
 use App\User\Framework\Repository\PreferencesRepository;
-use App\Util\Broadcaster;
 use App\Util\CountryLanguages;
 use App\Util\ProviderList;
 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;
 
 class PreferencesController extends AbstractController
 {
     public function __construct(
         private readonly PreferencesRepository $preferencesRepository,
-        private readonly Broadcaster $broadcaster,
+        private readonly SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler,
+        private readonly HubInterface $hub,
+        private readonly SaveUserDownloadPreferencesHandler $saveUserDownloadPreferencesHandler,
     ) {}
-
     #[Route('/user/preferences', 'app_user_preferences', methods: ['GET'])]
     public function mediaPreferences(): Response
     {
@@ -45,21 +48,25 @@ class PreferencesController extends AbstractController
 
     #[Route('/user/preferences/media', 'app_save_media_preferences', methods: ['POST'])]
     public function saveMediaPreferences(
+        Request $request,
         SaveUserMediaPreferencesInput $input,
-        SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler,
     ): Response
     {
-        $saveUserMediaPreferencesHandler->handle($input->toCommand());
+        $this->saveUserMediaPreferencesHandler->handle($input->toCommand());
         $mediaPreferences = $this->getUser()->getMediaPreferences();
         $downloadPreferences = $this->getUser()->getDownloadPreferences();
 
         $languages = CountryLanguages::$languages;
         sort($languages);
 
-        $this->broadcaster->alert(
+        $this->hub->publish(new Update(
-            title: 'Success',
+            $request->getSession()->get('mercure_alert_topic'),
-            message: 'Your media preferences have been saved.'
+            $this->renderView('broadcast/Alert.stream.html.twig', [
-        );
+                'alert_id' => uniqid(),
+                'title' => 'Success',
+                'message' => 'Your media preferences have been saved.',
+            ])
+        ));
 
         return $this->render(
             'user/preferences.html.twig',
@@ -75,20 +82,24 @@ class PreferencesController extends AbstractController
 
     #[Route('/user/preferences/download', 'app_save_download_preferences', methods: ['POST'])]
     public function saveDownloadPreferences(
+        Request $request,
         SaveUserDownloadPreferencesInput $input,
-        SaveUserDownloadPreferencesHandler $saveUserDownloadPreferencesHandler,
     ): Response
     {
-        $downloadPreferences = $saveUserDownloadPreferencesHandler->handle($input->toCommand())->downloadPreferences;
+        $downloadPreferences = $this->saveUserDownloadPreferencesHandler->handle($input->toCommand())->downloadPreferences;
         $mediaPreferences = $this->getUser()->getMediaPreferences();
 
         $languages = CountryLanguages::$languages;
         sort($languages);
 
-        $this->broadcaster->alert(
+        $this->hub->publish(new Update(
-            title: 'Success',
+            $request->getSession()->get('mercure_alert_topic'),
-            message: 'Your download preferences have been saved.'
+            $this->renderView('broadcast/Alert.stream.html.twig', [
-        );
+                'alert_id' => uniqid(),
+                'title' => 'Success',
+                'message' => 'Your download preferences have been saved.',
+            ])
+        ));
 
         return $this->render(
             'user/preferences.html.twig',

src/User/Framework/EventListener/LoginSuccessListener.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\User\Framework\EventListener;
-
-use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
-use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;
-
-final class LoginSuccessListener
-{
-    public function __construct(
-        private readonly RequestStack $requestStack,
-    ) {}
-
-    #[AsEventListener(event: 'security.authentication.success')]
-    public function setMercureTopics(AuthenticationSuccessEvent $event): void
-    {
-        // Set the unique Mercure topic name for the User's alerts
-        $this->requestStack->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
-    }
-}

src/Util/Broadcaster.php

@@ -1,33 +0,0 @@
-<?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,15 +2,6 @@
     "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": {
@@ -74,18 +65,6 @@
             "phpstan.dist.neon"
         ]
     },
-    "stof/doctrine-extensions-bundle": {
-        "version": "1.14",
-        "recipe": {
-            "repo": "github.com/symfony/recipes-contrib",
-            "branch": "main",
-            "version": "1.2",
-            "ref": "e805aba9eff5372e2d149a9ff56566769e22819d"
-        },
-        "files": [
-            "config/packages/stof_doctrine_extensions.yaml"
-        ]
-    },
     "symfony/asset-mapper": {
         "version": "7.2",
         "recipe": {
@@ -190,18 +169,6 @@
             "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,33 +4,8 @@ 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,40 +5,36 @@
 
     <turbo-stream action="append" target="active_downloads">
         <template>
-            <twig:DownloadListRow download="{{ entity }}" />
+            <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>
         </template>
     </turbo-stream>
 {% endblock %}
 
 {% block update %}
     {% if entity.status != "Complete" %}
-        <turbo-stream action="update" target="download_progress_{{ id }}">
+        <turbo-stream action="update" target="ad_download_{{ id }}">
             <template>
-                <div class="text-black text-center rounded-sm text-bold bg-green-300 h-5 relative z-10"
+                <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">
-                     style="width:{{ entity.progress }}%">
+                    {{ entity.title }}
-                </div>
+                </td>
-                <div class="absolute text-black text-center"
+                <td class="px-6 py-4 whitespace-nowrap text-sm text-end text-gray-800 dark:text-gray-50">
-                     style="z-index: 400;margin-top: -1.25rem; margin-left: 1.2rem">
+                    <div class="border-2 border-green-700 rounded-md w-full h-6 align-middle overflow-hidden">
-                    {{ entity.progress }}%
+                        <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>
+                    </div>
-                </div>
+                </td>
-            </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 %}
@@ -48,9 +44,6 @@
         <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" />
@@ -59,7 +52,14 @@
 
         <turbo-stream action="prepend" target="complete_downloads">
             <template>
-                <twig:DownloadListRow download="{{ entity }}" />
+                <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>
             </template>
         </turbo-stream>
     {% endif %}