Unit3Dup 0.13.0__tar.gz → 0.13.2__tar.gz

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

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

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

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

{unit3dup-0.13.0 → 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.0"
+version = "0.13.2"
 
 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.13.0 → unit3dup-0.13.2}/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,32 +176,33 @@ 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:
-            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.0 → unit3dup-0.13.2}/pyproject.toml

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