Unit3Dup 0.13.1__tar.gz → 0.13.2__tar.gz

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

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

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

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

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

{unit3dup-0.13.1 → unit3dup-0.13.2}/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.13.2}/pyproject.toml

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