Unit3Dup 0.9.31__tar.gz → 0.10.1__tar.gz

{unit3dup-0.9.31 → unit3dup-0.10.1}/PKG-INFO

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

{unit3dup-0.9.31 → unit3dup-0.10.1}/Unit3Dup.egg-info/PKG-INFO

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

{unit3dup-0.9.31 → unit3dup-0.10.1}/Unit3Dup.egg-info/SOURCES.txt

@@ -72,6 +72,7 @@ common/trackers/__init__.py
 common/trackers/ban_list.py
 common/trackers/data.py
 common/trackers/itt.py
+common/trackers/ptt.py
 common/trackers/signs_list.py
 common/trackers/sis.py
 common/trackers/tags_list.py

{unit3dup-0.9.31 → unit3dup-0.10.1}/common/mediainfo.py

@@ -158,7 +158,7 @@ class MediaFile:
         for track in self.audio_track:  # + self.subtitle_track:
             lang = track.get("language", "Unknown")
             if lang != "Unknown":
-                languages.add(ManageTitles.convert_iso(lang))
+                languages.add(ManageTitles.convert_iso(lang)[0])
         return list(languages) if len(languages) > 0 else ["not found"]
 
     @property

{unit3dup-0.9.31 → unit3dup-0.10.1}/common/settings.py

@@ -23,7 +23,7 @@ user_tags_file = "tags_list.json"
 user_sign_file = "sign_list.json"
 bane_file = "ban_list.json"
 
-version = "0.9.31"
+version = "0.10.1"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(
@@ -72,6 +72,9 @@ class TrackerConfig(BaseModel):
     SIS_URL: str
     SIS_APIKEY: str | None = None
     SIS_PID: str | None = None
+    PTT_URL: str
+    PTT_APIKEY: str | None = None
+    PTT_PID: str | None = None
     MULTI_TRACKER: list[str] | None = None
     TMDB_APIKEY: str | None = None
     TVDB_APIKEY: str | None = None
@@ -407,14 +410,14 @@ class Config(BaseModel):
             else:
                 field = field.upper()
 
-                if field in ['ITT_URL', 'SIS_URL']:
+                if field in ['ITT_URL']:
                     section[field] = Validate.url(value=section[field], field_name=field)
 
-                if field in ['ITT_PID', 'SIS_PID']:
+                if field in ['ITT_PID']:
                     section[field] = Validate.pid(value=section[field], field_name=field,
                                                   multi_trackers=section['MULTI_TRACKER'])
 
-                elif field in ['ITT', 'SIS']:
+                elif field in ['ITT', 'SIS', 'PTT']:
                     section[field] = Validate.dict(value=section[field], field_name=field)
                 elif field in ['MULTI_TRACKER']:
                     section[field] = Validate.validate_multi_tracker(multi_tracker_list=section[field])
@@ -573,7 +576,10 @@ class Load:
                 "SIS_URL": "https://no_tracker.xyz",
                 "SIS_APIKEY": "no_key",
                 "SIS_PID": "no_key",
-                "MULTI_TRACKER": ["itt"],
+                "PTT_URL": "https://no_tracker.xyz",
+                "PTT_APIKEY": "no_key",
+                "PTT_PID": "no_key",
+                "MULTI_TRACKER": ["itt","sis","ptt"],
                 "TMDB_APIKEY": "no_key",
                 "TVDB_APIKEY": "no_key",
                 "IMGBB_KEY": "no_key",
@@ -771,7 +777,7 @@ class JsonConfig:
         # Add the new attributes in 'tracker config'
         if self.tracker_diff_keys:
             self.updated = True
-            missing_keys_dict = {key: '' for key in self.tracker_diff_keys}
+            missing_keys_dict = {key: 'no_key' for key in self.tracker_diff_keys}
             self.tracker_config.update(missing_keys_dict)
 
     def update_torrent_client_config(self):

{unit3dup-0.9.31 → unit3dup-0.10.1}/common/trackers/__init__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from common.trackers.itt import itt_data
+from common.trackers.ptt import ptt_data
 from common.trackers.sis import sis_data
 
-tracker_list = {'ITT': itt_data, 'SIS': sis_data}
+tracker_list = {'ITT': itt_data, 'SIS': sis_data, 'PTT': ptt_data}

unit3dup-0.10.1/common/trackers/ban_list.py

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+BAN_LIST = {
+    "dummy" : "banned",
+    "video_encoder": "banned"
+}

{unit3dup-0.9.31 → unit3dup-0.10.1}/common/trackers/data.py

@@ -21,6 +21,15 @@ trackers_api_data = {
             "announce":  f"{config_settings.tracker_config.SIS_URL}/announce/{config_settings.tracker_config.SIS_PID}",
             "source": "ShareIsland",
         }
+    ,
+    'PTT':
+        {
+            "url": config_settings.tracker_config.PTT_URL,
+            "api_key": config_settings.tracker_config.PTT_APIKEY,
+            "pass_key": config_settings.tracker_config.PTT_PID,
+            "announce": f"{config_settings.tracker_config.PTT_URL}/announce/{config_settings.tracker_config.PTT_PID}",
+            "source": "PolishTorrent",
+        }
 
 }
 

{unit3dup-0.9.31 → unit3dup-0.10.1}/common/trackers/itt.py

@@ -12,6 +12,7 @@ itt_data = {
                  "size5": 25},
 
     "TYPE_ID":{ "full-disc": 1,
+                "fulldisc": 1,
                 "remux": 2,
                 "bdremux": 2,
                 "vh": 2,

unit3dup-0.10.1/common/trackers/ptt.py

@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+
+ptt_data = {
+    "CATEGORY": {
+        "applications": 6,
+        "audiobooks": 25,
+        "edicola": 20,
+        "4kmovies": 23,
+        "movie": 1,
+        "game": 5,
+        "others": 19,
+        "music": 8,
+        "sports": 21,
+        "tv": 9,
+    },
+    "FREELECH": {"size20": 100,
+                 "size15": 75,
+                 "size10": 50,
+                 "size5": 25},
+    "TYPE_ID": {
+        "bdrip": 11,
+        "blu-ray": 16,
+        "bluray": 16,
+        "brrip": 18,
+        "dvdrip": 15,
+        "discography": 3,
+        "encode": 7,
+        "full-disc": 1,
+        "fulldisc": 1,
+        "hdtv": 6,
+        "others": 12,
+        "polish cinema": 20,
+        "cinema": 13,
+        "cam": 13,
+        "webscr": 13,
+        "music": 14,
+        "remux": 2,
+        "sdtv": 17,
+        "tvrip": 19,
+        "vr": 21,
+        "web-dl": 4,
+        "webdl": 4,
+        "web": 4,
+        "web-dlmux": 4,
+        "pc": 5,
+        "pdf": 22,
+        "pc games": 23,
+        "playstation": 24,
+        "xbox": 25,
+        "nintendo switch": 26,
+        "vr_2": 27,
+        "retro": 28,
+    },
+    "TYPE_ID_AUDIO": {"flac": 8,
+                      "mp3": 10,
+                      },
+    "TAGS": {
+        "SD": 1,
+        "HD": 0,
+    },
+
+    "RESOLUTION": {
+        "4320p": 1,
+        "2160p": 2,
+        "1440p": 12,
+        "1080p": 3,
+        "1080i": 4,
+        "720p": 5,
+        "480p": 10,
+    },
+
+    "CODEC": [
+        "h261",
+        "h262",
+        "h263",
+        "h264",
+        "x264",
+        "x265",
+        "avc",
+        "h265",
+        "hevc",
+        "vp8",
+        "vp9",
+        "av1",
+        "mpeg-1",
+        "mpeg-4",
+        "wmv",
+        "theora",
+        "divx",
+        "xvid",
+        "prores",
+        "dnxhd",
+        "cinepak",
+        "indeo",
+        "dv",
+        "ffv1",
+        "sorenson",
+        "rv40",
+        "cineform",
+        "huffyuv",
+        "mjpeg",
+        "lagarith",
+        "msu",
+        "rle",
+        "dirac",
+        "wmv3",
+        "vorbis",
+        "smpte",
+        "mjpeg",
+        "ffvhuff",
+        "v210",
+        "yuv4:2:2",
+        "yuv4:4:4",
+        "hap",
+        "sheervideo",
+        "ut",
+        "quicktime",
+        "rududu",
+        "h.266",
+        "vvc",
+        "mjpeg 4:2:0",
+        "h.263+",
+        "h.263++",
+        "vp4",
+        "vp5",
+        "vp6",
+        "vp7",
+        "vp8",
+        "vp9",
+        "vp10",
+        "vp11",
+        "vp12",
+        "vp3",
+        "vp2",
+        "vp1",
+        "amv",
+        "daala",
+        "gecko",
+        "nvenc",
+        "bluray",
+    ],
+}

{unit3dup-0.9.31 → unit3dup-0.10.1}/common/utility.py

@@ -21,7 +21,7 @@ class ManageTitles:
     ]
 
     iso_3166_alpha3 = [
-        "ENG", "USA", "GBR", "ITA", "DEU", "FRA", "ESP", "SPA",
+        "ENG", "USA", "GBR", "ITA", "DEU", "GER", "FRA", "ESP", "SPA",
         "BRA", "JPN", "CHN", "RUS", "PER", "NOR",
         "SWE", "DAN", "POL", "HIN", "TUR", "ARA", "KOR", "VIE", "IND"
     ]
@@ -29,7 +29,7 @@ class ManageTitles:
     iso_3166_alpha2_to_alpha3 = {
         "EN": "ENG", "US": "USA", "GB": "GBR", "EN-US": "ENG", "EN-GB": "ENG", "EN-AU": "ENG",
         "IT": "ITA",
-        "DE": "DEU",
+        "DE": "GER",
         "FR": "FRA",
         "ES": "SPA", "ES-ES": "SPA", "ES-MX": "SPA",
         "BR": "BRA",
@@ -51,10 +51,10 @@ class ManageTitles:
 
     long_name = {
         "ENGLISH": "ENG",
-        "AMERICAN": "USA",
-        "BRITISH": "GBR",
+        "AMERICAN": "ENG",
+        "BRITISH": "ENG",
         "ITALIAN": "ITA",
-        "GERMAN": "DEU",
+        "GERMAN": "GER",
         "FRENCH": "FRA",
         "SPANISH": "SPA",
         "BRAZILIAN": "BRA",
@@ -76,7 +76,7 @@ class ManageTitles:
     }
 
     @staticmethod
-    def convert_iso(code) -> list | str | None:
+    def convert_iso(code) -> list[str] | str:
         """ Convert iso 2 to 3 """
         code = code.upper()
         # if it's 'multilang'
@@ -95,7 +95,7 @@ class ManageTitles:
             if match:
                 iso_code = match.group(1)
                 if len(iso_code) == 2:  # // alpha-2
-                    return ManageTitles.iso_3166_alpha2_to_alpha3.get(code, None)
+                    return ManageTitles.iso_3166_alpha2_to_alpha3.get(code, "")
                 elif len(iso_code) == 3:  # // alpha3
                     # return the same code provided it is an alpha3
                     if iso_code in ManageTitles.iso_3166_alpha3:

{unit3dup-0.9.31 → unit3dup-0.10.1}/pyproject.toml

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

{unit3dup-0.9.31 → unit3dup-0.10.1}/unit3dup/__main__.py

@@ -1,6 +1,8 @@
 # -*- 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
@@ -43,15 +45,25 @@ def main():
         custom_console.bot_error_log(f"No tracker name provided. Please update your configuration file")
         exit(1)
 
-    # /// Test the Trackers
-    for tracker_data in config.tracker_config.MULTI_TRACKER:
-        tracker = pvtTracker.Unit3d(tracker_name=tracker_data)
+    # Check if the tracker name exists
+    if cli.args.tracker:
+        if not any(cli.args.tracker.upper() in tracker.upper() for tracker in config.tracker_config.MULTI_TRACKER):
+            custom_console.bot_error_log(
+                f"Tracker '{cli.args.tracker}' not found. Please update your configuration file")
+            exit()
+
+        tracker = pvtTracker.Unit3d(tracker_name=cli.args.tracker)
         if tracker.get_alive(alive=True, perPage=1):
-            custom_console.bot_log(f"Tracker -> '{tracker_data.upper()}' Online")
-        else:
-            if cli.args.tracker == tracker_data:
-                custom_console.bot_error_log(f"Your default tracker '{tracker_data}' is offline")
-                exit()
+            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
+        for tracker_data in tracker_name_list[1:]:
+            tracker = pvtTracker.Unit3d(tracker_name=tracker_data)
+            if tracker.get_alive(alive=True, perPage=1):
+                custom_console.bot_log(f"Tracker -> '{tracker_data.upper()}' Online")
 
     # Test both clients only if used
     if cli.args.noseed is False and cli.args.noup is False or cli.args.reseed is True:
@@ -78,22 +90,6 @@ def main():
                 custom_console.bot_error_log(f"You need to set a favorite 'torrent_client' in the config file")
                 exit(1)
 
-    # Check if the tracker name exists
-    if cli.args.tracker and cli.args.tracker not in config.tracker_config.MULTI_TRACKER:
-        custom_console.bot_error_log(f"Tracker '{cli.args.tracker}' not found. Please update your configuration file")
-        exit()
-
-    # Get default tracker
-    tracker_name_list = [config.tracker_config.MULTI_TRACKER[0]]
-
-    # Add a single announce if requested (disabled)
-    if cli.args.tracker:
-        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
-
     # Load User Tags list
     tags_list = None
     if cli.args.buildtags:
@@ -138,7 +134,7 @@ def main():
             torrent_archive_path=tracker_archive,
             tags_list=tags_list,
             sign_list=sign_list,
-            ban_list = ban_list
+            ban_list=ban_list
         )
         bot.run()
 
@@ -181,7 +177,7 @@ def main():
 
     # Dump
     if cli.args.dump:
-        torrent_info.view_search(" ", inkey=False,save=True)
+        torrent_info.view_search(" ", inkey=False, save=True)
         return
 
     if cli.args.info:

{unit3dup-0.9.31 → unit3dup-0.10.1}/unit3dup/media.py

@@ -35,7 +35,7 @@ class Media:
         self._file_name: str | None = None
         self._display_name: str | None = None
         self._category: int | None = None
-        self._audio_languages: list[str] | None = None
+        self._audio_languages: list[str]  = []
         self._media_file: MediaFile | None = None
         self._languages: list[str] | None = None
         self._resolution: str | None = None
@@ -255,12 +255,15 @@ class Media:
         if not self._audio_languages:
             # Get languages from the title
             filename_split = self.display_name.upper().split(" ")
+
             for code in filename_split:
-                if converted_code := ManageTitles.convert_iso(code):
-                    self._audio_languages = converted_code
-                    return self._audio_languages
-            # get from the audio track
-            self._audio_languages = self.languages
+                converted_code = ManageTitles.convert_iso(code)
+                if converted_code:
+                    self._audio_languages.append(converted_code[0])
+
+            if not self._audio_languages:
+                # get from the audio track
+                self._audio_languages = self.languages
         return self._audio_languages
 
     @property

{unit3dup-0.9.31 → unit3dup-0.10.1}/unit3dup/pvtTracker.py

@@ -91,6 +91,11 @@ class Tracker(Myhttp):
                     f"or verify if the tracker is online",
                 )
                 exit(1)
+            except requests.exceptions.MissingSchema:
+                custom_console.bot_error_log(
+                    f"TRACKER Connection error. Please check your configuration data"
+                )
+                exit(1)
             except requests.exceptions.ReadTimeout as e:
                 custom_console.bot_error_log(f"TRACKER HTTP Error {e}. Tracker Offline !")
                 exit(1)

unit3dup-0.9.31/common/trackers/ban_list.py

@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-
-BAN_LIST = {
-    "dummy" : "banned"
-}