Unit3Dup 0.8.17__tar.gz → 0.8.19__tar.gz

{unit3dup-0.8.17 → unit3dup-0.8.19}/PKG-INFO

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

{unit3dup-0.8.17 → unit3dup-0.8.19}/Unit3Dup.egg-info/PKG-INFO

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

{unit3dup-0.8.17 → unit3dup-0.8.19}/common/settings.py

@@ -13,7 +13,7 @@ from common.utility import ManageTitles
 from common import trackers
 
 config_file = "Unit3Dbot.json"
-version = "0.8.17"
+version = "0.8.19"
 
 if os.name == "nt":
     PW_TORRENT_ARCHIVE_PATH: Path = Path(os.getenv("LOCALAPPDATA", ".")) / "Unit3Dup_config" / "pw_torrent_archive"

{unit3dup-0.8.17 → unit3dup-0.8.19}/common/utility.py

@@ -37,6 +37,11 @@ class ManageTitles:
         "BR": "BRA",
         "RU": "RUS",
         "CN": "CHN",
+        "EN-US": "ENG",
+        "EN-GB": "ENG",
+        "EN-AU": "ENG",
+        "ES-ES": "ESP",
+        "ES-MX": "ESP"
     }
 
     @staticmethod

{unit3dup-0.8.17 → unit3dup-0.8.19}/pyproject.toml

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

{unit3dup-0.8.17 → unit3dup-0.8.19}/unit3dup/__main__.py

@@ -151,7 +151,7 @@ def main():
     # Dump
     if cli.args.dump:
         print("NOT YET IMPLEMENTED")
-        # torrent_info.view_search(" ", inkey=False)
+        # torrent_info.view_search(" ", inkey=False,save=True) # Fix aggiunto Save
         return
 
     if cli.args.info:

{unit3dup-0.8.17 → unit3dup-0.8.19}/unit3dup/automode.py

@@ -45,6 +45,7 @@ class Auto:
             if self.auto == "folder":
                 # -f command (single folder series or 'saga')
                 return self._lists(files_path=[], subfolders_path=[self.path])
+            return None
         else:
             return self._lists(files_path=[self.path], subfolders_path=[])
 

{unit3dup-0.8.17 → unit3dup-0.8.19}/unit3dup/duplicate.py

@@ -139,7 +139,7 @@ class Duplicate:
         return self.search(torrent=self.torrent_info.search(self.query.guessit_title))
 
 
-    def process_dead_torrents(self, tmdb_id: int)-> list[requests] | None:
+    def process_dead_torrents(self, tmdb_id: int)-> list[requests.Response] | None:
          # Get the dead torrents
          torrents = self.torrent_info.get_by_tmdb_id(tmdb_id=tmdb_id)
          dead_torrents = []

{unit3dup-0.8.17 → unit3dup-0.8.19}/unit3dup/media_manager/ContentManager.py

@@ -90,13 +90,15 @@ class ContentManager:
             media.display_name = self.display_name
 
             # Add language to the title from the media file when it's absent
-            for found_languages in media.audio_languages:
-                if found_languages not in media.display_name:
-                    media.display_name = f"{media.display_name}  {found_languages}"
+            if media.category == 'tv':
+                for found_languages in media.audio_languages:
+                    if found_languages not in media.display_name.upper():
+                        media.display_name = f"{media.display_name}  {found_languages}"
             return media
         else:
             return False
 
+
     def search_ids(self):
         _id = re.findall(r"\{(imdb-\d+|tmdb-\d+|igdb-\d+)}", self.file_name, re.IGNORECASE)
         if _id:

{unit3dup-0.8.17 → unit3dup-0.8.19}/unit3dup/media_manager/common.py

@@ -166,7 +166,7 @@ class UserContent:
             return False
 
     @staticmethod
-    def can_ressed(content: Media, tracker_name: str,  cli: argparse.Namespace, tmdb_id :int) -> list[requests]:
+    def can_ressed(content: Media, tracker_name: str,  cli: argparse.Namespace, tmdb_id :int) -> list[requests.Response]:
         """
            Search for a duplicate and compare with the user content. Delta = config.SIZE_TH
 

{unit3dup-0.8.17 → unit3dup-0.8.19}/unit3dup/pvtTracker.py

@@ -97,21 +97,10 @@ class Tracker(Myhttp):
                 exit(1)
 
     def _post(self, file: dict, data: dict, params: dict):
-        with open(file['torrent'], "rb") as torrent:
-
-            # // Send content and mime type
-            file_ = {
-                "torrent": ("filename.torrent", torrent, "application/octet-stream"),
-            }
-
-            # // Send nfo
-            if file.get('nfo', None):
-                file_.update({"nfo": ("filename.nfo", file['nfo'], "text/plain")})
-
             try:
                 return requests.post(
                     url=self.upload_url,
-                    files=file_,
+                    files=file,
                     data=data,
                     headers=self.headers,
                     params=params,
@@ -327,12 +316,24 @@ class Torrents(Tracker):
 
 
 class Uploader(Tracker):
-    def upload_t(self, data: dict, torrent_path: str, torrent_archive_path: str, nfo_path = None) -> requests:
-        file_torrent = {"torrent": torrent_archive_path}
-        if nfo_path:
-            file_torrent.update({"nfo": self.encode_utf8(file_path=nfo_path)})
+    def upload_t(self, data: dict, torrent_archive_path: str, nfo_path=None) -> requests.Response:
+        files = {}
+        # Binary mode
+        with open(torrent_archive_path, 'rb') as torrent_file:
+            files['torrent'] = ('upload.torrent', torrent_file, 'application/x-bittorrent')
+
+            # Add the info file
+            if nfo_path:
+                with open(nfo_path, 'rb') as nfo_file:
+                    files['nfo'] = ('file.nfo', nfo_file, 'text/plain')
+                    # Post both
+                    response = self._post(file=files, data=data, params=self.params)
+            else:
+                # Post the torrent
+                response = self._post(file=files, data=data, params=self.params)
+
+        return response
 
-        return self._post(file=file_torrent, data=data, params=self.params)
 
     @staticmethod
     def encode_utf8(file_path:str) -> bytes | io.BytesIO:

{unit3dup-0.8.17 → unit3dup-0.8.19}/unit3dup/upload.py

@@ -15,9 +15,6 @@ from view import custom_console
 
 class UploadBot:
     def __init__(self, content: Media, tracker_name: str, cli: argparse):
-
-        self.API_TOKEN = config_settings.tracker_config.ITT_APIKEY
-        self.BASE_URL = config_settings.tracker_config.ITT_URL
         self.cli = cli
         self.content = content
         self.tracker_name = tracker_name
@@ -26,7 +23,7 @@ class UploadBot:
         self.sign = (f"[url=https://github.com/31December99/Unit3Dup][code][color=#00BFFF][size=14]Uploaded with Unit3Dup"
                      f" {Load.version}[/size][/color][/code][/url]")
 
-    def message(self,tracker_response: requests.Response) -> (requests, dict):
+    def message(self,tracker_response: requests.Response, torrent_archive: str) -> (requests, dict):
 
         name_error = ''
         info_hash_error = ''
@@ -38,6 +35,10 @@ class UploadBot:
             tracker_response_body = json.loads(tracker_response.text)
             custom_console.bot_log(f"\n[RESPONSE]-> '{self.tracker_name}'.....{tracker_response_body['message'].upper()}\n\n")
             custom_console.rule()
+            # https://github.com/HDInnovations/UNIT3D/pull/4910/files
+            # 08/09/2025
+            # We have to download the torrent file to get the new random info_hash generated
+            self.download_file(url=tracker_response_body["data"],destination_path=torrent_archive)
             return tracker_response_body["data"],{}
 
         elif tracker_response.status_code == 401:
@@ -110,7 +111,17 @@ class UploadBot:
 
     def send(self, torrent_archive: str, nfo_path = None) -> (requests, dict):
 
-        tracker_response=self.tracker.upload_t(data=self.tracker.data, torrent_path=self.content.torrent_path,
-                                        torrent_archive_path = torrent_archive,nfo_path=nfo_path)
-        return self.message(tracker_response)
+        tracker_response=self.tracker.upload_t(data=self.tracker.data,torrent_archive_path = torrent_archive,
+                                               nfo_path=nfo_path)
+        return self.message(tracker_response=tracker_response, torrent_archive=torrent_archive)
+
 
+    @staticmethod
+    def download_file(url: str, destination_path: str) -> bool:
+        download = requests.get(url)
+        if download.status_code == 200:
+            # File archived
+            with open(destination_path, "wb") as file:
+                file.write(download.content)
+            return True
+        return False