fix(monitor): adds null checkk and handles accordingly

Dockerfile

@@ -1,19 +1,10 @@
-FROM dunglas/frankenphp:php8.4
+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"
-ENV APP_VERSION="0.0.1"
+ENV APP_VERSION="0.0.0-dev"
-
-RUN install-php-extensions \
-	pdo_mysql \
-	gd \
-	intl \
-	zip \
-	opcache
-
-RUN apt update && apt install -y wget
 
 HEALTHCHECK --interval=3s --timeout=3s --retries=10 CMD [ "php", "/app/bin/console", "startup:status" ]
 
-COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile
+COPY --chmod=0755 docker/app/Caddyfile /etc/frankenphp/Caddyfile

assets/controllers/movie_results_controller.js

@@ -13,7 +13,6 @@ export default class extends Controller {
     };
 
     static targets = ['list']
-    static outlets = ['loading-icon']
 
     options = []
     optionsLoaded = false
@@ -28,7 +27,6 @@ export default class extends Controller {
         this.options = this.element.querySelectorAll('tbody tr');
         this.options.forEach((option) => option.querySelector('.download-btn').dataset['title'] = this.titleValue);
         this.resultCountEl.innerText = this.options.length;
-        this.loadingIconOutlet.toggleIcon();
         document.dispatchEvent(new CustomEvent('optionsLoaded', {detail: {options: this.options}}));
     }
 }

assets/controllers/result_filter_controller.js

@@ -22,7 +22,7 @@ export default class extends Controller {
     defaultOptions = '<option value="-">-</option>';
 
     static outlets = ['tv-episode-list']
-    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'loadingIcon', 'selectAll', 'downloadSelected']
+    static targets = ['resolution', 'codec', 'language', 'provider', 'season', 'quality', 'selectAll', 'downloadSelected', 'currentSeason']
     static values = {
         'imdbId': String,
         'media-type': String,
@@ -32,7 +32,6 @@ export default class extends Controller {
 
     async connect() {
         await this.setInitialFilter();
-        this.setTimerToStopLoadingIcon();
         this.element.filterResults = this.filter.bind(this);
         document.addEventListener('optionsLoaded', this.loadOptions.bind(this));
     }
@@ -48,10 +47,6 @@ export default class extends Controller {
         }
     }
 
-    setTimerToStopLoadingIcon() {
-        setTimeout(() => this.loadingIconTarget.hideIcon(), 10000);
-    }
-
     // Event is fired from movies/tvshows controllers to populate this data
     async loadOptions({detail: { options }}) {
         await options.forEach((option) => {
@@ -99,7 +94,9 @@ export default class extends Controller {
     }
 
     setSeason(event) {
+        console.log('hurrrr');
         this.tvEpisodeListOutlet.setSeason(event.target.value);
+        this.currentSeasonTarget.innerText = event.target.value;
     }
 
     downloadSeason() {

assets/controllers/search_bar_controller.js

@@ -38,21 +38,21 @@ export default class extends Controller {
             return `
             <span data-controller="loading-icon" data-loading-icon-total-value="52" data-loading-icon-count-value="20" class="loading-icon">
                 <svg viewBox="0 0 24 24" fill="currentColor" height="20" width="20" data-loading-icon-target="icon" class="text-end" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M12 6.99998C9.1747 6.99987 6.99997 9.24998 7 12C7.00003 14.55 9.02119 17 12 17C14.7712 17 17 14.75 17 12"><animateTransform attributeName="transform" attributeType="XML" dur="560ms" from="0,12,12" repeatCount="indefinite" to="360,12,12" type="rotate"></animateTransform></path></svg>
-            </span>
+            </span>`;
-`;
         }
         event.detail.options.render.option = (data, escape) => {
-            if (data.data.description.length > 60) {
+            console.log(data);
-                data.data.description = data.data.description.substring(0, 107) + "...";
+            if (data.data.overview.length > 60) {
+                data.data.overview = data.data.overview.substring(0, 107) + "...";
             }
+
             return `<div class="flex flex-row">
                         <img src="${data.data.poster}" class="w-16 rounded-md">
                         <div class="p-2 flex flex-col">
                             <h2>${data.data.title}</h2>
-                            <p class="max-w-[60ch] text-wrap">${data.data.description}</p>
+                            <p class="max-w-[60ch] text-wrap">${data.data.overview}</p>
                         </div>
-                    </div>
+                    </div>`;
-`
         }
     }
 

assets/controllers/tv_results_controller.js

@@ -19,7 +19,6 @@ export default class extends Controller {
     };
 
     static targets = ['list', 'count', 'episodeSelector',]
-    static outlets = ['loading-icon']
 
     options = []
 
@@ -35,6 +34,5 @@ export default class extends Controller {
             this.countTarget.innerText = 0;
             this.episodeSelectorTarget.disabled = true;
         }
-        this.loadingIconOutlet.increaseCount();
     }
 }

assets/styles/app.css

@@ -199,6 +199,10 @@ dialog[data-dialog-target="dialog"][closing] {
     @apply flex flex-col gap-1 justify-between;
 }
 
+/** FullCalendar **/
+#upcoming_episodes_calendar .fc-event-main .fc-event-title-container {
+    cursor: pointer !important;
+}
 .fc-col-header-cell {
     @apply bg-orange-500/60 text-white;
 }

bash/build_base.sh

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

compose.yml

@@ -33,7 +33,11 @@ services:
 
 
   worker:
-    build: .
+    build:
+      dockerfile: docker/Dockerfile.base.worker
+      context: .
+      args:
+        FRANKENPHP_TAG: php8.4-alpine
     restart: unless-stopped
     volumes:
       - $PWD:/app
@@ -41,11 +45,15 @@ services:
     tty: true
     environment:
       TZ: America/Chicago
-    command: php /app/bin/console messenger:consume async -vv --time-limit=3600
+    command: php /app/bin/console messenger:consume async --time-limit=3600 -vv
 
 
   scheduler:
-    build: .
+    build:
+      dockerfile: docker/Dockerfile.base.worker
+      context: .
+      args:
+        FRANKENPHP_TAG: php8.4-alpine
     restart: unless-stopped
     volumes:
       - $PWD:/app

src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php

@@ -42,9 +42,20 @@ 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->tvEpisodeDetails($monitor->getTmdbId(), $monitor->getSeason(), $monitor->getEpisode());
+            $episodeData = $this->tmdb->tvEpisodeDetails($monitor->getTmdbId(), $monitor->getImdbId(), $monitor->getSeason(), $monitor->getEpisode());
 
-            if (null === $monitor->getAirDate() && null !== $episodeData->episodeAirDate && "" !== $episodeData->episodeAirDate) {
+            if (null === $episodeData->episodeAirDate || "" !== $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 (null === $monitor->getAirDate()) {
                 $monitor->setAirDate(Carbon::parse($episodeData->episodeAirDate));
             }
 

src/Tmdb/TmdbClient.php

@@ -170,13 +170,13 @@ class TmdbClient
         return $result;
     }
 
-    public function tvEpisodeDetails(string $tmdbId, int $season, int $episode): TmdbResult|TmdbEpisodeDto|null
+    public function tvEpisodeDetails(string $tmdbId, string $showImdbId, int $season, int $episode): TmdbResult|TmdbEpisodeDto|null
     {
         $result = $this->tvEpisodeRepository->getApi()->getEpisode($tmdbId, $season, $episode, ['append_to_response' => 'external_ids,credits']);
         return $this->parseResult(
             $result,
             MediaType::TvEpisode->value,
-            $result['external_ids']['imdb_id']
+            $showImdbId
         );
     }
 

src/Torrentio/Action/Handler/GetTvShowOptionsHandler.php

@@ -24,7 +24,7 @@ class GetTvShowOptionsHandler implements HandlerInterface
 
     public function handle(CommandInterface $command): ResultInterface
     {
-        $media = $this->tmdb->tvEpisodeDetails($command->tmdbId, $command->season, $command->episode);
+        $media = $this->tmdb->tvEpisodeDetails($command->tmdbId, $command->imdbId, $command->season, $command->episode);
         $parentShow = $this->tmdb->tvshowDetails($command->imdbId);
         $file = $this->mediaFiles->episodeExists($parentShow->title, $command->season, $command->episode);
 

templates/components/Filter.html.twig

@@ -39,15 +39,9 @@
         </div>
     {{ form_end(preferences_form) }}
 
-    <div class="flex flex-col md:flex-row justify-between">
+    <div class="flex flex-col-reverse md:flex-row justify-between">
-        <span
-                {{ stimulus_target('result-filter', 'loadingIcon') }}
-                {{ stimulus_controller('loading_icon', {total: (results.media.mediaType == "tvshows") ? results.media.episodes[1]|length : 1, count: 0}) }}
-            class="loading-icon">
-            <twig:ux:icon name="codex:loader" height="20" width="20" data-loading-icon-target="icon" class="text-end" />
-        </span>
-
         {% if results.media.mediaType == "tvshows" %}
+            <p class="ml-2 mt-3 md:[margin-top:unset] md:self-center">Season <span data-result-filter-target="currentSeason" class="current-season">{{ results.season }}</span></p>
             <div class="flex flex-row gap-2 justify-end px-8">
                 <twig:Modal heading="Back up a sec!" button_text="Download Season" submit_action="{{ stimulus_action('result_filter', 'downloadSeason', 'click')|stimulus_action('dialog', 'close') }}" button_class="px-1.5 py-1 border border-green-500 bg-green-800/60 rounded-ms text-sm font-semibold" show_cancel show_submit>
                     Downloading an entire season this way will use the filter from your

templates/components/MonitorListRow.html.twig

@@ -14,18 +14,10 @@
 >
     <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-stone-800 truncate">
         <a href="{{ path('app_search_result', {imdbId: monitor.imdbId, mediaType: monitor.monitorType|as_download_type}) }}"
-           class="mr-1 hover:underline rounded-md"
+           class="mr-1 hover:underline rounded-md">
-        >
+            {% set episodeIdDto = extract_from_episode_id(monitor|monitor_media_id) %}
-
+            {% set routeParams = {imdbId: monitor.imdbId, mediaType: monitor.monitorType|as_download_type, season: episodeIdDto.season} %}
-            {% if monitor.monitorType == "movies" %}
+            <a href="{{ path('app_search_result', routeParams) }}"
-                {% set routeParams = {imdbId: monitor.imdbId, mediaType: monitor.monitorType} %}
-                {% set route = path('app_search_result', routeParams) %}
-            {% else %}
-                {% set episodeIdDto = extract_from_episode_id(monitor|monitor_media_id) %}
-                {% set routeParams = {imdbId: monitor.imdbId, mediaType: monitor.monitorType, season: episodeIdDto.season, episode: episodeIdDto.episode} %}
-                {% set route = path('app_search_result', routeParams) ~ "#" ~ episode_anchor(episodeIdDto.season, episodeIdDto.episode) %}
-            {% endif %}
-            <a href="{{ route }}"
                class="mr-1 hover:underline rounded-md max-w-[10ch] md:max-w-[unset] truncate dark:text-white">
                 {{ monitor.title }}
             </a>

templates/components/TvEpisodeList.html.twig

@@ -5,7 +5,6 @@
         {% for episode in this.getEpisodes().items %}
             <episode-container id="{{ episode_anchor(episode.seasonNumber, episode.episodeNumber) }}" class="results"
                  show-title="{{ this.title }}"
-                 data-tv-results-loading-icon-outlet=".loading-icon"
                  data-download-button-outlet=".download-btn"
                     {{ stimulus_controller('tv_results', {
                         title: this.title,
@@ -32,7 +31,7 @@
                                 <p>{{ episode.description|truncate }}</p>
                                 <div class="text-xs font-bold">
                                     <button class="results-count-badge py-1 px-1.5 mr-1 grow-0 bg-green-600 rounded-lg hover:cursor-pointer hover:bg-green-700 text-white" title="Click to expand the results table for season {{ episode.seasonNumber }} episode {{ episode.episodeNumber }}.">
-                                        <span class="results-count-number" {{ stimulus_target('tv-results', 'count') }}>-</span> results
+                                        <span class="results-count-number" {{ stimulus_target('tv-results', 'count') }}></span> results
                                     </button>
 
                                     <span class="py-1 px-1.5 mr-1 grow-0 bg-gray-700 rounded-lg text-white" title='"{{ episode.name }}" aired on {{ episode.airDate|date(null, 'UTC') }}.'>
@@ -72,14 +71,16 @@
                             </div>
                         </div>
                         <div class="results-container inline-block overflow-hidden rounded-lg hidden">
-                            <twig:Turbo:Frame id="results_{{ episode_id(episode.seasonNumber, episode.episodeNumber) }}" src="{{ path('app_torrentio_tvshows', {
+                            <twig:Turbo:Frame loading="lazy" id="results_{{ episode_id(episode.seasonNumber, episode.episodeNumber) }}" src="{{ path('app_torrentio_tvshows', {
                                 tmdbId: this.tmdbId,
                                 imdbId: this.imdbId,
                                 season: episode.seasonNumber,
                                 episode: episode.episodeNumber,
                                 target: 'results_' ~ episode_id(episode.seasonNumber, episode.episodeNumber),
                                 block: 'tvshow_results'
-                            }) }}" />
+                            }) }}">
+                                <twig:ux:icon name="codex:loader" height="20" width="20" data-loading-icon-target="icon" class="text-end" />
+                            </twig:Turbo:Frame>
                         </div>
                     </div>
             </episode-container>

templates/monitor/upcoming-episodes.html.twig

@@ -19,7 +19,7 @@
             <a href="{{ path('app.monitors.ical', {email: app.user.email}) }}" title="Subscribe to the 'Upcoming Episodes' calendar via iCal. Click to export the events to a .ics file or copy the link and use it to subscribe in a calendar app that supports iCal/ics calendars." class="mb-2 self-end dark:text-white decoration-underline">
                 <twig:ux:icon name="lets-icons:calendar-add-light" width="24" class="text-orange-500" />
             </a>
-            <div id="calendar" class="text-white">
+            <div id="upcoming_episodes_calendar" class="text-white">
             </div>
         </twig:Card>
     </div>
@@ -33,15 +33,22 @@
             }
         }
         document.addEventListener('DOMContentLoaded', async function() {
+            const modal = document.getElementById('previewModal');
             let data = await fetch('/api/monitor/upcoming-episodes');
             data = (await data.json())['data'];
 
-            const calendarEl = document.getElementById('calendar');
+            const calendarEl = document.getElementById('upcoming_episodes_calendar');
             const calendar = new FullCalendar.Calendar(calendarEl, {
                 initialView: getView(),
                 events: data['episodes'],
                 windowResize: function(arg) {
                     this.changeView(getView());
+                },
+                eventClick: function (data) {
+                    modal.display({
+                        heading: data.event.title,
+                        content: `<p>${data.event.startStr}</p>`
+                    })
                 }
             });
             calendar.render();

templates/search/result.html.twig

@@ -83,10 +83,10 @@
 
                         {% if results.media.mediaType == "tvshows" %}
                         <div class="flex flex-row justify-start items-end grow text-xs">
-                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold text-xs bg-orange-500 rounded-lg hover:cursor-pointer hover:bg-green-700 text-white">
+                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold text-xs bg-orange-500 rounded-lg text-white">
                                 <span>{{ results.media.numberSeasons }}</span> season(s)
                             </span>
-                            <span class="py-1 px-1.5 mr-1 grow-0 bg-sky-700 rounded-lg text-white" title='"{{ results.media.title }}" first aired on {{ results.media.premiereDate|date(null, 'UTC') }}.'>
+                            <span class="py-1 px-1.5 mr-1 grow-0 font-bold bg-sky-700 rounded-lg text-white" title='"{{ results.media.title }}" first aired on {{ results.media.premiereDate|date(null, 'UTC') }}.'>
                                 {{ results.media.premiereDate|date(null, 'UTC') }}
                             </span>
                         </div>
@@ -125,14 +125,15 @@
                 {% if "movies" == results.media.mediaType %}
                 <movie-container class="results"
                      {{ stimulus_controller('movie_results', {title: results.media.title, tmdbId: results.media.tmdbId, imdbId: results.media.imdbId}) }}
-                     data-movie-results-loading-icon-outlet=".loading-icon"
                 >
                     <twig:Turbo:Frame id="movie_results_frame" src="{{ path('app_torrentio_movies', {
                         tmdbId: results.media.tmdbId,
                         imdbId: results.media.imdbId,
                         target: 'movie_results_frame',
                         block: 'movie_results'
-                    }) }}" />
+                    }) }}">
+                        <twig:ux:icon name="codex:loader" height="20" width="20" data-loading-icon-target="icon" class="text-end" title="Loading download options for {{ results.media.title }}" />
+                    </twig:Turbo:Frame>
                 </movie-container>
                 {% elseif "tvshows" == results.media.mediaType %}
                     <twig:TvEpisodeList
@@ -151,8 +152,6 @@
         </div>
 
         <twig:Card title="Related Media" contentClass="flex flex-col gap-4 text-white">
-            <p>Results similar to "{{ results.media.title }}" that you may be interested in.</p>
-
             <div class="grid grid-cols-2 gap-4 md:flex flex-col md:flex-row justify-between w-full">
                 {% for media in results.relatedMedia %}
                     <twig:Poster imdbId="{{ media.imdbId }}"