feat: download movie to dedicated directory

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
 

compose.yml

@@ -19,24 +19,33 @@ services:
     command: redis-server --maxmemory 512MB
     restart: unless-stopped
 
-  php:
+  app:
-    build: .
+    image: code.caldwell.digital/home/torsearch:0.14.5-app
     volumes:
       - ./:/var/www
+    depends_on:
+      database:
+        condition: service_healthy
 
   worker:
-    build: .
+    image: code.caldwell.digital/home/torsearch:0.14.5-worker
     volumes:
       - ./:/var/www
       - ./var/download:/var/download
     command: php ./bin/console messenger:consume async -vvv --time-limit=3600
+    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 +76,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": "*"

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([
+        $downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
-            '/bin/sh',
+        $path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
-            '/var/www/bash/app/wget_download.sh',
+
-            $baseDir,
+        $process = (new Process([
-            $title,
+            '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/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;
@@ -27,6 +24,7 @@ class PreferencesController extends AbstractController
         private readonly PreferencesRepository $preferencesRepository,
         private readonly SaveUserMediaPreferencesHandler $saveUserMediaPreferencesHandler,
         private readonly HubInterface $hub,
+        private readonly SaveUserDownloadPreferencesHandler $saveUserDownloadPreferencesHandler,
     ) {}
     #[Route('/user/preferences', 'app_user_preferences', methods: ['GET'])]
     public function mediaPreferences(): Response
@@ -54,8 +52,9 @@ class PreferencesController extends AbstractController
         SaveUserMediaPreferencesInput $input,
     ): Response
     {
-        $userPreferences = $this->saveUserMediaPreferencesHandler->handle($input->toCommand())->userPreferences;
+        $this->saveUserMediaPreferencesHandler->handle($input->toCommand());
-        $userPreferences = Map::from($userPreferences)->rekey(fn($preference) => $preference->getPreference()->getId());
+        $mediaPreferences = $this->getUser()->getMediaPreferences();
+        $downloadPreferences = $this->getUser()->getDownloadPreferences();
 
         $languages = CountryLanguages::$languages;
         sort($languages);
@@ -75,7 +74,8 @@ class PreferencesController extends AbstractController
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
                 'providers' => ProviderList::$providers,
-                'userPreferences' => $userPreferences->toArray(),
+                'mediaPreferences' => $mediaPreferences,
+                'downloadPreferences' => $downloadPreferences,
             ]
         );
     }
@@ -83,11 +83,11 @@ class PreferencesController extends AbstractController
     #[Route('/user/preferences/download', 'app_save_download_preferences', methods: ['POST'])]
     public function saveDownloadPreferences(
         Request $request,
-        SaveUserMediaPreferencesInput $input,
+        SaveUserDownloadPreferencesInput $input,
     ): Response
     {
-        $userPreferences = $this->saveUserMediaPreferencesHandler->handle($input->toCommand())->userPreferences;
+        $downloadPreferences = $this->saveUserDownloadPreferencesHandler->handle($input->toCommand())->downloadPreferences;
-        $userPreferences = Map::from($userPreferences)->rekey(fn($preference) => $preference->getPreference()->getId());
+        $mediaPreferences = $this->getUser()->getMediaPreferences();
 
         $languages = CountryLanguages::$languages;
         sort($languages);
@@ -97,7 +97,7 @@ class PreferencesController extends AbstractController
             $this->renderView('broadcast/Alert.stream.html.twig', [
                 'alert_id' => uniqid(),
                 'title' => 'Success',
-                'message' => 'Your media preferences have been saved.',
+                'message' => 'Your download preferences have been saved.',
             ])
         ));
 
@@ -107,7 +107,8 @@ class PreferencesController extends AbstractController
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
                 'providers' => ProviderList::$providers,
-                'userPreferences' => $userPreferences->toArray(),
+                'mediaPreferences' => $mediaPreferences,
+                'downloadPreferences' => $downloadPreferences,
             ]
         );
     }

templates/user/preferences.html.twig

@@ -69,11 +69,13 @@
 
     <twig:Card title="Download Preferences" class="w-full">
         <p class="text-gray-50 mb-2">Change how your downloads are stored.</p>
-        <form id="media_preferences" class="flex flex-col" name="media_preferences" method="post" action="{{ path('app_save_download_preferences') }}">
+        <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">
+            <div class="flex flex-row gap-2 mb-2">
-                <input type="checkbox" name="movie_folder" id="movie_folder" {{ downloadPreferences['movie_folder'].getPreferenceValue() == true ? 'checked' }} />
+                <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>
 </div>