fix: forces results card to full screen width

assets/controllers/action_button_controller.js

@@ -0,0 +1,46 @@
+import { Controller } from '@hotwired/stimulus';
+
+/*
+* 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 {
+
+    initialize() {
+        // Called once when the controller is first instantiated (per element)
+
+        // Here you can initialize variables, create scoped callables for event
+        // listeners, instantiate external libraries, etc.
+        // this._fooBar = this.fooBar.bind(this)
+    }
+
+    connect() {
+        // Called every time the controller is connected to the DOM
+        // (on page load, when it's added to the DOM, moved in the DOM, etc.)
+
+        // Here you can add event listeners on the element or target elements,
+        // add or remove classes, attributes, dispatch custom events, etc.
+        // this.fooTarget.addEventListener('click', this._fooBar)
+    }
+
+    // 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)
+    }
+
+    default() {
+        console.log('Looks like you need to add an action to your action button...')
+    }
+
+    monitorDispatch() {
+        fetch('/api/monitor/dispatch')
+    }
+}

assets/controllers/monitor_button_controller.js

@@ -8,7 +8,7 @@ import { Controller } from '@hotwired/stimulus';
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
     static targets = ['button', 'options']
-    static outlets = ['result-filter']
+    static outlets = ['result-filter', 'dialog']
     static values = {
         tmdbId: String,
         imdbId: String,
@@ -54,6 +54,9 @@ export default class extends Controller {
             title: this.titleValue,
             monitorType: 'tvshows',
         });
+        if (this.hasDialogOutlet) {
+            this.dialogOutlet.close();
+        }
     }
 
     async monitorSeason() {

compose.yml

@@ -40,7 +40,7 @@ services:
     tty: true
     environment:
       TZ: America/Chicago
-    command: php /app/bin/console messenger:consume media_cache -vv --time-limit=3600
+    command: php /app/bin/console messenger:consume async -vv --time-limit=3600
 
 
   scheduler:

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -4,13 +4,13 @@ namespace App\Monitor\Action\Handler;
 
 use App\Download\Action\Command\DownloadMediaCommand;
 use App\Monitor\Action\Command\MonitorMovieCommand;
-use App\Monitor\Action\Result\MonitorMovieResult;
 use App\Monitor\Action\Result\MonitorTvEpisodeResult;
 use App\Monitor\Framework\Repository\MonitorRepository;
 use App\Monitor\Service\MonitorOptionEvaluator;
 use App\Tmdb\Tmdb;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
+use App\User\Dto\UserPreferencesFactory;
 use Carbon\Carbon;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
@@ -35,59 +35,65 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler');
-        $monitor = $this->monitorRepository->find($command->movieMonitorId);
+        try {
+            $monitor = $this->monitorRepository->find($command->movieMonitorId);
+            $this->logger->info('> [MonitorTvEpisodeHandler] Executing MonitorTvEpisodeHandler for ' . $monitor->getTitle() . ' season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode());
 
-        $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
-        if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::now()) {
-            $this->logger->info('> [MonitorTvEpisodeHandler] Episode has not aired yet, skipping for now');
-            return new MonitorTvEpisodeResult(
-                status: 'OK',
-                result: [
-                    'message' => 'No change',
-                    'monitor' => $monitor,
-                ]
+            $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
+            if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::today('UTC')) {
+                $this->logger->info('> [MonitorTvEpisodeHandler] ...Episode has not aired yet, skipping for now');
+                return new MonitorTvEpisodeResult(
+                    status: 'OK',
+                    result: [
+                        'message' => 'No change',
+                        'monitor' => $monitor,
+                    ]
+                );
+            }
+
+            $monitor->setStatus('In Progress');
+            $this->monitorRepository->getEntityManager()->flush();
+
+            $results = $this->getTvShowOptionsHandler->handle(
+                new GetTvShowOptionsCommand(
+                    $monitor->getTmdbId(),
+                    $monitor->getImdbId(),
+                    $monitor->getSeason(),
+                    $monitor->getEpisode()
+                )
             );
-        }
 
-        $monitor->setStatus('In Progress');
-        $this->monitorRepository->getEntityManager()->flush();
+            $this->logger->info('> [MonitorTvEpisodeHandler] ...Found ' . count($results->results) . ' total download options, beginning evaluation');
 
-        $this->logger->info('> [MonitorTvEpisodeHandler] Searching for "' . $monitor->getTitle() . '" season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode() . ' download options');
-        $results = $this->getTvShowOptionsHandler->handle(
-            new GetTvShowOptionsCommand(
-                $monitor->getTmdbId(),
-                $monitor->getImdbId(),
-                $monitor->getSeason(),
-                $monitor->getEpisode()
-            )
-        );
+            $result = $this->monitorOptionEvaluator->evaluateOptions($monitor, $results->results);
 
-        $this->logger->info('> [MonitorTvEpisodeHandler] Found ' . count($results->results) . ' download options');
+            if (null !== $result) {
+                $this->logger->info('> [MonitorTvEpisodeHandler] ...Found 1 matching result found: dispatching DownloadMediaCommand for "' . $result->title . '"', ['filter' => UserPreferencesFactory::createFromUser($monitor->getUser())]);
+                $this->bus->dispatch(new DownloadMediaCommand(
+                    $result->url,
+                    $monitor->getTitle(),
+                    $result->filename,
+                    'tvshows',
+                    $monitor->getImdbId(),
+                    $monitor->getUser()->getId(),
+                ));
+                $monitor->setStatus('Complete');
+                $monitor->setDownloadedAt(new DateTimeImmutable());
+            } else {
+                $this->logger->info('> [MonitorTvEpisodeHandler] ...Found 0 matching results found, monitor will run at next interval');
+                $monitor->setStatus('Active');
+            }
 
-        $result = $this->monitorOptionEvaluator->evaluateOptions($monitor, $results->results);
-
-        if (null !== $result) {
-            $this->logger->info('> [MonitorTvEpisodeHandler] 1 matching result found: dispatching DownloadMediaCommand for "' . $result->title . '"');
-            $this->bus->dispatch(new DownloadMediaCommand(
-                $result->url,
-                $monitor->getTitle(),
-                $result->filename,
-                'tvshows',
-                $monitor->getImdbId(),
-                $monitor->getUser()->getId(),
-            ));
-            $monitor->setStatus('Complete');
-            $monitor->setDownloadedAt(new DateTimeImmutable());
-        } else {
-            $this->logger->info('> [MonitorTvEpisodeHandler] 0 matching results found, monitor will run at next interval');
+            $monitor->setLastSearch(new DateTimeImmutable());
+            $monitor->setSearchCount($monitor->getSearchCount() + 1);
+            $this->entityManager->flush();
+        } catch (\Throwable $exception) {
+            $this->logger->error('> [MonitorTvEpisodeHandler] ...Exception thrown: ' . $exception->getMessage());
+            $this->logger->error($exception->getMessage());
             $monitor->setStatus('Active');
+            $this->monitorRepository->getEntityManager()->flush();
         }
 
-        $monitor->setLastSearch(new DateTimeImmutable());
-        $monitor->setSearchCount($monitor->getSearchCount() + 1);
-        $this->entityManager->flush();
-
         return new MonitorTvEpisodeResult(
             status: 'OK',
             result: [

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -61,26 +61,27 @@ readonly class MonitorTvShowHandler implements HandlerInterface
             // Dispatch Episode commands for each missing Episode
             foreach ($episodesInShow as $episode) {
                 // Only monitor future episodes
+                $this->logger->info('> [MonitorTvShowHandler] Evaluating "' . $monitor->getTitle() . '", season "' . $episode['season_number'] . '" episode "' . $episode['episode_number'] . '"');
                 $episodeInFuture = $this->episodeReleasedAfterMonitorCreated($monitor->getCreatedAt(), $episode);
-                $this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
+                $this->logger->info('> [MonitorTvShowHandler] ...Released after monitor started? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
                 if (false === $episodeInFuture) {
-                    $this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for title: ' . 'for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ', skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
                     continue;
                 }
 
                 // Check if the episode is already downloaded
                 $episodeExists = $this->episodeExists($episode, $downloadedEpisodes);
-                $this->logger->info('> [MonitorTvShowHandler] Episode exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeExists ? 'YES' : 'NO'));
+                $this->logger->info('> [MonitorTvShowHandler] ...Episode exists? ' . (true === $episodeExists ? 'YES' : 'NO'));
                 if (true === $episodeExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] Episode exists for title: ' . $monitor->getTitle() . ', skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
                     continue;
                 }
 
                 // Check for existing monitors
                 $monitorExists = $this->monitorExists($monitor, $episode);
-                $this->logger->info('> [MonitorTvShowHandler] Monitor exists for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $monitorExists ? 'YES' : 'NO'));
+                $this->logger->info('> [MonitorTvShowHandler] ...Monitor exists? ' . (true === $monitorExists ? 'YES' : 'NO'));
                 if (true === $monitorExists) {
-                    $this->logger->info('> [MonitorTvShowHandler] Monitor exists for title: ' . $monitor->getTitle() . ', skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] ...Skipping');
                     continue;
                 }
 
@@ -106,7 +107,7 @@ readonly class MonitorTvShowHandler implements HandlerInterface
                 // Immediately run the monitor
                 $command = new MonitorTvEpisodeCommand($episodeMonitor->getId());
                 $this->monitorTvEpisodeHandler->handle($command);
-                $this->logger->info('> [MonitorTvShowHandler] Dispatching MonitorTvEpisodeCommand for season ' . $episodeMonitor->getSeason() . ' episode ' . $episodeMonitor->getEpisode() . ' for title: ' . $monitor->getTitle());
+                $this->logger->info('> [MonitorTvShowHandler] ...Dispatching MonitorTvEpisodeCommand');
             }
         }
 

src/Monitor/Framework/Controller/ApiController.php

@@ -54,10 +54,12 @@ class ApiController extends AbstractController
     }
 
     #[Route('/api/monitor/dispatch', name: 'api_monitor_dispatch', methods: ['GET'])]
-    public function dispatch(MonitorDispatcher $dispatcher): Response
+    public function dispatch(MonitorDispatcher $dispatcher, Broadcaster $broadcaster): Response
     {
         $dispatcher();
 
+        $broadcaster->alert('Success', 'The monitor job has been dispatched.');
+
         return $this->json([
             'status' => 200,
             'message' => 'Manually dispatched MonitorDispatcher'

src/Twig/Components/ActionButton.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Twig\Components;
+
+use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+
+#[AsTwigComponent]
+final class ActionButton
+{
+}

src/User/Dto/UserPreferences.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\User\Dto;
+
+class UserPreferences
+{
+
+    public function __construct(
+        public readonly string $resolution,
+        public readonly string $codec,
+        public readonly string $language,
+        public readonly string $provider,
+        public readonly string $quality,
+    ) {}
+}

src/User/Dto/UserPreferencesFactory.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\User\Dto;
+
+use App\User\Framework\Entity\User;
+
+class UserPreferencesFactory
+{
+    public static function createFromUser(User $user): UserPreferences
+    {
+        return new UserPreferences(
+            resolution: $user->getUserPreference('resolution')->getPreferenceValue(),
+            codec: $user->getUserPreference('codec')->getPreferenceValue(),
+            language: $user->getUserPreference('language')->getPreferenceValue(),
+            provider: $user->getUserPreference('provider')->getPreferenceValue(),
+            quality: $user->getUserPreference('quality')->getPreferenceValue(),
+        );
+    }
+}

src/User/Framework/Entity/User.php

@@ -153,13 +153,14 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
         return $this->userPreferences;
     }
 
-    public function getUserPreference(string $preferenceName)
+    public function getUserPreference(string $preferenceName): ?UserPreference
     {
         foreach ($this->userPreferences as $userPreference) {
             if ($userPreference->getPreference()->getName() === $preferenceName) {
-                return $userPreference->getPreference();
+                return $userPreference;
             }
         }
+        return null;
     }
 
     public function hasUserPreference(string $preferenceName): bool

templates/base.html.twig

@@ -20,7 +20,12 @@
             </div>
             <div class="col-span-6 md:col-span-5 h-screen overflow-y-scroll">
                 <twig:Header />
-                <h2 class="px-4 mt-4 mb-2 text-3xl font-bold text-gray-50">{% block h2 %}{% endblock %}</h2>
+                <div class="flex justify-between items-center">
+                    <h2 class="px-4 mt-4 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">
+                        {% block action_buttons %}{% endblock %}
+                    </div>
+                </div>
                 {% block body %}{% endblock %}
             </div>
         </div>

templates/components/ActionButton.html.twig

@@ -0,0 +1,7 @@
+<button
+    class="h-8 bg-{{ color|default('orange') }}-500/80 hover:bg-{{ color|default('orange') }}-600/80 px-2 text-{{ text_color|default('white') }} rounded text-sm font-semibold"
+    {{ attributes.defaults(stimulus_controller('action_button')) }}
+    {{ stimulus_action('action_button', action|default('default')) }}
+>
+    {{ text|default('button') }}
+</button>

templates/components/Modal.html.twig

@@ -1,4 +1,4 @@
-<div{{ attributes }} data-controller="dialog" data-action="click->dialog#backdropClose" class="flex flex-row items-center">
+<div{{ attributes }} data-controller="dialog" data-action="click->dialog#backdropClose" class="modal flex flex-row items-center {{ container_class|default('') }}">
     <dialog data-dialog-target="dialog" class="py-3 px-4 w-[30rem] rounded-md">
         <h2 class="mb-4 text-2xl font-bold">{{ heading }}</h2>
 
@@ -22,5 +22,5 @@
         {% endif %}
     </dialog>
 
-    <button type="button" data-action="dialog#open">{{ button_text|raw }}</button>
+    <button type="button" class="{{ button_class|default('') }}" data-action="dialog#open">{{ button_text|raw }}</button>
 </div>

templates/monitor/index.html.twig

@@ -3,6 +3,10 @@
 {% block title %}Monitors — Torsearch{% endblock %}
 {% block h2 %}Monitors{% endblock %}
 
+{% block action_buttons %}
+    <twig:ActionButton action="monitorDispatch" text="Run Monitors" />
+{% endblock %}
+
 {% block body %}
     <div class="px-4 py-2">
         <twig:Card title="Active Monitors">

templates/search/result.html.twig

@@ -6,7 +6,7 @@
     <div class="p-4 flex flex-col grow gap-4">
         <h2 class="mb-2 text-3xl font-bold text-gray-50">Media Results</h2>
         <div class="flex flex-row w-full gap-2">
-            <twig:Card title="" contentClass="flex flex-col gap-4 justify-between w-full text-gray-50">
+            <twig:Card title="" class="w-full" contentClass="flex flex-col gap-4 justify-between w-full text-gray-50">
                 <div class="p-2 md:p-4 flex flex-col md:flex-row gap-6">
                     {% if results.media.poster != null %}
                         <img class="w-full md:w-40 rounded-lg" src="{{ results.media.poster }}" />
@@ -22,87 +22,30 @@
                                 {{ results.media.title }} - {{ results.media.year }}
                             </h3>
 
-{#                            <div data-controller="dropdown" class="relative"#}
-{#                                 {{ stimulus_controller('monitor_button', {#}
-{#                                     tmdbId: results.media.tmdbId,#}
-{#                                     imdbId: results.media.imdbId,#}
-{#                                     title: results.media.title,#}
-{#                                 })}}#}
-{#                                 data-monitor-button-result-filter-outlet="#filter"#}
-{#                            >#}
-{#                                <button type="button" data-action="dropdown#toggle click@window->dropdown#hide"#}
-{#                                        class="h-8 text-white bg-green-800 bg-opacity-60 font-medium rounded-lg text-sm#}
-{#                                         px-2 py-1.5 text-center inline-flex items-center hover:bg-green-900 border-2#}
-{#                                         border-green-500">#}
-{#                                        Monitor#}
-{#                                    <svg class="w-2.5 h-2.5 ms-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">#}
-{#                                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4" /></svg>#}
-{#                                    </svg>#}
-{#                                </button>#}
-
-{#                                <div#}
-{#                                     data-dropdown-target="menu"#}
-{#                                     class="hidden transition transform origin-top-right absolute right-0#}
-{#                                            flex flex-col rounded-md shadow-sm w-44 bg-green-800 border-2 border-green-500 mt-1"#}
-{#                                     data-transition-enter-from="opacity-0 scale-95"#}
-{#                                     data-transition-enter-to="opacity-100 scale-100"#}
-{#                                     data-transition-leave-from="opacity-100 scale-100"#}
-{#                                     data-transition-leave-to="opacity-0 scale-95"#}
-{#                                >#}
-{#                                    <a href="#"#}
-{#                                       data-action="dropdown#toggle"#}
-{#                                       class="backdrop-filter p-2 bg-opacity-100 hover:bg-green-950 rounded-t-md"#}
-{#                                    >#}
-{#                                       Entire Series#}
-{#                                    </a>#}
-{#                                    <a href="#"#}
-{#                                       data-action="dropdown#toggle"#}
-{#                                       class="backdrop-filter p-2 bg-opacity-100 hover:bg-green-950 rounded-b-md"#}
-{#                                    >#}
-{#                                       Season#}
-{#                                    </a>#}
-{#                                </div>#}
-{#                            </div>#}
-
-
+                            {% if results.media.mediaType == "tvshows" %}
                             <div {{ stimulus_controller('monitor_button', {
                                 tmdbId: results.media.tmdbId,
                                 imdbId: results.media.imdbId,
                                 title: results.media.title,
                             })}}
                                 data-monitor-button-result-filter-outlet="#filter"
+                                data-monitor-button-dialog-outlet=".monitor-modal"
                             >
-                                <button data-monitor-button-target="button" {{ stimulus_action('monitor_button', 'toggle', 'click') }}
-                                        class="h-8 text-white bg-green-800 bg-opacity-60 font-medium rounded-lg text-sm
-                                         px-2 py-1.5 text-center inline-flex items-center hover:bg-green-900 border-2
-                                         border-green-500"
-                                        type="button"
+                                <twig:Modal
+                                        unique_class="monitor-modal"
+                                        button_class="h-8 text-white bg-green-800 bg-opacity-60 font-medium rounded-lg text-sm
+                                        px-2 py-1.5 text-center inline-flex items-center hover:bg-green-900 border-2
+                                        border-green-500"
+                                        container_class="monitor-modal"
+                                        heading="'Hol Up!" button_text="Monitor" submit_action="{{ stimulus_action('monitor_button', 'monitorSeries', 'click') }}" show_cancel show_submit
                                 >
-                                    Monitor
-                                    <svg class="w-2.5 h-2.5 ms-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
-                                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
-                                    </svg>
-                                </button>
-
-                                <!-- Dropdown menu -->
-                                <div data-monitor-button-target="options"
-                                     class="absolute mt-1 right-12 z-40 hidden divide-y rounded-md shadow-sm
-                                     w-44 bg-green-800 backdrop-filter bg-opacity-100 border-2 border-green-500"
-                                >
-                                    <ul class="py-2 text-sm text-gray-100" aria-labelledby="dropdownDefaultButton">
-                                        <li {{ stimulus_action('monitor_button', 'monitorSeries', 'click') }}>
-                                            <button class="px-4 py-2 hover:bg-green-950 w-full text-left">
-                                                Entire Series
-                                            </button>
-                                        </li>
-                                        <li {{ stimulus_action('monitor_button', 'monitorSeason', 'click') }}>
-                                            <button class="px-4 py-2 hover:bg-green-950 w-full text-left">
-                                                Season
-                                            </button>
-                                        </li>
-                                    </ul>
-                                </div>
+                                    Monitoring a series will continuously search for new episodes and attempt to automatically download them. Your download preferences
+                                    will be used to choose the correct file. To stop monitoring for new episodes, delete the monitor.
+                                    <br /><br />
+                                    Would you like to add a new monitor for "{{ results.media.title }}"?
+                                </twig:Modal>
                             </div>
+                            {% endif %}
 
 
                         </div>