fix: prepends episode/season number to filename if doesn't exist. should fix monitors repeatedly downloading episodes

assets/app.js

@@ -1,5 +1,4 @@
 import './bootstrap.js';
-import Hls from "./vendor/hls.js/hls.js.index.js";
 /*
  * Welcome to your app's main JavaScript file!
  *
@@ -19,29 +18,3 @@ var observer = new MutationObserver(function(mutations) {
 
 observer.observe(document, {attributes: false, childList: true, characterData: false, subtree:true});
 
-document.addEventListener("DOMContentLoaded", () => {
-    const videoUrl = "http://127.0.0.1:11470/hlsv2/2b76fe2ec12c83d264076fb859923c5d/master.m3u8?mediaURL=https%3A%2F%2Ftorrentio.strem.fun%2Frealdebrid%2FQYYBR7OSQ4VEFKWASDEZ2B4VO67KHUJY6IWOT7HHA7ATXO7QCYDQ%2F6bf1938db882f6fcbb0dafa6e7326230e7f4eae0%2Fnull%2F3%2FSurvivor.S48E01.1080p.HEVC.x265-MeGusta.mkv%26videoCodecs%3Dh264%26videoCodecs%3Dh265%26videoCodecs%3Dhevc%26videoCodecs%3Dvp9%26audioCodecs%3Daac%26audioCodecs%3Dmp3%26audioCodecs%3Dopus%26maxAudioChannels%3D2";
-
-    var video = document.getElementById('video');
-    if (Hls.isSupported()) {
-        var hls = new Hls({
-            debug: true,
-        });
-        hls.loadSource(videoUrl);
-        hls.attachMedia(video);
-        hls.on(Hls.Events.MEDIA_ATTACHED, function () {
-            video.muted = true;
-            video.play();
-        });
-    }
-        // hls.js is not supported on platforms that do not have Media Source Extensions (MSE) enabled.
-        // When the browser has built-in HLS support (check using `canPlayType`), we can provide an HLS manifest (i.e. .m3u8 URL) directly to the video element through the `src` property.
-// This is using the built-in support of the plain video element, without using hls.js.
-    else if (video.canPlayType('application/vnd.apple.mpegurl')) {
-        video.src = videoUrl;
-        video.addEventListener('canplay', function () {
-            video.play();
-        });
-    }
-})
-

assets/controllers/download_button_controller.js

@@ -12,6 +12,7 @@ export default class extends Controller {
         filename: String,
         mediaType: String,
         imdbId: String,
+        episodeId: String
     }
 
     download() {
@@ -27,6 +28,7 @@ export default class extends Controller {
                 filename: this.filenameValue,
                 mediaType: this.mediaTypeValue,
                 imdbId: this.imdbIdValue,
+                episodeId: this.episodeIdValue
             })
         })
             .then(res => res.json())

importmap.php

@@ -40,7 +40,4 @@ return [
     'stimulus-use' => [
         'version' => '0.52.2',
     ],
-    'hls.js' => [
-        'version' => '1.6.5',
-    ],
 ];

src/Download/Action/Input/DownloadMediaInput.php

@@ -26,6 +26,9 @@ class DownloadMediaInput implements InputInterface
         #[SourceRequest('imdbId')]
         public string $imdbId,
 
+        #[SourceRequest('episodeId', nullify: true)]
+        public ?string $episodeId = null,
+
         public ?int $userId = null,
 
         public ?int $downloadId = null,

src/Download/Framework/Controller/ApiController.php

@@ -11,6 +11,7 @@ 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;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -28,6 +29,13 @@ class ApiController extends AbstractController
     public function download(
         DownloadMediaInput $input,
     ): Response {
+        $ptn = (object) new Ptn()->parse($input->filename);
+        if ($input->mediaType === "tvshows" &&
+            !property_exists($ptn, 'episode') && !property_exists($ptn, 'season')
+        ) {
+            $input->filename = $input->episodeId . '_' . $input->filename;
+        }
+
         $download = $this->downloadRepository->insert(
             $this->getUser(),
             $input->url,

src/Twig/Extensions/UtilExtension.php

@@ -4,7 +4,10 @@ namespace App\Twig\Extensions;
 
 use App\Monitor\Framework\Entity\Monitor;
 use App\Monitor\Service\MediaFiles;
+use App\Torrentio\Action\Result\GetTvShowOptionsResult;
+use App\Torrentio\Result\TorrentioResult;
 use ChrisUllyott\FileSize;
+use Tmdb\Model\Tv\Episode;
 use Twig\Attribute\AsTwigFilter;
 use Twig\Attribute\AsTwigFunction;
 
@@ -45,4 +48,15 @@ class UtilExtension
             $path
         );
     }
+
+    #[AsTwigFilter('episode_id_from_results')]
+    public function episodeId($result): ?string
+    {
+        if (!$result instanceof GetTvShowOptionsResult) {
+            return null;
+        }
+
+        return "S". str_pad($result->season, 2, "0", STR_PAD_LEFT) .
+            "E". str_pad($result->episode, 2, "0", STR_PAD_LEFT);
+    }
 }

templates/index/index.html.twig

@@ -5,12 +5,6 @@
 {% block body %}
     <div class="p-4 flex flex-col grow gap-4 z-30">
         <h2 class="mb-2 text-3xl font-bold text-gray-50">Dashboard</h2>
-        <div class="flex flex-row gap-4">
-            <twig:Card title="Play Survivor" class="w-full">
-                <video width="352" height="198" controls>
-                </video>
-            </twig:Card>
-        </div>
         <div class="flex flex-row gap-4">
             <twig:Card title="Active Downloads" class="w-full">
                 <twig:DownloadList :type="'active'" />

templates/torrentio/partial/option-table.html.twig

@@ -34,7 +34,7 @@
     </thead>
     <tbody>
     {% for result in results.results %}
-        <tr class="bg-white border-b dark:bg-slate-700 dark:border-gray-600 border-gray-200" data-provider="{{ result.provider }}" data-languages="{{ result.languages|json_encode }}" {% if "tvshows" == results.media.mediaType %} data-season="{{ results.season }} {% endif %}">
+        <tr class="bg-white border-b dark:bg-slate-700 dark:border-gray-600 border-gray-200" data-provider="{{ result.provider }}" data-languages="{{ result.languages|json_encode }}" {% if "tvshows" == results.media.mediaType %} data-season="{{ results.season }}"{% endif %}>
             <td id="size" class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-gray-50">
                 {{ result.size }}
             </td>
@@ -60,7 +60,8 @@
                                 title: results.media.title,
                                 filename: result.filename,
                                 mediaType: results.media.mediaType,
-                                imdbId: results.media.imdbId
+                                imdbId: results.media.imdbId,
+                                episodeId: results|episode_id_from_results
                             }) }}
                             {{ stimulus_action('download_button', 'download', 'click') }}
                         >