Unit3Dup 0.13.1__tar.gz → 0.14.0__tar.gz

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

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

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

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

{unit3dup-0.13.1 → unit3dup-0.14.0}/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.13.1"
+version = "0.14.0"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(
@@ -151,7 +151,11 @@ class UserPreferences(BaseModel):
     CACHE_DBONLINE: bool = False
     PERSONAL_RELEASE: bool = False
     FAST_LOAD: int = 0
-
+    MY_SIGN: str | None = None
+    MY_URL: str | None = None
+    MY_TEXT_1: str | None = None
+    MY_TEXT_2: str | None = None
+    MY_TEXT_3: str | None = None
 
 class Options(BaseModel):
     FTPX_USER: str = "user"
@@ -669,7 +673,12 @@ class Load:
                 "CACHE_DBONLINE": "False",
                 "PERSONAL_RELEASE": "False",
                 "FAST_LOAD": "0",
-                "RELEASER_SIGN": ""
+                "RELEASER_SIGN": "",
+                "MY_SIGN": "",
+                "MY_URL": "",
+                "MY_TEXT_1": "",
+                "MY_TEXT_2": "",
+                "MY_TEXT_3": ""
             },
             "options": {
                 "FTPX_USER": "user",

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

@@ -189,28 +189,20 @@ class QbittorrentClient(TorrClient):
             # 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:
-            with open(archive_path, "rb") as file_buffer:
-                torrent_data = file_buffer.read()
+        # We have to read the info_hash from the downloaded torrent file
+        # because the tracker randomizes it so it's not the same as the torf instance
+        with open(archive_path, "rb") as file_buffer:
+            torrent_data = file_buffer.read()
 
-                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)
-        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)
+            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)
 
 
 class RTorrentClient(TorrClient):

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

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

{unit3dup-0.13.1 → unit3dup-0.14.0}/unit3dup/pvtVideo.py

@@ -78,6 +78,20 @@ class Video:
             build_description = Build(extracted_frames=extracted_frames_webp+extracted_frames, filename= self.display_name)
             self.description = build_description.description()
 
+            if config_settings.user_preferences.MY_SIGN:
+                self.description += f"""
+            [center]━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━[/center]
+            [center][img=250]{config_settings.user_preferences.MY_SIGN}[/img][/center]
+            [center][b]{config_settings.user_preferences.MY_TEXT_1}[/b][/center]
+            [center]
+            {config_settings.user_preferences.MY_TEXT_2}
+            [/center]
+            [center]
+            {config_settings.user_preferences.MY_TEXT_3}
+            [/center]
+            [center][url={config_settings.user_preferences.MY_URL}]Tutte le mie release[/url][/center]
+            """
+
             if self.trailer_key:
                 self.description += (f"[b][spoiler=Spoiler: PLAY TRAILER][center][youtube]{self.trailer_key}[/youtube]"
                                      f"[/center][/spoiler][/b]")