fix: bad parsing of torrentio episode results

deploy.compose.yml

@@ -28,10 +28,6 @@ services:
       replicas: 2
     depends_on:
       - app
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "tcp://192.168.1.197:12203"
 
 
   scheduler:
@@ -43,11 +39,6 @@ services:
     command: -vv
     depends_on:
       - app
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "tcp://192.168.1.197:12204"
-
 
 
   redis:

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/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

@@ -18,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">