fix(local deploy): monitor/scheduler container

.env

@@ -37,33 +37,7 @@ MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
 MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 ###< symfony/messenger ###
 
-APP_URL=
-APP_SECRET=
-
-# Use the DATABASE_URL below to use the MariaDB container
-# provided in the example.compose.yml file, or remove this
-# line and fill in the details of your own MySQL/MariaDB server
-DATABASE_URL=
-
-# Fill in your MySQL/MariaDB connection details
-#DATABASE_URL="mysql://<mysql user>:<mysql pass>@<mysql host>:3306/<mysql db name>?serverVersion=10.6.19.2-MariaDB&charset=utf8mb4"
-
-# Enter your Real Debrid API key
-# This key is never saved anywhere
-# else and is passed to Torrentio
-# to retrieve download options
-REAL_DEBRID_KEY=
-
-# Enter you TMDB API key
-# This is used to provide rich search results
-# when searching for media and rendering the
-# Popular Movies and TV Shows section.
-TMDB_API=
-
-MERCURE_JWT_SECRET=
-
-# Use your own Redis instance or use the
-# below value to use the container included
-# in the example compose.yml file.
-REDIS_HOST=
+REDIS_HOST=redis://redis
 
+MOVIES_PATH=/var/download/movies
+TVSHOWS_PATH=/var/download/tvshows

.gitignore

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

Dockerfile

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

Dockerfile.prod

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

bash/app/wget_download.sh

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

bash/caddy/Caddyfile

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

bash/entrypoint.sh

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

bash/vhost.conf

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

compose.yml

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

composer.json

@@ -22,6 +22,7 @@
         "p3k/emoji-detector": "^1.2",
         "php-tmdb/api": "^4.1",
         "predis/predis": "^2.4",
+        "runtime/frankenphp-symfony": "^0.2.0",
         "symfony/asset": "7.2.*",
         "symfony/console": "7.2.*",
         "symfony/doctrine-messenger": "7.2.*",
@@ -89,7 +90,7 @@
         "post-update-cmd": [
             "@auto-scripts"
         ],
-        "sym": "docker compose exec php ./bin/console"
+        "sym": "docker compose exec app ./bin/console"
     },
     "conflict": {
         "symfony/symfony": "*"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "33f1579a34e7ada02bb4738a9b39f493",
+    "content-hash": "c4ad1f54b8dd44fb55097f631c945460",
     "packages": [
         {
             "name": "1tomany/rich-bundle",
@@ -3300,6 +3300,58 @@
             },
             "time": "2021-10-29T13:26:27+00:00"
         },
+        {
+            "name": "runtime/frankenphp-symfony",
+            "version": "0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-runtime/frankenphp-symfony.git",
+                "reference": "56822c3631d9522a3136a4c33082d006bdfe4bad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-runtime/frankenphp-symfony/zipball/56822c3631d9522a3136a4c33082d006bdfe4bad",
+                "reference": "56822c3631d9522a3136a4c33082d006bdfe4bad",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+                "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
+                "symfony/runtime": "^5.4 || ^6.0 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Runtime\\FrankenPhpSymfony\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kévin Dunglas",
+                    "email": "kevin@dunglas.dev"
+                }
+            ],
+            "description": "FrankenPHP runtime for Symfony",
+            "support": {
+                "issues": "https://github.com/php-runtime/frankenphp-symfony/issues",
+                "source": "https://github.com/php-runtime/frankenphp-symfony/tree/0.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/nyholm",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-12T12:06:11+00:00"
+        },
         {
             "name": "symfony/asset",
             "version": "v7.2.0",

config/packages/messenger.yaml

@@ -29,6 +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': async
 
 # when@test:
 #    framework:

config/services.yaml

@@ -7,12 +7,12 @@ parameters:
     # Media
     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://mercure/.well-known/mercure'
-    app.mercure.public_url: '%env(APP_URL)%/hub/.well-known/mercure'
+    app.mercure.url: 'http://app/.well-known/mercure'
+    app.mercure.public_url: '%env(APP_URL)%/.well-known/mercure'
 
     # Cache
     app.cache.adapter: '%env(default:app.cache.adapter.default:CACHE_ADAPTER)%'

deploy.compose.yml

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

docker/Dockerfile.app

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

docker/Dockerfile.scheduler

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

docker/Dockerfile.worker

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

docker/app/Caddyfile

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

docker/app/entrypoint.sh

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

docs/examples/.env

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

docs/examples/compose.yml

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

docs/examples/swarm.compose.yml

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

migrations/Version20250519193350.php

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

src/Command/SeedDatabaseCommand.php

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

src/Controller/SearchController.php

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

src/Download/Action/Handler/DownloadMediaHandler.php

@@ -37,8 +37,6 @@ readonly class DownloadMediaHandler implements HandlerInterface
             $download = $this->downloadRepository->find($command->downloadId);
         }
 
-        dump($download);
-
         try {
             $this->downloadRepository->updateStatus($download->getId(), 'In Progress');
 

src/Download/Downloader/DownloaderInterface.php

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

src/Download/Downloader/ProcessDownloader.php

@@ -3,6 +3,7 @@
 namespace App\Download\Downloader;
 
 use App\Download\Framework\Entity\Download;
+use App\Monitor\Service\MediaFiles;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
@@ -11,25 +12,26 @@ class ProcessDownloader implements DownloaderInterface
 {
     public function __construct(
         private EntityManagerInterface $entityManager,
+        private MediaFiles $mediaFiles,
     ) {}
 
     /**
      * @inheritDoc
      */
-    public function download(string $baseDir, string $title, string $url, ?int $downloadId): void
+    public function download(string $mediaType, string $title, string $url, ?int $downloadId): void
     {
         /** @var Download $downloadEntity */
         $downloadEntity = $this->entityManager->getRepository(Download::class)->find($downloadId);
         $downloadEntity->setProgress(0);
         $this->entityManager->flush();
 
-        $process = new Process([
-            '/bin/sh',
-            '/var/www/bash/app/wget_download.sh',
-            $baseDir,
-            $title,
+        $downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
+        $path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
+
+        $process = (new Process([
+            'wget',
             $url
-        ]);
+        ]))->setWorkingDirectory($path);
 
         $process->setTimeout(1800); // 30 min
         $process->setIdleTimeout(600); // 10 min
@@ -61,4 +63,20 @@ class ProcessDownloader implements DownloaderInterface
 
         $this->entityManager->flush();
     }
+
+    public function getDownloadPath(string $mediaType, string $title, array $downloadPreferences): string
+    {
+        if ($mediaType === 'movies') {
+            if ((bool) $downloadPreferences['movie_folder']->getPreferenceValue() === true) {
+                return $this->mediaFiles->createMovieDirectory($title);
+            }
+            return $this->mediaFiles->getMoviesPath();
+        }
+
+        if ($mediaType === 'tvshows') {
+            return $this->mediaFiles->createTvShowDirectory($title);
+        }
+
+        throw new \Exception("There is no download path for media type: $mediaType");
+    }
 }

src/Download/Framework/Controller/ApiController.php

@@ -56,4 +56,4 @@ class ApiController extends AbstractController
 
         return $this->json(['status' => 200, 'message' => 'Added to Queue']);
     }
-}
+}

src/Monitor/Framework/Controller/ApiController.php

@@ -17,8 +17,6 @@ class ApiController extends AbstractController
     public function __construct(
         #[Autowire(service: 'twig')]
         private readonly Environment $renderer,
-        private readonly HubInterface $hub,
-        private readonly Security $security,
     ) {}
 
     #[Route('/api/monitor', name: 'api_monitor', methods: ['POST'])]
@@ -28,12 +26,12 @@ class ApiController extends AbstractController
         HubInterface $hub,
     ) {
         $command = $input->toCommand();
-        $command->userId = $this->security->getUser()->getId();
+        $command->userId = $this->getUser()->getId();
         $response = $handler->handle($command);
 
         $hub->publish(new Update(
             'alerts',
-            $this->renderer->render('Alert.stream.html.twig', [
+            $this->renderer->render('broadcast/Alert.stream.html.twig', [
                 'alert_id' => uniqid(),
                 'title' => 'Success',
                 'message' => "New monitor added for {$input->title}",

src/Monitor/Service/MediaFiles.php

@@ -32,6 +32,17 @@ class MediaFiles
         $this->filesystem = $filesystem;
     }
 
+    public function getPathByType(string $mediaType): string
+    {
+        if ('movies' === $mediaType) {
+            return $this->moviesPath;
+        } elseif ('tvshows' === $mediaType) {
+            return $this->tvShowsPath;
+        }
+
+        throw new \Exception(sprintf('A path for media type %s does not exist.', $mediaType));
+    }
+
     public function getMoviesPath(): string
     {
         return $this->moviesPath;
@@ -83,4 +94,35 @@ class MediaFiles
 
         return Map::from($results);
     }
+
+    public function createMovieDirectory(string $path): string
+    {
+        $path = $this->moviesPath . DIRECTORY_SEPARATOR . $path;
+
+        if (false === $this->filesystem->exists($path)) {
+            $this->filesystem->mkdir($path);
+        }
+
+        return $path;
+    }
+
+    public function createTvShowDirectory(string $path): string
+    {
+        $path = $this->tvShowsPath . DIRECTORY_SEPARATOR . $path;
+
+        if (false === $this->filesystem->exists($path)) {
+            $this->filesystem->mkdir($path);
+        }
+
+        return $path;
+    }
+
+    public function createDirectory(string $path): string
+    {
+        if (false === $this->filesystem->exists($path)) {
+            $this->filesystem->mkdir($path);
+        }
+
+        return $path;
+    }
 }

src/Torrentio/Client/Torrentio.php

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

src/User/Action/Command/SaveUserDownloadPreferencesCommand.php

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

src/User/Action/Handler/SaveUserDownloadPreferencesHandler.php

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

src/User/Action/Input/SaveUserDownloadPreferencesInput.php

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

src/User/Action/Result/SaveUserDownloadPreferencesResult.php

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

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

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

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

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

src/User/Framework/Entity/Preference.php

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

src/User/Framework/Entity/User.php

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

templates/components/NavBar.html.twig

@@ -21,7 +21,7 @@
             </li>
 
             <li>
-                <a href="{{ path('app_media_preferences') }}"
+                <a href="{{ path('app_user_preferences') }}"
                    class="block rounded-lg px-4 py-2 text-sm font-medium text-gray-50 hover:bg-gray-100 hover:text-stone-700">
                     Preferences
                 </a>

templates/user/preferences.html.twig

@@ -3,55 +3,78 @@
 {% block h2 %}Preferences{% endblock %}
 
 {% block body %}
-<div class="p-4 flex flex-col">
-    <twig:Card title="Choose your preferences">
-        <p class="text-gray-50 mb-2">Define a set of filters to apply to your media download option results.</p>
-        <form id="media_preferences" class="flex flex-col max-w-64" name="media_preferences" method="post" action="{{ path('app_media_preferences') }}">
-
+<div class="p-4 flex flex-row gap-2">
+    <twig:Card title="Media Preferences" class="w-full">
+        <p class="text-gray-50 mb-2">Define a filter to be pre-applied to your download options.</p>
+        <form id="media_preferences" class="flex flex-col max-w-64" name="media_preferences" method="post" action="{{ path('app_save_media_preferences') }}">
             <label class="text-gray-50" for="resolution">Resolution</label>
-            <select class="p-1.5 rounded-md mb-2" name="resolution" id="resolution" value="{{ userPreferences['resolution'].getPreferenceValue() }}">
-                {% for pref in userPreferences['resolution'].getPreference().getPreferenceOptions() %}
+            <select class="p-1.5 rounded-md mb-2" name="resolution" id="resolution" value="{{ mediaPreferences['resolution'].getPreferenceValue() }}">
+                <option class="text-gray-800"
+                        value=""
+                        {{ mediaPreferences['resolution'] is null ? "selected" }}
+                >n/a</option>
+
+                {% for pref in mediaPreferences['resolution'].getPreference().getPreferenceOptions() %}
                     <option class="text-gray-800"
                             value="{{ pref.id }}"
-                            {{ pref.id == userPreferences['resolution'].getPreferenceValue() ? "selected" }}
+                            {{ pref.id == mediaPreferences['resolution'].getPreferenceValue() ? "selected" }}
                     >{{ pref.name }}</option>
                 {% endfor %}
             </select>
 
             <label class="text-gray-50" for="codec">Codec</label>
-            <select class="p-1.5 rounded-md mb-2" name="codec" id="codec" value="{{ userPreferences['codec'].getPreferenceValue() }}">
-                {% for pref in userPreferences['codec'].getPreference().getPreferenceOptions() %}
+            <select class="p-1.5 rounded-md mb-2" name="codec" id="codec" value="{{ mediaPreferences['codec'].getPreferenceValue() }}">
+                <option class="text-gray-800"
+                        value=""
+                        {{ mediaPreferences['codec'].getPreferenceValue() is null ? "selected" }}
+                >n/a</option>
+                {% for pref in mediaPreferences['codec'].getPreference().getPreferenceOptions() %}
                     <option class="text-gray-800"
                             value="{{ pref.id }}"
-                            {{ pref.id == userPreferences['codec'].getPreferenceValue() ? "selected" }}
+                            {{ pref.id == mediaPreferences['codec'].getPreferenceValue() ? "selected" }}
                     >{{ pref.name }}</option>
                 {% endfor %}
             </select>
 
             <label class="text-gray-50" for="provider">Provider</label>
-            <select class="p-1.5 rounded-md mb-2" name="provider" id="provider" value="{{ userPreferences['provider'].getPreferenceValue() }}">
-                <option class="text-gray-800" value=""
-                        {{ "" == userPreferences['provider'].getPreferenceValue() ? "selected" }}
+            <select class="p-1.5 rounded-md mb-2" name="provider" id="provider" value="{{ mediaPreferences['provider'].getPreferenceValue() }}">
+                <option class="text-gray-800"
+                        value=""
+                        {{ "" == mediaPreferences['provider'].getPreferenceValue() ? "selected" }}
                 >n/a</option>
                 {% for provider in providers %}
                     <option class="text-gray-800"
                             value="{{ provider }}"
-                            {{ provider == userPreferences['provider'].getPreferenceValue() ? "selected" }}
+                            {{ provider == mediaPreferences['provider'].getPreferenceValue() ? "selected" }}
                     >{{ provider }}</option>
                 {% endfor %}
             </select>
 
             <label class="text-gray-50" for="language">Language</label>
-            <select class="p-1.5 rounded-md mb-2" name="language" id="language" value="{{ userPreferences['language'].getPreferenceValue() }}">
+            <select class="p-1.5 rounded-md mb-2" name="language" id="language" value="{{ mediaPreferences['language'].getPreferenceValue() }}">
+                <option class="text-gray-800"
+                        value=""
+                        {{ mediaPreferences['language'].getPreferenceValue() is null ? "selected" }}
+                >n/a</option>
                 {% for language in languages %}
                     <option class="text-gray-800"
                             value="{{ language }}"
-                            {{ language == userPreferences['language'].getPreferenceValue() ? "selected" }}
+                            {{ language == mediaPreferences['language'].getPreferenceValue() ? "selected" }}
                     >{{ language }}</option>
                 {% endfor %}
             </select>
+            <button class="px-1.5 py-1 max-w-20 rounded-md bg-green-600 text-white" type="submit">Submit</button>
+        </form>
+    </twig:Card>
 
-
+    <twig:Card title="Download Preferences" class="w-full">
+        <p class="text-gray-50 mb-2">Change how your downloads are stored.</p>
+        <form id="download_preferences" class="flex flex-col" name="download_preferences" method="post" action="{{ path('app_save_download_preferences') }}">
+            <div class="flex flex-row gap-2 mb-2">
+                <input type="hidden" name="movie_folder" id="movie_folder_hidden" value="0" />
+                <input type="checkbox" name="movie_folder" id="movie_folder" value="1" {{ downloadPreferences['movie_folder'].getPreferenceValue() == true ? 'checked' }} />
+                <label class="text-gray-50" for="movie_folder">Store movies in a new directory?</label>
+            </div>
             <button class="px-1.5 py-1 max-w-20 rounded-md bg-green-600 text-white" type="submit">Submit</button>
         </form>
     </twig:Card>