fix: references correct base image tag

bash/build_base.sh

@@ -0,0 +1,7 @@
+# torsearch-app is built from this base, and torsearch-worker & torsearch-scheduler are built from torsearch-app
+# This image is used to speed up build times
+export FRANKENPHP_TAG=php8.4
+
+docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base -t code.caldwell.digital/home/torsearch-base:${FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${FRANKENPHP_TAG}" .
+docker push code.caldwell.digital/home/torsearch-base:${FRANKENPHP_TAG}
+docker push code.caldwell.digital/home/torsearch-base:latest

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c133ccd27ac6a41256bdc69129c16546",
+    "content-hash": "e055bbbbe5836c92bb147b6dbb1d1d46",
     "packages": [
         {
             "name": "1tomany/rich-bundle",
@@ -9467,6 +9467,57 @@
             ],
             "time": "2025-05-12T14:48:23+00:00"
         },
+        {
+            "name": "symfony/serializer-pack",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/serializer-pack.git",
+                "reference": "2844d81a5fc86b617b82f44a8bfcaaba1d583eee"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/serializer-pack/zipball/2844d81a5fc86b617b82f44a8bfcaaba1d583eee",
+                "reference": "2844d81a5fc86b617b82f44a8bfcaaba1d583eee",
+                "shasum": ""
+            },
+            "require": {
+                "phpdocumentor/reflection-docblock": "*",
+                "phpstan/phpdoc-parser": "*",
+                "symfony/property-access": "*",
+                "symfony/property-info": "*",
+                "symfony/serializer": "*"
+            },
+            "conflict": {
+                "symfony/property-info": "<5.4",
+                "symfony/serializer": "<5.4"
+            },
+            "type": "symfony-pack",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A pack for the Symfony serializer",
+            "support": {
+                "issues": "https://github.com/symfony/serializer-pack/issues",
+                "source": "https://github.com/symfony/serializer-pack/tree/v1.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-06-03T13:55:25+00:00"
+        },
         {
             "name": "symfony/service-contracts",
             "version": "v3.6.0",
@@ -13347,7 +13398,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
@@ -13355,7 +13406,7 @@
         "ext-ctype": "*",
         "ext-iconv": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.4"
     },

deploy.compose.yml

@@ -2,7 +2,7 @@ services:
   app:
     image: registry.caldwell.digital/home/torsearch-app:${TAG}
     ports:
-      - '8001:80'
+      - "${SWARM_PORT}:80"
     environment:
       MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
       MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'

docker/Dockerfile.app

@@ -1,19 +1,8 @@
-FROM dunglas/frankenphp
+FROM code.caldwell.digital/home/torsearch-base:php8.4
-
-ENV SERVER_NAME=":80"
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
 ARG APP_VERSION="0.dev"
 ENV APP_VERSION="${APP_VERSION}"
 
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
-
 COPY . /app
 COPY --chmod=775 docker/app/entrypoint.sh /usr/local/bin/docker-entrypoint
 COPY docker/app/Caddyfile /etc/frankenphp/Caddyfile

docker/Dockerfile.base

@@ -0,0 +1,16 @@
+ARG FRANKENPHP_TAG
+
+FROM dunglas/frankenphp:${FRANKENPHP_TAG}
+
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache && \
+    apt install -y wget && \
+    apt clean && apt autoremove

docker/Dockerfile.scheduler

@@ -1,6 +1,6 @@
 ARG APP_VERSION
 
-FROM code.caldwell.digital/torsearch/torsearch-app:${APP_VERSION}
+FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION}
 
 ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
 

docker/Dockerfile.worker

@@ -1,22 +1,10 @@
-FROM dunglas/frankenphp:php8.4-alpine
+ARG APP_VERSION
 
-ENV SERVER_NAME=":80"
+FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION}
-ENV CADDY_GLOBAL_OPTIONS="auto_https off"
-ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
 
-ARG APP_VERSION="0.dev"
+RUN apt install -y wget && \
-ENV APP_VERSION="${APP_VERSION}"
+    apt autoremove && \
-
+    apt clean
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
-
-RUN apk add --no-cache wget
-
-COPY . /app
 
 ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]
 

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -42,7 +42,7 @@ readonly class MonitorTvEpisodeHandler implements HandlerInterface
             $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->tvEpisodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
 
             if (null === $monitor->getAirDate() && null !== $episodeData->episodeAirDate && "" !== $episodeData->episodeAirDate) {
                 $monitor->setAirDate(Carbon::parse($episodeData->episodeAirDate));

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -9,6 +9,7 @@ use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
 use App\Monitor\Action\Result\MonitorTvShowResult;
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Tmdb\Dto\TmdbEpisodeDto;
 use App\Tmdb\TmdbClient;
 use Carbon\Carbon;
 use DateTimeImmutable;
@@ -61,8 +62,9 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         if ($downloadedEpisodes->count() !== $episodesInShow->count()) {
             // Dispatch Episode commands for each missing Episode
             foreach ($episodesInShow as $episode) {
+                /** @var TmdbEpisodeDto $episode */
                 // Only monitor future episodes
-                $this->logger->info('> [MonitorTvShowHandler] Evaluating "' . $monitor->getTitle() . '", season "' . $episode['season_number'] . '" episode "' . $episode['episode_number'] . '"');
+                $this->logger->info('> [MonitorTvShowHandler] Evaluating "' . $monitor->getTitle() . '", season "' . $episode->seasonNumber . '" episode "' . $episode->episodeNumber . '"');
                 $episodeInFuture = $this->episodeReleasedAfterMonitorCreated($monitor->getCreatedAt(), $episode);
                 $this->logger->info('> [MonitorTvShowHandler] ...Released after monitor started? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
                 if (false === $episodeInFuture) {
@@ -94,9 +96,9 @@ readonly class MonitorTvShowHandler implements HandlerInterface
                     ->setImdbId($monitor->getImdbId())
                     ->setTitle($monitor->getTitle())
                     ->setMonitorType('tvepisode')
-                    ->setSeason($episode['season_number'])
+                    ->setSeason($episode->seasonNumber)
-                    ->setEpisode($episode['episode_number'])
+                    ->setEpisode($episode->episodeNumber)
-                    ->setAirDate($episode['air_date'] !== null && $episode['air_date'] !== "" ? Carbon::parse($episode['air_date']) : null)
+                    ->setAirDate($episode->airDate !== null && $episode->airDate !== "" ? Carbon::parse($episode->airDate) : null)
                     ->setCreatedAt(new DateTimeImmutable())
                     ->setSearchCount(0)
                     ->setStatus('New');
@@ -128,29 +130,29 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         );
     }
 
-    private function episodeReleasedAfterMonitorCreated(string|DateTimeImmutable $monitorStartDate, array $episodeInShow): bool
+    private function episodeReleasedAfterMonitorCreated(string|DateTimeImmutable $monitorStartDate, TmdbEpisodeDto $episodeInShow): bool
     {
         $monitorStartDate = Carbon::parse($monitorStartDate)->setTime(0, 0);
-        $episodeAirDate = Carbon::parse($episodeInShow['air_date']);
+        $episodeAirDate = Carbon::parse($episodeInShow->airDate);
         return $episodeAirDate >= $monitorStartDate;
     }
 
-    private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool
+    private function episodeExists(TmdbEpisodeDto $episodeInShow, Map $downloadedEpisodes): bool
     {
         return $downloadedEpisodes->filter(
-            fn (object $episode) => $episode->episode === $episodeInShow['episode_number']
+            fn (object $episode) => $episode->episode === $episodeInShow->episodeNumber
-                && $episode->season === $episodeInShow['season_number']
+                && $episode->season === $episodeInShow->seasonNumber
             )->count() > 0;
     }
 
-    private function monitorExists(Monitor $monitor, array $episode): bool
+    private function monitorExists(Monitor $monitor, TmdbEpisodeDto $episode): bool
     {
         return $this->monitorRepository->findOneBy([
                 'imdbId' => $monitor->getImdbId(),
                 'title' => $monitor->getTitle(),
                 'monitorType' => 'tvepisode',
-                'season' => $episode['season_number'],
+                'season' => $episode->seasonNumber,
-                'episode' => $episode['episode_number'],
+                'episode' => $episode->episodeNumber,
                 'status' => ['New', 'Active', 'In Progress']
             ]) !== null;
     }

src/Monitor/Framework/Entity/Monitor.php

@@ -68,7 +68,7 @@ class Monitor
     #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')]
     private ?self $parent = null;
 
-    #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')]
+    #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent', cascade: ['remove'])]
     private Collection $children;
 
     public function __construct()

src/Tmdb/Framework/Serializer/TmdbTvEpisodeResultDenormalizer.php

@@ -16,10 +16,10 @@ class TmdbTvEpisodeResultDenormalizer implements DenormalizerInterface
         private readonly NormalizerInterface $normalizer,
     ) {}
 
-    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): TmdbResult|array|null
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): TmdbResult|TmdbEpisodeDto|array|null
     {
         /** @var TmdbEpisodeDto $result */
-        $result = $this->normalizer->denormalize($data, TmdbResult::class, $format, $context);
+        $result = $this->normalizer->denormalize($data, TmdbEpisodeDto::class, $format, $context);
         return $result;
     }
 

src/Tmdb/Framework/Serializer/TmdbTvShowResultDenormalizer.php

@@ -48,7 +48,7 @@ class TmdbTvShowResultDenormalizer extends TmdbResultDenormalizer implements Den
         array $context = []
     ): bool {
         return array_key_exists('media_type', $context) &&
-            $context['media_type'] === "tvshows";
+            $context['media_type'] === MediaType::TvShow->value;
     }
 
     public function getSupportedTypes(?string $format): array

src/Tmdb/TmdbClient.php

@@ -143,13 +143,13 @@ class TmdbClient
     {
         $tmdbId = $this->findByImdbId($imdbId)['id'];
         $media = $this->tvRepository->getApi()->getTvShow($tmdbId, ['append_to_response' => 'external_ids,credits']);
+
         $media['seasons'] = Map::from($media['seasons'])->filter(function ($data) {
             return $data['season_number'] !== 0 &&
-                strtolower($data['name']) !== 'specials';
+                strtolower($data['name']) !== 'specials' &&
+                $data['episode_count'] > 0;
         })->map(function ($data) use ($media) {
             return $this->tvSeasonDetails($media['id'], $data['season_number'])['episodes'];
-        })->rekey(function ($data) {
-            return $data[1]['season_number'];
         })->toArray();
 
         return $this->parseResult(

templates/search/result.html.twig

@@ -10,9 +10,9 @@
             <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 }}" />
+                        <img class="w-full md:w-[12.5rem] rounded-lg" src="{{ results.media.poster }}" />
                     {% else %}
-                        <div class="w-full md:w-40 h-[144px] rounded-lg bg-gray-700 flex items-center justify-center">
+                        <div class="w-full md:w-[12.5rem] h-[144px] rounded-lg bg-gray-700 flex items-center justify-center">
                             <twig:ux:icon width="24" name="hugeicons:loading-01" />
                         </div>
                     {% endif %}
@@ -20,7 +20,7 @@
                     <div class="w-full flex flex-col">
                         <div class="mb-4 flex flex-row gap-2 justify-between">
                             <h3 class="text-xl font-medium leading-tight font-bold text-gray-50">
-                                {{ results.media.title }} ({{ results.media.episodeAirDate|date('Y') }})
+                                {{ results.media.title }} ({{ results.media.year }})
                             </h3>
 
                             {% if results.media.mediaType == "tvshows" %}
@@ -109,7 +109,7 @@
                             </twig:Turbo:Frame>
 
                             <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-sky-700 rounded-lg text-white" title="Release date {{ results.media.episodeAirDate }}">
-                                {{ results.media.episodeAirDate|date('n/j/Y', 'UTC') }}
+                                {{ results.media.premiereDate|date('n/j/Y', 'UTC') }}
                             </span>
 
                             <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-orange-500 rounded-lg text-white" title="This movie has a runtime of {{ results.media.runtime }} minutes.">