fix: includes version number in worker & scheduler

assets/controllers/tv_results_controller.js

@@ -48,6 +48,7 @@ export default class extends Controller {
                     this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
                     this.options[0].querySelector('input[type="checkbox"]').checked = true;
                 } else {
+                    this.countTarget.innerText = 0;
                     this.episodeSelectorTarget.disabled = true;
                 }
                 this.loadingIconOutlet.increaseCount();

config/packages/twig.yaml

@@ -1,4 +1,6 @@
 twig:
+    globals:
+        version: '%app.version%'
     file_name_pattern: '*.twig'
     date:
         format: 'm/d/Y'

config/services.yaml

@@ -22,8 +22,11 @@ parameters:
     app.cache.redis.host.default: 'redis://redis'
 
     # Various configs
+    app.default.version: '0.dev'
     app.default.timezone: 'America/Chicago'
 
+    app.version: '%env(default:app.default.version:APP_VERSION)%'
+
 services:
     # default configuration for services in *this* file
     _defaults:

docker/Dockerfile.app

@@ -4,6 +4,9 @@ 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 \

docker/Dockerfile.scheduler

@@ -4,6 +4,9 @@ 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 \

docker/Dockerfile.worker

@@ -4,6 +4,9 @@ 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 \

src/Monitor/Action/Handler/MonitorTvShowHandler.php

@@ -61,10 +61,10 @@ readonly class MonitorTvShowHandler implements HandlerInterface
             // Dispatch Episode commands for each missing Episode
             foreach ($episodesInShow as $episode) {
                 // Only monitor future episodes
-                $episodeInFuture = $this->episodeInFuture($episode);
-                $this->logger->info('> [MonitorTvShowHandler] Episode is in future for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ' for title: ' . $monitor->getTitle() . ' ? ' . (true === $episodeInFuture ? 'YES' : 'NO'));
+                $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'));
                 if (false === $episodeInFuture) {
-                    $this->logger->info('> [MonitorTvShowHandler] Episode not in future for title: ' . 'for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ', skipping');
+                    $this->logger->info('> [MonitorTvShowHandler] Episode released after monitor started for title: ' . 'for season ' . $episode['season_number'] . ' episode ' . $episode['episode_number'] . ', skipping');
                     continue;
                 }
 
@@ -125,11 +125,11 @@ readonly class MonitorTvShowHandler implements HandlerInterface
         );
     }
 
-    private function episodeInFuture(array $episodeInShow): bool
+    private function episodeReleasedAfterMonitorCreated(string|DateTimeImmutable $monitorStartDate, array $episodeInShow): bool
     {
-        static $today = Carbon::today();
+        $monitorStartDate = Carbon::parse($monitorStartDate);
         $episodeAirDate = Carbon::parse($episodeInShow['air_date']);
-        return $episodeAirDate > $today;
+        return $episodeAirDate >= $monitorStartDate;
     }
 
     private function episodeExists(array $episodeInShow, Map $downloadedEpisodes): bool

src/Torrentio/Client/Torrentio.php

@@ -38,11 +38,21 @@ class Torrentio
 
         $results = $this->cache->get($cacheKey, function (ItemInterface $item) use ($imdbCode) {
             $item->expiresAt(Carbon::now()->addHour()->setMinute(0)->setSecond(0));
-            $response = file_get_contents(str_replace('{imdbCode}', $imdbCode, $this->searchUrl));
-            return json_decode(
-                $response,
-                true
-            );
+            try {
+                $response = $this->client->get("$this->searchUrl/$imdbCode.json");
+                return json_decode(
+                    $response->getBody()->getContents(),
+                    true
+                );
+            } catch (\Throwable $exception) {
+                if ($exception->getCode() === 429) {
+                    $this->logger->warning("> [TorrentioClient] Rate limit exceeded");
+                    return null;
+                }
+            }
+
+            $this->logger->error("> [TorrentioClient] Request error: " . $response->getStatusCode() . " - " . $response->getBody()->getContents());
+            return [];
         });
 
         return $this->parse($results, $filter);

templates/components/NavBar.html.twig

@@ -38,13 +38,13 @@
         </ul>
     </div>
 
-    <div class="sticky inset-x-0 bottom-0 border-t border-orange-500">
-        <a href="#" class="nav-foot flex items-center gap-2 p-4 bg-orange-500 hover:bg-opacity-80 bg-clip-padding backdrop-filter backdrop-blur-md bg-opacity-60">
+    <div class="sticky inset-x-0 bottom-0 border-t border-b border-orange-500 bg-orange-500 hover:bg-opacity-80 bg-clip-padding backdrop-filter backdrop-blur-md bg-opacity-60 flex flex-col">
+        <a href="#" class="nav-foot flex items-center gap-2 pt-4 px-4">
             <span class="rounded-full p-2 border-orange-500 border-2">
                 <twig:ux:icon name="ri:user-line" width="30" class="text-gray-50"/>
             </span>
 
-            <div>
+            <div class="flex flex-col text-white">
                 <p class="text-xs">
                     {% if app.user.name %}
                     <strong class="block font-medium text-white">{{ app.user.name }}</strong>
@@ -54,5 +54,8 @@
                 </p>
             </div>
         </a>
+        <p class="px-4 pt-1 inline-flex justify-center">
+            <small class="text-white text-xs">v0.18.14</small>
+        </p>
     </div>
 </nav>

templates/components/TvEpisodeList.html.twig

@@ -33,7 +33,7 @@
                                 <button class="py-1 px-1.5 mr-1 grow-0 font-bold text-xs bg-green-600 rounded-lg hover:cursor-pointer hover:bg-green-700 text-white"
                                         {{ stimulus_action('tv-results', 'toggleList', 'click') }}
                                 >
-                                    <span {{ stimulus_target('tv-results', 'count') }}>0</span> results
+                                    <span {{ stimulus_target('tv-results', 'count') }}>-</span> results
                                 </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'] }}">