fix: creates custom images for each container

.env

@@ -36,3 +36,8 @@ MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
 # MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
 MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 ###< symfony/messenger ###
+
+REDIS_HOST=redis://redis
+
+MOVIES_PATH=/var/download/movies
+TVSHOWS_PATH=/var/download/tvshows

Dockerfile

@@ -1,10 +1,19 @@
-FROM registry.caldwell.digital/library/php:8.4-apache
+FROM php:8.4-fpm-alpine3.21
 
-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
+RUN docker-php-ext-install pdo_mysql
 
-COPY ./bash/vhost.conf /etc/apache2/sites-enabled/vhost.conf
-RUN rm /etc/apache2/sites-enabled/000-default.conf
+# SETUP PHP-FPM CONFIG SETTINGS (max_children / max_requests)
+RUN echo 'pm = dynamic' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+    echo 'pm.max_children = 75' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+    echo 'pm.start_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+    echo 'pm.min_spare_servers = 5' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+    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
+
+COPY --chmod=0775 ./bash/entrypoint.sh /usr/local/bin/
+
+HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
+
+ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+
+WORKDIR /var/www

Dockerfile.prod

@@ -7,5 +7,5 @@ RUN apt-get update && \
     docker-php-ext-install ldap
 
 COPY --chown=www-data:www-data . /var/www
-COPY ./bash/vhost.conf /etc/apache2/sites-enabled/vhost.conf
+COPY bash/nginx.conf /etc/apache2/sites-enabled/vhost.conf
 RUN rm /etc/apache2/sites-enabled/000-default.conf

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 web:80
 

bash/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Sleep for a second to ensure DB is awake and ready
 SLEEP_TIME=$(shuf -i 2-5 -n 1)
@@ -11,8 +11,8 @@ 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
+echo "Starting PHP-FPM..."
+php-fpm
 
 exec "$@"
 

bash/nginx.conf

@@ -0,0 +1,66 @@
+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;
+    }
+
+    # optionally disable falling back to PHP script for the asset directories;
+    # nginx will return a 404 error when files are not found instead of passing the
+    # request to Symfony (improves performance but Symfony's 404 page is not displayed)
+    # location /bundles {
+    #     try_files $uri =404;
+    # }
+
+    location ~ ^/index\.php(/|$) {
+        fastcgi_pass app:9000;
+
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        include fastcgi_params;
+
+        # optionally set the value of the environment variables used in the application
+        # fastcgi_param APP_ENV prod;
+        # fastcgi_param APP_SECRET <app-secret-id>;
+        # fastcgi_param DATABASE_URL "mysql://db_user:db_pass@host:3306/db_name";
+
+        # When you are using symlinks to link the document root to the
+        # current version of your application, you should pass the real
+        # application path instead of the path to the symlink to PHP
+        # FPM.
+        # Otherwise, PHP's OPcache may not properly detect changes to
+        # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
+        # for more information).
+        # Caveat: When PHP-FPM is hosted on a different machine from nginx
+        #         $realpath_root may not resolve as you expect! In this case try using
+        #         $document_root instead.
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param DOCUMENT_ROOT $document_root;
+        # Prevents URIs that include the front controller. This will 404:
+        # http://example.com/index.php/some-path
+        # Remove the internal directive to allow URIs like this
+        internal;
+    }
+
+    # return 404 for all other php files not matching the front controller
+    # this prevents access to other php files you don't want to be accessible.
+    location ~ \.php$ {
+        return 404;
+    }
+
+    error_log /var/log/nginx/project_error.log;
+    access_log /var/log/nginx/project_access.log;
+}

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,14 @@ services:
       - $PWD/bash/caddy:/etc/caddy
       - $PWD/bash/certs:/etc/ssl
 
+  web:
+    build:
+      dockerfile: docker/Dockerfile.web
+      context: .
+    depends_on:
+      app:
+        condition: service_healthy
+
   redis:
     image: redis:latest
     volumes:
@@ -19,24 +27,38 @@ services:
     command: redis-server --maxmemory 512MB
     restart: unless-stopped
 
-  php:
+  app:
     build: .
     volumes:
       - ./:/var/www
+    depends_on:
+      database:
+        condition: service_healthy
 
   worker:
-    build: .
+    build:
+      dockerfile: docker/Dockerfile.worker
+      context: .
     volumes:
-      - ./:/var/www
-      - ./var/download:/var/download
-    command: php ./bin/console messenger:consume async -vvv --time-limit=3600
+      - ./:/app
+      - ./var/downloads/movies:/var/download/movies
+      - ./var/downloads/tvshows:/var/download/tvshows
+    command: -v --time-limit=3600 --limit=10
+    env_file:
+      - .env
+    depends_on:
+      app:
+        condition: service_healthy
 
   scheduler:
-    build: .
+    image: code.caldwell.digital/home/torsearch:0.14.5-worker
     volumes:
       - ./:/var/www
       - ./var/download:/var/download
     command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600
+    depends_on:
+      app:
+        condition: service_healthy
 
   mercure:
     image: dunglas/mercure
@@ -67,6 +89,10 @@ services:
       MYSQL_USERNAME: app
       MYSQL_PASSWORD: password
       MYSQL_ROOT_PASSWORD: password
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      timeout: 10s
+      retries: 10
 
   adminer:
     image: adminer

composer.json

@@ -89,7 +89,7 @@
         "post-update-cmd": [
             "@auto-scripts"
         ],
-        "sym": "docker compose exec php ./bin/console"
+        "sym": "docker compose exec app ./bin/console"
     },
     "conflict": {
         "symfony/symfony": "*"

config/services.yaml

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

deploy.compose.yml

@@ -1,13 +1,21 @@
 services:
-  php:
-    image: registry.caldwell.digital/home/torsearch/app:${TAG}
+  web:
+    image: code.caldwell.digital/home/torsearch/web:latest
     ports:
-      - "8001:80"
+      - '8001:80'
+    volumes:
+      - $PWD/bash/nginx.conf:/etc/nginx/conf.d/default.conf
+    depends_on:
+      app:
+        condition: service_healthy
+
+  app:
+    image: code.caldwell.digital/home/torsearch/app:${TAG}
     deploy:
       replicas: 2
 
   worker:
-    image: registry.caldwell.digital/home/torsearch/app:${TAG}
+    image: code.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
@@ -15,7 +23,7 @@ services:
       replicas: 2
 
   scheduler:
-    image: registry.caldwell.digital/home/torsearch/app:${TAG}
+    image: code.caldwell.digital/home/torsearch/app:${TAG}
     volumes:
       - /mnt/media/downloads:/var/download
     command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600

docker/Dockerfile.app

@@ -1,16 +1,20 @@
-FROM registry.caldwell.digital/library/php:8.4-apache
+FROM php:8.4-fpm-alpine3.21
 
-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
+RUN docker-php-ext-install pdo_mysql
+
+# SETUP PHP-FPM CONFIG SETTINGS (max_children / max_requests)
+RUN echo 'pm = dynamic' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+    echo 'pm.max_children = 75' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+    echo 'pm.start_servers = 30' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+    echo 'pm.min_spare_servers = 5' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+    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
 
 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
 
 HEALTHCHECK --interval=5s --timeout=5s --retries=5 CMD [ "php", "/var/www/bin/console", "startup:status" ]
 
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
+
+WORKDIR /var/www

docker/Dockerfile.scheduler

@@ -0,0 +1,7 @@
+FROM php:8.4-cli-alpine3.21
+
+RUN docker-php-ext-install pdo_mysql
+
+COPY --chown=www-data:www-data . /app
+
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume",  "scheduler_monitor" ]

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,12 +1,7 @@
-FROM registry.caldwell.digital/library/php:8.4-apache
+FROM php:8.4-cli-alpine3.21
 
-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
+RUN docker-php-ext-install pdo_mysql
 
-COPY --chown=www-data:www-data . /var/www
+COPY --chown=www-data:www-data . /app
 
-COPY ./bash/vhost.conf /etc/apache2/sites-enabled/vhost.conf
-RUN rm /etc/apache2/sites-enabled/000-default.conf
+ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume",  "async" ]

docs/examples/compose.yml

@@ -1,30 +1,39 @@
 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
-  app:
-    image: code.caldwell.digital/home/torsearch:0.14.0-app
+  # 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.
+  web:
+    image: code.caldwell.digital/home/torsearch-web:latest
     ports:
-      - "8006:80"
+      - '8006:80'
+    depends_on:
+      app:
+        condition: service_healthy
+
+  # This container runs the actual web app in a php:8.4-fpm
+  # base container.
+  app:
+    image: code.caldwell.digital/home/torsearch-app:0.14.9
     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: code.caldwell.digital/home/torsearch:0.14.0-worker
+    image: code.caldwell.digital/home/torsearch-worker:0.14.9
     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: -v --time-limit=3600 --limit=10
     env_file:
       - .env
     depends_on:
@@ -37,10 +46,10 @@ services:
   # This container runs a Symfony worker process.
   # See: https://symfony.com/doc/current/messenger.html
   scheduler:
-    image: code.caldwell.digital/home/torsearch:0.14.0-worker
+    image: code.caldwell.digital/home/torsearch-scheduler:0.14.9
     volumes:
       - ./downloads:/var/download
-    command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600
+    command: -vv --time-limit=3600
     env_file:
       - .env
     depends_on:
@@ -82,6 +91,15 @@ services:
       timeout: 10s
       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 +109,4 @@ volumes:
   mysql:
   mercure_config:
   mercure_data:
+  redis_data:

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/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/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/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>