task: adds event log module

assets/controllers/monitor_button_controller.js

@@ -13,34 +13,7 @@ export default class extends Controller {
         tmdbId: String,
         imdbId: String,
         title: String,
-    }
+        season: Number,
-
-    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)
     }
 
     toggle() {
@@ -53,34 +26,13 @@ export default class extends Controller {
             imdbId: this.imdbIdValue,
             title: this.titleValue,
             monitorType: 'tvshows',
+            season: this.seasonValue
         });
         if (this.hasDialogOutlet) {
             this.dialogOutlet.close();
         }
     }
 
-    async monitorSeason() {
-        await this.makeMonitor({
-            tmdbId: this.tmdbIdValue,
-            imdbId: this.imdbIdValue,
-            title: this.titleValue,
-            monitorType: 'tvseason',
-            season: this.resultFilterOutlet.activeFilter['season'],
-        });
-    }
-
-    async monitorEpisode() {
-        // ToDo: figure out how to set episode
-        await this.makeMonitor({
-            tmdbId: this.tmdbIdValue,
-            imdbId: this.imdbIdValue,
-            title: this.titleValue,
-            monitorType: 'tvepisode',
-            season: this.resultFilterOutlet.activeFilter['season'],
-            episode: '',
-        });
-    }
-
     async makeMonitor(body) {
         const response = await fetch('/api/monitor', {
             method: 'POST',
@@ -90,7 +42,6 @@ export default class extends Controller {
             },
             body: JSON.stringify(body)
         });
-
         return await response.json();
     }
 }

config/routes.yaml

@@ -6,6 +6,14 @@ controllersBase:
     defaults:
         schemes: [ 'https' ]
 
+controllersEventLog:
+    resource:
+        path: ../src/EventLog/Framework/Controller/
+        namespace: App\EventLog\Framework\Controller
+    type: attribute
+    defaults:
+        schemes: [ 'https' ]
+
 controllersLibrary:
     resource:
         path: ../src/Library/Framework/Controller/

deploy.compose.yml

@@ -15,10 +15,6 @@ services:
       - mercure_config:/config
     depends_on:
       - database
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "tcp://192.168.1.197:12202"
 
 
   worker:
@@ -32,10 +28,6 @@ services:
       replicas: 2
     depends_on:
       - app
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "tcp://192.168.1.197:12203"
 
 
   scheduler:
@@ -47,11 +39,6 @@ services:
     command: -vv
     depends_on:
       - app
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "tcp://192.168.1.197:12204"
-
 
 
   redis:

migrations/Version20251101194723.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20251101194723 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE user_preference CHANGE preference_value preference_value VARCHAR(255) DEFAULT NULL
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql(<<<'SQL'
+            ALTER TABLE user_preference CHANGE preference_value preference_value VARCHAR(1024) DEFAULT NULL
+        SQL);
+    }
+}

psalm.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="true"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/EventLog/Action/Command/AddEventLogCommand.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\EventLog\Action\Command;
+
+use OneToMany\RichBundle\Contract\CommandInterface;
+
+/** @implements CommandInterface<AddEventLogCommand> */
+class AddEventLogCommand implements CommandInterface
+{
+    public function __construct(
+        public string $type,
+        public string $message,
+        public array $context,
+    ) {}
+}

src/EventLog/Action/Handler/AddEventLogHandler.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\EventLog\Action\Handler;
+
+use App\EventLog\Framework\Repository\EventLogRepository;
+use App\EventLog\Action\Command\AddEventLogCommand;
+use App\EventLog\Action\Result\AddEventLogResult;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\HandlerInterface;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/*** @implements HandlerInterface<AddEventLogCommand> */
+class AddEventLogHandler implements HandlerInterface
+{
+    public function __construct(
+        private EventLogRepository $repository,
+    ) {}
+
+    public function handle(CommandInterface $command): ResultInterface
+    {
+        $eventLog = $this->repository->insert(
+            type: $command->type,
+            message: $command->message,
+            context: $command->context
+        );
+        return new AddEventLogResult($eventLog);
+    }
+}

src/EventLog/Action/Input/AddEventLogInput.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\EventLog\Action\Input;
+
+use App\EventLog\Action\Command\AddEventLogCommand;
+use OneToMany\RichBundle\Attribute\SourceQuery;
+use OneToMany\RichBundle\Attribute\SourceRequest;
+use OneToMany\RichBundle\Contract\CommandInterface;
+use OneToMany\RichBundle\Contract\InputInterface;
+
+/** @implements InputInterface<AddEventLogCommand> */
+class AddEventLogInput implements InputInterface
+{
+    public function __construct(
+        #[SourceQuery('type')]
+        #[SourceRequest('type')]
+        public string $type,
+        
+        #[SourceQuery('message')]
+        #[SourceRequest('message')]
+        public string $message,
+        
+        #[SourceQuery('context')]
+        #[SourceRequest('context')]
+        public array $context = []
+    ){}
+
+    public function toCommand(): CommandInterface
+    {
+        return new AddEventLogCommand(
+            $this->type,
+            $this->message,
+            $this->context
+        );
+    }
+}

src/EventLog/Action/Result/AddEventLogResult.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\EventLog\Action\Result;
+
+use App\EventLog\Framework\Entity\EventLog;
+use OneToMany\RichBundle\Contract\ResultInterface;
+
+/** @implements ResultInterface<AddEventLogResult> */
+class AddEventLogResult implements ResultInterface
+{
+    public function __construct(
+        public EventLog $eventLog,
+    ) {}
+}

src/EventLog/Framework/Controller/EventLogController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\EventLog\Framework\Controller;
+
+use App\Base\Service\Broadcaster;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+
+final class EventLogController extends AbstractController
+{
+    public function __construct(
+        private readonly Broadcaster $broadcaster,
+    ) {}
+
+    #[Route('/alert', name: 'app_alert')]
+    public function index(): Response
+    {
+        $this->broadcaster->alert(
+            'Added to queue',
+            'This is a testy test!'
+        );
+
+        return $this->json([
+            'Success' => 'Published'
+        ]);
+    }
+}

src/EventLog/Framework/Entity/EventLog.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\EventLog\Framework\Entity;
+
+use App\EventLog\Framework\Repository\EventLogRepository;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity(repositoryClass: EventLogRepository::class)]
+class EventLog
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(nullable: true)]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 255, nullable: true)]
+    private ?string $type = null;
+
+    #[ORM\Column(type: Types::TEXT, nullable: true)]
+    private ?string $message = null;
+
+    #[ORM\Column(type: Types::JSON, nullable: true)]
+    private ?array $context = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getType(): ?string
+    {
+        return $this->type;
+    }
+
+    public function setType(?string $type): self
+    {
+        $this->type = $type;
+        return $this;
+    }
+
+    public function getMessage(): ?string
+    {
+        return $this->message;
+    }
+
+    public function setMessage(?string $message): self
+    {
+        $this->message = $message;
+        return $this;
+    }
+
+    public function getContext(): ?array
+    {
+        return $this->context;
+    }
+
+    public function setContext(?array $context): self
+    {
+        $this->context = $context;
+        return $this;
+    }
+}

src/EventLog/Framework/Repository/EventLogRepository.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\EventLog\Framework\Repository;
+
+use App\EventLog\Framework\Entity\EventLog;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<EventLog>
+ */
+class EventLogRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, EventLog::class);
+    }
+
+    public function insert(
+        string $type,
+        string $message,
+        array $context = []
+    ): EventLog {
+        $eventLog = new EventLog()
+            ->setType($type)
+            ->setMessage($message)
+            ->setContext($context);
+        $this->getEntityManager()->persist($eventLog);
+        $this->getEntityManager()->flush();
+        return $eventLog;
+    }
+}

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -44,11 +44,22 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
 
             $episodeData = $this->tmdb->tvEpisodeDetails($monitor->getTmdbId(), $monitor->getImdbId(), $monitor->getSeason(), $monitor->getEpisode());
 
-            if (null === $monitor->getAirDate() && null !== $episodeData->episodeAirDate && "" !== $episodeData->episodeAirDate) {
+            if (null === $episodeData->airDate || "" === $episodeData->airDate) {
-                $monitor->setAirDate(Carbon::parse($episodeData->episodeAirDate));
+                $this->logger->info('> [MonitorTvEpisodeHandler] ...Episode does not have an air date, skipping for now');
+                return new MonitorTvEpisodeResult(
+                    status: 'OK',
+                    result: [
+                        'message' => 'No change',
+                        'monitor' => $monitor,
+                    ]
+                );
             }
 
-            if (Carbon::createFromTimestamp($episodeData->episodeAirDate) > Carbon::today('UTC')) {
+            if (null === $monitor->getAirDate()) {
+                $monitor->setAirDate(Carbon::parse($episodeData->airDate));
+            }
+
+            if (Carbon::createFromTimestamp($episodeData->airDate) > Carbon::today('UTC')) {
                 $this->logger->info('> [MonitorTvEpisodeHandler] ...Episode has not aired yet, skipping for now');
                 return new MonitorTvEpisodeResult(
                     status: 'OK',

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -30,7 +30,8 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         private MediaFiles $mediaFiles,
         private LoggerInterface $logger,
         private TmdbClient $tmdb,
-    ) {}
+    ) {
+    }
 
     public function handle(CommandInterface $command): ResultInterface
     {
@@ -41,25 +42,24 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         $downloadedEpisodes = $this->mediaFiles
             ->getEpisodes($monitor->getTitle())
             ->map(fn($episode) => (object)(new PTN())->parse($episode))
-            ->filter(fn ($episode) =>
+            ->filter(fn($episode) => property_exists($episode, 'episode')
-                property_exists($episode, 'episode')
                 && property_exists($episode, 'season')
                 && null !== $episode->episode
                 && null !== $episode->season
-            )
+            );
-        ;
 
         $this->logger->info('> [MonitorTvShowHandler] Found ' . count($downloadedEpisodes) . ' downloaded episodes for title: ' . $monitor->getTitle());
 
         // Compare against list from TMDB
         $episodesInShow = Map::from(
             $this->tmdb->tvshowDetails($monitor->getImdbId())->episodes
-        )->flat(1);
+        )->flat(1)
+            ->filter(fn(TmdbEpisodeDto $episode) => $episode->seasonNumber >= $monitor->getSeason())
+            ->values();
 
         $this->logger->info('> [MonitorTvShowHandler] Found ' . count($episodesInShow) . ' episodes for title: ' . $monitor->getTitle());
 
         $episodeMonitors = [];
-        if ($downloadedEpisodes->count() !== $episodesInShow->count()) {
         // Dispatch Episode commands for each missing Episode
         foreach ($episodesInShow as $episode) {
             /** @var TmdbEpisodeDto $episode */
@@ -113,7 +113,6 @@ readonly class MonitorTvShowHandler implements HandlerInterface
             $this->monitorTvEpisodeHandler->handle($command);
             $this->logger->info('> [MonitorTvShowHandler] ...Dispatching MonitorTvEpisodeCommand');
         }
-        }
 
         // Set the status to Active, so it will be re-executed.
         $monitor->setStatus('Active');
@@ -130,8 +129,10 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         );
     }
 
-    private function episodeReleasedAfterMonitorCreated(string|DateTimeImmutable $monitorStartDate, TmdbEpisodeDto $episodeInShow): bool
+    private function episodeReleasedAfterMonitorCreated(
-    {
+        string|DateTimeImmutable $monitorStartDate,
+        TmdbEpisodeDto $episodeInShow
+    ): bool {
         $monitorStartDate = Carbon::parse($monitorStartDate)->setTime(0, 0);
         $episodeAirDate = Carbon::parse($episodeInShow->airDate);
         return $episodeAirDate >= $monitorStartDate;

src/Tmdb/Framework/Serializer/TmdbTvShowResultDenormalizer.php

@@ -38,6 +38,10 @@ class TmdbTvShowResultDenormalizer extends TmdbResultDenormalizer implements Den
         $result->year = (null !== $airDate) ? $airDate->format('Y') : null;
         $result->mediaType = MediaType::TvShow->value;
 
+        if (is_array($result->episodes)) {
+            $result->latestSeason = array_key_last($result->episodes);
+        }
+
         return $result;
     }
 

src/Tmdb/TmdbClient.php

@@ -150,6 +150,8 @@ class TmdbClient
                 $data['episode_count'] > 0;
         })->map(function ($data) use ($media) {
             return $this->tvSeasonDetails($media['id'], $data['season_number'])['episodes'];
+        })->rekey(function ($data) use ($media) {
+            return $data[1]['season_number'];
         })->toArray();
 
         return $this->parseResult(

src/Tmdb/TmdbResult.php

@@ -56,5 +56,6 @@ class TmdbResult
         public ?array $producers = null,
         public ?int $runtime = null,
         public ?int $numberSeasons = null,
+        public ?int $latestSeason = null,
     ) {}
 }

src/Torrentio/Result/ResultFactory.php

@@ -21,29 +21,32 @@ class ResultFactory
         string $bingeGroup = "-",
         string $imdbId = "-",
     ) {
-        $ptn = (object) (new PTN())->parse($title);
+        $title = trim(preg_replace('/\s+/', ' ', $title));
-        return new TorrentioResult(
+        $ptn = (object) new PTN()->parse(self::setFilename($url));
+        $result = new TorrentioResult(
             self::trimTitle($title),
-            urldecode($url),
+            self::setUrl($url),
             self::setFilename($url),
             self::setSize($title),
             self::setSeeders($title),
             self::setProvider($title),
             self::setEpisode($title),
-            $ptn->season ?? "-",
+            self::setSeason($ptn),
             $bingeGroup,
-            $ptn->resolution ?? "-",
+            self::setResolution($ptn),
-            self::setCodec($ptn->codec ?? "-"),
+            self::setCodec($ptn),
-            $ptn->quality ?? "-",
+            self::setQuality($ptn),
             $ptn,
-            substr(base64_encode($url), strlen($url) - 10),
+            self::setKey($url),
-            $ptn->episode ?? "-",
+            self::setEpisodeNumber($ptn),
             self::setLanguages($title),
             self::setLanguageFlags($title),
             false,
             uniqid(),
             $imdbId,
         );
+
+        return $result;
     }
 
     public static function setFilename(string $url)
@@ -52,6 +55,11 @@ class ResultFactory
         return end($file);
     }
 
+    public static function setUrl(string $url): string
+    {
+        return urldecode($url);
+    }
+
     public static function setSize(string $title): string
     {
         $sizeMatch = [];
@@ -112,9 +120,15 @@ class ResultFactory
         }
     }
 
-    public static function setCodec(string $codec): string
+    public static function setCodec(object $ptn): string
     {
-        return self::$codecMap[strtolower($codec)] ?? $codec;
+        if (isset($ptn->codec) && array_key_exists($ptn->codec, self::$codecMap)) {
+            return self::$codecMap[strtolower($ptn->codec)];
+        } elseif (isset($ptn->codec)) {
+            return $ptn->codec;
+        }
+
+        return "-";
     }
 
     private static function setEpisode(string $title)
@@ -124,6 +138,36 @@ class ResultFactory
         return array_key_exists(0, $value) ? strtoupper($value[0]) : "n/a";
     }
 
+    public static function setSeason(object $ptn): string
+    {
+        return $ptn->season ?? "-";
+    }
+
+    public static function setBingeGroup(string $bingeGroup): string
+    {
+        return $bingeGroup;
+    }
+
+    public static function setResolution(object $ptn): string
+    {
+        return $ptn->resolution ?? "-";
+    }
+
+    public static function setQuality(object $ptn): string
+    {
+        return $ptn->quality ?? "-";
+    }
+
+    public static function setKey(string $url): string
+    {
+        return substr(base64_encode($url), strlen($url) - 10);
+    }
+
+    public static function setEpisodeNumber(object $ptn): string
+    {
+        return $ptn->episode ?? "-";
+    }
+
     private static function trimTitle(string $title)
     {
         $emoji = \Emoji\detect_emoji($title);

src/Twig/Components/TvEpisodeList.php

@@ -49,7 +49,6 @@ final class  TvEpisodeList
         }
 
         $this->reloadCount++;
-//        dd(new TvEpisodePaginator()->paginate($results, $this->pageNumber, $this->perPage));
         return new TvEpisodePaginator()->paginate($results, $this->pageNumber, $this->perPage);
     }
 

templates/components/TvEpisodeList.html.twig

@@ -2,6 +2,7 @@
         class="episode-list flex flex-col gap-4"
 >
     <div data-live-id="{{ uniqid() }}" class="episode-container flex flex-col gap-4">
+        {% if this.getEpisodes().items != null %}
         {% for episode in this.getEpisodes().items %}
             <episode-container id="{{ episode_anchor(episode.seasonNumber, episode.episodeNumber) }}" class="results"
                  show-title="{{ this.title }}"
@@ -17,7 +18,7 @@
             >
                     <div class="p-4 md:p-6 flex flex-col gap-6 bg-orange-500/60 bg-clip-padding backdrop-filter backdrop-blur-md rounded-md">
                         <div class="flex flex-col md:flex-row gap-4">
-                            {% if episode.poster != null %}
+                            {% if "jpg" in episode.poster %}
                                 <img class="w-full md:w-64 rounded-lg" src="{{ episode.poster }}" />
                             {% else %}
                                 <div class="w-full md:w-64 min-w-64 sticky h-[144px] rounded-lg bg-gray-700 flex items-center justify-center">
@@ -85,6 +86,7 @@
                     </div>
             </episode-container>
         {% endfor %}
+        {% endif %}
     </div>
     {% set paginator = this.episodes %}
     {% include 'partial/tv-episode-list-paginator.html.twig' %}

templates/search/result.html.twig

@@ -28,6 +28,7 @@
                                 tmdbId: results.media.tmdbId,
                                 imdbId: results.media.imdbId,
                                 title: results.media.title,
+                                season: results.media.latestSeason,
                             })}}
                                 data-monitor-button-result-filter-outlet="#filter"
                                 data-monitor-button-dialog-outlet=".monitor-modal"