fix: cleans up download list search bar

assets/controllers/download_list_controller.js

@@ -7,13 +7,7 @@ import { getComponent } from '@symfony/ux-live-component';
 
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
-    static targets = ['download', 'downloadRow', 'viewAllBtn']
-    static values = {
-        isWidget: Boolean,
-        perPage: Number,
-    }
-
-    component = null;
+    static targets = ['download']
 
     async initialize() {
         this.component = await getComponent(this.element);
@@ -28,38 +22,9 @@ export default class extends Controller {
         // this.fooTarget.addEventListener('click', this._fooBar)
     }
 
-    downloadRowTargetConnected(target) {
-        if (Boolean(target.getAttribute('isBroadcasted')) === true) {
-            this.viewAllBtnTarget.parentElement.append(this.viewAllBtnTarget);
-            if (this.downloadRowTargets.length > this.perPageValue) {
-                target.classList.add('hidden');
-                this.viewAllBtnTarget.classList.remove('hidden');
-            } else {
-                this.viewAllBtnTarget.classList.add('hidden');
-            }
-        }
-    }
-
-    downloadRowTargetDisconnected(target) {
-        this.viewAllBtnTarget.parentElement.append(this.viewAllBtnTarget);
-        let i = 1;
-        this.downloadRowTargets.forEach((downloadRow) => {
-            console.log(downloadRow)
-            if (i <= this.perPageValue) {
-                downloadRow.classList.remove('hidden');
-            } else {
-                downloadRow.classList.add('hidden');
-            }
-        })
-
-        if (this.downloadRowTargets.length > this.perPage) {
-            this.viewAllBtnTarget.classList.remove('hidden');
-        }
-    }
-
     downloadTargetConnected(target) {
         let downloads = this.element.querySelectorAll('tbody tr');
-        if (downloads.length > this.perPageValue) {
+        if (downloads.length > 5) {
             target.classList.add('hidden');
         }
     }

docker/app/Caddyfile

@@ -3,8 +3,6 @@
 
 	frankenphp {
 		{$FRANKENPHP_CONFIG}
-
-
 	}
 }
 

src/Controller/SearchController.php

@@ -33,11 +33,12 @@ final class SearchController extends AbstractController
         ]);
     }
 
-    #[Route('/result/{mediaType}/{tmdbId}', name: 'app_search_result')]
+    #[Route('/result/{mediaType}/{imdbId}', name: 'app_search_result')]
     public function result(
         GetMediaInfoInput $input,
     ): Response {
         $result = $this->getMediaInfoHandler->handle($input->toCommand());
+
         $this->warmDownloadOptionCache($result->media);
 
         return $this->render('search/result.html.twig', [

src/Download/Framework/Entity/Download.php

@@ -3,8 +3,11 @@
 namespace App\Download\Framework\Entity;
 
 use App\Download\Framework\Repository\DownloadRepository;
+use App\Torrentio\Result\ResultFactory;
+use App\Torrentio\Result\TorrentioResult;
 use App\User\Framework\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
+use Nihilarr\PTN;
 use Symfony\UX\Turbo\Attribute\Broadcast;
 
 #[ORM\Entity(repositoryClass: DownloadRepository::class)]
@@ -162,4 +165,16 @@ class Download
 
         return $this;
     }
+
+    public function getPtn(): object
+    {
+        $ptn = (object) (new PTN())->parse($this->filename);
+
+        if ($this->mediaType === "tvshows") {
+            $ptn->season = str_pad($ptn->season, 2, "0", STR_PAD_LEFT);
+            $ptn->episode = str_pad($ptn->episode, 2, "0", STR_PAD_LEFT);
+        }
+
+        return $ptn;
+    }
 }

src/Download/Framework/Repository/DownloadRepository.php

@@ -25,27 +25,31 @@ class DownloadRepository extends ServiceEntityRepository
         $this->paginator = $paginator;
     }
 
-    public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10): Paginator
+    public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10, string $term = ""): Paginator
     {
         $query = $this->createQueryBuilder('d')
             ->andWhere('d.status IN (:statuses)')
             ->andWhere('d.user = :user')
+            ->andWhere('(d.title LIKE :term OR d.imdbId LIKE :term)')
             ->orderBy('d.id', 'DESC')
             ->setParameter('statuses', ['Complete'])
             ->setParameter('user', $user)
+            ->setParameter('term', '%' . $term . '%')
             ->getQuery();
 
         return $this->paginator->paginate($query, $pageNumber, $perPage);
     }
 
-    public function getActivePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 5): Paginator
+    public function getActivePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 5, string $term = ""): Paginator
     {
         $query = $this->createQueryBuilder('d')
             ->andWhere('d.status IN (:statuses)')
             ->andWhere('d.user = :user')
+            ->andWhere('(d.title LIKE :term OR d.imdbId LIKE :term)')
             ->orderBy('d.id', 'ASC')
             ->setParameter('statuses', ['New', 'In Progress'])
             ->setParameter('user', $user)
+            ->setParameter('term', '%' . $term . '%')
             ->getQuery();
 
         return $this->paginator->paginate($query, $pageNumber, $perPage);

src/Search/Action/Command/GetMediaInfoCommand.php

@@ -8,7 +8,7 @@ use OneToMany\RichBundle\Contract\CommandInterface;
 class GetMediaInfoCommand implements CommandInterface
 {
     public function __construct(
-        public string $tmdbId,
+        public string $imdbId,
         public string $mediaType,
     ) {}
 }

src/Search/Action/Handler/GetMediaInfoHandler.php

@@ -18,7 +18,7 @@ class GetMediaInfoHandler implements HandlerInterface
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $media = $this->tmdb->mediaDetails($command->tmdbId, $command->mediaType);
+        $media = $this->tmdb->mediaDetails($command->imdbId, $command->mediaType);
 
         return new GetMediaInfoResult($media);
     }

src/Search/Action/Input/GetMediaInfoInput.php

@@ -12,8 +12,8 @@ use OneToMany\RichBundle\Contract\InputInterface;
 class GetMediaInfoInput implements InputInterface
 {
     public function __construct(
-        #[SourceRoute('tmdbId')]
-        public string $tmdbId,
+        #[SourceRoute('imdbId')]
+        public string $imdbId,
 
         #[SourceRoute('mediaType')]
         public string $mediaType,
@@ -21,6 +21,6 @@ class GetMediaInfoInput implements InputInterface
 
     public function toCommand(): CommandInterface
     {
-        return new GetMediaInfoCommand($this->tmdbId, $this->mediaType);
+        return new GetMediaInfoCommand($this->imdbId, $this->mediaType);
     }
 }

src/Tmdb/Tmdb.php

@@ -133,9 +133,12 @@ class Tmdb
             if (!$result instanceof Movie && !$result instanceof Tv) {
                 continue;
             }
+
             $results[] = $this->parseResult($result);
         }
 
+        $results = array_filter($results, fn ($result) => null !== $result->imdbId);
+
         return $results;
     }
 
@@ -143,7 +146,16 @@ class Tmdb
     {
         $finder = new Find($this->client);
         $result = $finder->findBy($id, ['external_source' => 'imdb_id']);
-        return $this->parseResult($result);
+
+        if (count($result['movie_results']) > 0) {
+            return $result['movie_results'][0]['id'];
+        } elseif (count($result['tv_results']) > 0) {
+            return $result['tv_results'][0]['id'];
+        } elseif (count($result['tv_episode_results']) > 0) {
+            return $result['tv_episode_results'][0]['show_id'];
+        }
+
+        throw new \Exception("No results found for $id");
     }
 
     public function movieDetails(string $id)
@@ -183,6 +195,8 @@ class Tmdb
 
     public function mediaDetails(string $id, string $type)
     {
+        $id = $this->find($id);
+
         if ($type === "movies") {
             return $this->movieDetails($id);
         } else {

src/Torrentio/Action/Handler/GetMovieOptionsHandler.php

@@ -19,7 +19,7 @@ class GetMovieOptionsHandler implements HandlerInterface
     public function handle(CommandInterface $command): ResultInterface
     {
         return new GetMovieOptionsResult(
-            media: $this->tmdb->mediaDetails($command->tmdbId, 'movies'),
+            media: $this->tmdb->mediaDetails($command->imdbId, 'movies'),
             results: $this->torrentio->search($command->imdbId, 'movies'),
         );
     }

src/Twig/Components/DownloadList.php

@@ -18,6 +18,9 @@ final class DownloadList extends AbstractController
 
     use PaginateTrait;
 
+    #[LiveProp(writable: true)]
+    public string $term = "";
+
     #[LiveProp(writable: true)]
     public string $type;
 
@@ -31,9 +34,9 @@ final class DownloadList extends AbstractController
     public function getDownloads()
     {
         if ($this->type === "active") {
-            return $this->downloadRepository->getActivePaginated($this->getUser(), $this->pageNumber, $this->perPage);
+            return $this->downloadRepository->getActivePaginated($this->getUser(), $this->pageNumber, $this->perPage, $this->term);
         } elseif ($this->type === "complete") {
-            return $this->downloadRepository->getCompletePaginated($this->getUser(), $this->pageNumber, $this->perPage);
+            return $this->downloadRepository->getCompletePaginated($this->getUser(), $this->pageNumber, $this->perPage, $this->term);
         }
 
         return [];

src/Twig/Components/DownloadListRow.php

@@ -11,6 +11,4 @@ final class DownloadListRow
     public Download $download;
 
     public bool $isWidget = true;
-
-    public bool $isBroadcasted = false;
 }

templates/broadcast/Download.stream.html.twig

@@ -5,7 +5,7 @@
 
     <turbo-stream action="append" target="active_downloads">
         <template>
-            <twig:DownloadListRow download="{{ entity }}" isBroadcasted="true" />
+            <twig:DownloadListRow download="{{ entity }}" />
         </template>
     </turbo-stream>
 {% endblock %}
@@ -35,7 +35,7 @@
 
         <turbo-stream action="prepend" target="complete_downloads">
             <template>
-                <twig:DownloadListRow download="{{ entity }}" :isBroadcasted="true" />
+                <twig:DownloadListRow download="{{ entity }}" />
             </template>
         </turbo-stream>
     {% endif %}

templates/components/DownloadList.html.twig

@@ -1,9 +1,10 @@
-<div{{ attributes.defaults(stimulus_controller('download_list', {isWidget: this.isWidget, perPage: this.perPage})) }} class="min-w-48" >
+<div{{ attributes.defaults(stimulus_controller('download_list')) }} class="min-w-48" >
     {% set table_body_id = (type == "complete") ? "complete_downloads" : "active_downloads" %}
-    {% if this.isWidget == true and this.downloads.items|length > this.perPage %}
-        {% set show_view_all = true %}
-    {% else %}
-        {% set show_view_all = false %}
+
+    {% if this.isWidget == false %}
+        <div class="flex flex-row mb-2 justify-end">
+            <twig:DownloadSearch search_path="app_search" placeholder="Find one of your downloads..." />
+        </div>
     {% endif %}
 
     <table id="downloads" class="divide-y divide-gray-200 bg-gray-50 overflow-hidden rounded-lg table-auto w-full" {{ turbo_stream_listen('App\\Download\\Framework\\Entity\\Download') }}>
@@ -37,13 +38,15 @@
         <tbody id="{{ table_body_id }}" class="divide-y divide-gray-200 dark:divide-gray-50">
         {% if this.downloads.items|length > 0 %}
             {% for download in this.downloads.items %}
-                <twig:DownloadListRow download="{{ download }}" isWidget="{{ this.isWidget }}" perPage="{{ this.perPage }}" />
+                <twig:DownloadListRow download="{{ download }}" isWidget="{{ this.isWidget }}" />
             {% endfor %}
-            <tr id="download_view_all" class="{{ show_view_all == false ?? "hidden" }}" {{ stimulus_target('download_list', 'viewAllBtn')}} >
-                <td class="py-2 whitespace-nowrap bg-orange-300 uppercase text-xs font-medium text-center text-black truncate" colspan="100%">
-                    <a href="{{ path('app_downloads') }}">View All Downloads</a>
-                </td>
-            </tr>
+            {% if this.isWidget == true and this.downloads.items|length > this.perPage %}
+                <tr  id="download_view_all">
+                    <td class="py-2 whitespace-nowrap bg-orange-300 uppercase text-xs font-medium text-center text-black truncate" colspan="100%">
+                        <a href="{{ path('app_downloads') }}">View All Downloads</a>
+                    </td>
+                </tr>
+            {% endif %}
         {% else %}
             <tr id="{{ table_body_id }}_no_downloads">
                 <td class="px-6 py-4 whitespace-nowrap text-xs uppercase text-center font-medium text-gray-800 dark:text-stone-800" colspan="100%">

templates/components/DownloadListRow.html.twig

@@ -1,6 +1,14 @@
-<tr{{ attributes }} id="ad_download_{{ download.id }}" {{ stimulus_target('download_list', 'downloadRow') }} isBroadcasted="{{ isBroadcasted ?? 'false' }}">
+<tr{{ attributes }} 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">
-        {{ download.title }}
+        <a href="{{ path('app_search_result', {imdbId: download.imdbId, mediaType: download.mediaType}) }}"
+           class="hover:underline mr-1"
+        >
+            {{ download.title }}
+        </a>
+
+        {% if download.mediaType == "tvshows" %}
+            &mdash; <span class="ml-1">(S{{ download.ptn.season }}E{{ download.ptn.episode }})</span>
+        {% endif %}
     </td>
 
     {% if isWidget == false %}

templates/components/DownloadSearch.html.twig

@@ -0,0 +1,29 @@
+<div {{ attributes }} class="w-full max-w-sm min-w-[200px]">
+    <div class="relative">
+        <form>
+            <input
+                    data-model="term"
+                    class="w-full bg-transparent
+                          placeholder:text-slate-200 text-gray-50
+                         text-sm border-b border-orange-500 pl-3 pr-28 py-2 transition
+                         duration-300 ease focus:outline-none focus:border-orange-400 hover:border-orange-300
+                         shadow-sm focus:shadow"
+                    placeholder="{{ placeholder ?? 'TV Show, Movie...' }}"
+            />
+            <button
+                    class="absolute top-1 right-1 flex items-center
+                    bg-green-600 py-1 px-2  text-center
+                    text-md text-white transition-all
+                    focus:bg-green-700 active:bg-green-700 hover:bg-green-700
+
+                    text-white bg-green-600 text-xs
+                     rounded-sm
+                    bg-opacity-80
+"
+                    onclick="return false;"
+            >
+                Search
+            </button>
+        </form>
+    </div>
+</div>

templates/components/Poster.html.twig

@@ -1,13 +1,13 @@
 <div{{ attributes }}>
     <a href="{{ path('app_search_result', {
         mediaType: mediaType,
-        tmdbId: tmdbId
+        imdbId: imdbId
     }) }}">
         <img src="{{ image }}" class="w-40 rounded-md" />
     </a>
     <a href="{{ path('app_search_result', {
         mediaType: mediaType,
-        tmdbId: tmdbId
+        imdbId: imdbId
     }) }}">
         <h3 class="text-center text-gray-50 max-w-[16ch] text-extrabold">{{ title }}</h3>
     </a>

templates/components/SearchResult.html.twig

@@ -17,7 +17,7 @@
             </p>
         </div>
         <a class="h-9 rounded-md py-1 px-2 bg-green-600 text-gray-50"
-           href="{{ path('app_search_result', {mediaType: mediaType, tmdbId: tmdbId}) }}"
+           href="{{ path('app_search_result', {mediaType: mediaType, imdbId: imdbId}) }}"
            >choose</a>
     </div>
 </div>

templates/index/index.html.twig

@@ -22,7 +22,7 @@
         <div class="flex flex-col gap-4">
             <twig:Card title="Popular Movies" contentClass="flex flex-row justify-between w-full">
                 {% for movie in popular_movies %}
-                    <twig:Poster imdbId=""
+                    <twig:Poster imdbId="{{ movie.imdbId }}"
                                  tmdbId="{{ movie.tmdbId }}"
                                  title="{{ movie.title }}"
                                  description="{{ movie.description }}"
@@ -34,7 +34,7 @@
             </twig:Card>
             <twig:Card title="Popular TV Shows" contentClass="flex flex-row justify-between w-full">
                 {% for movie in popular_tvshows %}
-                    <twig:Poster imdbId=""
+                    <twig:Poster imdbId="{{ movie.imdbId }}"
                                  tmdbId="{{ movie.tmdbId }}"
                                  title="{{ movie.title }}"
                                  description="{{ movie.description }}"