fix: deep links from monitors

.gitignore

@@ -18,3 +18,4 @@ bolt.db
 ###> phpstan/phpstan ###
 phpstan.neon
 ###< phpstan/phpstan ###
+.php-cs-fixer.cache

assets/bootstrap.js

@@ -2,6 +2,7 @@ import { startStimulusApp } from '@symfony/stimulus-bundle';
 import Popover from '@stimulus-components/popover'
 import Dialog from '@stimulus-components/dialog'
 import Dropdown from '@stimulus-components/dropdown'
+import 'animate.css'
 
 const app = startStimulusApp();
 // register any custom, 3rd party controllers here

assets/controllers/download_list_controller.js

@@ -7,7 +7,7 @@ import { getComponent } from '@symfony/ux-live-component';
 
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
-    static targets = ['download']
+    static targets = ['download', 'deleteFileInput']
 
     async initialize() {
         this.component = await getComponent(this.element);
@@ -42,7 +42,8 @@ export default class extends Controller {
     }
 
     deleteDownload(data) {
-        fetch(`/api/download/${data.params.id}`, {method: 'DELETE'})
+        const deleteFileInput = document.querySelector(`#delete_file_${data.params.id}`)
+        fetch(`/api/download/${data.params.id}?deleteFile=${deleteFileInput.checked}`, {method: 'DELETE'})
             .then(res => res.json())
             .then(json => console.debug(json));
     }

assets/controllers/tv_episode_list_controller.js

@@ -14,6 +14,11 @@ export default class extends Controller {
         this.component.on('render:finished', (component) => {
             console.log(component);
         });
+        if (window.location.hash) {
+            let targetElement = document.querySelector(window.location.hash);
+            targetElement.scrollIntoView({ behavior: 'smooth', block: 'start' });
+            targetElement.classList.add('animate__animated', 'animate__pulse', 'animate__faster');
+        }
     }
 
     setSeason(season) {
@@ -25,6 +30,7 @@ export default class extends Controller {
 
     paginate(event) {
         this.element.querySelectorAll(".episode-container").forEach(element => element.remove());
+        this.component.set('episodeNumber', null);
         this.component.action('paginate', {page: event.params.page});
         this.component.render();
     }

config/packages/pwa.yaml

@@ -10,9 +10,9 @@ pwa:
     theme_color: "#083344"
     description: Torsearch provides a simple and intuitive way to manage your personal media library.
     icons:
-      - src: "icon.png"
+      - src: "/icon.png"
         sizes: [ 192 ]
-      - src: "icon.png"
+      - src: "/icon.png"
         sizes: [ 192 ]
         purpose: maskable
     categories:

src/Base/Service/MediaFiles.php

@@ -5,6 +5,7 @@ namespace App\Base\Service;
 use Aimeos\Map;
 use App\Download\Framework\Entity\Download;
 use Nihilarr\PTN;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
@@ -21,6 +22,7 @@ class MediaFiles
     private string $tvShowsPath;
 
     private Filesystem $filesystem;
+    private LoggerInterface $logger;
 
     public function __construct(
         #[Autowire(param: 'media.base_path')]
@@ -33,12 +35,14 @@ class MediaFiles
         string $tvShowsPath,
 
         Filesystem $filesystem,
+        LoggerInterface $logger,
     ) {
         $this->finder = new Finder();
         $this->basePath = $basePath;
         $this->moviesPath = $moviesPath;
         $this->tvShowsPath = $tvShowsPath;
         $this->filesystem = $filesystem;
+        $this->logger = $logger;
     }
 
     public function getPathByType(string $mediaType): string
@@ -220,4 +224,26 @@ class MediaFiles
     {
         $this->filesystem->chmod($filepath, $permissions);
     }
+
+    /**
+     * @param string $filepath
+     * @return bool
+     * Returns true if file was deleted
+     * Returns false is file not found or was not deleted
+     */
+    public function removeFile(string $filepath): bool
+    {
+        if (true === $this->filesystem->exists($filepath)) {
+            try {
+                $this->filesystem->remove($filepath);
+                return true;
+            } catch (\Throwable $exception) {
+                $this->logger->error($exception->getMessage(), ['file' => $filepath]);
+                return false;
+            }
+        }
+
+        $this->logger->warning('> [MediaFiles] Attempted to remove file, but it did not exist.', ['file' => $filepath]);
+        return false;
+    }
 }

src/Download/Action/Command/DeleteDownloadCommand.php

@@ -11,5 +11,6 @@ class DeleteDownloadCommand implements CommandInterface
 {
     public function __construct(
         public int $downloadId,
+        public bool $deleteFile = false,
     ) {}
 }

src/Download/Action/Handler/DeleteDownloadHandler.php

@@ -5,6 +5,8 @@ namespace App\Download\Action\Handler;
 use App\Download\Action\Command\DeleteDownloadCommand;
 use App\Download\Action\Result\DeleteDownloadResult;
 use App\Download\Framework\Repository\DownloadRepository;
+use App\Library\Action\Command\DeleteMediaFileCommand;
+use App\Library\Action\Handler\DeleteMediaFileHandler;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\HandlerInterface;
 use OneToMany\RichBundle\Contract\ResultInterface;
@@ -14,13 +16,26 @@ readonly class DeleteDownloadHandler implements HandlerInterface
 {
     public function __construct(
         private DownloadRepository $downloadRepository,
+        private DeleteMediaFileHandler $deleteMediaFileHandler,
     ) {}
 
     public function handle(CommandInterface $command): ResultInterface
     {
         $download = $this->downloadRepository->find($command->downloadId);
+
+        if (true === $command->deleteFile) {
+            $deletedFileResult = $this->deleteMediaFileHandler->handle(new DeleteMediaFileCommand(
+                filename: $download->getFilename(),
+                downloadId: $command->downloadId
+            ));
+        }
         $this->downloadRepository->delete($command->downloadId);
 
-        return new DeleteDownloadResult(200, 'Success', $download);
+        return new DeleteDownloadResult(
+            status: 200,
+            message: 'Success',
+            download: $download,
+            deleteMediaFileResult: $deletedFileResult ?? null
+        );
     }
 }

src/Download/Action/Input/DeleteDownloadInput.php

@@ -3,6 +3,7 @@
 namespace App\Download\Action\Input;
 
 use App\Download\Action\Command\DeleteDownloadCommand;
+use OneToMany\RichBundle\Attribute\SourceQuery;
 use OneToMany\RichBundle\Attribute\SourceRoute;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\InputInterface;
@@ -13,12 +14,15 @@ class DeleteDownloadInput implements InputInterface
     public function __construct(
         #[SourceRoute('downloadId')]
         public int $downloadId,
+        #[SourceQuery('deleteFile')]
+        public bool $deleteFile = false,
     ) {}
 
     public function toCommand(): CommandInterface
     {
         return new DeleteDownloadCommand(
             $this->downloadId,
+            $this->deleteFile,
         );
     }
 }

src/Download/Action/Result/DeleteDownloadResult.php

@@ -12,5 +12,6 @@ class DeleteDownloadResult implements ResultInterface
         public int $status,
         public string $message,
         public Download $download,
+        public ?DeleteMediaFileResult $deleteMediaFileResult = null,
     ) {}
 }

src/Download/Action/Result/DeleteMediaFileResult.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Download\Action\Result;
+
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+class DeleteMediaFileResult implements ResultInterface
+{
+    public function __construct(
+        public string $message,
+        public string $filepath,
+        public bool $isDeleted,
+    ) {}
+}

src/Download/Framework/Controller/ApiController.php

@@ -66,7 +66,7 @@ class ApiController extends AbstractController
             message: "{$result->download->getTitle()} has been deleted.",
         );
 
-        return $this->json(['status' => 200, 'message' => 'Download Deleted']);
+        return $this->json($result);
     }
 
     #[Route('/api/download/{downloadId}/pause', name: 'api_download_pause', methods: ['PATCH'])]

src/Download/Framework/Entity/Download.php

@@ -7,6 +7,7 @@ use App\User\Framework\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Timestampable\Traits\TimestampableEntity;
 use Nihilarr\PTN;
+use Symfony\Component\Serializer\Attribute\Ignore;
 use Symfony\UX\Turbo\Attribute\Broadcast;
 
 #[ORM\Entity(repositoryClass: DownloadRepository::class)]
@@ -44,6 +45,7 @@ class Download
     #[ORM\Column(length: 255, nullable: true)]
     private ?string $episodeId = null;
 
+    #[Ignore]
     #[ORM\ManyToOne(inversedBy: 'downloads')]
     private ?User $user = null;
 

src/Library/Action/Command/DeleteMediaFileCommand.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Library\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+
+/**
+ * @implements CommandInterface<DeleteMediaFileCommand>
+ */
+class DeleteMediaFileCommand implements CommandInterface
+{
+    public function __construct(
+        public string $filename,
+        public ?int $downloadId = null,
+    ) {}
+}

src/Library/Action/Handler/DeleteMediaFileHandler.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Library\Action\Handler;
+
+use App\Base\Service\MediaFiles;
+use App\Download\Action\Result\DeleteMediaFileResult;
+use App\Download\Framework\Entity\Download;
+use App\Download\Framework\Repository\DownloadRepository;
+use App\Library\Action\Command\DeleteMediaFileCommand;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/**
+ * @implements HandlerInterface<DeleteMediaFileCommand,DeleteMediaFileResult>
+ */
+class DeleteMediaFileHandler implements HandlerInterface
+{
+    public function __construct(
+        private readonly DownloadRepository $downloadRepository,
+        private readonly MediaFiles $mediaFiles,
+    ) {}
+
+    public function handle(CommandInterface $command): ResultInterface
+    {
+        /** @var Download $downloadRecord */
+        $downloadRecord = $this->downloadRepository->find($command->downloadId);
+        $filepath = $this->getFullFilepath($downloadRecord);
+        $result = $this->mediaFiles->removeFile($filepath);
+
+        return new DeleteMediaFileResult(
+            message: true === $result ? 'File removed' : 'File not removed',
+            filepath: $filepath,
+            isDeleted: $result
+        );
+    }
+
+    private function getFullFilepath(Download $download): string
+    {
+        return $this->mediaFiles->getPathByType($download->getMediaType()) . DIRECTORY_SEPARATOR . $download->getFilename();
+    }
+}

src/Library/Action/Input/DeleteMediaFileInput.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Library\Action\Input;
+
+use App\Library\Action\Command\DeleteMediaFileCommand;
+use OneToMany\RichBundle\Attribute\SourceRequest;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\InputInterface;
+
+/**
+ * @implements InputInterface<DeleteMediaFileInput,DeleteMediaFileCommand>
+ */
+class DeleteMediaFileInput implements InputInterface
+{
+    public function __construct(
+        #[SourceRequest('filename')]
+        public string $filename,
+        #[SourceRequest('downloadId', nullify: true)]
+        public ?int $downloadId = null,
+    ) {}
+
+    public function toCommand(): CommandInterface
+    {
+        return new DeleteMediaFileCommand(
+            $this->filename,
+            $this->downloadId,
+        );
+    }
+}

src/Library/Action/Result/DeleteMediaFileResult.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Library\Action\Result;
+
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/**
+ * @implements ResultInterface
+ */
+class DeleteMediaFileResult implements ResultInterface
+{
+    public function __construct(
+        public string $status,
+    ) {}
+}

src/Library/Dto/MediaFileDto.php

@@ -11,9 +11,9 @@ readonly class MediaFileDto
         public string $size,
     ) {}
 
-    public static function fromSplFileInfo(\SplFileInfo $fileInfo): self
+    public static function fromSplFileInfo(\SplFileInfo|false $fileInfo): self|false
     {
-        return new static(
+        return false === $fileInfo ? false : new static(
             path: $fileInfo->getRealPath(),
             filename: $fileInfo->getFilename(),
             extension: $fileInfo->getExtension(),

src/Search/Action/Command/GetMediaInfoCommand.php

@@ -11,5 +11,6 @@ class GetMediaInfoCommand implements CommandInterface
         public string $imdbId,
         public string $mediaType,
         public ?int $season = null,
+        public ?int $episode = null,
     ) {}
 }

src/Search/Action/Handler/GetMediaInfoHandler.php

@@ -20,6 +20,6 @@ class GetMediaInfoHandler implements HandlerInterface
     {
         $media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
 
-        return new GetMediaInfoResult($media, $command->season);
+        return new GetMediaInfoResult($media, $command->season, $command->episode);
     }
 }

src/Search/Action/Input/GetMediaInfoInput.php

@@ -19,6 +19,9 @@ class GetMediaInfoInput implements InputInterface
 
         #[SourceRoute('season', nullify: true)]
         public ?int $season,
+
+        #[SourceRoute('episode', nullify: true)]
+        public ?int $episode,
     ) {}
 
     public function toCommand(): CommandInterface
@@ -26,6 +29,10 @@ class GetMediaInfoInput implements InputInterface
         if ("tvshows" === $this->mediaType  && null === $this->season) {
             $this->season = 1;
         }
-        return new GetMediaInfoCommand($this->imdbId, $this->mediaType, $this->season);
+
+        if ("tvshows" === $this->mediaType && null === $this->episode) {
+            $this->episode = 1;
+        }
+        return new GetMediaInfoCommand($this->imdbId, $this->mediaType, $this->season, $this->episode);
     }
 }

src/Search/Action/Result/GetMediaInfoResult.php

@@ -11,5 +11,6 @@ class GetMediaInfoResult implements ResultInterface
     public function __construct(
         public TmdbResult $media,
         public ?int $season,
+        public ?int $episode,
     ) {}
 }

src/Search/Framework/Controller/WebController.php

@@ -33,7 +33,7 @@ final class WebController extends AbstractController
         ]);
     }
 
-    #[Route('/result/{mediaType}/{imdbId}/{season}', name: 'app_search_result')]
+    #[Route('/result/{mediaType}/{imdbId}/{season}/{episode?}', name: 'app_search_result')]
     public function result(
         GetMediaInfoInput $input,
         ?int $season = null,

src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php

@@ -3,6 +3,7 @@
 namespace App\Torrentio\Action\Handler;
 
 use App\Base\Service\MediaFiles;
+use App\Library\Dto\MediaFileDto;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
@@ -28,7 +29,7 @@ class GetTvShowOptionsHandler implements HandlerInterface
 
         return new GetTvShowOptionsResult(
             media: $media,
-            file: $file,
+            file: MediaFileDto::fromSplFileInfo($file),
             season: $command->season,
             episode: $command->episode,
             results: $this->torrentio->fetchEpisodeResults(

src/Torrentio/Action/Result/GetTvShowOptionsResult.php

@@ -2,15 +2,15 @@
 
 namespace App\Torrentio\Action\Result;
 
+use App\Library\Dto\MediaFileDto;
 use App\Tmdb\TmdbResult;
 use OneToMany\RichBundle\Contract\ResultInterface;
-use Symfony\Component\Finder\SplFileInfo;
 
 class GetTvShowOptionsResult implements ResultInterface
 {
     public function __construct(
         public TmdbResult $media,
-        public bool|SplFileInfo $file,
+        public MediaFileDto|false $file,
         public string $season,
         public string $episode,
         public array $results

src/Torrentio/Framework/Controller/WebController.php

@@ -13,6 +13,7 @@ use OneToMany\RichBundle\Contract\ResultInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Attribute\Cache;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
@@ -26,6 +27,7 @@ final class WebController extends AbstractController
         private readonly Broadcaster $broadcaster,
     ) {}
 
+    #[Cache(expires: 3600, public: false, mustRevalidate: true)]
     #[Route('/torrentio/movies/{tmdbId}/{imdbId}', name: 'app_torrentio_movies')]
     public function movieOptions(GetMovieOptionsInput $input, CacheInterface $cache, Request $request): Response
     {
@@ -35,9 +37,10 @@ final class WebController extends AbstractController
             $input->imdbId
         );
 
-        return $cache->get($cacheId, function (ItemInterface $item) use ($input, $request) {
+        $results =  $cache->get($cacheId, function (ItemInterface $item) use ($input, $request) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $results = $this->getMovieOptionsHandler->handle($input->toCommand());
+            return $this->getMovieOptionsHandler->handle($input->toCommand());
+        });
 
         if ($request->headers->get('Turbo-Frame')) {
             return $this->sendFragmentResponse($results, $request);
@@ -46,7 +49,6 @@ final class WebController extends AbstractController
         return $this->render('torrentio/movies.html.twig', [
             'results' => $results,
         ]);
-        });
     }
 
     #[Route('/torrentio/tvshows/{tmdbId}/{imdbId}/{season?}/{episode?}', name: 'app_torrentio_tvshows')]
@@ -61,9 +63,10 @@ final class WebController extends AbstractController
         );
 
         try {
-            return $cache->get($cacheId, function (ItemInterface $item) use ($input, $request) {
+            $results = $cache->get($cacheId, function (ItemInterface $item) use ($input) {
                 $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-                $results = $this->getTvShowOptionsHandler->handle($input->toCommand());
+                return $this->getTvShowOptionsHandler->handle($input->toCommand());
+            });
 
             if ($request->headers->get('Turbo-Frame')) {
                 return $this->sendFragmentResponse($results, $request);
@@ -72,7 +75,6 @@ final class WebController extends AbstractController
             return $this->render('torrentio/tvshows.html.twig', [
                 'results' => $results,
             ]);
-            });
         } catch (TorrentioRateLimitException $exception) {
             $this->broadcaster->alert('Warning', 'Torrentio has rate limited your requests. Please wait a few minutes before trying again.', 'warning');
             return $this->render('bare.html.twig',

src/Twig/Components/TvEpisodeList.php

@@ -6,6 +6,8 @@ use App\Search\Action\Command\GetMediaInfoCommand;
 use App\Search\Action\Handler\GetMediaInfoHandler;
 use App\Search\TvEpisodePaginator;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
+use Symfony\UX\LiveComponent\Attribute\LiveAction;
+use Symfony\UX\LiveComponent\Attribute\LiveArg;
 use Symfony\UX\LiveComponent\Attribute\LiveProp;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
 
@@ -27,6 +29,12 @@ final class TvEpisodeList
     #[LiveProp(writable: true)]
     public int $season = 1;
 
+    #[LiveProp(writable: true)]
+    public int $reloadCount = 0;
+
+    #[LiveProp(writable: true)]
+    public ?int $episodeNumber = null;
+
     public function __construct(
         private GetMediaInfoHandler $getMediaInfoHandler,
     ) {}
@@ -34,6 +42,14 @@ final class TvEpisodeList
     public function getEpisodes()
     {
         $results = $this->getMediaInfoHandler->handle(new GetMediaInfoCommand($this->imdbId, "tvshows", $this->season));
+
+        if (null !== $this->episodeNumber) {
+            $this->pageNumber = ceil($this->episodeNumber / $this->perPage);
+            $this->episodeNumber = null;
+        }
+
+        $this->reloadCount++;
+
         return new TvEpisodePaginator()->paginate($results, $this->pageNumber, $this->perPage);
     }
 

src/Twig/Dto/EpisodeIdDto.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Twig\Dto;
+
+class EpisodeIdDto
+{
+    public function __construct(
+        public string $season,
+        public string $episode,
+    ) {}
+
+    public function asEpisodeId(): string
+    {
+        return "S". str_pad($this->season, 2, "0", STR_PAD_LEFT) .
+        "E". str_pad($this->episode, 2, "0", STR_PAD_LEFT);
+    }
+
+    public function __toString(): string
+    {
+        if ("" !== $this->season && "" !== $this->episode) {
+            return $this->asEpisodeId();
+        }
+        return "";
+    }
+}

src/Twig/Extensions/UtilExtension.php

@@ -4,6 +4,7 @@ namespace App\Twig\Extensions;
 
 use App\Base\Service\MediaFiles;
 use App\Torrentio\Action\Result\GetTvShowOptionsResult;
+use App\Twig\Dto\EpisodeIdDto;
 use ChrisUllyott\FileSize;
 use Twig\Attribute\AsTwigFilter;
 use Twig\Attribute\AsTwigFunction;
@@ -63,4 +64,42 @@ class UtilExtension
         return "S". str_pad($season, 2, "0", STR_PAD_LEFT) .
             "E". str_pad($episode, 2, "0", STR_PAD_LEFT);
     }
+
+    #[AsTwigFunction('episode_anchor')]
+    public function episodeAnchor($season, $episode): ?string
+    {
+        return "episode_" . $season . "_" . $episode;
+    }
+
+    #[AsTwigFunction('extract_from_episode_id')]
+    public function extractFromEpisodeId(?string $episodeId): ?EpisodeIdDto
+    {
+        if (null === $episodeId) {
+            return new EpisodeIdDto("", "");
+        }
+
+        // Capture season
+        $seasonMatch = [];
+        preg_match('/[sS]\d\d/', $episodeId, $seasonMatch);
+        if (empty($seasonMatch)) {
+            $season = "";
+        } else {
+            $season = str_replace(['S', 's'], '', $seasonMatch[0]);
+        }
+
+        // Capture episode
+        $episodeMatch = [];
+        preg_match('/[eE]\d\d/', $episodeId, $episodeMatch);
+        if (empty($episodeMatch)) {
+            $episode = "";
+        } else {
+            $episode = str_replace(['E', 'e'], '', $episodeMatch[0]);
+        }
+
+        if (null === $season && null === $episode) {
+            return new EpisodeIdDto("", "");
+        }
+
+        return new EpisodeIdDto($season, $episode);
+    }
 }

templates/components/DownloadListRow.html.twig

@@ -1,8 +1,15 @@
 <tr{{ attributes }} class="hover:bg-gray-200" id="ad_download_{{ download.id }}">
     <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 truncate">
-        <a href="{{ path('app_search_result', {imdbId: download.imdbId, mediaType: download.mediaType}) }}"
+        {% if download.mediaType == "movies" %}
-           class="mr-1 hover:underline rounded-md max-w-[10ch] md:max-w-[unset] truncate"
+            {% set routeParams = {imdbId: download.imdbId, mediaType: download.mediaType} %}
-        >
+            {% set route = path('app_search_result', routeParams) %}
+        {% else %}
+            {% set episodeIdDto = extract_from_episode_id(download.episodeId) %}
+            {% set routeParams = {imdbId: download.imdbId, mediaType: download.mediaType, season: episodeIdDto.season, episode: episodeIdDto.episode} %}
+            {% set route = path('app_search_result', routeParams) ~ "#" ~ episode_anchor(episodeIdDto.season, episodeIdDto.episode) %}
+        {% endif %}
+        <a href="{{ route }}"
+           class="mr-1 hover:underline rounded-md max-w-[10ch] md:max-w-[unset] truncate">
             {{ download.title }}
         </a>
 
@@ -44,7 +51,12 @@
 
         {% set delete_button = component('ux:icon', {name: 'ic:twotone-cancel', height: '17.75px', width: '17.75px', class: 'rounded-full align-middle text-red-600 hover:text-red-700' }) %}
         <twig:Modal heading="But wait!" button_text="{{ delete_button }}" submit_action="{{ stimulus_action('download_list', 'deleteDownload', 'click', {id: download.id}) }}" show_cancel show_submit>
-            Are you sure you want to delete <span class="font-bold">{{ download.filename }}</span>?
+            <p class="mb-1">Are you sure you want to delete the following record?</p>
+            <p class="mb-1 ml-4 italic">{{ download.filename }}</p>
+            <div class="">
+                <input id="delete_file_{{ download.id }}" class="accent-orange-500" type="checkbox" value="false" name="delete_file" />
+                <label for="delete_file_{{ download.id }}">Delete the file as well?</label>
+            </div>
         </twig:Modal>
     </td>
 </tr>

templates/components/Filter.html.twig

@@ -73,18 +73,15 @@
                         {{ stimulus_action('result_filter', 'setSeason', 'change') }}
                         {{ stimulus_action('result_filter', 'uncheckSelectAllBtn', 'change') }}
                 >
-                    <option selected value="1">1</option>
+                    {% for season in range(1, results.media.episodes|length) %}
-                    {% for season in range(2, results.media.episodes|length) %}
+                        <option value="{{ season }}"
-                        <option value="{{ season }}">{{ season }}</option>
+                            {% if results.season == season %}
+                                selected="selected"
+                            {% endif %}
+                        >{{ season }}</option>
                     {% endfor %}
                 </select>
             </label>
-            {#                        <label for="episodeNumber">#}
-            {#                            Episode#}
-            {#                            <select id="episodeNumber" name="episodeNumber" data-result-filter-target="episode" class="px-1 py-0.5 bg-stone-100 text-gray-800 rounded-sm">#}
-            {#                                <option selected value="">n/a</option>#}
-            {#                            </select>#}
-            {#                        </label>#}
         {% endif %}
         <span {{ stimulus_controller('loading_icon', {total: (results.media.mediaType == "tvshows") ? results.media.episodes[1]|length : 1, count: 0}) }}
             class="loading-icon">

templates/components/MonitorListRow.html.twig

@@ -3,8 +3,20 @@
         <a href="{{ path('app_search_result', {imdbId: monitor.imdbId, mediaType: monitor.monitorType|as_download_type}) }}"
            class="mr-1 hover:underline rounded-md"
         >
+
+            {% if monitor.monitorType == "movies" %}
+                {% set routeParams = {imdbId: monitor.imdbId, mediaType: monitor.monitorType} %}
+                {% set route = path('app_search_result', routeParams) %}
+            {% else %}
+                {% set episodeIdDto = extract_from_episode_id(monitor|monitor_media_id) %}
+                {% set routeParams = {imdbId: monitor.imdbId, mediaType: monitor.monitorType, season: episodeIdDto.season, episode: episodeIdDto.episode} %}
+                {% set route = path('app_search_result', routeParams) ~ "#" ~ episode_anchor(episodeIdDto.season, episodeIdDto.episode) %}
+            {% endif %}
+            <a href="{{ route }}"
+               class="mr-1 hover:underline rounded-md max-w-[10ch] md:max-w-[unset] truncate">
                 {{ monitor.title }}
             </a>
+        </a>
     </td>
     <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800">
         {{ monitor|monitor_media_id }}

templates/components/NavBar.html.twig

@@ -1,4 +1,4 @@
-<nav id="navbar" {{ attributes }} {{ stimulus_controller('navbar') }} {{ stimulus_action('navbar', 'setActive')}} class="flex h-screen flex-col justify-between bg-cyan-950 animate__animated animate__slideInLeft animate__slow">
+<nav id="navbar" {{ attributes }} {{ stimulus_controller('navbar') }} {{ stimulus_action('navbar', 'setActive')}} class="flex h-screen flex-col justify-between bg-cyan-950">
     <div class="px-4 py-4 flex flex-col gap-12">
         <h1 class="text-3xl mt-12 md:mt-0 font-extrabold text-orange-500 mb-3"><a href="{{ path('app_index') }}">Torsearch</a></h1>
         <ul class="nav-list space-y-1">

templates/components/TvEpisodeList.html.twig

@@ -2,8 +2,8 @@
         class="episode-list flex flex-col gap-4"
 >
     <div data-live-id="{{ uniqid() }}" class="episode-container flex flex-col gap-4">
-        {% for episode in this.episodes.items %}
+        {% for episode in this.getEpisodes().items %}
-            <div id="episode_{{ episode['season_number'] }}_{{ episode['episode_number'] }}" class="results"
+            <div id="{{ episode_anchor(episode['season_number'], episode['episode_number']) }}" class="results"
                  data-tv-results-loading-icon-outlet=".loading-icon"
                  data-download-button-outlet=".download-btn"
                     {{ stimulus_controller('tv_results', {

templates/search/result.html.twig

@@ -96,7 +96,7 @@
                     <twig:TvEpisodeList
                             results="results"
                         :imdbId="results.media.imdbId" :season="results.season" :perPage="20" :pageNumber="1"
-                        :tmdbId="results.media.tmdbId" :title="results.media.title" loading="defer"
+                        :tmdbId="results.media.tmdbId" :title="results.media.title" loading="defer" :episodeNumber="results.episode"
                     />
                 {% endif %}
             </twig:Card>

templates/torrentio/fragments.html.twig

@@ -13,7 +13,9 @@
 {% block tvshow_results %}
     <turbo-stream action="replace" targets="#{{ target }}">
         <template>
+            <div id="{{ target }}">
                 {{ include('torrentio/partial/option-table.html.twig', {controller: 'tv-results'}) }}
+            </div>
         </template>
     </turbo-stream>
 {% endblock %}