Unit3Dup 0.14.2__tar.gz → 0.14.4__tar.gz

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

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

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

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

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

@@ -35,6 +35,7 @@ base_url = "https://api.themoviedb.org/3"
 ENABLE_LOG = True
 T = TypeVar('T')
 
+
 class MovieEndpoint:
     @staticmethod
     def search(query: str) -> dict:
@@ -275,10 +276,12 @@ class DbOnline(TmdbAPI):
                         continue
 
                 # Search for title
-                if ManageTitles.fuzzyit(str1=self.query, str2=ManageTitles.clean_text(result.get_title())) > 95:
+                if ManageTitles.fuzzyit(str1=ManageTitles.clean_text(self.query),
+                                        str2=ManageTitles.clean_text(result.get_title())) > 95:
                     return result
 
-                if ManageTitles.fuzzyit(str1=self.query, str2=ManageTitles.clean_text(result.get_original())) > 95:
+                if ManageTitles.fuzzyit(str1=ManageTitles.clean_text(self.query),
+                                        str2=ManageTitles.clean_text(result.get_original())) > 95:
                     return result
 
             # Search for alternative title
@@ -336,8 +339,8 @@ class DbOnline(TmdbAPI):
 
         # or start an on-line search
         results = self._search(self.query, self.category)
-        # Use imdb_id when tmdb_id is not available
 
+        # Use imdb_id when tmdb_id is not available
         tvdb_result = self.tvdb_search()
         if tvdb_result:
             self.tvdb_id = tvdb_result.get('tvdb_id', None)
@@ -427,6 +430,9 @@ class DbOnline(TmdbAPI):
         if 'no_key' in config_settings.tracker_config.YOUTUBE_KEY:
             return "not available"
 
+        if not config_settings.user_preferences.SKIP_YOUTUBE:
+            return "Skipped"
+
         yt_trailer = YtTrailer(self.query)
         result = yt_trailer.get_trailer_link()
         if result:
@@ -434,13 +440,11 @@ class DbOnline(TmdbAPI):
             # todo compare against the media title especially for the favorite channel
             return result[0].items[0].id.videoId
         else:
-            if not config_settings.user_preferences.SKIP_YOUTUBE:
-                user_youtube_id = custom_console.user_input_str(message="Title not found."
-                                                                        " Please digit a valid Youtube ID (0=skip)->")
-                if user_youtube_id == 0:
-                    return "not available"
-                return user_youtube_id
-            return None
+            user_youtube_id = custom_console.user_input_str(message="Sorry trailer not found."
+                                                                    " Please digit a valid Youtube ID (0=skip)->")
+            if user_youtube_id == 0:
+                return "not available"
+            return user_youtube_id
 
     def trailer(self, video_id: int) -> str | None:
         # Search for tmdb trailer
@@ -471,7 +475,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}")
-        custom_console.bot_log(f"'TRAILER CODE' .. {results.trailer_key}")
+        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/common/external_services/trailers/api.py

@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+import time
+import requests
+
+from .response import YouTubeSearchResponse, Thumbnails, Id, Item, PageInfo, Snippet
+
+from common import config_settings
+from common.utility import ManageTitles
+from view import custom_console
+
+
+class YtTrailer:
+    url = 'https://www.googleapis.com/youtube/v3/search'
+
+    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(), "")
+        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,
+        }
+
+    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()
+
+        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}")
+
+            attempt += 1
+            custom_console.bot_log(self.params)
+            custom_console.bot_warning_log(
+                f"Attempt #{attempt} Server Response ({response.status_code})")
+            time.sleep(1)
+
+        if attempt == max_attempts:
+            return None
+
+        response_data = response.json()
+        youtube_responses = []
+
+        if response_data['items']:
+            for result in response_data['items']:
+                thumbnails_data = result['snippet']['thumbnails']
+                thumbnails = Thumbnails(
+                    default=thumbnails_data['default'],
+                    high=thumbnails_data['high'],
+                    medium=thumbnails_data['medium']
+                )
+
+                snippet_data = result['snippet']
+                snippet = Snippet(
+                    channelId=snippet_data['channelId'],
+                    channelTitle=snippet_data['channelTitle'],
+                    description=snippet_data['description'],
+                    liveBroadcastContent=snippet_data['liveBroadcastContent'],
+                    publishTime=snippet_data['publishTime'],
+                    publishedAt=snippet_data['publishedAt'],
+                    title=snippet_data['title'],
+                    thumbnails=thumbnails
+                )
+
+                video_id = None
+                # Sometimes it returns a chennelId and not only the video id
+                if 'id' in result:
+                    id_data = result['id']
+
+                    # Check if the result is a video or a channel
+                    if id_data['kind'] == 'youtube#video':
+                        video_id = Id(
+                            kind=id_data.get('kind', ''),
+                            videoId=id_data.get('videoId', '')
+                        )
+                    elif id_data['kind'] == 'youtube#channel':
+                        # Get video_di from the result
+                        video_id = Id(
+                            kind=id_data.get('kind', ''),
+                            videoId=id_data.get('channelId', '')
+                        )
+                    else:
+                        # Fail
+                        pass
+
+                item = Item(
+                    etag=result['etag'],
+                    id=video_id,
+                    kind=result['kind'],
+                    snippet=snippet
+                )
+
+                page_info = PageInfo(**response_data['pageInfo'])
+                youtube_response = YouTubeSearchResponse(
+                    etag=response_data['etag'],
+                    items=[item],
+                    kind=response_data['kind'],
+                    pageInfo=page_info,
+                    regionCode=response_data['regionCode']
+                )
+                youtube_responses.append(youtube_response)
+
+            return youtube_responses
+        else:
+            return None

{unit3dup-0.14.2 → unit3dup-0.14.4}/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.2"
+version = "0.14.4"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(
@@ -128,8 +128,8 @@ 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_FAV_CHANNEL_ID: str | None = None
+    # YOUTUBE_CHANNEL_ENABLE: bool = False
     DUPLICATE_ON: bool = False
     SKIP_DUPLICATE: bool = False
     SKIP_TMDB: bool = False
@@ -652,8 +652,8 @@ class Load:
                                         "multi", "acodec", "channels", "flag", "subtitle", "hdr", "vcodec",
                                         "video_encoder"],
 
-                "YOUTUBE_FAV_CHANNEL_ID": "UCGCbxpnt25hWPFLSbvwfg_w",
-                "YOUTUBE_CHANNEL_ENABLE": "False",
+                # "YOUTUBE_FAV_CHANNEL_ID": "UCGCbxpnt25hWPFLSbvwfg_w",
+                # "YOUTUBE_CHANNEL_ENABLE": "False",
                 "DUPLICATE_ON": "true",
                 "SKIP_DUPLICATE": "false",
                 "SKIP_TMDB": "false",

{unit3dup-0.14.2 → unit3dup-0.14.4}/common/utility.py

@@ -228,6 +228,10 @@ class ManageTitles:
         """
         str2 = str2.lower().replace("-", "")
         str2 = ManageTitles.clean(str2)
+
+        str1 = str1.lower().replace("-", "")
+        str1 = ManageTitles.clean(str1)
+
         return fuzz.ratio(ManageTitles.remove_accent(str1.lower()), ManageTitles.remove_accent(str2.lower()))
 
     @staticmethod

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

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

{unit3dup-0.14.2 → unit3dup-0.14.4}/unit3dup/media.py

@@ -323,7 +323,11 @@ class Media:
     @property
     def _resolution2(self):
         if self.mediafile:
-            width = int(self.mediafile.video_width)
+            try:
+                width = int(self.mediafile.video_width)
+            except ValueError:
+                print(f"{self.file_name} Video width unknown or file corrupted")
+                exit()
             if self.mediafile.video_width:
                 if width >= 3200:
                     return "2160p"

unit3dup-0.14.2/common/external_services/trailers/api.py

@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import requests
-from .response import YouTubeSearchResponse, Thumbnails, Id, Item, PageInfo, Snippet
-
-from common import config_settings
-from view import custom_console
-
-class YtTrailer:
-    url = 'https://www.googleapis.com/youtube/v3/search'
-
-    def __init__(self, title: str):
-        self.title = title
-        self.params = {
-            'part': 'snippet',
-            'q': f'{title} trailer',
-            'type': 'video',
-            'key': config_settings.tracker_config.YOUTUBE_KEY,
-            'channelId': '',
-            'maxResults': 3,
-        }
-
-    def get_trailer_link(self) -> list[YouTubeSearchResponse] | None:
-
-        # Use a favorite channel if the flag is True
-        # Otherwise use a global YouTube search
-        if config_settings.user_preferences.YOUTUBE_CHANNEL_ENABLE:
-            self.params['channelId'] = config_settings.user_preferences.YOUTUBE_FAV_CHANNEL_ID
-
-        response = requests.get(self.url, params=self.params)
-
-        if response.status_code == 200:
-            response_data = response.json()
-            youtube_responses = []
-
-            if response_data['items']:
-                for result in response_data['items']:
-                    thumbnails_data = result['snippet']['thumbnails']
-                    thumbnails = Thumbnails(
-                        default=thumbnails_data['default'],
-                        high=thumbnails_data['high'],
-                        medium=thumbnails_data['medium']
-                    )
-
-                    snippet_data = result['snippet']
-                    snippet = Snippet(
-                        channelId=snippet_data['channelId'],
-                        channelTitle=snippet_data['channelTitle'],
-                        description=snippet_data['description'],
-                        liveBroadcastContent=snippet_data['liveBroadcastContent'],
-                        publishTime=snippet_data['publishTime'],
-                        publishedAt=snippet_data['publishedAt'],
-                        title=snippet_data['title'],
-                        thumbnails=thumbnails
-                    )
-
-                    video_id = None
-                    # Sometimes it returns a chennelId and not only the video id
-                    if 'id' in result:
-                        id_data = result['id']
-
-                        # Check if the result is a video or a channel
-                        if id_data['kind'] == 'youtube#video':
-                            video_id = Id(
-                                kind=id_data.get('kind', ''),
-                                videoId=id_data.get('videoId', '')
-                            )
-                        elif id_data['kind'] == 'youtube#channel':
-                            # Get video_di from the result
-                            video_id = Id(
-                                kind=id_data.get('kind', ''),
-                                videoId=id_data.get('channelId', '')
-                            )
-                        else:
-                            # Fail
-                            pass
-
-                    item = Item(
-                        etag=result['etag'],
-                        id=video_id,
-                        kind=result['kind'],
-                        snippet=snippet
-                    )
-
-                    page_info = PageInfo(**response_data['pageInfo'])
-                    youtube_response = YouTubeSearchResponse(
-                        etag=response_data['etag'],
-                        items=[item],
-                        kind=response_data['kind'],
-                        pageInfo=page_info,
-                        regionCode=response_data['regionCode']
-                    )
-                    youtube_responses.append(youtube_response)
-
-
-                return youtube_responses
-            else:
-                return None
-        else:
-            custom_console.wait_for_user_confirmation("No response from YouTube. Check your API_KEY\n"
-                                              "Press Enter to continue or Ctrl-C to exit")
-            return None