Unit3Dup 0.11.10__tar.gz → 0.12.0__tar.gz

{unit3dup-0.11.10 → unit3dup-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.11.10
+Version: 0.12.0
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -10,7 +10,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: guessit==3.8.0
 Requires-Dist: pymediainfo==6.1.0
-Requires-Dist: python-qbittorrent==0.4.3
+Requires-Dist: qbittorrent-api==2026.6.0
 Requires-Dist: pydantic==2.10.6
 Requires-Dist: requests==2.32.3
 Requires-Dist: rich==13.7.1

{unit3dup-0.11.10 → unit3dup-0.12.0}/Unit3Dup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.11.10
+Version: 0.12.0
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -10,7 +10,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: guessit==3.8.0
 Requires-Dist: pymediainfo==6.1.0
-Requires-Dist: python-qbittorrent==0.4.3
+Requires-Dist: qbittorrent-api==2026.6.0
 Requires-Dist: pydantic==2.10.6
 Requires-Dist: requests==2.32.3
 Requires-Dist: rich==13.7.1

{unit3dup-0.11.10 → unit3dup-0.12.0}/Unit3Dup.egg-info/requires.txt

@@ -1,6 +1,6 @@
 guessit==3.8.0
 pymediainfo==6.1.0
-python-qbittorrent==0.4.3
+qbittorrent-api==2026.6.0
 pydantic==2.10.6
 requests==2.32.3
 rich==13.7.1

{unit3dup-0.11.10 → unit3dup-0.12.0}/common/command.py

@@ -88,6 +88,9 @@ class CommandLine:
         search_group.add_argument("-d", "--description", type=str, help="By description")
         search_group.add_argument("-bd", "--bdinfo", type=str, help="Show BDInfo")
         search_group.add_argument("-m", "--mediainfo", type=str, help="Show MediaInfo")
+        search_group.add_argument("-int", "--internal", action="store_true", help="Internal Release")
+        search_group.add_argument("-mod", "--moderation", action="store_true", help="In moderation")
+
 
         # /////////////////////////
         # Filter Options
@@ -123,7 +126,7 @@ class CommandLine:
         special_group.add_argument("-str", "--stream", action="store_true", help="Stream")
         special_group.add_argument("-sd", "--standard", action="store_true", help="SD")
         special_group.add_argument("-hs", "--highspeed", action="store_true", help="Highspeed")
-        special_group.add_argument("-int", "--internal", action="store_true", help="Internal")
+        special_group.add_argument("-inter", "--intern_r", action="store_true", help="Internal Release")
         special_group.add_argument("-pr", "--prelease", action="store_true", help="Personal")
 
         # /////////////////////////
@@ -159,4 +162,4 @@ class CommandLine:
             if self.args.force.lower() not in valid_categories:
                 self.args.force = None
                 print("Invalid -force category")
-                exit()
+                exit()

{unit3dup-0.11.10 → unit3dup-0.12.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.11.10"
+version = "0.12.0"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(
@@ -112,6 +112,8 @@ class TorrentClientConfig(BaseModel):
     SHARED_RTORR_PATH: str | None = None
     TORRENT_CLIENT: str | None = None
     TAG: str | None = None
+    CATEGORY_MOVIE: str | None = None
+    CATEGORY_TV: str | None = None
 
 
 class UserPreferences(BaseModel):
@@ -452,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', 'RTORR_HOST']:
+                             'TORRENT_CLIENT', 'TAG', 'CATEGORY_MOVIE','CATEGORY_TV', 'RTORR_HOST']:
                     section[field] = Validate.string(value=section[field], field_name=field)
 
                 if field in ['SHARED_TRASM_PATH', 'SHARED_QBIT_PATH', 'SHARED_RTORR_PATH']:
@@ -622,7 +624,9 @@ class Load:
                 "RTORR_PORT": "9091",
                 "SHARED_RTORR_PATH": "no_path",
                 "TORRENT_CLIENT": "qbittorrent",
-                "TAG": "ADDED TORRENTS"
+                "TAG": "ADDED TORRENTS",
+                "CATEGORY_MOVIE": "movie",
+                "CATEGORY_TV": "tv"
             },
             "user_preferences": {
                 "PTSCREENS_PRIORITY": 0,

unit3dup-0.12.0/common/torrent_clients.py

@@ -0,0 +1,281 @@
+# -*- coding: utf-8 -*-
+import hashlib
+import os
+import stat
+import time
+import bencode2
+import requests
+from requests import Response
+from rtorrent_rpc import RTorrent
+
+from abc import ABC, abstractmethod
+
+import qbittorrentapi
+import transmission_rpc
+
+from unit3dup.pvtTorrent import Mytorrent
+from unit3dup import config_settings
+from unit3dup.media import Media
+
+from view import custom_console
+
+
+class TorrClient(ABC):
+
+    def __init__(self):
+        self.client = None
+
+    @abstractmethod
+    def connect(self):
+        pass
+
+    @abstractmethod
+    def send_to_client(self, tracker_data_response: str, torrent: Mytorrent, content: Media, archive_path: str):
+        pass
+
+    @staticmethod
+    def download(tracker_torrent_url: Response, full_path_archive: str):
+        # File archived
+        with open(full_path_archive, "wb") as file:
+            file.write(tracker_torrent_url.content)
+
+        # Ready for seeding
+        return open(full_path_archive, "rb")
+
+
+class TransmissionClient(TorrClient):
+    def __init__(self) -> None:
+        super().__init__()
+
+    def connect(self) -> transmission_rpc.Client | None:
+        try:
+            self.client = transmission_rpc.Client(host=config_settings.torrent_client_config.TRASM_HOST,
+                                                  port=config_settings.torrent_client_config.TRASM_PORT,
+                                                  username=config_settings.torrent_client_config.TRASM_USER,
+                                                  password=config_settings.torrent_client_config.TRASM_PASS,
+                                                  timeout=10)
+            return self.client
+        except requests.exceptions.HTTPError:
+            custom_console.bot_error_log(
+                f"{self.__class__.__name__} HTTP Error. Check IP/port or run Transmission"
+            )
+        except requests.exceptions.ConnectionError:
+            custom_console.bot_error_log(
+                f"{self.__class__.__name__} Connection Error. Check IP/port or run Transmission"
+            )
+        except transmission_rpc.TransmissionError:
+            custom_console.bot_error_log(
+                f"{self.__class__.__name__} Login required. Check your username and password"
+            )
+        except Exception as e:
+            custom_console.bot_error_log(f"{self.__class__.__name__} Unexpected error: {e}")
+            custom_console.bot_error_log(f"{self.__class__.__name__} Please verify your configuration")
+
+    def send_to_client(self, tracker_data_response: str, torrent: Mytorrent, content: Media, archive_path: str):
+        # "Translate" files location to shared_path if necessary
+        if config_settings.torrent_client_config.SHARED_QBIT_PATH:
+            torr_location = config_settings.torrent_client_config.SHARED_QBIT_PATH
+        else:
+            # If no shared_path is specified set it to the path specified in the CLI commands (path)
+            torr_location = os.path.dirname(content.torrent_path)
+
+        # Send to the client
+        with open(archive_path, "rb") as file_buffer:
+            self.client.add_torrent(torrent=file_buffer, download_dir=str(torr_location))
+
+    def send_file_to_client(self, torrent_path: str):
+        self.client.add_torrent(torrent=open(torrent_path, "rb"), download_dir=str(os.path.dirname(torrent_path)))
+
+
+class QbittorrentClient(TorrClient):
+
+    def __init__(self):
+        super().__init__()
+
+    def connect(self) -> qbittorrentapi.Client | None:
+        try:
+            self.client = qbittorrentapi.Client(
+                host=config_settings.torrent_client_config.QBIT_HOST,
+                port=config_settings.torrent_client_config.QBIT_PORT,
+                username=config_settings.torrent_client_config.QBIT_USER,
+                password=config_settings.torrent_client_config.QBIT_PASS,
+                REQUESTS_ARGS={"timeout": 10},
+            )
+
+            login_count = 0
+
+            while True:
+                try:
+                    self.client.auth_log_in()
+                    break
+
+                except qbittorrentapi.LoginFailed:
+
+                    if login_count > 5:
+                        custom_console.bot_error_log("Failed to login.")
+                        exit(1)
+
+                    custom_console.bot_warning_log(
+                        "Qbittorrent failed to login. Retry...Please wait"
+                    )
+
+                    time.sleep(2)
+                    login_count += 1
+
+            return self.client
+
+        except requests.exceptions.HTTPError:
+            custom_console.bot_error_log(
+                f"{self.__class__.__name__} HTTP Error. "
+                f"Check IP/port or run qBittorrent"
+            )
+
+        except requests.exceptions.ConnectionError:
+            custom_console.bot_error_log(
+                f"{self.__class__.__name__} Connection Error. "
+                f"Check IP/port or run qBittorrent"
+            )
+
+        except qbittorrentapi.LoginFailed:
+            custom_console.bot_error_log(
+                f"{self.__class__.__name__} Login required. "
+                f"Check your username and password"
+            )
+
+        except Exception as e:
+            custom_console.bot_error_log(
+                f"{self.__class__.__name__} Unexpected error: {e}"
+            )
+            custom_console.bot_error_log(
+                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:
+
+        self.client.torrents_add(torrent_files=torrent_bytes,save_path=save_path)
+
+        # wait for torrent to be registered
+        for _ in range(20):
+            try:
+                torrents = self.client.torrents_info(torrent_hashes=info_hash)
+                if torrents:
+                    break
+            except Exception:
+                pass
+            time.sleep(0.25)
+
+        if category=='movie':
+            category = config_settings.torrent_client_config.CATEGORY_MOVIE
+        if category=='tv':
+            category = config_settings.torrent_client_config.CATEGORY_MOVIE
+        self.client.torrents_add_tags(tags=config_settings.torrent_client_config.TAG, torrent_hashes=info_hash)
+        self.client.torrents_set_category(category=category, torrent_hashes=info_hash)
+
+
+    def send_to_client(self, tracker_data_response: str, torrent: Mytorrent, content: Media,archive_path: str):
+
+        if config_settings.torrent_client_config.SHARED_QBIT_PATH:
+            torr_location = (
+                config_settings.torrent_client_config.SHARED_QBIT_PATH
+            )
+        else:
+            torr_location = os.path.dirname(content.torrent_path)
+
+        if not torrent:
+            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)
+
+
+class RTorrentClient(TorrClient):
+    def __init__(self):
+        super().__init__()
+
+    def connect(self) -> RTorrent | None:
+
+        # Build the socket string for rTorrent
+        # Tcp or File
+        if os.path.exists(config_settings.torrent_client_config.RTORR_HOST):
+            socket_type = os.stat(config_settings.torrent_client_config.RTORR_HOST).st_mode
+            if stat.S_ISSOCK(socket_type):
+                socket = f"scgi:///{config_settings.torrent_client_config.RTORR_HOST}"
+            else:
+                custom_console.bot_error_log("Invalid RTorrent host")
+                exit(1)
+        else:
+            socket = (f"scgi://{config_settings.torrent_client_config.RTORR_HOST}:"
+                      f"{config_settings.torrent_client_config.RTORR_PORT}")
+
+        login_count = 0
+        while True:
+            try:
+                # open
+                self.client = RTorrent(address=socket, timeout=10)
+                # Test
+                self.client.system_list_methods()
+                return self.client
+            except requests.exceptions.HTTPError:
+                custom_console.bot_warning_log("Rtorrent failed to login. Retry...Please wait")
+                time.sleep(2)
+                login_count += 1
+                if login_count > 5:
+                    custom_console.bot_error_log("Rtorrent failed to login.")
+                    exit()
+            except requests.exceptions.ConnectionError:
+                custom_console.bot_error_log(
+                    f"{self.__class__.__name__} Connection Error. Check IP/port or run rTorrent"
+                )
+                exit()
+            except TimeoutError:
+                custom_console.bot_error_log(
+                    f"{self.__class__.__name__} Connection Error. Check IP/port or run rTorrent"
+                )
+                exit()
+            except AttributeError:
+                custom_console.bot_error_log(
+                    f"{self.__class__.__name__} Socket connection error or wrong OS platform"
+                )
+                exit()
+            except ConnectionRefusedError:
+                custom_console.bot_error_log(
+                    f"{self.__class__.__name__} Connection refused"
+                )
+                exit()
+
+    def send_to_client(self, tracker_data_response: str, torrent: Mytorrent, content: Media, archive_path: str):
+        # "Translate" files location to shared_path if necessary
+        if config_settings.torrent_client_config.SHARED_RTORR_PATH:
+            torr_location = config_settings.torrent_client_config.SHARED_RTORR_PATH
+        else:
+            # If no shared_path is specified set it to the path specified in the CLI commands (path)
+            torr_location = os.path.dirname(content.torrent_path)
+
+        # Add the torrent folder needed for rTorrent
+        if os.path.isdir(content.subfolder):
+            torr_location = os.path.join(torr_location, content.torrent_name)
+            # Save path for Windows or Linux.The root directory (/mnt or c:\) is the responsibility of the user
+            # in shared_folder
+            torr_location = torr_location.replace('\\', '/')
+
+        # Read and send
+        with open(archive_path, "rb") as file:
+            self.client.add_torrent_by_file(content=file.read(), directory_base=str(torr_location),
+                                            tags=[config_settings.torrent_client_config.TAG])
+
+    def send_file_to_client(self, torrent_path: str, media_location: str):
+        with open(torrent_path, "rb") as file:
+            self.client.add_torrent_by_file(content=file.read(), directory_base=str(media_location),
+                                            tags=[config_settings.torrent_client_config.TAG])

{unit3dup-0.11.10 → unit3dup-0.12.0}/common/trackers/signs_list.py

@@ -21,6 +21,7 @@ SIGNS_LIST = {
     "BITSHIFT": "releaser",
     "BLACKBIT": "releaser",
     "BL4CK-B4RT-MIRCREW": "releaser",
+    "BLOOM": "releaser",
     "BLUWORLD": "releaser",
     "BOBDOBBS": "releaser",
     "BONE": "releaser",
@@ -34,6 +35,9 @@ SIGNS_LIST = {
     "CHD": "releaser",
     "CHDWEB": "releaser",
     "CIAME": "releaser",
+    "CINEPHILES": "releaser",
+    "CINEPTH": "releaser",
+    "CINEWEB": "releaser",
     "CLOCLONE": "releaser",
     "CODEX": "releaser",
     "COMIX21": "releaser",
@@ -57,6 +61,7 @@ SIGNS_LIST = {
     "DOCH74": "releaser",
     "DR4GON": "releaser",
     "DRIIP": "releaser",
+    "DRPLEB": "releaser",
     "DST": "releaser",
     "DYNUX": "releaser",
     "EA": "releaser",
@@ -89,6 +94,7 @@ SIGNS_LIST = {
     "GFM": "releaser",
     "GIUSEPPETNT": "releaser",
     "GOLDENTORRENT": "releaser",
+    "GRAPPA": "releaser",
     "GRYM": "releaser",
     "HAPPITEAM-YNK": "releaser",
     "HASHDEV": "releaser",
@@ -107,6 +113,7 @@ SIGNS_LIST = {
     "IDN-CREW": "releaser",
     "IGS": "releaser",
     "ILGANZO": "releaser",
+    "ILENIA": "releaser",
     "ILPADRINO": "releaser",
     "ILSAGGIO": "releaser",
     "ILSOMMO": "releaser",
@@ -129,6 +136,7 @@ SIGNS_LIST = {
     "KUCHU": "releaser",
     "LAZY-SUBS": "releaser",
     "LATENEVER": "releaser",
+    "LAXII": "releaser",
     "LDI": "releaser",
     "LEAGUENF": "releaser",
     "LELE753": "releaser",
@@ -138,20 +146,20 @@ SIGNS_LIST = {
     "LOZIO-MIRCREW": "releaser",
     "LULLOZZO": "releaser",
     "LZ": "releaser",
-    "LAXII": "releaser",
     "LZ59": "releaser",
     "MADHEX": "releaser",
     "MADSKY": "releaser",
     "MADTIA": "releaser",
     "MAX": "releaser",
-    "MEM.GP" : "releaser",
-    "MEMGP": "releaser",
-    "MEM": "releaser",
     "MAX2014": "releaser",
     "ME7ALH": "releaser",
+    "MEM": "releaser",
+    "MEM.GP": "releaser",
+    "MEMGP": "releaser",
     "MIK0YAN": "releaser",
     "MIRCREW": "releaser",
     "MISTERNED": "releaser",
+    "MOORKAT": "releaser",
     "MORPHEUS": "releaser",
     "MRBLONDE": "releaser",
     "MRROBOT": "releaser",
@@ -166,9 +174,11 @@ SIGNS_LIST = {
     "NOMADS": "releaser",
     "NOVARIP": "releaser",
     "NTB": "releaser",
+    "NTG": "releaser",
     "NTROPIC": "releaser",
     "ODS": "releaser",
     "ODINO": "releaser",
+    "OFT": "releaser",
     "ONGOIA": "releaser",
     "PASO77": "releaser",
     "PEPPE": "releaser",
@@ -178,6 +188,7 @@ SIGNS_LIST = {
     "PING": "releaser",
     "PINKER": "releaser",
     "PIR8": "releaser",
+    "PLAYTV": "releaser",
     "PLAYWEB": "releaser",
     "PLUSAM": "releaser",
     "POKE": "releaser",
@@ -187,10 +198,12 @@ SIGNS_LIST = {
     "RADESE": "releaser",
     "RAPTA": "releaser",
     "RARBG": "releaser",
+    "RAMSEIS": "releaser",
     "RAWR": "releaser",
     "REALDMDJ": "releaser",
     "RIDDICKK": "releaser",
     "RMTEAM": "releaser",
+    "R00T": "releaser",
     "ROMEO": "releaser",
     "RUNE": "releaser",
     "RYUKXX": "releaser",
@@ -207,6 +220,7 @@ SIGNS_LIST = {
     "SK4TTO": "releaser",
     "SMURF": "releaser",
     "SMURFADMIN": "releaser",
+    "SM737": "releaser",
     "SP33DY94-MIRCREW": "releaser",
     "SPWEB": "releaser",
     "SPYRO": "releaser",
@@ -215,7 +229,12 @@ SIGNS_LIST = {
     "STEVEJOHNNEE": "releaser",
     "STINGUAJT": "releaser",
     "TAHTAKALECI": "releaser",
+    "TAREK": "releaser",
     "TASKO": "releaser",
+    "TBR": "releaser",
+    "TBZ": "releaser",
+    "T4H": "releaser",
+    "T4P3": "releaser",
     "TELESTO": "releaser",
     "TEPES": "releaser",
     "TERMINAL": "releaser",
@@ -224,11 +243,8 @@ SIGNS_LIST = {
     "THUDARA": "releaser",
     "TIGER": "releaser",
     "TIGRE67": "releaser",
-    "TBR": "releaser",
-    "TBZ": "releaser",
-    "T4P3": "releaser",
-    "TORRENTER10": "releaser",
     "TOTAL_SHARE88": "releaser",
+    "TORRENTER10": "releaser",
     "TREE7458": "releaser",
     "TRITON": "releaser",
     "TRL": "releaser",

{unit3dup-0.11.10 → unit3dup-0.12.0}/common/trackers/tags_list.py

@@ -29,6 +29,7 @@ TAGS_LIST = {
     "MD": "source",
     "UHDRIP": "source",
     "BLURAY": "source",
+    "BLU-RAY": "source",
     "BRRIP": "source",
     "BDRIP": "source",
     "FHDRIP": "source",

{unit3dup-0.11.10 → unit3dup-0.12.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 dynamic = ["dependencies"]
 name = "Unit3Dup"
-version = "0.11.10"
+version = "0.12.0"
 description = "An uploader for the Unit3D torrent tracker"
 readme = "README.rst"
 requires-python = ">=3.10"
@@ -13,8 +13,8 @@ license = "MIT"
 
 authors = [
     { name = "Parzival" }
+  
 ]
-
 [project.urls]
 Homepage = "https://github.com/31December99/Unit3Dup"
 

{unit3dup-0.11.10 → unit3dup-0.12.0}/requirements.txt

@@ -1,6 +1,6 @@
 guessit==3.8.0
 pymediainfo==6.1.0
-python-qbittorrent==0.4.3
+qbittorrent-api==2026.6.0
 pydantic==2.10.6
 requests==2.32.3
 rich==13.7.1

{unit3dup-0.11.10 → unit3dup-0.12.0}/unit3dup/__main__.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import json
 
-import requests
-
 from common.torrent_clients import TransmissionClient, QbittorrentClient, RTorrentClient
 from common.command import CommandLine
 from common.settings import Load, DEFAULT_JSON_PATH, USER_TAGS_PATH, USER_SIGN_PATH, BAN_TAGS_PATH, version
@@ -58,7 +56,6 @@ def main():
             custom_console.bot_log(f"Tracker -> '{cli.args.tracker.upper()}' Online")
             tracker_name_list = [cli.args.tracker.upper()]
 
-
     # Send content to the multi_tracker list
     if cli.args.mt:
         tracker_name_list = config.tracker_config.MULTI_TRACKER
@@ -294,7 +291,7 @@ def main():
         torrent_info.view_highspeed()
         return
 
-    if cli.args.internal:
+    if cli.args.intern_r:
         torrent_info.view_internal()
         return
 

{unit3dup-0.11.10 → unit3dup-0.12.0}/unit3dup/media_manager/TorrentManager.py

@@ -124,9 +124,6 @@ class TorrentManager:
             custom_console.bot_log(f"Tracker '{selected_tracker}' Done.")
             custom_console.rule()
 
-    custom_console.bot_log(f"Done.")
-    custom_console.rule()
-
     def reseed(self, trackers_name_list: list) -> None:
         """