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() {

assets/styles/app.css

@@ -23,7 +23,7 @@
         @apply bg-green-950 hover:bg-green-900 border-green-500
     }
     .alert-warning {
-        @apply bg-yellow-500/70 hover:bg-yellow-600 border-yellow-400 text-black
+        @apply bg-yellow-500 hover:bg-yellow-600 border-yellow-400 text-black
     }
 }
 

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:

config/routes.yaml

@@ -1,7 +1,15 @@
-controllersIndex:
+controllersBase:
     resource:
-        path: ../src/Controller/
+        path: ../src/Base/Framework/Controller/
-        namespace: App\Controller
+        namespace: App\Base\Framework\Controller
+    type: attribute
+    defaults:
+        schemes: [ 'https' ]
+
+controllersSearch:
+    resource:
+        path: ../src/Search/Framework/Controller/
+        namespace: App\Search\Framework\Controller
     type: attribute
     defaults:
         schemes: [ 'https' ]

config/services.yaml

@@ -4,6 +4,15 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
+    # App
+    app.url: '%env(APP_URL)%'
+
+    # Debrid Services
+    app.debrid.real_debrid.key: '%env(REAL_DEBRID_KEY)%'
+
+    # TMDB Key
+    app.meta_provider.tmdb.key: '%env(TMDB_API)%'
+
     # Media
     media.base_path: '/var/download'
     media.default_movies_dir: movies

src/Base/ConfigResolver.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Base;
+
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+
+final class ConfigResolver
+{
+    private array $messages = [];
+
+    public function __construct(
+        #[Autowire(param: 'app.url')]
+        private readonly ?string $appUrl = null,
+
+        #[Autowire(param: 'app.debrid.real_debrid.key')]
+        private readonly ?string $realDebridApiKey = null,
+
+        #[Autowire(param: 'app.meta_provider.tmdb.key')]
+        private readonly ?string $tmdbApiKey = null,
+
+        #[Autowire(param: 'media.movies_path')]
+        private readonly ?string $moviesPath = null,
+
+        #[Autowire(param: 'media.tvshows.path')]
+        private readonly ?string $tvshowsPath = null,
+    ) {}
+
+    public function validate(): bool
+    {
+        $valid = true;
+
+        if (null === $this->realDebridApiKey || "" === $this->realDebridApiKey) {
+            $this->messages[] = "Your Real Debrid API key is missing. Please set it to the 'REAL_DEBRID_KEY' environment variable.";
+            $valid = false;
+        }
+
+        if (null === $this->tmdbApiKey || "" === $this->tmdbApiKey) {
+            $this->messages[] = "Your TMDB API key is missing. Please set it to the 'TMDB_API' environment variable.";
+            $valid = false;
+        }
+
+        return $valid;
+    }
+
+    public function getMessages(): array
+    {
+        return $this->messages;
+    }
+}

src/Base/Enum/MediaType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Enum;
+namespace App\Base\Enum;
 
 enum MediaType: string
 {

src/Base/Framework/Command/ConfigSetCommand.php

@@ -1,12 +1,11 @@
 <?php
 
-namespace App\Command;
+namespace App\Base\Framework\Command;
 
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 

src/Base/Framework/Command/SeedDatabaseCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Command;
+namespace App\Base\Framework\Command;
 
 use App\User\Framework\Entity\UserPreference;
 use App\User\Framework\Repository\PreferenceOptionRepository;

src/Base/Framework/Command/StartupStatusCommand.php

@@ -1,13 +1,11 @@
 <?php
 
-namespace App\Command;
+namespace App\Base\Framework\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 

src/Base/Framework/Controller/AlertController.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Controller;
+namespace App\Base\Framework\Controller;
 
-use App\Util\Broadcaster;
+use App\Base\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;

src/Base/Framework/Controller/IndexController.php

@@ -1,13 +1,9 @@
 <?php
 
-namespace App\Controller;
+namespace App\Base\Framework\Controller;
 
-use App\Download\Framework\Repository\DownloadRepository;
-use App\Monitor\Action\Command\MonitorTvShowCommand;
 use App\Monitor\Action\Handler\MonitorTvShowHandler;
-use App\Monitor\Framework\Scheduler\MonitorDispatcher;
 use App\Tmdb\Tmdb;
-use App\Tmdb\TmdbResult;
 use App\User\Framework\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;

src/Base/Util/Broadcaster.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RequestStack;

src/Base/Util/CountryCodes.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 class CountryCodes
 {

src/Base/Util/CountryLanguages.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 class CountryLanguages
 {

src/Base/Util/Paginator.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;

src/Base/Util/ProviderList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 class ProviderList
 {

src/Base/Util/QualityList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 class QualityList
 {

src/Download/Framework/Controller/ApiController.php

@@ -2,6 +2,7 @@
 
 namespace App\Download\Framework\Controller;
 
+use App\Base\Util\Broadcaster;
 use App\Download\Action\Handler\DeleteDownloadHandler;
 use App\Download\Action\Handler\PauseDownloadHandler;
 use App\Download\Action\Handler\ResumeDownloadHandler;
@@ -10,7 +11,6 @@ use App\Download\Action\Input\DownloadMediaInput;
 use App\Download\Action\Input\PauseDownloadInput;
 use App\Download\Action\Input\ResumeDownloadInput;
 use App\Download\Framework\Repository\DownloadRepository;
-use App\Util\Broadcaster;
 use Nihilarr\PTN;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;

src/Download/Framework/Repository/DownloadRepository.php

@@ -2,9 +2,9 @@
 
 namespace App\Download\Framework\Repository;
 
+use App\Base\Util\Paginator;
 use App\Download\Framework\Entity\Download;
 use App\User\Framework\Entity\User;
-use App\Util\Paginator;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Security\Core\User\UserInterface;

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');
+        try {
-        $monitor = $this->monitorRepository->find($command->movieMonitorId);
+            $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());
+            $episodeData = $this->tmdb->episodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
-        if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::now()) {
+            if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::today('UTC')) {
-            $this->logger->info('> [MonitorTvEpisodeHandler] Episode has not aired yet, skipping for now');
+                $this->logger->info('> [MonitorTvEpisodeHandler] ...Episode has not aired yet, skipping for now');
-            return new MonitorTvEpisodeResult(
+                return new MonitorTvEpisodeResult(
-                status: 'OK',
+                    status: 'OK',
-                result: [
+                    result: [
-                    'message' => 'No change',
+                        'message' => 'No change',
-                    'monitor' => $monitor,
+                        '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->logger->info('> [MonitorTvEpisodeHandler] ...Found ' . count($results->results) . ' total download options, beginning evaluation');
-        $this->monitorRepository->getEntityManager()->flush();
 
-        $this->logger->info('> [MonitorTvEpisodeHandler] Searching for "' . $monitor->getTitle() . '" season ' . $monitor->getSeason() . ' episode ' . $monitor->getEpisode() . ' download options');
+            $result = $this->monitorOptionEvaluator->evaluateOptions($monitor, $results->results);
-        $results = $this->getTvShowOptionsHandler->handle(
-            new GetTvShowOptionsCommand(
-                $monitor->getTmdbId(),
-                $monitor->getImdbId(),
-                $monitor->getSeason(),
-                $monitor->getEpisode()
-            )
-        );
 
-        $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);
+            $monitor->setLastSearch(new DateTimeImmutable());
-
+            $monitor->setSearchCount($monitor->getSearchCount() + 1);
-        if (null !== $result) {
+            $this->entityManager->flush();
-            $this->logger->info('> [MonitorTvEpisodeHandler] 1 matching result found: dispatching DownloadMediaCommand for "' . $result->title . '"');
+        } catch (\Throwable $exception) {
-            $this->bus->dispatch(new DownloadMediaCommand(
+            $this->logger->error('> [MonitorTvEpisodeHandler] ...Exception thrown: ' . $exception->getMessage());
-                $result->url,
+            $this->logger->error($exception->getMessage());
-                $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->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

@@ -2,12 +2,12 @@
 
 namespace App\Monitor\Framework\Controller;
 
+use App\Base\Util\Broadcaster;
 use App\Monitor\Action\Handler\AddMonitorHandler;
 use App\Monitor\Action\Handler\DeleteMonitorHandler;
 use App\Monitor\Action\Input\AddMonitorInput;
 use App\Monitor\Action\Input\DeleteMonitorInput;
 use App\Monitor\Framework\Scheduler\MonitorDispatcher;
-use App\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mercure\HubInterface;
@@ -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/Monitor/Framework/Repository/MonitorRepository.php

@@ -2,8 +2,8 @@
 
 namespace App\Monitor\Framework\Repository;
 
+use App\Base\Util\Paginator;
 use App\Monitor\Framework\Entity\Monitor;
-use App\Util\Paginator;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Security\Core\User\UserInterface;

src/Search/Action/Input/GetMediaInfoInput.php

@@ -2,8 +2,6 @@
 
 namespace App\Search\Action\Input;
 
-use App\Download\Action\Command\DownloadMediaCommand;
-use App\Enum\MediaType;
 use App\Search\Action\Command\GetMediaInfoCommand;
 use OneToMany\RichBundle\Attribute\SourceRoute;
 use OneToMany\RichBundle\Contract\CommandInterface;

src/Search/Framework/Controller/WebController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace App\Search\Framework\Controller;
 
 use App\Search\Action\Handler\GetMediaInfoHandler;
 use App\Search\Action\Handler\SearchHandler;
@@ -14,7 +14,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Attribute\Route;
 
-final class SearchController extends AbstractController
+final class WebController extends AbstractController
 {
     public function __construct(
         private SearchHandler $searchHandler,

src/Tmdb/Tmdb.php

@@ -3,14 +3,11 @@
 namespace App\Tmdb;
 
 use Aimeos\Map;
-use App\Enum\MediaType;
+use App\Base\Enum\MediaType;
 use App\ValueObject\ResultFactory;
-use Carbon\Carbon;
 use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 use Tmdb\Api\Find;
 use Tmdb\Client;
@@ -20,7 +17,6 @@ use Tmdb\Event\Listener\Request\AcceptJsonRequestListener;
 use Tmdb\Event\Listener\Request\ApiTokenRequestListener;
 use Tmdb\Event\Listener\Request\ContentTypeJsonRequestListener;
 use Tmdb\Event\Listener\Request\UserAgentRequestListener;
-use Tmdb\Event\Listener\RequestListener;
 use Tmdb\Event\RequestEvent;
 use Tmdb\Model\Movie;
 use Tmdb\Model\Search\SearchQuery\KeywordSearchQuery;

src/Torrentio/Framework/Controller/ApiController.php

@@ -2,20 +2,10 @@
 
 namespace App\Torrentio\Framework\Controller;
 
-use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
-use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
-use App\Torrentio\Action\Input\GetMovieOptionsInput;
-use App\Torrentio\Action\Input\GetTvShowOptionsInput;
 use App\Torrentio\Client\Torrentio;
-use App\Torrentio\Exception\TorrentioRateLimitException;
-use App\Util\Broadcaster;
-use Carbon\Carbon;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Cache\ItemInterface;
 
 final class ApiController extends AbstractController
 {

src/Torrentio/Framework/Controller/WebController.php

@@ -2,12 +2,12 @@
 
 namespace App\Torrentio\Framework\Controller;
 
+use App\Base\Util\Broadcaster;
 use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\Torrentio\Action\Input\GetMovieOptionsInput;
 use App\Torrentio\Action\Input\GetTvShowOptionsInput;
 use App\Torrentio\Exception\TorrentioRateLimitException;
-use App\Util\Broadcaster;
 use Carbon\Carbon;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;

src/Torrentio/Result/ResultFactory.php

@@ -2,8 +2,7 @@
 
 namespace App\Torrentio\Result;
 
-use App\Util\CountryCodes;
+use App\Base\Util\CountryLanguages;
-use App\Util\CountryLanguages;
 use Nihilarr\PTN;
 
 class ResultFactory

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/Twig/Components/DownloadList.php

@@ -3,11 +3,8 @@
 namespace App\Twig\Components;
 
 use App\Download\Framework\Repository\DownloadRepository;
-use App\Util\Paginator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 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;
 

src/Twig/Components/Filter.php

@@ -3,8 +3,8 @@
 namespace App\Twig\Components;
 
 use Aimeos\Map;
+use App\Base\Util\QualityList;
 use App\User\Framework\Repository\PreferencesRepository;
-use App\Util\QualityList;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\DefaultActionTrait;

src/Twig/Components/PaginateTrait.php

@@ -2,7 +2,7 @@
 
 namespace App\Twig\Components;
 
-use App\Util\Paginator;
+use App\Base\Util\Paginator;
 use Doctrine\ORM\Query;
 use Symfony\UX\LiveComponent\Attribute\LiveAction;
 use Symfony\UX\LiveComponent\Attribute\LiveArg;

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/Controller/Web/PreferencesController.php

@@ -4,15 +4,15 @@ declare(strict_types=1);
 
 namespace App\User\Framework\Controller\Web;
 
+use App\Base\Util\Broadcaster;
+use App\Base\Util\CountryLanguages;
+use App\Base\Util\ProviderList;
+use App\Base\Util\QualityList;
 use App\User\Action\Handler\SaveUserDownloadPreferencesHandler;
 use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
 use App\User\Action\Input\SaveUserDownloadPreferencesInput;
 use App\User\Action\Input\SaveUserMediaPreferencesInput;
 use App\User\Framework\Repository\PreferencesRepository;
-use App\Util\Broadcaster;
-use App\Util\CountryLanguages;
-use App\Util\ProviderList;
-use App\Util\QualityList;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -98,7 +98,8 @@ class PreferencesController extends AbstractController
             [
                 'preferences' => $this->preferencesRepository->findEnabled(),
                 'languages' => $languages,
-                'providers' => ProviderList::$providers,
+                'providers' => ProviderList::getProviders(),
+                'qualities' => QualityList::getBaseQualities(),
                 'mediaPreferences' => $mediaPreferences,
                 'downloadPreferences' => $downloadPreferences,
             ]

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

src/User/Framework/EventListener/LoginSuccessListener.php

@@ -2,6 +2,8 @@
 
 namespace App\User\Framework\EventListener;
 
+use App\Base\ConfigResolver;
+use App\Base\Util\Broadcaster;
 use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;
@@ -10,12 +12,26 @@ final class LoginSuccessListener
 {
     public function __construct(
         private readonly RequestStack $requestStack,
+        private readonly ConfigResolver $configResolver,
+        private readonly Broadcaster $broadcaster,
     ) {}
 
-    #[AsEventListener(event: 'security.authentication.success')]
+    #[AsEventListener(event: 'security.authentication.success', priority: 20)]
     public function setMercureTopics(AuthenticationSuccessEvent $event): void
     {
         // Set the unique Mercure topic name for the User's alerts
         $this->requestStack->getSession()->set('mercure_alert_topic', 'alerts_' . uniqid());
     }
+
+    #[AsEventListener(event: 'security.authentication.success', priority: 10)]
+    public function validateConfig(AuthenticationSuccessEvent $event): void
+    {
+        // Set the unique Mercure topic name for the User's alerts
+        $valid = $this->configResolver->validate();
+        if (false === $valid) {
+            foreach ($this->configResolver->getMessages() as $message) {
+                $this->requestStack->getSession()->getFlashBag()->add('warning', $message);
+            }
+        }
+    }
 }

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/Alert.html.twig

@@ -7,20 +7,9 @@
             <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"/>
         </svg>
         <span class="sr-only">Info</span>
-        <h3 class="text-lg font-medium">{{ title|default('') }}</h3>
+        <h3 class="text-lg font-medium font-bold">{{ title|default('') }}</h3>
     </div>
-    <div class="mt-2 text-sm">
+    <div class="mt-2 text-sm w-[350px] font-bold">
         {{ message }}
     </div>
-{#    <div class="flex">#}
-{#        <button type="button" class="text-white bg-green-800 hover:bg-green-900 focus:ring-4 focus:outline-none focus:ring-green-300 font-medium rounded-lg text-xs px-3 py-1.5 me-2 text-center inline-flex items-center dark:bg-green-600 dark:hover:bg-green-700 dark:focus:ring-green-800">#}
-{#            <svg class="me-2 h-3 w-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 14">#}
-{#                <path d="M10 0C4.612 0 0 5.336 0 7c0 1.742 3.546 7 10 7 6.454 0 10-5.258 10-7 0-1.664-4.612-7-10-7Zm0 10a3 3 0 1 1 0-6 3 3 0 0 1 0 6Z"/>#}
-{#            </svg>#}
-{#            View more#}
-{#        </button>#}
-{#        <button type="button" class="text-green-800 bg-transparent border border-green-800 hover:bg-green-900 hover:text-white focus:ring-4 focus:outline-none focus:ring-green-300 font-medium rounded-lg text-xs px-3 py-1.5 text-center dark:hover:bg-green-600 dark:border-green-600 dark:text-green-400 dark:hover:text-white dark:focus:ring-green-800" data-dismiss-target="#alert-additional-content-3" aria-label="Close">#}
-{#            Dismiss#}
-{#        </button>#}
-{#    </div>#}
 </li>

templates/components/Header.html.twig

@@ -28,7 +28,10 @@
     </div>
     <div {{ turbo_stream_listen(app.session.get('mercure_alert_topic')) }} class="fixed z-40 top-10 right-10">
         <div class="z-40">
-            <ul id="alert_list">
+            <ul id="alert_list" class="flex flex-col gap-2">
+                {% for message in app.flashes('warning') %}
+                    <twig:Alert :title="'Warning'" :message="message" :alert_id="''" type="warning" data-controller="alert" />
+                {% endfor %}
             </ul>
         </div>
     </div>

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/components/TvEpisodeList.html.twig

@@ -37,7 +37,7 @@
                                 </button>
 
                                 <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 }}
+                                    {{ episode['air_date']|date(null, 'UTC') }}
                                 </small>
                             </div>
                         </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"#}
+                            {% if results.media.mediaType == "tvshows" %}
-{#                                 {{ 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>#}
-
-
                             <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') }}
+                                <twig:Modal
-                                        class="h-8 text-white bg-green-800 bg-opacity-60 font-medium rounded-lg text-sm
+                                        unique_class="monitor-modal"
-                                         px-2 py-1.5 text-center inline-flex items-center hover:bg-green-900 border-2
+                                        button_class="h-8 text-white bg-green-800 bg-opacity-60 font-medium rounded-lg text-sm
-                                         border-green-500"
+                                        px-2 py-1.5 text-center inline-flex items-center hover:bg-green-900 border-2
-                                        type="button"
+                                        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
+                                    Monitoring a series will continuously search for new episodes and attempt to automatically download them. Your download preferences
-                                    <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">
+                                    will be used to choose the correct file. To stop monitoring for new episodes, delete the monitor.
-                                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
+                                    <br /><br />
-                                    </svg>
+                                    Would you like to add a new monitor for "{{ results.media.title }}"?
-                                </button>
+                                </twig:Modal>
-
-                                <!-- 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>
                             </div>
+                            {% endif %}
 
 
                         </div>