fix: episode id not being added when monitor downloads episode

.env

@@ -38,3 +38,7 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 ###< symfony/messenger ###
 
 REDIS_HOST=redis://redis
+
+###> symfony/mailer ###
+MAILER_DSN=null://null
+###< symfony/mailer ###

assets/controllers/movie_results_controller.js

@@ -51,6 +51,7 @@ export default class extends Controller {
         let selectedCount = 0;
 
         this.options.forEach((option) => {
+            const optionHeader = document.querySelector(`[data-option-id="${option.dataset['localId']}"]`)
             const props = {
                 "resolution": option.querySelector('#resolution').textContent.trim(),
                 "codec": option.querySelector('#codec').textContent.trim(),
@@ -62,6 +63,8 @@ export default class extends Controller {
             let include = true;
             option.classList.add('r-tablerow');
             option.classList.remove('hidden');
+            optionHeader.classList.add('r-tablerow');
+            optionHeader.classList.remove('hidden');
             option.querySelector('input[type="checkbox"]').checked = false;
 
             for (let [key, value] of Object.entries(activeFilter)) {
@@ -88,6 +91,8 @@ export default class extends Controller {
             if (false === include) {
                 option.classList.remove('r-tablerow');
                 option.classList.add('hidden');
+                optionHeader.classList.remove('r-tablerow');
+                optionHeader.classList.add('hidden');
             } else if (true === firstIncluded) {
                 count = 1;
                 selectedCount = selectedCount + 1;

assets/controllers/result_filter_controller.js

@@ -127,6 +127,7 @@ export default class extends Controller {
     }
 
     async filter() {
+        const downloadSeasonSpan = document.querySelector("#downloadSeasonModal");
         const currentSeason = this.activeFilter['season'];
 
         let results = [];
@@ -145,6 +146,7 @@ export default class extends Controller {
         } else if ("tvshows" === this.mediaTypeValue) {
             results = this.tvResultsOutlets;
             this.activeFilter.season = this.seasonTarget.value;
+            downloadSeasonSpan.innerText = this.activeFilter.season;
             await results.forEach((list) => list.filter(this.activeFilter, currentSeason, this.seasonTarget.value));
         }
     }

assets/controllers/tv_results_controller.js

@@ -128,6 +128,7 @@ export default class extends Controller {
         let selectedCount = 0;
 
         this.options.forEach((option) => {
+            const optionHeader = document.querySelector(`[data-option-id="${option.dataset['localId']}"]`)
             const props = {
                 "resolution": option.querySelector('#resolution').textContent.trim(),
                 "codec": option.querySelector('#codec').textContent.trim(),
@@ -138,6 +139,8 @@ export default class extends Controller {
             let include = true;
             option.classList.add('r-tablerow');
             option.classList.remove('hidden');
+            optionHeader.classList.add('r-tablerow');
+            optionHeader.classList.remove('hidden');
             option.querySelector('input[type="checkbox"]').checked = false;
 
             for (let [key, value] of Object.entries(activeFilter)) {
@@ -164,6 +167,8 @@ export default class extends Controller {
             if (false === include) {
                 option.classList.remove('r-tablerow');
                 option.classList.add('hidden');
+                optionHeader.classList.remove('r-tablerow');
+                optionHeader.classList.add('hidden');
             } else if (true === firstIncluded) {
                 count = 1;
                 selectedCount = selectedCount + 1;

assets/styles/app.css

@@ -74,7 +74,7 @@ dialog[data-dialog-target="dialog"][closing] {
 
 @media screen and (min-width: 768px) {
     .r-tablecell {
-        display: inline-table;
+        display: table-cell;
     }
 
     .r-tablerow {

composer.json

@@ -37,6 +37,7 @@
         "symfony/form": "7.3.*",
         "symfony/framework-bundle": "7.3.*",
         "symfony/ldap": "7.3.*",
+        "symfony/mailer": "7.3.*",
         "symfony/mercure-bundle": "^0.3.9",
         "symfony/messenger": "7.3.*",
         "symfony/runtime": "7.3.*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "248d1e534ec6bb56594a7380fb2eb860",
+    "content-hash": "a659d112da02d5ff1bde5081db62de31",
     "packages": [
         {
             "name": "1tomany/rich-bundle",
@@ -1883,6 +1883,73 @@
             ],
             "time": "2024-10-09T13:47:03+00:00"
         },
+        {
+            "name": "egulias/email-validator",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/egulias/EmailValidator.git",
+                "reference": "d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa",
+                "reference": "d42c8731f0624ad6bdc8d3e5e9a4524f68801cfa",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "^2.0 || ^3.0",
+                "php": ">=8.1",
+                "symfony/polyfill-intl-idn": "^1.26"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^10.2",
+                "vimeo/psalm": "^5.12"
+            },
+            "suggest": {
+                "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Egulias\\EmailValidator\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eduardo Gulias Davis"
+                }
+            ],
+            "description": "A library for validating emails against several RFCs",
+            "homepage": "https://github.com/egulias/EmailValidator",
+            "keywords": [
+                "email",
+                "emailvalidation",
+                "emailvalidator",
+                "validation",
+                "validator"
+            ],
+            "support": {
+                "issues": "https://github.com/egulias/EmailValidator/issues",
+                "source": "https://github.com/egulias/EmailValidator/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/egulias",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-03-06T22:45:56+00:00"
+        },
         {
             "name": "gedmo/doctrine-extensions",
             "version": "v3.20.0",
@@ -6487,6 +6554,86 @@
             ],
             "time": "2025-02-20T14:18:10+00:00"
         },
+        {
+            "name": "symfony/mailer",
+            "version": "v7.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/mailer.git",
+                "reference": "b5db5105b290bdbea5ab27b89c69effcf1cb3368"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/b5db5105b290bdbea5ab27b89c69effcf1cb3368",
+                "reference": "b5db5105b290bdbea5ab27b89c69effcf1cb3368",
+                "shasum": ""
+            },
+            "require": {
+                "egulias/email-validator": "^2.1.10|^3|^4",
+                "php": ">=8.2",
+                "psr/event-dispatcher": "^1",
+                "psr/log": "^1|^2|^3",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/mime": "^7.2",
+                "symfony/service-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/http-client-contracts": "<2.5",
+                "symfony/http-kernel": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/mime": "<6.4",
+                "symfony/twig-bridge": "<6.4"
+            },
+            "require-dev": {
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/twig-bridge": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mailer\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Helps sending emails",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/mailer/tree/v7.3.1"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-06-27T19:55:54+00:00"
+        },
         {
             "name": "symfony/mercure",
             "version": "v0.6.5",
@@ -6743,6 +6890,90 @@
             ],
             "time": "2025-05-22T15:02:37+00:00"
         },
+        {
+            "name": "symfony/mime",
+            "version": "v7.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/mime.git",
+                "reference": "0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9",
+                "reference": "0e7b19b2f399c31df0cdbe5d8cbf53f02f6cfcd9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/polyfill-intl-idn": "^1.10",
+                "symfony/polyfill-mbstring": "^1.0"
+            },
+            "conflict": {
+                "egulias/email-validator": "~3.0.0",
+                "phpdocumentor/reflection-docblock": "<3.2.2",
+                "phpdocumentor/type-resolver": "<1.4.0",
+                "symfony/mailer": "<6.4",
+                "symfony/serializer": "<6.4.3|>7.0,<7.0.3"
+            },
+            "require-dev": {
+                "egulias/email-validator": "^2.1.10|^3.1|^4",
+                "league/html-to-markdown": "^5.0",
+                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/property-info": "^6.4|^7.0",
+                "symfony/serializer": "^6.4.3|^7.0.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mime\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Allows manipulating MIME messages",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "mime",
+                "mime-type"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/mime/tree/v7.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-02-19T08:51:26+00:00"
+        },
         {
             "name": "symfony/options-resolver",
             "version": "v7.3.0",
@@ -7044,6 +7275,89 @@
             ],
             "time": "2024-12-21T18:38:29+00:00"
         },
+        {
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.32.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3",
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2",
+                "symfony/polyfill-intl-normalizer": "^1.10"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.32.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-10T14:38:51+00:00"
+        },
         {
             "name": "symfony/polyfill-intl-normalizer",
             "version": "v1.32.0",

config/packages/mailer.yaml

@@ -0,0 +1,7 @@
+framework:
+    mailer:
+        dsn: 'smtp://%env(SMTP_USER)%:%env(SMTP_PASS)%@%env(SMTP_HOST)%:%env(SMTP_PORT)%'
+        envelope:
+            sender: '%env(SMTP_FROM)%'
+        headers:
+            From: '%env(SMTP_FROM_NAME)% <%env(SMTP_FROM)%>'

docs/examples/compose.yml

@@ -1,22 +1,4 @@
 services:
-  caddy:
-    image: caddy:2.9.1
-    restart: unless-stopped
-    cap_add:
-      - NET_ADMIN
-    ports:
-      - "80:80"
-      - "443:443"
-      - "443:443/udp"
-    volumes:
-      - $PWD/../../bash/caddy:/etc/caddy
-      - $PWD/../../bash/certs:/etc/ssl
-  # The "entrypoint" into the application. This reverse proxy
-  # proxies traffic back to their respective services. If not
-  # running behind a reverse proxy inject your SSL certificates
-  # into this container.
-  # This container runs the actual web app in a php:8.4-fpm
-  # base container.
   app:
     image: code.caldwell.digital/home/torsearch-app:latest
     ports:
@@ -48,7 +30,7 @@ services:
       - ./downloads/tvshows:/var/download/tvshows
     environment:
       TZ: America/Chicago
-    command: -vvv
+    command: -vv --time-limit=3600 --limit=10
     env_file:
       - .env
     restart: always
@@ -68,6 +50,7 @@ services:
       - ./downloads/tvshows:/var/download/tvshows
     env_file:
       - .env
+    command: -vv
     environment:
       TZ: America/Chicago
     restart: always

migrations/Version20250708033046.php

@@ -20,12 +20,6 @@ final class Version20250708033046 extends AbstractMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            DROP TABLE sessions
-        SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE download CHANGE created_at created_at DATETIME NOT NULL, CHANGE updated_at updated_at DATETIME NOT NULL
-        SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE monitor ADD only_future TINYINT(1) NOT NULL DEFAULT 1
         SQL);
@@ -34,14 +28,8 @@ final class Version20250708033046 extends AbstractMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql(<<<'SQL'
-            CREATE TABLE sessions (sess_id VARBINARY(128) NOT NULL, sess_data LONGBLOB NOT NULL, sess_lifetime INT UNSIGNED NOT NULL, sess_time INT UNSIGNED NOT NULL, INDEX sess_lifetime_idx (sess_lifetime), PRIMARY KEY(sess_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_bin` ENGINE = InnoDB COMMENT = '' 
-        SQL);
         $this->addSql(<<<'SQL'
             ALTER TABLE monitor DROP only_future
         SQL);
-        $this->addSql(<<<'SQL'
-            ALTER TABLE download CHANGE created_at created_at DATETIME DEFAULT NULL, CHANGE updated_at updated_at DATETIME DEFAULT NULL
-        SQL);
     }
 }

migrations/Version20250709161037.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 Version20250709161037 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 batch_id episode_id 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 download CHANGE episode_id batch_id VARCHAR(255) DEFAULT NULL
+        SQL);
+    }
+}

src/Base/Framework/Controller/IndexController.php

@@ -8,6 +8,8 @@ use App\User\Framework\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Mime\Email;
 use Symfony\Component\Routing\Attribute\Route;
 
 final class IndexController extends AbstractController
@@ -29,4 +31,21 @@ final class IndexController extends AbstractController
             'popular_tvshows' => $this->tmdb->popularTvShows(1, 6),
         ]);
     }
+
+    #[Route('/email')]
+    public function sendEmail(MailerInterface $mailer): Response
+    {
+        $email = (new Email())
+            ->to('brock@caldwell.digital')
+            ->subject('Time for Symfony Mailer!')
+            ->text('Sending emails is fun again!')
+            ->html('<p>See Twig integration for better HTML integration!</p>');
+
+        $mailer->send($email);
+
+        return $this->json([
+            'success' => true,
+            'message' => 'Email sent!'
+        ]);
+    }
 }

src/Base/Service/MediaFiles.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Monitor\Service;
+namespace App\Base\Service;
 
 use Aimeos\Map;
 use App\Download\Framework\Entity\Download;

src/Base/Util/EpisodeId.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Base\Util;
+
+class EpisodeId
+{
+    public static function fromSeasonEpisodeNumbers(int $season, int $episode): string
+    {
+        return "S". str_pad($season, 2, "0", STR_PAD_LEFT) .
+            "E". str_pad($episode, 2, "0", STR_PAD_LEFT);
+    }
+}

src/Download/Action/Handler/DownloadSeasonHandler.php

@@ -3,17 +3,12 @@
 namespace App\Download\Action\Handler;
 
 use Aimeos\Map;
+use App\Base\Service\MediaFiles;
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Download\Action\Command\DownloadSeasonCommand;
 use App\Download\Action\Result\DownloadMediaResult;
 use App\Download\Action\Result\DownloadSeasonResult;
 use App\Download\DownloadOptionEvaluator;
-use App\Download\Framework\Repository\DownloadRepository;
-use App\Download\Downloader\DownloaderInterface;
-use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
-use App\Monitor\Action\Handler\MonitorTvEpisodeHandler;
-use App\Monitor\Framework\Entity\Monitor;
-use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;

src/Download/Downloader/ProcessDownloader.php

@@ -2,8 +2,8 @@
 
 namespace App\Download\Downloader;
 
+use App\Base\Service\MediaFiles;
 use App\Download\Framework\Entity\Download;
-use App\Monitor\Service\MediaFiles;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\Process\Exception\ProcessFailedException;
@@ -15,7 +15,6 @@ class ProcessDownloader implements DownloaderInterface
     /**
      * @var RedisAdapter $cache
      */
-
     public function __construct(
         private EntityManagerInterface $entityManager,
         private MediaFiles $mediaFiles,
@@ -34,11 +33,11 @@ class ProcessDownloader implements DownloaderInterface
         $downloadPreferences = $downloadEntity->getUser()->getDownloadPreferences();
         $path = $this->getDownloadPath($mediaType, $title, $downloadPreferences);
 
-        $processArgs = ['wget', $url];
+        $processArgs = ['wget', '-O', $downloadEntity->getFilename(), $url];
 
         if ($downloadEntity->getStatus() === 'Paused') {
             $downloadEntity->setStatus('In Progress');
-            $processArgs = ['wget', '-c', $url];
+            $processArgs = ['wget', '-c', '-O', $downloadEntity->getFilename(), $url];
         } else {
             $downloadEntity->setProgress(0);
         }

src/Download/Framework/Controller/ApiController.php

@@ -32,13 +32,6 @@ class ApiController extends AbstractController
     public function download(
         DownloadMediaInput $input,
     ): Response {
-        $ptn = (object) new Ptn()->parse($input->filename);
-        if ($input->mediaType === "tvshows" &&
-            !property_exists($ptn, 'episode') && !property_exists($ptn, 'season')
-        ) {
-            $input->filename = $input->episodeId . '_' . $input->filename;
-        }
-
         $download = $this->downloadRepository->insert(
             $this->getUser(),
             $input->url,
@@ -46,10 +39,8 @@ class ApiController extends AbstractController
             $input->filename,
             $input->imdbId,
             $input->mediaType,
-            "",
+            $input->episodeId,
         );
-        $this->downloadRepository->getEntityManager()->persist($download);
-        $this->downloadRepository->getEntityManager()->flush();
         $input->downloadId = $download->getId();
         $input->userId = $this->getUser()->getId();
 

src/Download/Framework/Entity/Download.php

@@ -42,7 +42,7 @@ class Download
     private ?int $progress = null;
 
     #[ORM\Column(length: 255, nullable: true)]
-    private ?string $batchId = null;
+    private ?string $episodeId = null;
 
     #[ORM\ManyToOne(inversedBy: 'downloads')]
     private ?User $user = null;
@@ -143,14 +143,14 @@ class Download
         return $this;
     }
 
-    public function getBatchId(): ?string
+    public function getEpisodeId(): ?string
     {
-        return $this->batchId;
+        return $this->episodeId;
     }
 
-    public function setBatchId(?string $batchId): static
+    public function setEpisodeId(?string $episodeId): static
     {
-        $this->batchId = $batchId;
+        $this->episodeId = $episodeId;
 
         return $this;
     }

src/Download/Framework/Repository/DownloadRepository.php

@@ -7,6 +7,7 @@ use App\Download\Framework\Entity\Download;
 use App\User\Framework\Entity\User;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
+use Nihilarr\PTN;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
@@ -62,9 +63,15 @@ class DownloadRepository extends ServiceEntityRepository
         string $filename,
         string $imdbId,
         string $mediaType,
-        string $batchId,
+        ?string $episodeId = null,
         string $status = 'New'
     ): Download {
+        $ptn = (object) new Ptn()->parse($filename);
+        if ($mediaType === "tvshows" &&
+            !property_exists($ptn, 'episode') && !property_exists($ptn, 'season')
+        ) {
+            $filename = $episodeId . '_' . $filename;
+        }
         /** @var User $user */
         $download = (new Download())
             ->setUser($user)
@@ -73,7 +80,7 @@ class DownloadRepository extends ServiceEntityRepository
             ->setFilename($filename)
             ->setImdbId($imdbId)
             ->setMediaType($mediaType)
-            ->setBatchId($batchId)
+            ->setEpisodeId($episodeId)
             ->setProgress(0)
             ->setStatus($status);
 

src/Monitor/Action/Handler/MonitorMovieHandler.php

@@ -25,7 +25,6 @@ readonly class MonitorMovieHandler implements HandlerInterface
     public function __construct(
         private MonitorRepository $movieMonitorRepository,
         private GetMovieOptionsHandler $getMovieOptionsHandler,
-        private MonitorOptionEvaluator $monitorOptionEvaluator,
         private EntityManagerInterface $entityManager,
         private MessageBusInterface $bus,
         private LoggerInterface $logger,

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -2,8 +2,11 @@
 
 namespace App\Monitor\Action\Handler;
 
+use App\Base\Util\EpisodeId;
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Download\DownloadOptionEvaluator;
+use App\Download\Framework\Entity\Download;
+use App\Download\Framework\Repository\DownloadRepository;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Result\MonitorTvEpisodeResult;
 use App\Monitor\Framework\Repository\MonitorRepository;
@@ -31,6 +34,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
         private LoggerInterface $logger,
         private MonitorRepository $monitorRepository,
         private Tmdb $tmdb,
+        private DownloadRepository $downloadRepository,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
@@ -69,13 +73,23 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
 
             if (null !== $result) {
                 $this->logger->info('> [MonitorTvEpisodeHandler] ...Found 1 matching result found: dispatching DownloadMediaCommand for "' . $result->title . '"');
+                $download = $this->downloadRepository->insert(
+                    user: $monitor->getUser(),
+                    url: $result->url,
+                    title: $monitor->getTitle(),
+                    filename: $result->filename,
+                    imdbId: $monitor->getImdbId(),
+                    mediaType: 'tvshows',
+                    episodeId: EpisodeId::fromSeasonEpisodeNumbers($monitor->getSeason(), $monitor->getEpisode()),
+                );
                 $this->bus->dispatch(new DownloadMediaCommand(
-                    $result->url,
-                    $monitor->getTitle(),
-                    $result->filename,
+                    $download->getUrl(),
+                    $download->getTitle(),
+                    $download->getFilename(),
                     'tvshows',
-                    $monitor->getImdbId(),
+                    $download->getImdbId(),
                     $monitor->getUser()->getId(),
+                    $download->getId(),
                 ));
                 $monitor->setStatus('Complete');
                 $monitor->setDownloadedAt(new DateTimeImmutable());

src/Monitor/Action/Handler/MonitorTvSeasonHandler.php

@@ -3,12 +3,12 @@
 namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
+use App\Base\Service\MediaFiles;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
 use App\Monitor\Action\Command\MonitorTvSeasonCommand;
 use App\Monitor\Action\Result\MonitorTvSeasonResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -3,12 +3,12 @@
 namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
+use App\Base\Service\MediaFiles;
 use App\Monitor\Action\Command\MonitorMovieCommand;
 use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
 use App\Monitor\Action\Result\MonitorTvShowResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
-use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use Carbon\Carbon;
 use DateTimeImmutable;

src/Monitor/Service/MonitorOptionEvaluator.php

@@ -1,95 +0,0 @@
-<?php
-
-namespace App\Monitor\Service;
-
-use Aimeos\Map;
-use App\Monitor\Framework\Entity\Monitor;
-use App\Torrentio\Result\TorrentioResult;
-
-class MonitorOptionEvaluator
-{
-    /**
-     * @param Monitor $monitor
-     * @param TorrentioResult[] $results
-     * @return TorrentioResult|null
-     * @throws \Throwable
-     */
-    public function evaluateOptions(Monitor $monitor, array $results): ?TorrentioResult
-    {
-        $sizeLow = 000;
-        $sizeHigh = 4096;
-
-        $bestMatches = [];
-        $matches = [];
-
-        $userPreferences = $monitor->getUser()->getUserPreferenceValues();
-
-        foreach ($results as $result) {
-            if (!in_array($userPreferences['language'], $result->languages)) {
-                continue;
-            }
-
-            if ($result->resolution === $userPreferences['resolution']
-                && $result->codec === $userPreferences['codec']
-            ) {
-                $bestMatches[] = $result;
-            }
-
-            if ($userPreferences['resolution'] === '2160p'
-                && $userPreferences['codec'] === $result->codec
-                && $result->resolution === '1080p'
-            ) {
-                $matches[] = $result;
-            }
-
-            if ($userPreferences['codec'] === 'h264'
-                && $userPreferences['resolution'] === $result->resolution
-                && $result->codec === 'h265'
-            ) {
-                $matches[] = $result;
-            }
-
-            if (($userPreferences['codec'] === null )
-                && ($userPreferences['resolution'] === null )) {
-                $matches[] = $result;
-            }
-        }
-
-        $sizeMatches = [];
-
-        foreach ($bestMatches as $result) {
-            if (str_contains($result->size, 'GB')) {
-                $size = (int) trim(str_replace('GB', '', $result->size)) * 1024;
-            } else {
-                $size = (int) trim(str_replace('MB', '', $result->size));
-            }
-
-            if ($size > $sizeLow && $size < $sizeHigh) {
-                $sizeMatches[] = $result;
-            }
-        }
-
-        if (!empty($sizeMatches)) {
-            return Map::from($sizeMatches)->usort(fn($a, $b) => $a->seeders <=> $b->seeders)->last();
-        }
-
-        foreach ($matches as $result) {
-            $size = 0;
-            if (str_contains($result->size, 'GB')) {
-                $size = (int) trim(str_replace('GB', '', $result->size)) * 1024;
-            } else {
-                $size = (int) trim(str_replace('MB', '', $result->size));
-            }
-
-            if ($size > $sizeLow && $size < $sizeHigh) {
-                $sizeMatches[] = $result;
-            }
-        }
-
-        if (!empty($sizeMatches)) {
-            return Map::from($sizeMatches)->usort(fn($a, $b) => $a->seeders <=> $b->seeders)->last();
-        }
-
-        return null;
-    }
-}

src/Search/Action/Handler/GetMediaInfoHandler.php

@@ -2,6 +2,7 @@
 
 namespace App\Search\Action\Handler;
 
+use App\Base\Service\MediaFiles;
 use App\Search\Action\Command\GetMediaInfoCommand;
 use App\Search\Action\Result\GetMediaInfoResult;
 use App\Tmdb\Tmdb;
@@ -14,12 +15,19 @@ class GetMediaInfoHandler implements HandlerInterface
 {
     public function __construct(
         private readonly Tmdb $tmdb,
+        private readonly MediaFiles $mediaFiles
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
         $media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
 
+        if ("tvshows" === $command->mediaType) {
+            foreach ($media->episodes[$command->season] as $key => $episode) {
+                $media->episodes[$command->season][$key]['file'] = $this->mediaFiles->episodeExists($media->title, $command->season, $episode['episode_number']);
+            }
+        }
+
         return new GetMediaInfoResult($media, $command->season);
     }
 }

src/Torrentio/Action/Handler/GetMovieOptionsHandler.php

@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Action\Handler;
 
-use App\Monitor\Service\MediaFiles;
+use App\Base\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Result\GetMovieOptionsResult;
 use App\Torrentio\Client\Torrentio;

src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php

@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Action\Handler;
 
-use App\Monitor\Service\MediaFiles;
+use App\Base\Service\MediaFiles;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;

src/Torrentio/Result/ResultFactory.php

@@ -21,7 +21,6 @@ class ResultFactory
         string $bingeGroup = "-"
     ) {
         $ptn = (object) (new PTN())->parse($title);
-//        dump($ptn);
         return new TorrentioResult(
             self::trimTitle($title),
             urldecode($url),
@@ -40,7 +39,8 @@ class ResultFactory
             $ptn->episode ?? "-",
             self::setLanguages($title),
             self::setLanguageFlags($title),
-            false
+            false,
+            uniqid()
         );
     }
 

src/Torrentio/Result/TorrentioResult.php

@@ -23,5 +23,6 @@ class TorrentioResult
         public ?array $languages = [],
         public ?string $languageFlags = "-",
         public ?bool $selected = false,
+        public ?string $localId = "-"
     ) {}
 }

src/Twig/Extensions/UtilExtension.php

@@ -2,12 +2,9 @@
 
 namespace App\Twig\Extensions;
 
-use App\Monitor\Framework\Entity\Monitor;
-use App\Monitor\Service\MediaFiles;
+use App\Base\Service\MediaFiles;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
-use App\Torrentio\Result\TorrentioResult;
 use ChrisUllyott\FileSize;
-use Tmdb\Model\Tv\Episode;
 use Twig\Attribute\AsTwigFilter;
 use Twig\Attribute\AsTwigFunction;
 

src/User/Framework/Entity/User.php

@@ -99,7 +99,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
      */
     public function getUserIdentifier(): string
     {
-        return (string) $this->username ?? $this->email;
+        return (string) $this->email;
     }
 
     /**

symfony.lock

@@ -157,6 +157,18 @@
             "src/Kernel.php"
         ]
     },
+    "symfony/mailer": {
+        "version": "7.3",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "4.3",
+            "ref": "09051cfde49476e3c12cd3a0e44289ace1c75a4f"
+        },
+        "files": [
+            "config/packages/mailer.yaml"
+        ]
+    },
     "symfony/maker-bundle": {
         "version": "1.62",
         "recipe": {

tailwind.config.js

@@ -32,7 +32,8 @@ module.exports = {
       "truncate",
       "text-wrap",
       "rounded-sm",
-      "rounded-md"
+      "rounded-md",
+      "r-tablecell",
   ],
   theme: {
       extend: {

templates/components/DownloadList.html.twig

@@ -1,4 +1,4 @@
-<div{{ attributes.defaults(stimulus_controller('download_list')) }} class="min-w-48" >
+<div{{ attributes.defaults(stimulus_controller('download_list')) }} class="min-w-48 overflow-scroll" >
     {% set table_body_id = (type == "complete") ? "complete_downloads" : "active_downloads" %}
 
     {% if this.isWidget == false %}

templates/components/DownloadListRow.html.twig

@@ -6,8 +6,8 @@
             {{ download.title }}
         </a>
 
-        {% if download.mediaType == "tvshows" %}
-            &mdash; <span class="ml-1">(S{{ download.ptn.season }}E{{ download.ptn.episode }})</span>
+        {% if download.mediaType == "tvshows" and download.episodeId != null %}
+            &mdash; <span class="ml-1">(S{{ download.episodeId }})</span>
         {% endif %}
     </td>
 
@@ -25,7 +25,7 @@
                 <div class="text-black text-center rounded-sm text-bold bg-green-300 h-5 relative z-10"
                      style="width:{{ download.progress }}%">
                 </div>
-                <div class="absolute text-black text-center" style="z-index: 400;margin-top: -1.25rem; margin-left: 1.2rem">{{ download.progress }}%</div>
+                <div class="text-black text-center" style="z-index: 400;margin-top: -1.25rem; margin-left: 1.2rem">{{ download.progress }}%</div>
             </div>
         {% else %}
             <twig:StatusBadge color="green" status="Complete" />

templates/components/Filter.html.twig

@@ -99,7 +99,7 @@
                 <a href="{{ path('app_user_preferences') }}" class="text-underline">preferences</a> to choose
                 the appropriate file(s).
                 <br /><br />
-                Do you wish to download <strong>season {{ results.season }}</strong> of "<strong>{{ results.media.title }}</strong>"?
+                Do you wish to download <strong>season <span id="downloadSeasonModal">{{ results.season }}</span></strong> of "<strong>{{ results.media.title }}</strong>"?
             </twig:Modal>
 
             <button class="px-1.5 py-1 bg-green-600 hover:bg-green-700 rounded-ms text-sm font-semibold"

templates/components/MonitorList.html.twig

@@ -1,4 +1,4 @@
-<div{{ attributes.defaults(stimulus_controller('monitor_list')) }}>
+<div{{ attributes.defaults(stimulus_controller('monitor_list')) }} class="overflow-scroll">
     {% if this.isWidget == false %}
         <div class="flex flex-row mb-2 justify-end">
             <twig:DownloadSearch search_path="app_search" placeholder="Find {{ type == "complete" ? "a" : "an" }} {{ type }} monitor..." />

templates/components/TvEpisodeList.html.twig

@@ -39,6 +39,31 @@
                                 <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-gray-700 rounded-lg font-normal text-white" title="Air date {{ episode['name'] }}">
                                     {{ episode['air_date']|date(null, 'UTC') }}
                                 </small>
+
+                                {% if episode['file'] != false %}
+                                    <span data-controller="popover">
+                                        <template data-popover-target="content">
+                                            <div data-popover-target="card" class="absolute z-40 p-1 bg-stone-400 p-1 text-black rounded-md m-1 animate-fade">
+                                                <p class="font-bold text-sm text-left">Existing file(s) for this episode:</p>
+                                                <ul class="list-disc ml-3">
+                                                    <li class="font-normal">{{ episode['file'].realPath|strip_media_path }} &mdash; <strong>{{ episode['file'].size|filesize }}</strong></li>
+                                                </ul>
+                                            </div>
+                                        </template>
+                                        <small
+                                                class="py-1 px-1.5 mr-1 grow-0 font-bold bg-blue-600 rounded-lg text-center text-white"
+                                                data-action="mouseenter->popover#show mouseleave->popover#hide"
+                                        >
+                                            exists
+                                        </small>
+                                    </span>
+                                {% endif %}
+
+                                {% if episode['file'] == false %}
+                                    <small class="py-1 px-1.5 mr-1 grow-0 font-bold bg-rose-600 rounded-lg text-white" title="Episode has not been downloaded yet.">
+                                        missing
+                                    </small>
+                                {% endif %}
                             </div>
                         </div>
                         <div class="flex flex-col gap-4 justify-between">

templates/torrentio/movies.html.twig

@@ -2,7 +2,7 @@
     {% if results.file != false %}
     <div class="p-3 bg-stone-400 p-1 text-black rounded-md m-1 animate-fade">
         <p class="font-bold text-sm text-left">Existing file(s) for this movie:</p>
-        <ul class="list-disc ml-3">
+        <ul class="list-disc ml-3 overflow-scroll">
             <li class="font-normal">{{ results.file.realPath|strip_media_path }} &mdash; <strong>{{ results.file.size|filesize }}</strong></li>
         </ul>
     </div>

templates/torrentio/partial/option-table.html.twig

@@ -3,7 +3,7 @@
 >
     <thead class="text-xs text-gray-700 uppercase dark:text-gray-400">
     {% for result in results.results %}
-    <tr class="dark:bg-stone-600 overflow-hidden flex flex-col md:flex-col flex-no wrap md:table-row border-b border-gray-500">
+    <tr data-option-id="{{ result.localId }}" class="dark:bg-stone-600 overflow-hidden flex flex-col md:flex-col flex-no wrap md:table-row border-b border-gray-500">
         <th scope="col"
             class="px-4 py-4 leading-[20px] font-medium text-gray-900 whitespace-nowrap dark:text-white">
             Size
@@ -41,7 +41,7 @@
     </thead>
     <tbody class="flex-1 sm:flex-none">
     {% for result in results.results %}
-        <tr class="bg-white dark:bg-slate-700 flex flex-col flex-no wrap r-tablerow border-b border-gray-500" data-provider="{{ result.provider }}" data-quality="{{ result.quality }}" data-languages="{{ result.languages|json_encode }}" {% if "tvshows" == results.media.mediaType %} data-season="{{ results.season }}"{% endif %}>
+        <tr class="bg-white dark:bg-slate-700 flex flex-col flex-no wrap r-tablerow border-b border-gray-500" data-local-id="{{ result.localId }}" data-provider="{{ result.provider }}" data-quality="{{ result.quality }}" data-languages="{{ result.languages|json_encode }}" {% if "tvshows" == results.media.mediaType %} data-season="{{ results.season }}"{% endif %}>
             <td id="size" class="px-4 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-gray-50">
                 {{ result.size }}
             </td>