Unit3Dup 0.14.4__tar.gz → 0.14.7__tar.gz

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

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

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

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

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

@@ -430,15 +430,17 @@ class DbOnline(TmdbAPI):
         if 'no_key' in config_settings.tracker_config.YOUTUBE_KEY:
             return "not available"
 
-        if not config_settings.user_preferences.SKIP_YOUTUBE:
+        if config_settings.user_preferences.SKIP_YOUTUBE:
             return "Skipped"
 
         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,10 @@ 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}")
-        custom_console.bot_log(f"'TRAILER' ....... https://www.youtube.com/watch?v={results.trailer_key}")
+        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}")
 
     def load_cache(self, query: str) -> MediaResult | None:
         # Check if the item is in the cache

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

@@ -15,33 +15,31 @@ class YtTrailer:
     def __init__(self, title: str):
 
         # Add language to the query (title) string to increase the prob of getting results in the pref lang
-        force_query = ManageTitles.iso_3166_alpha2_to_alpha3.get(config_settings.user_preferences.PREFERRED_LANG.upper(), "")
+        force_query = ManageTitles.iso_3166_alpha2_to_alpha3.get(config_settings.user_preferences.YOUTUBE_PREF_LANG.upper(), "")
         self.title = f"{title} {force_query}"
         self.params = {
             'part': 'snippet',
             '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:
 
         # Use pref language for searching
         self.params['userId'] = 'me'
-        self.params['regionCode'] = config_settings.user_preferences.PREFERRED_LANG.upper()
-        self.params['relevanceLanguage'] = config_settings.user_preferences.PREFERRED_LANG.lower()
+        self.params['regionCode'] = config_settings.user_preferences.YOUTUBE_PREF_LANG.upper()
+        self.params['relevanceLanguage'] = config_settings.user_preferences.YOUTUBE_PREF_LANG.lower()
 
         attempt: int = 0
         max_attempts: int = 3
         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.4 → 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.4"
+version = "0.14.7"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(
@@ -128,8 +128,7 @@ class UserPreferences(BaseModel):
     TAGS_POSITION_SERIE: list[str] | None = None
 
     NUMBER_OF_SCREENSHOTS: int = 4
-    # YOUTUBE_FAV_CHANNEL_ID: str | None = None
-    # YOUTUBE_CHANNEL_ENABLE: bool = False
+    YOUTUBE_PREF_LANG: str | None = None
     DUPLICATE_ON: bool = False
     SKIP_DUPLICATE: bool = False
     SKIP_TMDB: bool = False
@@ -490,7 +489,7 @@ class Config(BaseModel):
                              'FAST_LOAD']:
                     section[field] = Validate.integer(value=section[field], field_name=field)
 
-                if field == 'PREFERRED_LANG':
+                if field in ['PREFERRED_LANG', 'YOUTUBE_PREF_LANG']:
                     section[field] = Validate.iso3166(value=section[field], field_name=field)
 
                 if field == 'CACHE_PATH':
@@ -652,8 +651,7 @@ class Load:
                                         "multi", "acodec", "channels", "flag", "subtitle", "hdr", "vcodec",
                                         "video_encoder"],
 
-                # "YOUTUBE_FAV_CHANNEL_ID": "UCGCbxpnt25hWPFLSbvwfg_w",
-                # "YOUTUBE_CHANNEL_ENABLE": "False",
+                "YOUTUBE_PREF_LANG": "IT",
                 "DUPLICATE_ON": "true",
                 "SKIP_DUPLICATE": "false",
                 "SKIP_TMDB": "false",

{unit3dup-0.14.4 → unit3dup-0.14.7}/common/trackers/signs_list.py

@@ -150,6 +150,7 @@ SIGNS_LIST = {
     "MADHEX": "releaser",
     "MADSKY": "releaser",
     "MADTIA": "releaser",
+    "MATITA": "releaser",
     "MAX": "releaser",
     "MAX2014": "releaser",
     "ME7ALH": "releaser",

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

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

{unit3dup-0.14.4 → unit3dup-0.14.7}/unit3dup/__main__.py

@@ -28,6 +28,7 @@ def main():
     custom_console.bot_log(f"[Watcher] '{config.user_preferences.WATCHER_PATH}'")
     custom_console.bot_log(f"[Watcher] '{config.user_preferences.WATCHER_DESTINATION_PATH}'")
     custom_console.bot_log(f"[Preferred Language] '{config.user_preferences.PREFERRED_LANG}'")
+    custom_console.bot_log(f"[Youtube Preferred Language] '{config.user_preferences.YOUTUBE_PREF_LANG}'")
     print()
 
     # /// Initialize command line interface

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

@@ -21,7 +21,7 @@ class Video:
         self.display_name: str = media.display_name
 
         self.tmdb_id: int = tmdb_id
-        self.trailer_key: int = trailer_key
+        self.trailer_key: str = trailer_key
         self.cache = diskcache.Cache(str(config_settings.user_preferences.CACHE_PATH))
 
         # Create a cache key for tmdb_id
@@ -94,7 +94,7 @@ class Video:
             [center][url={config_settings.user_preferences.MY_URL}]Tutte le mie release[/url][/center]
             """
 
-            if self.trailer_key:
+            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