WIP: working move/tv show download

.env

@@ -13,7 +13,7 @@
 #
 # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
-
+APP_URL=
 ###> symfony/framework-bundle ###
 APP_ENV=prod
 APP_SECRET=
@@ -27,9 +27,12 @@ APP_SECRET=
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
 # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
 # DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8"
+DATABASE_URL=
 
 ###< doctrine/doctrine-bundle ###
 MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
+MERCURE_PUBLISHER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!"
+MERCURE_SUBSCRIBER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!"
 ###> symfony/messenger ###
 # Choose one of the transports below
 # MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages

.gitea/workflows/build_base_images.yml

@@ -0,0 +1,59 @@
+name: CI
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build-base-app:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: "${{ vars.REGISTRY_URL }}"
+          username: "${{ vars.REGISTRY_USER }}"
+          password: "${{ vars.REGISTRY_PASS }}"
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        env:
+          APP_FRANKENPHP_TAG: php8.4
+        with:
+          context: .
+          push: true
+          file: docker/Dockerfile.base.worker
+          platforms: linux/amd64
+          build-args: |
+            APP_FRANKENPHP_TAG=${{ env.APP_FRANKENPHP_TAG }}
+          tags: |
+            code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG}
+            code.caldwell.digital/home/torsearch-base:latest
+
+  build-base-worker-supervisord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: "${{ vars.REGISTRY_URL }}"
+          username: "${{ vars.REGISTRY_USER }}"
+          password: "${{ vars.REGISTRY_PASS }}"
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          file: docker/Dockerfile.base.worker
+          platforms: linux/amd64
+          build-args: |
+            ALPINE_VERSION=3.22
+          tags: |
+            code.caldwell.digital/home/torsearch-base-worker-supervisord:latest

.gitea/workflows/ci.yml

@@ -0,0 +1,104 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - "main"
+    tags:
+      - "v*"
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+      
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2 
+        with:
+          php-version: '8.4'
+
+      - name: Install phing
+        run: composer global require phing/phing
+
+      - name: Run composer
+        run: composer install --no-dev --no-scripts --ignore-platform-reqs -o
+  
+      - name: Build tailwind
+        run: APP_ENV=build php bin/console tailwind:build
+
+      - name: Install frontend assets
+        run: APP_ENV=build php bin/console importmap:install
+
+      - name: Compile assets
+        run: APP_ENV=build php bin/console asset-map:compile
+
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: "${{ vars.REGISTRY_URL }}"
+          username: "${{ vars.REGISTRY_USER }}"
+          password: "${{ vars.REGISTRY_PASS }}"
+
+      - name: Create torsearch-app docker image
+        run: |
+          tag="${{ gitea.REF_NAME }}"
+          tmdb_api="${{ vars.TMDB_API }}"
+          version=${tag:1}
+          docker build --pull -f docker/Dockerfile.app \
+            -t code.caldwell.digital/home/torsearch-app:${version} \
+            -t code.caldwell.digital/home/torsearch-app:latest \
+            --build-arg "APP_VERSION=${version}" \
+            --build-arg "TMDB_API=${tmdb_api}" \
+            .
+          docker push code.caldwell.digital/home/torsearch-app:${version}
+          docker push code.caldwell.digital/home/torsearch-app:latest
+
+      - name: Create torsearch-worker docker image
+        run: |
+          tag="${{ gitea.REF_NAME }}"
+          tmdb_api="${{ vars.TMDB_API }}"
+          version=${tag:1}
+          docker build --pull -f docker/Dockerfile.worker \
+            -t code.caldwell.digital/home/torsearch-worker:${version} \
+            -t code.caldwell.digital/home/torsearch-worker:latest \
+            --build-arg "APP_VERSION=${version}" \
+            --build-arg "TMDB_API=${tmdb_api}" \
+            .
+          docker push code.caldwell.digital/home/torsearch-worker:${version}
+          docker push code.caldwell.digital/home/torsearch-worker:latest
+
+      - name: Create torsearch-scheduler docker image
+        run: |
+          tag="${{ gitea.REF_NAME }}"
+          tmdb_api="${{ vars.TMDB_API }}"
+          version=${tag:1}
+          docker build --pull -f docker/Dockerfile.scheduler \
+            -t code.caldwell.digital/home/torsearch-scheduler:${version} \
+            -t code.caldwell.digital/home/torsearch-scheduler:latest \
+            --build-arg "APP_VERSION=${version}" \
+            --build-arg "TMDB_API=${tmdb_api}" \
+            .
+          docker push code.caldwell.digital/home/torsearch-scheduler:${version}
+          docker push code.caldwell.digital/home/torsearch-scheduler:latest
+
+      - name: Create artifact
+        run: |
+          file="torsearch-${{ gitea.REF_NAME }}.tar.gz"
+          touch $file
+          tar -cvzf $file --exclude=$file .
+
+      - name: Create release
+        uses: akkuman/gitea-release-action@v1
+        with:
+          files: |-
+            "torsearch-${{ gitea.REF_NAME }}.tar.gz"
+
+#      - name: Upload artifact
+#        uses: actions/upload-artifact@v3
+#        with:
+#          name: "torsearch-${{ gitea.REF_NAME }}.tar.gz"
+#          path: "torsearch-${{ gitea.REF_NAME }}.tar.gz"
+#          compression_level: 9

.gitea/workflows/sonarqube_scans.yml

@@ -1,24 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-name: SonarQube Scan
-jobs:
-  sonarqube:
-    name: SonarQube Trigger
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checking out
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: SonarQube Scan
-        uses: https://code.caldwell.digital/tools/sonarqube-action@v0.0.3
-        with:
-          host: "https://qube.caldwell.digital"
-          login: ${{ secrets.SONARQUBE_TOKEN }}
-          projectName: "torsearch"
-          projectBaseDir: "./src"

assets/components/download-option-tr.js

@@ -102,6 +102,14 @@ export default class DownloadOptionTr extends HTMLTableRowElement {
     }
 
     download() {
+        const preferencesForm = document.querySelector('[name="user_media_preferences_form"]');
+        const preferences = {
+            resolution: preferencesForm.querySelector('[id="user_media_preferences_form_resolution"]').value,
+            codec: preferencesForm.querySelector('[id="user_media_preferences_form_codec"]').value,
+            language: preferencesForm.querySelector('[id="user_media_preferences_form_language"]').value,
+            quality: preferencesForm.querySelector('[id="user_media_preferences_form_quality"]').value,
+            provider: preferencesForm.querySelector('[id="user_media_preferences_form_provider"]').value,
+        }
         fetch('/api/download', {
             method: 'POST',
             headers: {
@@ -109,12 +117,11 @@ export default class DownloadOptionTr extends HTMLTableRowElement {
                 'Accept': 'application/json',
             },
             body: JSON.stringify({
-                url: this.url,
-                title: this.mediaTitle,
-                filename: this.filename,
                 mediaType: this.mediaType,
                 imdbId: this.imdbId,
-                episodeId: this.episodeId
+                season: this.season,
+                episode: this.episode,
+                filter: preferences,
             })
         })
             .then(res => res.json())

assets/controllers/download_button_controller.js

@@ -16,6 +16,7 @@ export default class extends Controller {
     }
 
     download() {
+        console.log(new FormData(document.querySelector('[name="user_media_preferences_form"]')).values());
         fetch('/api/download', {
             method: 'POST',
             headers: {
@@ -28,7 +29,8 @@ export default class extends Controller {
                 filename: this.filenameValue,
                 mediaType: this.mediaTypeValue,
                 imdbId: this.imdbIdValue,
-                episodeId: this.episodeIdValue
+                episodeId: this.episodeIdValue,
+                filter: new FormData(document.querySelector('[name="user_media_preferences_form"]')).values()
             })
         })
             .then(res => res.json())

bash/build_base.sh

@@ -1,22 +1,19 @@
 # torsearch-app is built from this base
 export APP_FRANKENPHP_TAG=php8.4
 
-#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" .
-docker build -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" .
-docker push code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG}
-docker push code.caldwell.digital/home/torsearch-base:latest
+docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" .
+docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG}
+docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base:latest
 
 # torsearch-worker & torsearch-scheduler are built from this base
 export WORKER_FRANKENPHP_TAG=php8.4-alpine
 
-#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" .
-docker build -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" .
-docker push code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG}
-docker push code.caldwell.digital/home/torsearch-base-worker:latest
+docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" .
+docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG}
+docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker:latest
 
 # torsearch-worker-supervisord
 export ALPINE_VERSION=3.22
 
-#docker buildx build --platform=linux/amd64,linux/arm64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .
-docker build -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .
-docker push code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
+docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .
+docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker-supervisord:latest

compose.yml

@@ -27,8 +27,8 @@ services:
     tty: true
     environment:
       TZ: America/Chicago
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
+      MERCURE_PUBLISHER_JWT_KEY: "${MERCURE_PUBLISHER_JWT_KEY}"
+      MERCURE_SUBSCRIBER_JWT_KEY: "${MERCURE_SUBSCRIBER_JWT_KEY}"
     depends_on:
       database:
         condition: service_healthy

config/packages/sentry.yaml

@@ -1,3 +1,4 @@
+when@prod: &prod
     sentry:
         register_error_listener: true # Disables the ErrorListener to avoid duplicated log in sentry
         register_error_handler: true # Disables the ErrorListener, ExceptionListener and FatalErrorListener integrations of the base PHP SDK
@@ -38,3 +39,5 @@ monolog:
                 hub_id: Sentry\State\HubInterface
                 fill_extra_context: true # Enables sending monolog context to Sentry
                 process_psr_3_messages: false # Disables the resolution of PSR-3 placeholders in reported messages
+
+when@dev: *prod

config/services.yaml

@@ -66,6 +66,7 @@ services:
     App\:
         resource: '../src/'
         exclude:
+            - '../src/Library/Dto'
             - '../src/DependencyInjection/'
             - '../src/Entity/'
             - '../src/Kernel.php'

docker/Dockerfile.base.worker

@@ -16,11 +16,13 @@ RUN apk add --no-cache \
   php84-fileinfo \
   php84-fpm \
   php84-gd \
+  php84-intl \
   php84-mbstring \
   php84-mysqli \
   php84-opcache \
   php84-openssl \
   php84-pdo_mysql \
+  php84-session \
   php84-tokenizer \
   php84-xml \
   supervisor

docker/Dockerfile.scheduler

@@ -15,6 +15,7 @@ FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS app_image
 FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
 
 # Set the APP_VERSION in the image
+ARG APP_VERSION="latest"
 ENV APP_VERSION=${APP_VERSION}
 
 ARG TMDB_API=""

docker/Dockerfile.worker

@@ -15,6 +15,7 @@ FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION} AS app_image
 FROM code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
 
 # Set the APP_VERSION in the image
+ARG APP_VERSION="latest"
 ENV APP_VERSION=${APP_VERSION}
 
 ARG TMDB_API=""

migrations/Version20260321191300.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 Version20260321191300 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE download CHANGE url url VARCHAR(1024) 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 download CHANGE url url VARCHAR(1024) NOT NULL
+        SQL);
+    }
+}

src/Base/Service/MediaFiles.php

@@ -113,9 +113,15 @@ class MediaFiles
         return Map::from($results);
     }
 
-    public function createMovieDirectory(string $path): string
+    public function createMovieDirectory(string $title, string|int $year, string $imdbId): string
     {
-        $path = $this->moviesPath . DIRECTORY_SEPARATOR . $path;
+        $path = sprintf(
+            '%s' . DIRECTORY_SEPARATOR . '%s (%s) [imdbid-%s]',
+            $this->moviesPath,
+            $title,
+            $year,
+            $imdbId
+        );
 
         if (false === $this->filesystem->exists($path)) {
             $this->filesystem->mkdir($path);
@@ -124,9 +130,16 @@ class MediaFiles
         return $path;
     }
 
-    public function createTvShowDirectory(string $path): string
+    public function createTvShowDirectory(string $title, string|int $year, string|int $season, string|int $episode, string $imdbId): string
     {
-        $path = $this->tvShowsPath . DIRECTORY_SEPARATOR . $path;
+        $path = sprintf(
+            '%s' . DIRECTORY_SEPARATOR . '%s (%s) [imdbid-%s]' . DIRECTORY_SEPARATOR . 'Season %s',
+            $this->tvShowsPath,
+            $title,
+            $year,
+            $imdbId,
+            str_pad($season, 2, '0', STR_PAD_LEFT),
+        );
 
         if (false === $this->filesystem->exists($path)) {
             $this->filesystem->mkdir($path);

src/Download/Action/Command/DownloadMediaCommand.php

@@ -10,13 +10,14 @@ use OneToMany\RichBundle\Contract\CommandInterface;
 class DownloadMediaCommand implements CommandInterface
 {
     public function __construct(
-        public string $url,
-        public string $title,
-        public string $filename,
-        public string $mediaType,
         public string $imdbId,
-        public int $userId,
-        public ?int $downloadId = null,
+        public string $mediaType,
+        public int|string|null $season = null,
+        public int|string|null $episode = null,
+        public string|null $url = null,
+        public array|null $filter = null,
+        public int|null $downloadId = null,
+        public int|null $userId = null,
         public ?string $mercureAlertTopic = null,
     ) {}
 }

src/Download/Action/Handler/DownloadMediaHandler.php

@@ -4,13 +4,26 @@ namespace App\Download\Action\Handler;
 
 use App\Base\Enum\MediaType;
 use App\Base\Service\Broadcaster;
+use App\Base\Service\MediaFiles;
+use App\Base\Util\EpisodeId;
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Download\Action\Result\DownloadMediaResult;
 use App\Download\DownloadEvents;
+use App\Download\DownloadOptionEvaluator;
 use App\Download\Framework\Entity\Download;
 use App\Download\Framework\Repository\DownloadRepository;
 use App\Download\Downloader\DownloaderInterface;
 use App\EventLog\Action\Command\AddEventLogCommand;
+use App\Library\Dto\MediaFileDto;
+use App\Search\Action\Command\GetMediaInfoCommand;
+use App\Search\Action\Handler\GetMediaInfoHandler;
+use App\Search\Action\Result\GetMediaInfoResult;
+use App\Torrentio\Action\Command\GetMovieOptionsCommand;
+use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
+use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
+use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
+use App\Torrentio\Result\TorrentioResult;
+use App\User\Dto\UserPreferencesFactory;
 use App\User\Framework\Repository\UserRepository;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
@@ -18,19 +31,63 @@ use OneToMany\RichBundle\Contract\ResultInterface;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Component\Messenger\MessageBusInterface;
 
+
 /** @implements HandlerInterface<DownloadMediaCommand, DownloadMediaResult> */
 readonly class DownloadMediaHandler implements HandlerInterface
 {
     public function __construct(
+        private DownloadOptionEvaluator $downloadOptionEvaluator,
+        private GetTvShowOptionsHandler $getTvShowOptionsHandler,
+        private GetMovieOptionsHandler  $getMovieOptionsHandler,
+        private GetMediaInfoHandler     $getMediaInfoHandler,
         private MessageBusInterface     $bus,
         private DownloaderInterface     $downloader,
         private DownloadRepository      $downloadRepository,
-        private UserRepository      $userRepository, private Broadcaster $broadcaster,
+        private UserRepository          $userRepository,
+        private Broadcaster             $broadcaster,
+        private MediaFiles              $mediaFiles,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
         $user = $this->userRepository->find($command->userId);
+        /** @var \App\Download\Framework\Entity\Download $download */
+        $download = $this->downloadRepository->find($command->downloadId);
+        $media = $this->getMediaInfoHandler->handle(new GetMediaInfoCommand(
+            $command->imdbId,
+            $command->mediaType,
+            $command->season,
+            $command->episode,
+        ));
+        $downloadOptions = match ($command->mediaType) {
+            MediaType::Movie->value => $this->getMovieOptionsHandler->handle(
+                new GetMovieOptionsCommand(
+                    $media->media->tmdbId,
+                    $media->media->imdbId
+                )
+            ),
+            MediaType::TvShow->value => $this->getTvShowOptionsHandler->handle(
+                new GetTvShowOptionsCommand(
+                    $media->media->tmdbId,
+                    $media->media->imdbId,
+                    $command->season,
+                    $command->episode
+                )
+            )
+        };
+
+        $filter = $command->filter !== null
+            ? UserPreferencesFactory::createFromArray($command->filter)
+            : UserPreferencesFactory::createFromUser($user);
+
+        $matchingOption = $this->downloadOptionEvaluator->evaluateOptions($downloadOptions->results, $filter);
+
+        $download->setUrl($matchingOption->url);
+        $download->setTitle($media->media->title);
+        $download->setFileName(
+            $this->getFilename(MediaType::from($command->mediaType), $media, $matchingOption)
+        );
+
         $this->bus->dispatch(new AddEventLogCommand(
             $user,
             DownloadEvents::DOWNLOAD_STARTED->type(),
@@ -38,20 +95,6 @@ readonly class DownloadMediaHandler implements HandlerInterface
             (array) $command
         ));
 
-        if (null === $command->downloadId) {
-            $download = $this->downloadRepository->insert(
-                $user,
-                $command->url,
-                $command->title,
-                $command->filename,
-                $command->imdbId,
-                $command->mediaType,
-                ""
-            );
-        } else {
-            $download = $this->downloadRepository->find($command->downloadId);
-        }
-
         try {
             $this->validateDownloadUrl($download->getUrl());
         } catch (\Throwable $exception) {
@@ -69,8 +112,8 @@ readonly class DownloadMediaHandler implements HandlerInterface
 
             $this->downloader->download(
                 $command->mediaType,
-                $command->title,
-                $command->url,
+                $download->getUrl(),
+                $this->getFilepath(MediaType::from($command->mediaType), $media, $matchingOption),
                 $download->getId()
             );
 
@@ -91,6 +134,54 @@ readonly class DownloadMediaHandler implements HandlerInterface
         return new DownloadMediaResult(200, "Success.");
     }
 
+    private function getFilepath(MediaType $mediaType, GetMediaInfoResult $media, TorrentioResult $option): ?string
+    {
+        return match ($mediaType) {
+            MediaType::Movie => $this->mediaFiles->createMovieDirectory(
+                $media->media->title,
+                $media->media->year,
+                $media->media->imdbId,
+            ),
+            MediaType::TvShow => $this->mediaFiles->createTvShowDirectory(
+                $media->media->title,
+                $media->media->year,
+                $media->season,
+                $media->episode,
+                $media->media->imdbId,
+            )
+        };
+    }
+
+    private function getFilename(MediaType $mediaType, GetMediaInfoResult $media, TorrentioResult $option): ?string
+    {
+        $fileType = $option->ptn->container;
+        return (match ($mediaType) {
+            MediaType::Movie => function () use ($media, $fileType) {
+                $template = "%s (%s) [imdbid-%s].%s";
+                return sprintf(
+                    $template,
+                    $media->media->title,
+                    $media->media->year,
+                    $media->media->imdbId,
+                    $fileType
+                );
+            },
+            MediaType::TvShow => function () use ($media, $fileType) {
+                $template = "%s %s.%s";
+                $episodeId = EpisodeId::fromSeasonEpisodeNumbers(
+                    $media->season,
+                    $media->episode,
+                );
+                return sprintf(
+                    $template,
+                    $media->media->title,
+                    $episodeId,
+                    $fileType
+                );
+            }
+        })();
+    }
+
     public function validateDownloadUrl(string $downloadUrl)
     {
         $badFileSizes = [

src/Download/Action/Input/DownloadMediaInput.php

@@ -3,9 +3,12 @@
 namespace App\Download\Action\Input;
 
 use App\Download\Action\Command\DownloadMediaCommand;
+use OneToMany\RichBundle\Attribute\PropertyIgnored;
 use OneToMany\RichBundle\Attribute\SourceRequest;
+use OneToMany\RichBundle\Attribute\SourceSecurity;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\InputInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 /** @implements InputInterface<DownloadMediaInput> */
 class DownloadMediaInput implements InputInterface
@@ -13,39 +16,60 @@ class DownloadMediaInput implements InputInterface
     public ?string $mercureAlertTopic = null;
 
     public function __construct(
-        #[SourceRequest('url')]
-        public string $url,
-
-        #[SourceRequest('title')]
-        public string $title,
-
-        #[SourceRequest('filename')]
-        public string $filename,
+        #[SourceRequest('imdbId')]
+        public string $imdbId,
 
         #[SourceRequest('mediaType')]
         public string $mediaType,
 
-        #[SourceRequest('imdbId')]
-        public string $imdbId,
+        #[SourceRequest('season', nullify: true)]
+        public int|string|null $season = null,
 
-        #[SourceRequest('episodeId', nullify: true)]
-        public ?string $episodeId = null,
+        #[SourceRequest('episode', nullify: true)]
+        public int|string|null $episode = null,
 
-        public ?int $userId = null,
+        #[SourceRequest('url', nullify: true)]
+        public string|null $url = null,
 
-        public ?int $downloadId = null,
+        #[SourceRequest('filter', nullify: true)]
+        public array|null $filter = null,
+
+        #[PropertyIgnored]
+        public int|null $downloadId = null,
+
+        #[PropertyIgnored]
+        public int|null $userId = null,
     ) {}
 
+    public function setUserId(int $userId): static
+    {
+        $this->userId = $userId;
+        return $this;
+    }
+
+    public function setDownloadId(int $downloadId): static
+    {
+        $this->downloadId = $downloadId;
+        return $this;
+    }
+
+    public function setMercureAlertTopic(string $mercureAlertTopic): static
+    {
+        $this->mercureAlertTopic = $mercureAlertTopic;
+        return $this;
+    }
+
     public function toCommand(): CommandInterface
     {
         return new DownloadMediaCommand(
-            $this->url,
-            $this->title,
-            $this->filename,
-            $this->mediaType,
             $this->imdbId,
-            $this->userId,
+            $this->mediaType,
+            $this->season,
+            $this->episode,
+            $this->url,
+            $this->filter,
             $this->downloadId,
+            $this->userId,
             $this->mercureAlertTopic,
         );
     }

src/Download/DownloadOptionEvaluator.php

@@ -26,13 +26,15 @@ class DownloadOptionEvaluator
             //    return false;
             //}
 
-            if (false === $this->validateDownloadUrl($result->url)) {
-                return false;
-            }
+//            if (false === $this->validateDownloadUrl($result->url)) {
+//                return false;
+//            }
 
             return true;
         });
 
+//        dd($filter);
+
         if ($matches->count() > 0) {
             return Map::from($matches)->usort(fn($a, $b) => $a->seeders <=> $b->seeders)->last();
         }

src/Download/Downloader/DownloaderInterface.php

@@ -16,5 +16,5 @@ interface DownloaderInterface
      * @return void
      * Downloads the requested file.
      */
-    public function download(string $mediaType, string $title, string $url, ?int $downloadId): void;
+    public function download(string $mediaType, string $url, string $downloadPath, ?int $downloadId): void;
 }

src/Download/Downloader/ProcessDownloader.php

@@ -7,6 +7,8 @@ use App\Base\Service\MediaFiles;
 use App\Download\DownloadEvents;
 use App\Download\Framework\Entity\Download;
 use App\EventLog\Action\Command\AddEventLogCommand;
+use App\Search\Action\Command\GetMediaInfoCommand;
+use App\Search\Action\Handler\GetMediaInfoHandler;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -22,7 +24,6 @@ class ProcessDownloader implements DownloaderInterface
     public function __construct(
         private MessageBusInterface $bus,
         private EntityManagerInterface $entityManager,
-        private MediaFiles $mediaFiles,
         private CacheInterface $cache,
         private readonly Broadcaster $broadcaster,
     ) {}
@@ -30,15 +31,12 @@ class ProcessDownloader implements DownloaderInterface
     /**
      * @inheritDoc
      */
-    public function download(string $mediaType, string $title, string $url, ?int $downloadId): void
+    public function download(string $mediaType, string $url, string $downloadPath, ?int $downloadId): void
     {
         /** @var Download $downloadEntity */
         $downloadEntity = $this->entityManager->getRepository(Download::class)->find($downloadId);
         $this->entityManager->flush();
 
-        $downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
-        $path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
-
         $processArgs = ['wget', '-O', $downloadEntity->getFilename(), $url];
 
         if ($downloadEntity->getStatus() === 'Paused') {
@@ -48,13 +46,9 @@ class ProcessDownloader implements DownloaderInterface
             $downloadEntity->setProgress(0);
         }
 
-        fwrite(STDOUT, implode(" ", $processArgs));
-
-        $process = (new Process($processArgs))->setWorkingDirectory($path);
-
+        $process = (new Process($processArgs))->setWorkingDirectory($downloadPath);
         $process->setTimeout(1800); // 30 min
         $process->setIdleTimeout(600); // 10 min
-
         $process->start();
 
         try {
@@ -93,7 +87,7 @@ class ProcessDownloader implements DownloaderInterface
         } catch (ProcessFailedException $exception) {
             $downloadEntity->setStatus('Failed');
             $this->bus->dispatch(new AddEventLogCommand(
-                $downloadEntity->getUser()->getId(),
+                $downloadEntity->getUser(),
                 DownloadEvents::DOWNLOAD_ERROR->type(),
                 DownloadEvents::DOWNLOAD_ERROR->message() . ': ' . $exception->getMessage(),
                 (array) $downloadEntity
@@ -103,22 +97,6 @@ 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");
-    }
-
     private function alertComplete(Download $download): void
     {
         if ("tvshows" === $download->getMediaType()) {

src/Download/Downloader/WgetDownloader.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Download\Downloader;
-
-use App\Message\DownloadMessage;
-use App\Message\DownloadMovieMessage;
-use App\Message\DownloadTvShowMessage;
-
-class WgetDownloader implements DownloaderInterface
-{
-
-    /**
-     * @inheritDoc
-     * SSHs into the NAS and performs the download.
-     * This way retains the fast DL speed on the NAS.
-     */
-    public function download(string $baseDir, string $title, string $url, ?int $downloadId): void
-    {
-        // SSHs into the NAS, cds into movies dir, makes new dir based on filename, cds into that dir, downloads movie
-        system(sprintf(
-            'sh /var/www/bash/app/wget_download.sh "%s" "%s" "%s"',
-            $baseDir,
-            $title,
-            $url
-        ));
-    }
-}

src/Download/Framework/Controller/ApiController.php

@@ -4,6 +4,7 @@ namespace App\Download\Framework\Controller;
 
 use App\Base\Service\Broadcaster;
 use App\Download\Action\Handler\DeleteDownloadHandler;
+use App\Download\Action\Handler\DownloadMediaHandler;
 use App\Download\Action\Handler\PauseDownloadHandler;
 use App\Download\Action\Handler\ResumeDownloadHandler;
 use App\Download\Action\Input\DeleteDownloadInput;
@@ -12,6 +13,7 @@ use App\Download\Action\Input\DownloadSeasonInput;
 use App\Download\Action\Input\PauseDownloadInput;
 use App\Download\Action\Input\ResumeDownloadInput;
 use App\Download\DownloadEvents;
+use App\Download\Framework\Entity\Download;
 use App\Download\Framework\Repository\DownloadRepository;
 use App\EventLog\Action\Command\AddEventLogCommand;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -31,19 +33,19 @@ class ApiController extends AbstractController
     #[Route('/api/download', name: 'api_download', methods: ['POST'])]
     public function download(
         DownloadMediaInput $input,
+        DownloadMediaHandler $handler,
     ): Response {
-        $download = $this->downloadRepository->insert(
+        $download = $this->downloadRepository->insertNew(
             $this->getUser(),
-            $input->url,
-            $input->title,
-            $input->filename,
             $input->imdbId,
             $input->mediaType,
-            $input->episodeId,
+            $input->season,
+            $input->episode,
         );
-        $input->downloadId = $download->getId();
-        $input->userId = $this->getUser()->getId();
-        $input->mercureAlertTopic = $this->requestStack->getSession()->get('mercure_alert_topic');
+        $input->setDownloadId($download->getId());
+        $input->setUserId($this->getUser()->getId());
+        $input->setMercureAlertTopic($this->requestStack->getSession()->get('mercure_alert_topic'));
+        $input->toCommand();
 
         $this->bus->dispatch(new AddEventLogCommand(
             $this->getUser(),
@@ -60,7 +62,7 @@ class ApiController extends AbstractController
 
         $this->broadcaster->alert(
             title: 'Success',
-            message: "$input->title added to Queue."
+            message: "Added to Queue."
         );
 
         return $this->json(['status' => 200, 'message' => 'Added to Queue']);
@@ -121,4 +123,22 @@ class ApiController extends AbstractController
 
         return $this->json(['status' => 200, 'message' => 'Download Resumed']);
     }
+
+    #[Route('/api/download', name: 'api_get_downloads', methods: ['GET'])]
+    public function getDownloads(DownloadRepository $repository): Response
+    {
+        $downloads = $repository->findBy(['user' => $this->getUser()]);
+
+        return $this->json(['status' => 200, 'message' => 'Success', 'data' => ['downloads' => $downloads]]);
+    }
+
+    #[Route('/api/download/{id}', name: 'api_get_download', methods: ['GET'])]
+    public function getDownload(Download $download): Response
+    {
+        if ($download->getUser() === $this->getUser()) {
+            return $this->json(['status' => 200, 'message' => 'Success', 'data' => ['download' => $download]]);
+        }
+
+        return $this->json(['status' => 404, 'message' => 'Success'], 404);
+    }
 }

src/Download/Framework/Entity/Download.php

@@ -30,7 +30,7 @@ class Download
     #[ORM\Column(length: 255, nullable: true)]
     private ?string $title = null;
 
-    #[ORM\Column(length: 1024)]
+    #[ORM\Column(length: 1024, nullable: true)]
     private ?string $url = null;
 
     #[ORM\Column(length: 1024, nullable: true)]

src/Download/Framework/Repository/DownloadRepository.php

@@ -2,6 +2,7 @@
 
 namespace App\Download\Framework\Repository;
 
+use App\Base\Util\EpisodeId;
 use App\Base\Util\Paginator;
 use App\Download\Framework\Entity\Download;
 use App\User\Framework\Entity\User;
@@ -56,6 +57,34 @@ class DownloadRepository extends ServiceEntityRepository
         return $this->paginator->paginate($query, $pageNumber, $perPage);
     }
 
+    public function insertNew(
+        UserInterface $user,
+        string $imdbId,
+        string $mediaType,
+        int|null $season = null,
+        int|null $episode = null,
+        string $status = 'New'
+    ): Download {
+        /** @var User $user */
+        $download = (new Download())
+            ->setUser($user)
+            ->setImdbId($imdbId)
+            ->setMediaType($mediaType)
+            ->setProgress(0)
+            ->setStatus($status);
+
+        if (null !== $season && null !== $episode) {
+            $download->setEpisodeId(
+                EpisodeId::fromSeasonEpisodeNumbers($season, $episode)
+            );
+        }
+
+        $this->getEntityManager()->persist($download);
+        $this->getEntityManager()->flush();
+
+        return $download;
+    }
+
     public function insert(
         UserInterface $user,
         string $url,

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -11,6 +11,7 @@ use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Tmdb\Dto\TmdbEpisodeDto;
 use App\Tmdb\TmdbClient;
+use App\Tmdb\TmdbResult;
 use Carbon\Carbon;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
@@ -36,18 +37,14 @@ readonly class MonitorTvShowHandler implements HandlerInterface
     public function handle(CommandInterface $command): ResultInterface
     {
         $this->logger->info('> [MonitorTvShowHandler] Executing MonitorTvShowHandler');
+
         $monitor = $this->monitorRepository->find($command->monitorId);
-        $this->refreshData($monitor);
+        $showTmdbData = $this->tmdb->tvshowDetails($monitor->getImdbId());
+
+        $this->refreshData($monitor, $showTmdbData);
 
         // Check current episodes
-        $downloadedEpisodes = $this->mediaFiles
-            ->getEpisodes($monitor->getTitle())
-            ->map(fn($episode) => (object)(new PTN())->parse($episode))
-            ->filter(fn($episode) => property_exists($episode, 'episode')
-                && property_exists($episode, 'season')
-                && null !== $episode->episode
-                && null !== $episode->season
-            );
+        $downloadedEpisodes = $this->getDownloadedEpisodes($monitor->getTitle(), $showTmdbData);
 
         $this->logger->info('> [MonitorTvShowHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
 
@@ -130,6 +127,33 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         );
     }
 
+    private function getDownloadedEpisodes(string $title, TmdbResult $showTmdbData): Map
+    {
+        // Episodes in folder w/o the year
+        $downloadedEpisodes = $this->mediaFiles
+            ->getEpisodes($title)
+            ->map(fn($episode) => (object) new PTN()->parse($episode))
+            ->filter(fn($episode) =>
+                property_exists($episode, 'episode')
+                && property_exists($episode, 'season')
+                && null !== $episode->episode
+                && null !== $episode->season
+            );
+
+        return $downloadedEpisodes->concat(
+            // Episodes in folder w/ the year
+            $this->mediaFiles
+                ->getEpisodes(sprintf("%s (%s)", $title, $showTmdbData->year))
+                ->map(fn($episode) => (object) new PTN()->parse($episode))
+                ->filter(fn($episode) =>
+                    property_exists($episode, 'episode')
+                    && property_exists($episode, 'season')
+                    && null !== $episode->episode
+                    && null !== $episode->season
+                )
+        );
+    }
+
     private function episodeReleasedAfterMonitorCreated(
         string|DateTimeImmutable $monitorStartDate,
         TmdbEpisodeDto $episodeInShow
@@ -159,11 +183,11 @@ readonly class MonitorTvShowHandler implements HandlerInterface
             ]) !== null;
     }
 
-    private function refreshData(Monitor $monitor)
+    private function refreshData(Monitor $monitor, TmdbResult $showTmdbData)
     {
         if (null === $monitor->getPoster()) {
             $this->logger->info('> [MonitorTvShowHandler] Refreshing poster for "' . $monitor->getTitle() . '"');
-            $poster = $this->tmdb->tvshowDetails($monitor->getImdbId())->poster;
+            $poster = $showTmdbData->poster;
             if (null !== $poster && "" !== $poster) {
                 $monitor->setPoster($poster);
             }

src/Monitor/MonitorTypes.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Monitor;
+
+enum MonitorTypes: string
+{
+    case TV_EPISODE = "tvepisode";
+    case TV_SEASON = "tvseason";
+    case TV_SERIES = "tvseries";
+}

src/Tmdb/TmdbClient.php

@@ -8,6 +8,7 @@ use App\Base\Util\ImdbMatcher;
 use App\Tmdb\Dto\TmdbEpisodeDto;
 use App\Tmdb\Dto\WatchProviderDto;
 use Psr\Cache\CacheItemPoolInterface;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpClient\HttpClient;
@@ -60,6 +61,7 @@ class TmdbClient
         private readonly SerializerInterface $serializer,
         private readonly CacheItemPoolInterface $cache,
         private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly LoggerInterface $logger,
         #[Autowire(env: 'TMDB_API')] string $apiKey,
         #[Autowire(env: 'TMDB_ORIGINAL_LANGUAGE')] ?string $originalLanguage = null,
     ) {
@@ -293,7 +295,12 @@ class TmdbClient
             !in_array($mediaType, [MediaType::Movie->value, MediaType::TvShow->value])) {
             return [];
         }
+        try {
             return $this->repos[$mediaType]->getApi()->getExternalIds($tmdbId);
+        } catch (\Throwable $throwable) {
+            $this->logger->warning("[TmdbClient] Error getting external ids for $tmdbId: " . $throwable->getMessage());
+            return [];
+        }
     }
 
     private function findByImdbId(string $imdbId): array

src/User/Dto/UserPreferencesFactory.php

@@ -8,6 +8,17 @@ use Symfony\Component\Security\Core\User\UserInterface;
 
 class UserPreferencesFactory
 {
+    public static function createFromArray(array $data): UserPreferences
+    {
+        return new UserPreferences(
+            resolution: static::getArrayValue($data, 'resolution'),
+            codec: static::getArrayValue($data, 'codec'),
+            language: static::getArrayValue($data, 'language'),
+            provider: static::getArrayValue($data, 'provider'),
+            quality: static::getArrayValue($data, 'quality'),
+        );
+    }
+
     /** @param User $user */
     public static function createFromUser(UserInterface $user): UserPreferences
     {
@@ -30,4 +41,21 @@ class UserPreferencesFactory
         $value = explode(',', $value);
         return $value;
     }
+
+    private static function getArrayValue(array $data, string $key): array|null
+    {
+        if (!array_key_exists($key, $data)) {
+            return null;
+        }
+
+        if ("" === $data[$key]) {
+            return null;
+        }
+
+        if (true === is_string($data[$key])) {
+            return [$data[$key]];
+        }
+
+        return $data[$key];
+    }
 }