Unit3Dup 0.14.6__tar.gz → 0.14.8__tar.gz

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

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

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

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

{unit3dup-0.14.6 → unit3dup-0.14.8}/common/external_services/imageHost.py

@@ -277,7 +277,7 @@ class Build:
         description = "[center]\n"
         console_url = []
 
-        custom_console.bot_log("Starting image upload..")
+        custom_console.bot_log(f"\n[STARTING IMAGE UPLOAD..]")
         _number = 0
         for img_bytes in self.extracted_frames:
             _number = _number + 1

{unit3dup-0.14.6 → unit3dup-0.14.8}/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.8}/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.8}/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.8"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(

{unit3dup-0.14.6 → unit3dup-0.14.8}/common/tags.py

@@ -142,7 +142,7 @@ class SearchTags(object):
         refactored = ' '.join(build) + self.releaser_sign
         return refactored
 
-    def process(self) -> str:
+    def process(self) -> tuple[str, dict]:
         patterns = []
 
         # Remove banned items from categories
@@ -251,10 +251,8 @@ class SearchTags(object):
             for k in self.tags_position
             if k in self.tags_dict
         }
-
         new_title = self.build_title(tags_dict)
-
-        return new_title
+        return new_title, tags_dict
 
     def mediainfo_audio(self, category: str) -> dict:
         languages = []

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

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

{unit3dup-0.14.6 → unit3dup-0.14.8}/unit3dup/media_manager/VideoManager.py

@@ -48,6 +48,8 @@ class VideoManager:
 
         #  Init the torrent list
         bittorrent_list = []
+        # Tags list extracted used to build title ( -b flag)
+        tags_dictionary = {}
         for content in self.contents:
             # /// User request to build the title; overwriting display_name
             if self.cli.buildtags:
@@ -67,7 +69,8 @@ class VideoManager:
                                          ban_list=self.ban_list,
                                          media=content,
                                          )
-                content.display_name = search_tags.process()
+                content.display_name, tags_dictionary = search_tags.process()
+
 
             # get the archive path
             archive = os.path.join(tracker_archive, selected_tracker)
@@ -103,8 +106,17 @@ class VideoManager:
                 video_info = Video(media=content, tmdb_id=db.video_id, trailer_key=db.trailer_key)
                 video_info.build_info()
 
-                # print the title will be shown on the torrent page
-                custom_console.bot_log(f"'DISPLAYNAME'...{{{content.display_name}}}\n")
+                # Tags found ( -b flag)
+                if tags_dictionary:
+                    custom_console.bot_log(f"\n[GENERATING DISPLAYNAME..]")
+                    for key, value in tags_dictionary.items():
+                        if isinstance(value, list):
+                            value = " ".join(value)
+                        custom_console.bot_log(f"{key:<13} '{value}'")
+                    custom_console.bot_log(f"Done.\n")
+                else:
+                    # print the title will be shown on the torrent page
+                    custom_console.bot_log(f"'DISPLAYNAME'...{{{content.display_name}}}\n")
 
                 # Tracker instance
                 unit3d_up = UploadBot(content=content, tracker_name=selected_tracker, cli=self.cli)

{unit3dup-0.14.6 → unit3dup-0.14.8}/unit3dup/media_manager/common.py

@@ -76,7 +76,6 @@ class UserContent:
 
         if not tracker_name_list:
             tracker_name_list = [selected_tracker]
-        custom_console.bot_log(f"UPLOAD TO {tracker_name_list}")
 
         # // Read the existing torrent file
         with open(torrent_path, 'rb') as f:
@@ -239,7 +238,7 @@ class UserContent:
         if not bittorrent_list:
             return None
 
-        custom_console.bot_warning_log(f"\nSending {message} torrents to the "
+        custom_console.bot_log(f"\nSending {message} torrents to the "
                                        f"{config_settings.torrent_client_config.TORRENT_CLIENT.upper()} client "
                                        f"... Please wait")
 

{unit3dup-0.14.6 → unit3dup-0.14.8}/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