Unit3Dup 0.14.6__tar.gz → 0.14.7__tar.gz

{unit3dup-0.14.6 → unit3dup-0.14.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.14.6
+Version: 0.14.7
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT

{unit3dup-0.14.6 → unit3dup-0.14.7}/Unit3Dup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.14.6
+Version: 0.14.7
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT

{unit3dup-0.14.6 → unit3dup-0.14.7}/common/external_services/theMovieDB/core/api.py

@@ -436,9 +436,11 @@ class DbOnline(TmdbAPI):
         yt_trailer = YtTrailer(self.query)
         result = yt_trailer.get_trailer_link()
         if result:
-            # choose the first in the list
-            # todo compare against the media title especially for the favorite channel
-            return result[0].items[0].id.videoId
+            for r in result:
+                title = r.items[0].snippet.title if r.items else None
+                if self.query in title:
+                    return r.items[0].id.videoId
+            return "not available"
         else:
             user_youtube_id = custom_console.user_input_str(message="Sorry trailer not found."
                                                                     " Please digit a valid Youtube ID (0=skip)->")
@@ -450,8 +452,7 @@ class DbOnline(TmdbAPI):
         # Search for tmdb trailer
         trailers = self._videos(video_id, self.category)
         if trailers:
-            trailer = next((video for video in trailers if video.type.lower() == 'trailer'
-                            and video.site.lower() == 'youtube'), None)
+            trailer = next((video for video in trailers if video.site.lower() == 'youtube'), None)
             if trailer:
                 return trailer.key
             else:
@@ -475,7 +476,7 @@ class DbOnline(TmdbAPI):
         if results.tvdb_id:
             custom_console.bot_warning_log(f"'TVDB ID'........ '{results.tvdb_id}'")
         custom_console.bot_log(f"'TMDB KEYWORDS'.. {results.keywords_list}")
-        if 'SKIPPED' in results.trailer_key.upper():
+        if results.trailer_key.upper() in  ['SKIPPED', 'NOT AVAILABLE']:
             custom_console.bot_log(f"'TRAILER' ....... {results.trailer_key}")
         else:
             custom_console.bot_log(f"'TRAILER' ....... https://www.youtube.com/watch?v={results.trailer_key}")

{unit3dup-0.14.6 → unit3dup-0.14.7}/common/external_services/trailers/api.py

@@ -22,7 +22,7 @@ class YtTrailer:
             'q': f'{self.title} trailer',
             'type': 'video',
             'key': config_settings.tracker_config.YOUTUBE_KEY,
-            'maxResults': 3,
+            'maxResults': 50,
         }
 
     def get_trailer_link(self) -> list[YouTubeSearchResponse] | None:
@@ -37,11 +37,9 @@ class YtTrailer:
         response = None
 
         while attempt < max_attempts:
-            custom_console.bot_log("Searching YouTube for a trailer...")
             try:
                 response = requests.get(self.url, params=self.params, timeout=5)
                 if response.status_code == 200:
-                    custom_console.bot_log("YouTube Response with no error")
                     break
             except requests.RequestException:
                 custom_console.error(f"Could not connect to YouTube API {response.status_code}")

{unit3dup-0.14.6 → unit3dup-0.14.7}/common/settings.py

@@ -24,7 +24,7 @@ user_tags_file = "tags_list.json"
 user_sign_file = "sign_list.json"
 bane_file = "ban_list.json"
 
-version = "0.14.6"
+version = "0.14.7"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(

{unit3dup-0.14.6 → unit3dup-0.14.7}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 dynamic = ["dependencies"]
 name = "Unit3Dup"
-version = "0.14.6"
+version = "0.14.7"
 description = "An uploader for the Unit3D torrent tracker"
 readme = "README.rst"
 requires-python = ">=3.10"

{unit3dup-0.14.6 → unit3dup-0.14.7}/unit3dup/pvtVideo.py

@@ -94,7 +94,7 @@ class Video:
             [center][url={config_settings.user_preferences.MY_URL}]Tutte le mie release[/url][/center]
             """
 
-            if 'SKIPPED' not in self.trailer_key.upper() and self.trailer_key.upper() is not None:
+            if self.trailer_key is not None and self.trailer_key.upper() not in ['SKIPPED', 'NOT AVAILABLE']:
                 self.description += (f"[b][spoiler=Spoiler: PLAY TRAILER][center][youtube]{self.trailer_key}[/youtube]"
                                      f"[/center][/spoiler][/b]")
             self.is_hd = is_hd