Unit3Dup 0.12.2__tar.gz → 0.13.1__tar.gz

{unit3dup-0.12.2 → unit3dup-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.12.2
+Version: 0.13.1
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -109,7 +109,9 @@ RUN
 DOC
 ===
 
-Commands list `Unit3Dup <https://31december99.github.io/Unit3Dup/commands/>`_
+Full documentation `Unit3Dup Docs <https://31december99.github.io/Unit3Dup/>`_
+
+Commands list `Unit3Dup <https://31december99.github.io/Unit3Dup/reference/commands/>`_
 
 
 ImageHost

{unit3dup-0.12.2 → unit3dup-0.13.1}/README.rst

@@ -78,7 +78,9 @@ RUN
 DOC
 ===
 
-Commands list `Unit3Dup <https://31december99.github.io/Unit3Dup/commands/>`_
+Full documentation `Unit3Dup Docs <https://31december99.github.io/Unit3Dup/>`_
+
+Commands list `Unit3Dup <https://31december99.github.io/Unit3Dup/reference/commands/>`_
 
 
 ImageHost

{unit3dup-0.12.2 → unit3dup-0.13.1}/Unit3Dup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.12.2
+Version: 0.13.1
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -109,7 +109,9 @@ RUN
 DOC
 ===
 
-Commands list `Unit3Dup <https://31december99.github.io/Unit3Dup/commands/>`_
+Full documentation `Unit3Dup Docs <https://31december99.github.io/Unit3Dup/>`_
+
+Commands list `Unit3Dup <https://31december99.github.io/Unit3Dup/reference/commands/>`_
 
 
 ImageHost

{unit3dup-0.12.2 → unit3dup-0.13.1}/Unit3Dup.egg-info/SOURCES.txt

@@ -54,11 +54,12 @@ common/external_services/theMovieDB/core/keywords.py
 common/external_services/theMovieDB/core/videos.py
 common/external_services/theMovieDB/core/models/__init__.py
 common/external_services/theMovieDB/core/models/movie/__init__.py
-common/external_services/theMovieDB/core/models/movie/alternative_titles.py
+common/external_services/theMovieDB/core/models/movie/alternative.py
 common/external_services/theMovieDB/core/models/movie/details.py
 common/external_services/theMovieDB/core/models/movie/movie.py
 common/external_services/theMovieDB/core/models/movie/nowplaying.py
 common/external_services/theMovieDB/core/models/movie/release_info.py
+common/external_services/theMovieDB/core/models/movie/translations.py
 common/external_services/theMovieDB/core/models/tvshow/__init__.py
 common/external_services/theMovieDB/core/models/tvshow/alternative.py
 common/external_services/theMovieDB/core/models/tvshow/details.py

{unit3dup-0.12.2 → unit3dup-0.13.1}/common/external_services/theMovieDB/core/api.py

@@ -7,6 +7,9 @@ import diskcache
 from typing import TypeVar
 
 from common.external_services.theMovieDB.core.models.tvshow.alternative import Alternative
+
+from common.external_services.theMovieDB.core.models.tvshow.translations import Translation
+from common.external_services.theMovieDB.core.models.movie.translations import Translation
 from common.external_services.theMovieDB.core.models.tvshow.details import TVShowDetails
 from common.external_services.theMovieDB.core.models.movie.details import MovieDetails
 from common.external_services.theMovieDB.core.models.movie.nowplaying import NowPlaying
@@ -26,7 +29,6 @@ from common.utility import ManageTitles
 from unit3dup.media import Media
 from view import custom_console
 
-
 from unit3dup import config_settings
 
 base_url = "https://api.themoviedb.org/3"
@@ -47,6 +49,11 @@ class MovieEndpoint:
         return {'url': f'{base_url}/movie/{movie_id}/alternative_titles', 'datatype': Alternative, 'query': '',
                 'results': 'titles'}
 
+    @staticmethod
+    def translations(movie_id: int) -> dict:
+        return {'url': f'{base_url}/movie/{movie_id}/translations', 'datatype': Translation, 'query': '',
+                'results': 'translations'}
+
     @staticmethod
     def videos(movie_id: int) -> dict:
         return {'url': f'{base_url}/movie/{movie_id}/videos', 'datatype': Videos, 'query': '',
@@ -76,6 +83,11 @@ class TvEndpoint:
         return {'url': f'{base_url}/tv/{serie_id}/alternative_titles', 'datatype': Alternative, 'query': '',
                 'results': 'results'}
 
+    @staticmethod
+    def translations(serie_id: int) -> dict:
+        return {'url': f'{base_url}/tv/{serie_id}/translations', 'datatype': Translation, 'query': '',
+                'results': 'translations'}
+
     @staticmethod
     def videos(serie_id: int) -> dict:
         return {'url': f'{base_url}/tv/{serie_id}/videos', 'datatype': Videos, 'query': '',
@@ -119,7 +131,7 @@ class TmdbAPI(MyHttp):
 
     def _search(self, query: str, category: str) -> list[T] | None:
         """
-        Searches for data based on a query and category.
+        Searches for data based on a query and category
         :param query: search query
         :param category: category of the search query, e.g., 'movie' or 'tv'
         :return: list of T or None
@@ -151,7 +163,7 @@ class TmdbAPI(MyHttp):
 
     def alternative(self, media_id: int, category: str) -> list[T] | None:
         """
-        Searches for data based on a query and category.
+        Searches for data based on a query and category
         :param media_id: id of the media to search for
         :param category: category of the search query, e.g., 'movie' or 'tv'
         :return: list of T or None
@@ -163,6 +175,20 @@ class TmdbAPI(MyHttp):
             print(f"Endpoint for category '{category}' not found.")
             return []
 
+    def translations(self, media_id: int, category: str) -> list[T] | None:
+        """
+        Searches for data based on a query and category
+        :param media_id: id of the media to search for
+        :param category: category of the search query, e.g., 'movie' or 'tv'
+        :return: list of T or None
+        """
+        if endpoint_class := self.ENDPOINTS.get(category):
+            request = endpoint_class.translations(media_id)
+            return self.request(endpoint=request)
+        else:
+            print(f"Endpoint for category '{category}' not found.")
+            return []
+
     def _videos(self, video_id: int, category: str) -> list[T] | None:
         if endpoint_class := self.ENDPOINTS.get(category):
             request = endpoint_class.videos(video_id)
@@ -262,6 +288,16 @@ class DbOnline(TmdbAPI):
                     for alt in alternative:
                         if ManageTitles.fuzzyit(str1=self.query, str2=alt.title) > 95:
                             return result
+
+            for result in results:
+                translations = self.translations(media_id=result.id, category=self.category)
+                if translations:
+                    for tr in translations:
+                        if tr.data:
+                            title = tr.data.name or tr.data.title
+                            if title:
+                                if ManageTitles.fuzzyit(self.query, title) > 95:
+                                    return result
         return False
 
     def results_in_string(self, tmdb_id: int, imdb_id: int, tvdb_id: int) -> MediaResult:

unit3dup-0.13.1/common/external_services/theMovieDB/core/models/movie/alternative.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+# Same dataclass used for TV

unit3dup-0.13.1/common/external_services/theMovieDB/core/models/movie/translations.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+from dataclasses import dataclass
+from typing import List
+
+#Movie
+@dataclass
+class TranslationData:
+    homepage: str | None = None
+    overview: str | None = None
+    runtime: int | None = None
+    tagline: str | None = None
+    title: str | None = None
+    name: str | None = None
+
+
+@dataclass
+class Translation:
+    iso_3166_1: str
+    iso_639_1: str
+    name: str
+    english_name: str
+    data: TranslationData | dict
+
+    def __post_init__(self):
+        if isinstance(self.data, dict):
+            self.data = TranslationData(**self.data)
+
+
+@dataclass
+class TranslationsResponse:
+    id: int
+    translations: List[Translation]

unit3dup-0.13.1/common/external_services/theMovieDB/core/models/tvshow/translations.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+
+from dataclasses import dataclass
+from typing import Any
+
+
+@dataclass
+class TvTranslationData:
+    homepage: str | None = None
+    overview: str | None = None
+    tagline: str | None = None
+    name: str | None = None
+
+    @staticmethod
+    def from_data(data: dict[str, Any]) -> "TvTranslationData":
+        return TvTranslationData(
+            homepage=data.get("homepage"),
+            overview=data.get("overview"),
+            tagline=data.get("tagline"),
+            name=data.get("name"),
+        )
+
+
+@dataclass
+class TvTranslation:
+    iso_3166_1: str
+    iso_639_1: str
+    name: str
+    english_name: str
+    data: TvTranslationData | None = None
+
+    @staticmethod
+    def from_data(data: dict[str, Any]) -> "TvTranslation":
+        return TvTranslation(
+            iso_3166_1=data["iso_3166_1"],
+            iso_639_1=data["iso_639_1"],
+            name=data["name"],
+            english_name=data["english_name"],
+            data=TvTranslationData.from_data(data.get("data", {})) if data.get("data") else None,
+        )
+
+@dataclass
+class Translation:
+    id: int
+    translations: list[TvTranslation]

{unit3dup-0.12.2 → unit3dup-0.13.1}/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.12.2"
+version = "0.13.1"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(
@@ -454,7 +454,7 @@ class Config(BaseModel):
                     section[field] = Validate.integer(value=section[field], field_name=field)
 
                 if field in ['QBIT_PASS', 'TRASM_PASS', 'RTORR_PASS', 'QBIT_USER', 'TRASM_USER', 'RTORR_USER',
-                             'TORRENT_CLIENT', 'TAG', 'CATEGORY_MOVIE','CATEGORY_TV', 'RTORR_HOST']:
+                            'TORRENT_CLIENT', 'TAG',  'RTORR_HOST']:
                     section[field] = Validate.string(value=section[field], field_name=field)
 
                 if field in ['SHARED_TRASM_PATH', 'SHARED_QBIT_PATH', 'SHARED_RTORR_PATH']:

{unit3dup-0.12.2 → unit3dup-0.13.1}/common/torrent_clients.py

@@ -150,9 +150,9 @@ class QbittorrentClient(TorrClient):
                 f"{self.__class__.__name__} Please verify your configuration"
             )
 
-    def _add_torrent_and_tag(self, torrent_bytes: bytes, save_path: str, info_hash: str,category: str) -> None:
+    def _add_torrent_and_tag(self, torrent_bytes: bytes, save_path: str, info_hash: str, category: str) -> None:
 
-        self.client.torrents_add(torrent_files=torrent_bytes,save_path=save_path)
+        self.client.torrents_add(torrent_files=torrent_bytes, save_path=save_path)
 
         # wait for torrent to be registered
         for _ in range(20):
@@ -164,9 +164,9 @@ class QbittorrentClient(TorrClient):
                 pass
             time.sleep(0.25)
 
-        if category=='movie':
+        if category == 'movie':
             category = config_settings.torrent_client_config.CATEGORY_MOVIE
-        if category=='tv':
+        if category == 'tv':
             category = config_settings.torrent_client_config.CATEGORY_MOVIE
 
         try:
@@ -176,13 +176,22 @@ class QbittorrentClient(TorrClient):
 
         self.client.torrents_add_tags(tags=config_settings.torrent_client_config.TAG, torrent_hashes=info_hash)
 
-    def send_to_client(self, tracker_data_response: str, torrent: Mytorrent, content: Media,archive_path: str):
+    def send_to_client(self, tracker_data_response: str, torrent: Mytorrent, content: Media, archive_path: str):
 
+        # Check if shared path exists
         if config_settings.torrent_client_config.SHARED_QBIT_PATH:
-            torr_location = (
-                config_settings.torrent_client_config.SHARED_QBIT_PATH
-            )
+            torr_location = config_settings.torrent_client_config.SHARED_QBIT_PATH
+
+            # append the category Serie to the shared path
+            if 'tv' in content.category.lower():
+                torr_location = os.path.join(torr_location, config_settings.torrent_client_config.CATEGORY_TV)
+
+            # append the category Movie to the shared path
+            if 'movie' in content.category.lower():
+                torr_location = os.path.join(torr_location, config_settings.torrent_client_config.CATEGORY_MOVIE)
+
         else:
+            # otherwise set torr_location using the cli path
             torr_location = os.path.dirname(content.torrent_path)
 
         if not torrent:
@@ -192,16 +201,16 @@ class QbittorrentClient(TorrClient):
                 info = bencode2.bdecode(torrent_data)[b"info"]
                 info_hash = hashlib.sha1(bencode2.bencode(info)).hexdigest()
                 file_buffer.seek(0)
-                self._add_torrent_and_tag(torrent_bytes=file_buffer.read(),save_path=str(torr_location),
-                    info_hash=info_hash, category = content.category)
+                self._add_torrent_and_tag(torrent_bytes=file_buffer.read(), save_path=str(torr_location),
+                                          info_hash=info_hash, category=content.category)
         else:
             info = torrent.mytorr.metainfo["info"]
             info_hash = hashlib.sha1(
                 bencode2.bencode(info)
             ).hexdigest()
             with open(archive_path, "rb") as file_buffer:
-                self._add_torrent_and_tag(torrent_bytes=file_buffer.read(),save_path=str(torr_location),
-                    info_hash=info_hash, category = content.category)
+                self._add_torrent_and_tag(torrent_bytes=file_buffer.read(), save_path=str(torr_location),
+                                          info_hash=info_hash, category=content.category)
 
 
 class RTorrentClient(TorrClient):

{unit3dup-0.12.2 → unit3dup-0.13.1}/pyproject.toml

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

unit3dup-0.12.2/common/external_services/theMovieDB/core/models/movie/alternative_titles.py

@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from dataclasses import dataclass, field
-from common.external_services import logger
-from typing import Any
-import json
-
-
-@dataclass
-class Title:
-    iso_3166_1: str
-    title: str
-    type: str | None = None
-    logger: logger = field(init=False, repr=False)
-
-    def __post_init__(self):
-        """
-        method invoked right after  the __init__ method !
-        """
-        self.logger = logger.getChild(self.__class__.__name__)
-
-    @staticmethod
-    def from_data(data: dict[str, Any]) -> "Title | None":
-        try:
-            return Title(
-                iso_3166_1=data["iso_3166_1"],
-                title=data["title"],
-                type=data.get("type"),
-            )
-        except KeyError as e:
-            logger.debug(f"Missing key in Title data: {e}")
-            return None
-        except TypeError as e:
-            logger.debug(f"Type error in Title data: {e}")
-            return None
-
-
-@dataclass
-class AltTitle:
-    id: int
-    titles: list[Title]
-
-    @classmethod
-    def validate(cls, json_str: str) -> "AltTitle":
-        data = json.loads(json_str)
-        id_ = data.get("id", 0)
-        titles_data = data.get("titles", [])
-        titles = [
-            Title.from_data(title_data)
-            for title_data in titles_data
-            if Title.from_data(title_data) is not None
-        ]
-        return cls(id=id_, titles=titles)

unit3dup-0.12.2/common/external_services/theMovieDB/core/models/tvshow/translations.py

@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from dataclasses import dataclass
-
-
-@dataclass
-class Translation:
-    """
-    Represents a TV show translation
-    """
-    iso_639_1: str
-    """
-    Language code of the translation
-    """
-    english_name: str
-    """
-    English name of the language
-    """
-    name: str
-    """
-    Name of the translation
-    """
-    url: str | None
-    """
-    Optional URL associated with the translation
-    """
-    tagline: str | None
-    """
-    Optional tagline for the translation
-    """
-    description: str | None
-    """
-    Optional description for the translation
-    """
-    country: str | None
-    """
-    Optional country code related to the translation
-    """
-
-
-@dataclass
-class TranslationsResponse:
-    """
-    Contains a list of TV show translations
-    """
-    translations: list[Translation]
-    """
-    List of Translation objects
-    """