fix: download season handler

assets/bootstrap.js

@@ -10,7 +10,6 @@ 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();

assets/controllers/dashboard_widgets_controller.js

@@ -1,40 +0,0 @@
-import { Controller } from '@hotwired/stimulus';
-import {GridStack} from "../vendor/gridstack/gridstack.index.js";
-
-/*
-* The following line makes this controller "lazy": it won't be downloaded until needed
-* See https://symfony.com/bundles/StimulusBundle/current/index.html#lazy-stimulus-controllers
-*/
-
-/* stimulusFetch: 'lazy' */
-export default class extends Controller {
-    grid;
-
-    initialize() {
-
-    }
-
-    connect() {
-        this.grid = GridStack.init({
-            column: 2,
-            alwaysShowResizeHandle: true,
-            margin: "2rem",
-            resizable: {
-                handles: 'e,se,s,sw,w'
-            }
-        });
-
-        this.grid.load();
-    }
-
-    // Add custom controller actions here
-    // fooBar() { this.fooTarget.classList.toggle(this.bazClass) }
-
-    disconnect() {
-        // Called anytime its element is disconnected from the DOM
-        // (on page change, when it's removed from or moved in the DOM, etc.)
-
-        // Here you should remove all event listeners added in "connect()" 
-        // this.fooTarget.removeEventListener('click', this._fooBar)
-    }
-}

assets/icons/fluent-mdl2/back.svg

@@ -0,0 +1 @@
+<svg xmlns="https://www.w3.org/2000/svg" viewBox="0 0 2048 2048"><path fill="currentColor" d="M2048 1088H250l787 787l-90 90L6 1024L947 83l90 90l-787 787h1798z"/></svg>

importmap.php

@@ -70,7 +70,4 @@ return [
     '@ungap/custom-elements' => [
         'version' => '1.3.0',
     ],
-    'gridstack' => [
-        'version' => '12.3.3',
-    ],
 ];

src/Download/Action/Handler/DownloadSeasonHandler.php

@@ -46,14 +46,14 @@ readonly class DownloadSeasonHandler implements HandlerInterface
 
         $downloadCommands = [];
         foreach ($episodesInSeason as $episode) {
-            $this->logger->info('> [DownloadTvSeasonHandler] ...Evaluating episode ' . $episode['episode_number']);
+            $this->logger->info('> [DownloadTvSeasonHandler] ...Evaluating episode ' . $episode->episodeNumber);
 
             $results = $this->getTvShowOptionsHandler->handle(
                 new GetTvShowOptionsCommand(
                     $series->tmdbId,
                     $command->imdbId,
                     $command->season,
-                    $episode['episode_number']
+                    $episode->episodeNumber
                 )
             );
 
@@ -67,7 +67,7 @@ readonly class DownloadSeasonHandler implements HandlerInterface
 
             if (null !== $result) {
                 $this->logger->info('> [DownloadTvSeasonHandler] ......Found 1 matching result');
-                $this->logger->info('> [DownloadTvSeasonHandler] ......Dispatching DownloadMediaCommand for "' . $series->title . '" season ' . $command->season . ' episode ' . $episode['episode_number']);
+                $this->logger->info('> [DownloadTvSeasonHandler] ......Dispatching DownloadMediaCommand for "' . $series->title . '" season ' . $command->season . ' episode ' . $episode->episodeNumber);
                 $downloadCommand = new DownloadMediaCommand(
                     $result->url,
                     $series->title,
@@ -99,10 +99,10 @@ readonly class DownloadSeasonHandler implements HandlerInterface
             ->filter(fn ($episode) =>
                 property_exists($episode, 'episode')
                 && property_exists($episode, 'season')
-                && null !== $episode->episode
+                && null !== $episode->episodeNumber
                 && null !== $episode->season
             )
-            ->rekey(fn($episode) => $episode->episode);
+            ->rekey(fn($episode) => $episode->episodeNumber);
         $this->logger->info('> [MonitorTvSeasonHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
     }
 }

src/Download/Action/Handler/MonitorHandlerTrait.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Download\Action\Handler;
+
+use Aimeos\Map;
+use App\Monitor\Framework\Entity\Monitor;
+use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Tmdb\Dto\TmdbEpisodeDto;
+use App\Tmdb\TmdbClient;
+use Carbon\Carbon;
+use DateTimeImmutable;
+use Psr\Log\LoggerInterface;
+
+trait MonitorHandlerTrait
+{
+    private MonitorRepository $monitorRepository;
+    private LoggerInterface $logger;
+    private TmdbClient $tmdb;
+
+    private function episodeReleasedAfterMonitorCreated(
+        string|DateTimeImmutable $monitorStartDate,
+        TmdbEpisodeDto $episodeInShow
+    ): bool {
+        $monitorStartDate = Carbon::parse($monitorStartDate)->setTime(0, 0);
+        $episodeAirDate = Carbon::parse($episodeInShow->airDate);
+        return $episodeAirDate >= $monitorStartDate;
+    }
+
+    private function episodeExists(TmdbEpisodeDto $episodeInShow, Map $downloadedEpisodes): bool
+    {
+        return $downloadedEpisodes->filter(
+                fn(object $episode) => $episode->episode === $episodeInShow->episodeNumber
+                    && $episode->season === $episodeInShow->seasonNumber
+            )->count() > 0;
+    }
+
+    private function monitorExists(Monitor $monitor, TmdbEpisodeDto $episode): bool
+    {
+        return $this->monitorRepository->findOneBy([
+                'imdbId' => $monitor->getImdbId(),
+                'title' => $monitor->getTitle(),
+                'monitorType' => 'tvepisode',
+                'season' => $episode->seasonNumber,
+                'episode' => $episode->episodeNumber,
+                'status' => ['New', 'Active', 'In Progress']
+            ]) !== null;
+    }
+
+    private function refreshData(Monitor $monitor)
+    {
+        if (null === $monitor->getPoster()) {
+            $this->logger->info('> [MonitorTvShowHandler] Refreshing poster for "' . $monitor->getTitle() . '"');
+            $poster = $this->tmdb->tvshowDetails($monitor->getImdbId())->poster;
+            if (null !== $poster && "" !== $poster) {
+                $monitor->setPoster($poster);
+            }
+        }
+    }
+}

src/Monitor/Framework/Controller/WebController.php

@@ -29,7 +29,7 @@ class WebController extends AbstractController
         private readonly Environment $renderer,
     ) {}
 
-    #[Route('/monitors', name: 'app_monitors', methods: ['GET'])]
+    #[Route('/monitors', name: 'app.monitors', methods: ['GET'])]
     public function addMonitor()
     {
         return $this->render('monitor/index.html.twig');

src/Monitor/Framework/Scheduler/MonitorDispatcher.php

@@ -33,9 +33,7 @@ class MonitorDispatcher
             'tvshows' => MonitorTvShowCommand::class,
         ];
 
-        $monitors = $this->monitorRepository->findBy([
+        $monitors = $this->monitorRepository->findBy(['status' => ['New', 'Active']]);
-            'status' => ['New', 'Active'],
-        ]);
 
         foreach ($monitors as $monitor) {
             $monitor->setStatus('In Progress');

templates/base.html.twig

@@ -11,14 +11,7 @@
         {% endblock %}
 
         {% block javascripts %}
-            {% block pre_js %}{% endblock %}
+            {% block importmap %}{{ importmap('app') }}{% endblock %}
-
-            {% block importmap %}
-                {{ importmap('app') }}
-            {% endblock %}
-
-            {% block post_js %}{% endblock %}
-
             <script src='https://cdn.jsdelivr.net/npm/fullcalendar@6.1.19/index.global.min.js'></script>
         {% endblock %}
     </head>
@@ -29,9 +22,9 @@
             </div>
             <div class="col-span-6 md:col-span-5 h-screen overflow-y-scroll">
                 <twig:Header />
-                <div class="flex justify-between items-center">
+                <div class="flex flex-col md:flex-row justify-between md:items-center">
-                    <h2 class="px-4 mt-4 mb-2 text-3xl font-bold text-gray-50">{% block h2 %}{% endblock %}</h2>
+                    <h2 class="px-4 mt-4 mb-4 md:mb-2 text-3xl font-bold text-gray-50">{% block h2 %}{% endblock %}</h2>
-                    <div class="flex mt-4 gap-2 items-center grow-0 md:px-4">
+                    <div class="flex mx-4 mb-2 md:mt-4 gap-2 items-center grow-0 md:px-4">
                         {% block action_buttons %}{% endblock %}
                     </div>
                 </div>

templates/components/MonitorList.html.twig

@@ -55,7 +55,7 @@
             {% if this.isWidget and this.monitors.items|length > 5 %}
                 <tr  id="monitor_view_all">
                     <td colspan="100%" class="py-2 whitespace-nowrap bg-orange-500/80 uppercase text-xs font-medium text-center truncate dark:text-black">
-                        <a href="{{ path('app_monitors') }}">View All Monitors</a>
+                        <a href="{{ path('app.monitors') }}">View All Monitors</a>
                     </td>
                 </tr>
             {% endif %}

templates/components/NavBar.html.twig

@@ -21,7 +21,7 @@
             </li>
 
             <li>
-                <a href="{{ path('app_monitors') }}"
+                <a href="{{ path('app.monitors') }}"
                    class="block rounded-lg
                          bg-orange-500 hover:bg-opacity-80 bg-clip-padding backdrop-filter backdrop-blur-md bg-opacity-60
                          px-4 py-2 text-sm font-medium text-gray-50">

templates/index/index.html.twig

@@ -4,31 +4,20 @@
 {% block h2 %}Dashboard{% endblock %}
 
 {% block body %}
-    <div class="p-4 z-10">
+    <div class="p-4 flex flex-col grow gap-4 z-10">
-        <div class="grid-stack gs-2">
+        <div class="flex flex-col md:flex-row gap-4">
-            <div class="grid-stack-item" gs-x="1">
+            <twig:Card title="Active Downloads" class="w-full">
-                <div class="grid-stack-item-content">
+                <twig:DownloadList :type="'active'" />
-                    <twig:Card title="Active Downloads">
+            </twig:Card>
-                        <twig:DownloadList :type="'active'" />
-                    </twig:Card>
-                </div>
-            </div>
 
-            <div class="grid-stack-item"  gs-x="2">
+            <twig:Card title="Recent Downloads" class="w-full">
-                <div class="grid-stack-item-content">
+                <twig:DownloadList :type="'complete'" />
-                    <twig:Card title="Complete Downloads" >
+            </twig:Card>
-                        <twig:DownloadList :type="'complete'" />
+        </div>
-                    </twig:Card>
+        <div class="flex flex-col md:flex-row gap-4">
-                </div>
+            <twig:Card title="Monitors" class="w-full">
-            </div>
+                <twig:MonitorList :type="'active'" :isWidget="true" />
-
+            </twig:Card>
-            <div class="grid-stack-item" gs-x="3">
-                <div class="grid-stack-item-content">
-                    <twig:Card title="Active Monitors">
-                        <twig:MonitorList :type="'active'" />
-                    </twig:Card>
-                </div>
-            </div>
         </div>
         <div class="flex flex-col gap-4">
             <twig:Card title="Popular Movies" contentClass="grid grid-cols-2 gap-4 md:flex md:flex-row md:justify-between w-full">
@@ -56,6 +45,5 @@
                 {% endfor %}
             </twig:Card>
         </div>
-        <div class="grid-stack" data-controller="dashboard-widgets"></div>
     </div>
 {% endblock %}

templates/monitor/upcoming-episodes.html.twig

@@ -15,6 +15,12 @@
     <script src='https://cdn.jsdelivr.net/npm/fullcalendar@6.1.19/index.global.min.js'></script>
 
     <div class="p-4">
+        <div class="mb-4 text-white">
+            <a href="{{ path('app.monitors') }}" class="btn btn-primary inline-flex items-center gap-2">
+                <twig:ux:icon name="fluent-mdl2:back" width="14" /> Back to Monitors
+            </a>
+        </div>
+        
         <twig:Card title="Upcoming episodes of shows your monitoring">
             <a href="{{ path('app.monitors.ical', {email: app.user.email}) }}" title="Subscribe to the 'Upcoming Episodes' calendar via iCal. Click to export the events to a .ics file or copy the link and use it to subscribe in a calendar app that supports iCal/ics calendars." class="mb-2 self-end dark:text-white decoration-underline">
                 <twig:ux:icon name="lets-icons:calendar-add-light" width="24" class="text-orange-500" />

templates/monitor/view.html.twig

@@ -5,6 +5,11 @@
 
 {% block body %}
     <div class="px-4 py-2">
+        <div class="mb-4 text-white">
+            <a href="{{ path('app.monitors') }}" class="btn btn-primary inline-flex items-center gap-2">
+                <twig:ux:icon name="fluent-mdl2:back" width="14" /> Back to Monitors
+            </a>
+        </div>
         <twig:Card title="Viewing your monitors for {{ monitor.title }}">
             <div class="p-2 md:p-4 flex flex-col md:flex-row gap-6">
                 {% if results.media.poster != null %}
@@ -53,7 +58,6 @@
 
                         {% if results.media.genres != null %}
                             <div id="genres" class="text-gray-50 my-4">
-{#                                <strong>Genres</strong>: <br />#}
                                 {% for genre in results.media.genres %}
                                     <small class="px-2 py-1 border border-orange-500 rounded-full">{{ genre }}</small>
                                 {% endfor %}
@@ -65,10 +69,10 @@
                         <div class="flex flex-col gap-4">
                             <div class="flex flex-col grow text-white">
                                 <strong class="mb-1">In Your Library</strong>
-                                <div class="flex flex-col md:flex-row  border-t-orange-500 text-xs gap-2">
+                                <div class="flex flex-col md:flex-row border-t-orange-500 text-xs gap-4">
                                     <div class="flex flex-col">
                                         <span class="text-sm mb-1">Seasons</span>
-                                        <div class="flex flex-col md:flex-row border p-2 border-orange-500 rounded-lg text-xs items-center">
+                                        <div class="flex flex-row border p-2 border-orange-500 rounded-lg text-xs items-center">
                                             <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-orange-500 rounded-lg text-white">
                                                 <span>{{ library.seasonCount }}</span> full
                                             </span>
@@ -83,7 +87,7 @@
 
                                     <div class="flex flex-col">
                                         <span class="text-sm mb-1">Episodes</span>
-                                        <div class="flex flex-col md:flex-row border p-2 border-orange-500 rounded-lg text-xs items-center">
+                                        <div class="flex flex-row border p-2 border-orange-500 rounded-lg text-xs items-center">
                                             <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-cyan-500 rounded-lg text-white">
                                                 <span>{{ library.episodeCount }}</span> existing
                                             </span>
@@ -95,14 +99,14 @@
 
                                     <div class="flex flex-col">
                                         <span class="text-sm mb-1">Monitors</span>
-                                        <div class="flex flex-col md:flex-row border p-2 border-orange-500 rounded-lg text-xs items-center">
+                                        <div class="flex flex-row border p-2 border-orange-500 rounded-lg text-xs items-center">
-                                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-pink-500 rounded-lg text-white">
+                                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-red-500 rounded-lg text-white">
                                                 <span>{{ library.monitorCount }}</span> total
                                             </span>
-                                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-pink-500 rounded-lg text-white">
+                                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-red-500 rounded-lg text-white">
                                                 <span>{{ library.activeMonitorCount }}</span> active
                                             </span>
-                                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-pink-500 rounded-lg text-white">
+                                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-red-500 rounded-lg text-white">
                                                 <span>{{ library.completeMonitorCount }}</span> complete
                                             </span>
                                         </div>