Unit3Dup 0.9.16__tar.gz → 0.9.18__tar.gz

{unit3dup-0.9.16 → unit3dup-0.9.18}/PKG-INFO

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

{unit3dup-0.9.16 → unit3dup-0.9.18}/Unit3Dup.egg-info/PKG-INFO

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

{unit3dup-0.9.16 → unit3dup-0.9.18}/Unit3Dup.egg-info/SOURCES.txt

@@ -71,7 +71,9 @@ common/external_services/trailers/response.py
 common/trackers/__init__.py
 common/trackers/data.py
 common/trackers/itt.py
+common/trackers/releasers.py
 common/trackers/sis.py
+common/trackers/tags_list.py
 common/trackers/trackers.py
 unit3dup/__init__.py
 unit3dup/__main__.py

{unit3dup-0.9.16 → unit3dup-0.9.18}/common/settings.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 import ipaddress
 import json
 import os
@@ -8,9 +7,13 @@ import re
 import unicodedata
 
 from pydantic import BaseModel, model_validator
+from pathvalidate import sanitize_filepath
 from urllib.parse import urlparse
 from pathlib import Path
-from pathvalidate import sanitize_filepath
+
+from common.trackers.releasers import SIGNS_LIST
+from common.trackers.tags_list import TAGS_LIST
+
 from common.utility import ManageTitles
 from common import trackers
 
@@ -18,7 +21,7 @@ config_file = "Unit3Dbot.json"
 user_tags_file = "tags_list.json"
 user_sign_file = "sign_list.json"
 
-version = "0.9.16"
+version = "0.9.18"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(
@@ -526,268 +529,18 @@ class Load:
         """
         Creates a tags list file
         """
-        TAG_TYPES = {
-            "REMUX": "remux",
-            "WEB-DL": "source",
-            "WEB-DLMUX": "source",
-            "WEBMUX": "source",
-            "WEBRIP": "source",
-            "BD-UNTOUCHED": "source",
-            "TS": "source",
-            "CAM": "source",
-            "HDTS": "source",
-            "MD": "source",
-            "UHDRIP": "source",
-            "BLURAY": "source",
-            "BRRIP": "source",
-            "BDRIP": "source",
-            "FHDRIP": "source",
-            "PDTV": "source",
-            "SATRIP": "source",
-            "DVBRIP": "source",
-            "DVB-S": "source",
-            "DTTRIP": "source",
-            "WP": "source",
-            "DVDSCR": "source",
-            "TVRIP": "source",
-            "VHSRIP": "source",
-            "DVDRIP": "source",
-            "HDTV": "source",
-            "DVD5": "source",
-            "DVD9": "source",
-            "VU": "source",
-
-            "ATVP": "platform",
-            "AMZN": "platform",
-            "AMC": "platform",
-            "CN": "platform",
-            "CR": "platform",
-            "DCU": "platform",
-            "DISC": "platform",
-            "DSCP": "platform",
-            "DSNY": "platform",
-            "DSNP": "platform",
-            "DPLY": "platform",
-            "ESPN": "platform",
-            "FOOD": "platform",
-            "FOX": "platform",
-            "PLAY": "platform",
-            "HBO": "platform",
-            "HMAX": "platform",
-            "HGTV": "platform",
-            "HIST": "platform",
-            "HULU": "platform",
-            "MTOD": "platform",
-            "NATG": "platform",
-            "NF": "platform",
-            "NICK": "platform",
-            "NOW": "platform",
-            "PMNT": "platform",
-            "PMTP": "platform",
-            "PCOK": "platform",
-            "RKTN": "platform",
-            "SHO": "platform",
-            "SKST": "platform",
-            "STAN": "platform",
-            "STRP": "platform",
-            "STZ": "platform",
-            "TIMV": "platform",
-
-            "REPACK": "version",
-            "EXTENDED": "version",
-            "EXTENDED EDITION": "version",
-            "EXTENDED CUT": "version",
-            "DIRECTOR'S CUT": "version",
-            "SUBBED": "version",
-            "MUX": "version",
-            "REMASTERED": "version",
-            "READNFO": "version",
-            "UNRATED": "version",
-            "UNCUT": "version",
-            "LIMITED": "version",
-            "ANNIVERSARY": "version",
-            "SPECIAL EDITION": "version",
-            "4k RESTORATION": "version",
-            "IMAX": "version",
-            "OPEN MATTE": "version",
-            "2IN1": "version",
-
-            "STV": "version",
-            "RECODE": "version",
-            "INTERNAL": "version",
-            "PROPER": "version",
-            "DUAL": "version",
-            "UNTOUCHED": "version",
-            "COMPLETE": "version",
-            "COMPLETA": "version",
-
-            "X264": "video_encoder",
-            "X265": "video_encoder",
-        }
-
         path.parent.mkdir(parents=True, exist_ok=True)
         with open(path, "w", encoding="utf-8") as tags_list_file:
-            json.dump(TAG_TYPES, tags_list_file, ensure_ascii=False, indent=4)
+            json.dump(TAGS_LIST, tags_list_file, ensure_ascii=False, indent=4)
 
     @staticmethod
     def create_sign_list_file(path: Path):
         """
         Creates a tags list file
         """
-        TAG_TYPES = {
-            "21APRILE": "releaser",
-            "ALE88SERMETE": "releaser",
-            "ARRANCAR": "releaser",
-            "ASTOR": "releaser",
-            "AV1MERR": "releaser",
-            "BADGUY": "releaser",
-            "BITSHIFT": "releaser",
-            "BLACKBIT": "releaser",
-            "BUMBLEBEE1982": "releaser",
-            "CAPPYO": "releaser",
-            "CAVALLONZI": "releaser",
-            "CB01HD": "releaser",
-            "CHD": "releaser",
-            "CHDWEB": "releaser",
-            "CIAME": "releaser",
-            "CLOCLONE": "releaser",
-            "COMIX21": "releaser",
-            "CREW": "releaser",
-            "CSS": "releaser",
-            "CSS2": "releaser",
-            "CSS7896": "releaser",
-            "CYBER": "releaser",
-            "D3VELOPER": "releaser",
-            "DAICHISO": "releaser",
-            "DANGUARD": "releaser",
-            "DARKCOMPANY": "releaser",
-            "DARKPARANOR": "releaser",
-            "DAYMON64": "releaser",
-            "DDN": "releaser",
-            "DEDO1911": "releaser",
-            "DEMN": "releaser",
-            "DMAN": "releaser",
-            "DOCH74": "releaser",
-            "DRIIP": "releaser",
-            "DYNUX": "releaser",
-            "ELGHOTO": "releaser",
-            "ENCRYPTED": "releaser",
-            "EVN": "releaser",
-            "EZTV": "releaser",
-            "FAINO1310": "releaser",
-            "FEDECAS89": "releaser",
-            "FGT": "releaser",
-            "FHC": "releaser",
-            "FLORIN993": "releaser",
-            "FLUX": "releaser",
-            "FREZEEN": "releaser",
-            "FUSION": "releaser",
-            "G66": "releaser",
-            "GABIACAS": "releaser",
-            "GIUSEPPETNT": "releaser",
-            "GOLDENTORRENT": "releaser",
-            "GRYM": "releaser",
-            "HAPPITEAM-YNK": "releaser",
-            "HASHDEV": "releaser",
-            "HDCHINA": "releaser",
-            "HENRYDIRTY": "releaser",
-            "HONE": "releaser",
-            "HHNN": "releaser",
-            "HYRULE": "releaser",
-            "I3AM": "releaser",
-            "IBANEZ89": "releaser",
-            "IDIB": "releaser",
-            "IDN": "releaser",
-            "ILGANZO": "releaser",
-            "ILPADRINO": "releaser",
-            "ILSAGGIO": "releaser",
-            "ILSOMMO": "releaser",
-            "IPDR01": "releaser",
-            "ITT": "releaser",
-            "JOHNSEED": "releaser",
-            "KINGOFROME": "releaser",
-            "KRIKK": "releaser",
-            "LAZY-SUBS": "releaser",
-            "LEPORE": "releaser",
-            "LFI": "releaser",
-            "LULLOZZO": "releaser",
-            "MATT3O": "releaser",
-            "MATT_BROWN4": "releaser",
-            "MAX2014": "releaser",
-            "MIRCREW": "releaser",
-            "MISTERNED": "releaser",
-            "MRBLONDE": "releaser",
-            "MRROBOT": "releaser",
-            "MUETTO": "releaser",
-            "MUWATTALI": "releaser",
-            "NAHOM": "releaser",
-            "NARSETE": "releaser",
-            "NEOSTARK": "releaser",
-            "NEUROSIS": "releaser",
-            "NIMOUEH": "releaser",
-            "NOGROUP": "releaser",
-            "NOVARIP": "releaser",
-            "NTROPIC": "releaser",
-            "ODS": "releaser",
-            "ONGOIA": "releaser",
-            "PEPPE": "releaser",
-            "PENNYWISE": "releaser",
-            "PETE321": "releaser",
-            "PICOPOCO": "releaser",
-            "PING": "releaser",
-            "PINKER": "releaser",
-            "PIR8": "releaser",
-            "PLAYWEB": "releaser",
-            "PRIME": "releaser",
-            "PROMETHEUS": "releaser",
-            "PROSCIUTTO": "releaser",
-            "RADESE": "releaser",
-            "RAWR": "releaser",
-            "RARBG": "releaser",
-            "RIDDICKK": "releaser",
-            "ROGELIOBYNIGHT": "releaser",
-            "ROMEO": "releaser",
-            "RYUKXX": "releaser",
-            "S-K": "releaser",
-            "SANDWORM": "releaser",
-            "SEEDBOX": "releaser",
-            "SEEDBOX2": "releaser",
-            "SERCIUS": "releaser",
-            "SIMO01": "releaser",
-            "SIXTEEN8664": "releaser",
-            "SK4TTO": "releaser",
-            "SMURFADMIN": "releaser",
-            "SPYRO1989": "releaser",
-            "STEVEJOHNNEE": "releaser",
-            "STINGUAJT": "releaser",
-            "TAHTAKALECI": "releaser",
-            "TELESTO": "releaser",
-            "TERMINAL": "releaser",
-            "THEBLACKKING": "releaser",
-            "THEEMOJICREW": "releaser",
-            "THUDARA": "releaser",
-            "TIGRE67": "releaser",
-            "TORRENT10": "releaser",
-            "TOTAL_SHARE88": "releaser",
-            "TREE7458": "releaser",
-            "TRIVIAL99": "releaser",
-            "UBI": "releaser",
-            "V3SP4EV3R": "releaser",
-            "VIOLENT96": "releaser",
-            "VOLVIC": "releaser",
-            "WHEELIE": "releaser",
-            "WHITERHINO": "releaser",
-            "WIZARDS2K": "releaser",
-            "WRS": "releaser",
-            "XVID": "releaser",
-            "YIFY": "releaser",
-            "YTS": "releaser",
-            "ZIORIP": "releaser"
-            }
-
         path.parent.mkdir(parents=True, exist_ok=True)
         with open(path, "w", encoding="utf-8") as tags_sign_file:
-            json.dump(TAG_TYPES, tags_sign_file, ensure_ascii=False, indent=4)
+            json.dump(SIGNS_LIST, tags_sign_file, ensure_ascii=False, indent=4)
 
     @staticmethod
     def create_default_json_file(path: Path):

{unit3dup-0.9.16 → unit3dup-0.9.18}/common/tags.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import os
 import re
 from common.mediainfo import MediaFile
 from common.utility import ManageTitles
@@ -10,13 +9,16 @@ hdr_map = {
     "DOLBY VISION": "DV",
     "DOLBY VISION HDR": "DV HDR",
     "DOLBY VISION HDR10": "DV HDR10",
-    "DOLBY VISION HDR10+": "DV HDR",
+    "DOLBY VISION HDR10+": "DV HDR10+",
     "HDR10PLUS": "HDR10+",
     "HDRPLUS+": "HDR10+",
     "HDR10+": "HDR10+",
     "HDR10": "HDR10",
     "HDR10 / HDR10": "HDR10",
+    "HDR10 / HDR10+": "HDR10+",
     "HDR10 / HDR10 / HDR10+": "HDR10+",
+    "SMPTE ST 2086": "HDR10",
+    "SMPTE ST 2094": "HDR10+",
 
     "DOVI": "DV",
     "HDR": "HDR",
@@ -72,21 +74,16 @@ class SearchTags(object):
     @staticmethod
     def normalize_version_tag(tag: str) -> str:
         tag_esc = re.escape(tag)
-        # Filter hyphenated,space compounds
-        tag_esc = tag_esc.replace(r'\ ', r'[.\s_-]*')
         return tag_esc
 
     @staticmethod
     def normalize_platform_tag(tag: str) -> str:
-        # escape
         tag_esc = re.escape(tag)
         return tag_esc
 
     @staticmethod
     def normalize_sources(tag: str) -> str:
         tag_esc = re.escape(tag)
-        # Filter hyphenated,space compounds
-        tag_esc = tag_esc.replace(r'\ ', r'[.\s_-]*')
         return tag_esc
 
     @staticmethod
@@ -103,6 +100,7 @@ class SearchTags(object):
                 build.append(' '.join(v))
             else:
                 build.append(str(v))
+
         refactored = ' '.join(build) + self.releaser_sign
         return refactored
 
@@ -177,22 +175,7 @@ class SearchTags(object):
         if not self.releaser_sign:
             # If releaser_sign is not defined in the configuration file,
             # try to detect a known sign from SIGN_LIST
-            pattern = "|".join(
-                sorted((re.escape(k) for k in self.SIGNS_LIST.keys()), key=len, reverse=True)
-            )
-            self.filename = os.path.splitext(self.filename)[0]
-            regex = re.compile(
-                r'(?:^|[\s._-])(' + pattern + r')(?=$|[\s._-]*$)',
-                re.IGNORECASE
-            )
-            matches = regex.findall(self.filename)
-            if matches:
-                self.releaser_sign = f"-{matches[0]}" if matches[0].upper() in self.SIGNS_LIST else ""
-            else:
-                self.releaser_sign = ""
-        else:
-            # Add releaser_sign from the configuration file
-            self.releaser_sign = f"-{self.releaser_sign}"
+            self.releaser_sign = self.detect_releaser(self.filename, self.SIGNS_LIST)
 
         # /// Order according to tag position
         tags_dict = {
@@ -316,3 +299,34 @@ class SearchTags(object):
                 result['resolution'] = f'{video_width}x{video_height}'
 
         return result
+
+    @staticmethod
+    def detect_releaser(name: str, signs_list: dict) -> str:
+        """
+            normalize both signs_list and base_name
+            find the start/end position of the matched sign
+            extract the substring from the original base_name
+        """
+        # Strip the title
+        base_name = str(name).strip()
+
+        # Remove '.'; '_'; '-' chars from the filename and dictionary signs_list
+        tokens = re.split(r"[._-]+", base_name)
+
+        base_name_normalized = ' '.join(tokens)
+
+        # normalize list of signs ( because it is user editable)
+        tokens_signs_list = [re.sub(r"[._-]+", " ", str(sign)) for sign in signs_list]
+
+        # sort dictionary from the longest to shortest to avoid partial result (es. 'crew' instead di 'mircrew')
+        tokens_signs_list_sorted = sorted(tokens_signs_list, key=len, reverse=True)
+
+        # Search for signs in the base_name_normalized
+        for token in tokens_signs_list_sorted:
+            pattern = r"\b" + re.escape(token) + r"\b"
+            match = re.search(pattern, base_name_normalized, re.IGNORECASE)
+            if match:
+                # Capture any characters from the start to the end of base_name
+                # normalized_base_name loses chars like '-','.' or '-'
+                return f"-{base_name[match.start(): match.end()]}"
+        return ""

unit3dup-0.9.18/common/trackers/releasers.py

@@ -0,0 +1,252 @@
+# -*- coding: utf-8 -*-
+
+SIGNS_LIST = {
+    "21APRILE": "releaser",
+    "ACCID": "releaser",
+    "ADWEB": "releaser",
+    "ALE88SERMETE": "releaser",
+    "APEX": "releaser",
+    "ARMOR": "releaser",
+    "ARRANCAR": "releaser",
+    "ARTEMIX MIRCREW": "releaser",
+    "ASPIDE MIRCREW": "releaser",
+    "ASTOR": "releaser",
+    "AV1MERR": "releaser",
+    "BADGUY": "releaser",
+    "BALTHA": "releaser",
+    "BAMAX71": "releaser",
+    "BD": "releaser",
+    "BEN THE MEN": "releaser",
+    "BITSHIFT": "releaser",
+    "BLACKBIT": "releaser",
+    "BL4CK-B4RT-MIRCREW": "releaser",
+    "BLUWORLD": "releaser",
+    "BOBDOBBS": "releaser",
+    "BULLITT": "releaser",
+    "BUMBLEBEE1982": "releaser",
+    "BUREK": "releaser",
+    "C0P": "releaser",
+    "CAPPYO": "releaser",
+    "CAVALLONZI": "releaser",
+    "CB01HD": "releaser",
+    "CHD": "releaser",
+    "CHDWEB": "releaser",
+    "CIAME": "releaser",
+    "CLOCLONE": "releaser",
+    "CODEX": "releaser",
+    "COMIX21": "releaser",
+    "CREW": "releaser",
+    "CSS": "releaser",
+    "CSS2": "releaser",
+    "CSS7896": "releaser",
+    "CYBER": "releaser",
+    "D3VELOPER": "releaser",
+    "DAICHISO": "releaser",
+    "DANGUARD": "releaser",
+    "DARKCOMPANY": "releaser",
+    "DARKPARANOR": "releaser",
+    "DAYMON64": "releaser",
+    "DB": "releaser",
+    "DDN": "releaser",
+    "DDNCREW": "releaser",
+    "DEDO1911": "releaser",
+    "DEMN": "releaser",
+    "DMAN": "releaser",
+    "DOCH74": "releaser",
+    "DR4GON": "releaser",
+    "DRIIP": "releaser",
+    "DST": "releaser",
+    "DYNUX": "releaser",
+    "EA": "releaser",
+    "EGL": "releaser",
+    "ELGHOTO": "releaser",
+    "ELISA": "releaser",
+    "EMPRESS": "releaser",
+    "ENCRYPTED": "releaser",
+    "EPSILON": "releaser",
+    "EVN": "releaser",
+    "EZTV": "releaser",
+    "FAINO1310": "releaser",
+    "FEDECAS89": "releaser",
+    "FGT": "releaser",
+    "FHC": "releaser",
+    "FLT": "releaser",
+    "FLORIN993": "releaser",
+    "FLUX": "releaser",
+    "FOOD": "releaser",
+    "FRAMESTOR": "releaser",
+    "FREZEEN": "releaser",
+    "FW": "releaser",
+    "FUSION": "releaser",
+    "FXE": "releaser",
+    "G66": "releaser",
+    "GABIACAS": "releaser",
+    "GATTOPOLLO": "releaser",
+    "GFM": "releaser",
+    "GIUSEPPETNT": "releaser",
+    "GOLDENTORRENT": "releaser",
+    "GRYM": "releaser",
+    "HAPPITEAM-YNK": "releaser",
+    "HASHDEV": "releaser",
+    "HDCHINA": "releaser",
+    "HDI": "releaser",
+    "HHNN": "releaser",
+    "HHWEB": "releaser",
+    "HENRYDIRTY": "releaser",
+    "HMR": "releaser",
+    "HONE": "releaser",
+    "HYRULE": "releaser",
+    "I3AM": "releaser",
+    "IBANEZ89": "releaser",
+    "IDIB": "releaser",
+    "IDN": "releaser",
+    "IDN-CREW": "releaser",
+    "IGS": "releaser",
+    "ILGANZO": "releaser",
+    "ILPADRINO": "releaser",
+    "ILSAGGIO": "releaser",
+    "ILSOMMO": "releaser",
+    "IPDR01": "releaser",
+    "ITT": "releaser",
+    "JEDDAK-MIRCREW": "releaser",
+    "JOHNSEED": "releaser",
+    "KINGOFROME": "releaser",
+    "KIN": "releaser",
+    "KISSY": "releaser",
+    "KITSUNE": "releaser",
+    "KJM": "releaser",
+    "KOGI": "releaser",
+    "KONTRAST": "releaser",
+    "KOVALSKI": "releaser",
+    "KRALIMARKO": "releaser",
+    "KRIKK": "releaser",
+    "KUCHU": "releaser",
+    "LAZY-SUBS": "releaser",
+    "LATENEVER": "releaser",
+    "LDI": "releaser",
+    "LEAGUENF": "releaser",
+    "LELE753": "releaser",
+    "LEPORE": "releaser",
+    "LFI": "releaser",
+    "LICDOM": "releaser",
+    "LOZIO-MIRCREW": "releaser",
+    "LULLOZZO": "releaser",
+    "LZ": "releaser",
+    "LZ59": "releaser",
+    "MADHEX": "releaser",
+    "MADSKY": "releaser",
+    "MADTIA": "releaser",
+    "MAX": "releaser",
+    "MAX2014": "releaser",
+    "ME7ALH": "releaser",
+    "MIK0YAN": "releaser",
+    "MIRCREW": "releaser",
+    "MISTERNED": "releaser",
+    "MORPHEUS": "releaser",
+    "MRBLONDE": "releaser",
+    "MRROBOT": "releaser",
+    "MUETTO": "releaser",
+    "MUWATTALI": "releaser",
+    "NAHOM": "releaser",
+    "NARSETE": "releaser",
+    "NEOSTARK": "releaser",
+    "NEUROSIS": "releaser",
+    "NIMOUEH": "releaser",
+    "NOGROUP": "releaser",
+    "NOMADS": "releaser",
+    "NOVARIP": "releaser",
+    "NTB": "releaser",
+    "NTROPIC": "releaser",
+    "ODS": "releaser",
+    "ODINO": "releaser",
+    "ONGOIA": "releaser",
+    "PASO77": "releaser",
+    "PEPPE": "releaser",
+    "PENNYWISE": "releaser",
+    "PETE321": "releaser",
+    "PICOPOCO": "releaser",
+    "PING": "releaser",
+    "PINKER": "releaser",
+    "PIR8": "releaser",
+    "PLAYWEB": "releaser",
+    "PLUSAM": "releaser",
+    "POKE": "releaser",
+    "PRIME": "releaser",
+    "PROMETHEUS": "releaser",
+    "PROSCIUTTO": "releaser",
+    "RADESE": "releaser",
+    "RAPTA": "releaser",
+    "RARBG": "releaser",
+    "RAWR": "releaser",
+    "REALDMDJ": "releaser",
+    "RIDDICKK": "releaser",
+    "RMTEAM": "releaser",
+    "ROMEO": "releaser",
+    "RUNE": "releaser",
+    "RYUKXX": "releaser",
+    "S-K": "releaser",
+    "SAW": "releaser",
+    "SANDWORM": "releaser",
+    "SBR": "releaser",
+    "SEEDBOX": "releaser",
+    "SEEDBOX2": "releaser",
+    "SERCIUS": "releaser",
+    "SID": "releaser",
+    "SIMO01": "releaser",
+    "SIXTEEN8664": "releaser",
+    "SK4TTO": "releaser",
+    "SMURF": "releaser",
+    "SMURFADMIN": "releaser",
+    "SP33DY94-MIRCREW": "releaser",
+    "SPWEB": "releaser",
+    "SPYRO": "releaser",
+    "SPYRO1989": "releaser",
+    "STEFRA": "releaser",
+    "STEVEJOHNNEE": "releaser",
+    "STINGUAJT": "releaser",
+    "TAHTAKALECI": "releaser",
+    "TASKO": "releaser",
+    "TELESTO": "releaser",
+    "TEPES": "releaser",
+    "TERMINAL": "releaser",
+    "THEBLACKKING": "releaser",
+    "THEEMOJICREW": "releaser",
+    "THUDARA": "releaser",
+    "TIGER": "releaser",
+    "TIGRE67": "releaser",
+    "TBR": "releaser",
+    "T4P3": "releaser",
+    "TORRENTER10": "releaser",
+    "TOTAL_SHARE88": "releaser",
+    "TREE7458": "releaser",
+    "TRITON": "releaser",
+    "TRL": "releaser",
+    "UBI": "releaser",
+    "UH": "releaser",
+    "V3SP4EV3R": "releaser",
+    "VARYG": "releaser",
+    "VIOLENT96": "releaser",
+    "VITELLO": "releaser",
+    "VOLVIC": "releaser",
+    "WAR": "releaser",
+    "WATCHABLE": "releaser",
+    "WELP": "releaser",
+    "WGZ": "releaser",
+    "WHEELIE": "releaser",
+    "WHITERHINO": "releaser",
+    "WIGGAZ": "releaser",
+    "WIZARDS2K": "releaser",
+    "WRM": "releaser",
+    "WRS": "releaser",
+    "XFM": "releaser",
+    "XVID": "releaser",
+    "YIFY": "releaser",
+    "YTS": "releaser",
+    "YTS.BZ": "releaser",
+    "ZIORIP": "releaser",
+    "ZK": "releaser",
+    "ZODD": "releaser",
+    "ZOOEYDES": "releaser",
+    "ZTR": "releaser",
+    "£ƐGƐND63": "releaser"
+}

unit3dup-0.9.18/common/trackers/tags_list.py

@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+
+TAGS_LIST = {
+            "REMUX": "remux",
+            "WEB-DL": "source",
+            "WEBDL": "source",
+            "WEB-DLRIP": "source",
+            "WEBDLRIP": "source",
+            "WEB-DLMUX": "source",
+            "WEBDLMUX": "source",
+            "WEBMUX": "source",
+            "WEBRIP": "source",
+            "BD-UNTOUCHED": "source",
+            "UNTOUCHED": "source",
+
+            "TS": "source",
+            "CAM": "source",
+            "HDTS": "source",
+            "MD": "source",
+            "UHDRIP": "source",
+            "BLURAY": "source",
+            "BRRIP": "source",
+            "BDRIP": "source",
+            "FHDRIP": "source",
+            "PDTV": "source",
+            "SATRIP": "source",
+            "DVBRIP": "source",
+            "DVB-S": "source",
+            "DTTRIP": "source",
+            "WP": "source",
+            "DVDSCR": "source",
+            "TVRIP": "source",
+            "VHSRIP": "source",
+            "DVDRIP": "source",
+            "HDTV": "source",
+            "DVD5": "source",
+            "DVD9": "source",
+            "VU": "source",
+
+            "ATVP": "platform",
+            "AMZN": "platform",
+            "AMC": "platform",
+            "CN": "platform",
+            "CR": "platform",
+            "DCU": "platform",
+            "DISC": "platform",
+            "DSCP": "platform",
+            "DSNY": "platform",
+            "DSNP": "platform",
+            "DPLY": "platform",
+            "ESPN": "platform",
+            "FOOD": "platform",
+            "FOX": "platform",
+            "PLAY": "platform",
+            "HBO": "platform",
+            "HMAX": "platform",
+            "HGTV": "platform",
+            "HIST": "platform",
+            "HULU": "platform",
+            "MTOD": "platform",
+            "NATG": "platform",
+            "NF": "platform",
+            "NICK": "platform",
+            "NOW": "platform",
+            "PMNT": "platform",
+            "PMTP": "platform",
+            "PCOK": "platform",
+            "RKTN": "platform",
+            "SHO": "platform",
+            "SKST": "platform",
+            "STAN": "platform",
+            "STRP": "platform",
+            "STZ": "platform",
+            "TIMV": "platform",
+
+            "SPECIAL": "version",
+            "REPACK": "version",
+            "EXTENDED": "version",
+            "EDITION": "version",
+            "DIRECTOR'S": "version",
+            "CUT": "version",
+
+            "SUBBED": "version",
+            "MUX": "version",
+            "REMASTERED": "version",
+            "READNFO": "version",
+            "UNRATED": "version",
+            "UNCUT": "version",
+            "LIMITED": "version",
+            "ANNIVERSARY": "version",
+            "4k RESTORATION": "version",
+            "IMAX": "version",
+            "OPEN MATTE": "version",
+            "2IN1": "version",
+
+            "STV": "version",
+            "RECODE": "version",
+            "INTERNAL": "version",
+            "PROPER": "version",
+            "DUAL": "version",
+            "COMPLETE": "version",
+            "COMPLETA": "version",
+
+            "X264": "video_encoder",
+            "X265": "video_encoder",
+        }

{unit3dup-0.9.16 → unit3dup-0.9.18}/common/utility.py

@@ -20,43 +20,61 @@ class ManageTitles:
         "\\", "&", "*", "$", "%", "#", "@", "_", "+", "|"
     ]
 
-    # TAG Audio in title
-    iso_3166_alpha3 = ["ENG", "USA", "ITA", "DEU", "FRA", "GBR", "ESP", "JPN", "BRA", "RUS", "CHN"]
+    iso_3166_alpha3 = [
+        "ENG", "USA", "GBR", "ITA", "DEU", "FRA", "ESP",
+        "BRA", "JPN", "CHN", "RUS", "PER", "NOR",
+        "SWE", "DAN", "POL", "HIN", "TUR", "ARA", "KOR", "VIE", "IND"
+    ]
 
-    # TAG Audio in title
     iso_3166_alpha2_to_alpha3 = {
-        "EN": "ENG",  # exception
-        "US": "USA",
+        "EN": "ENG", "US": "USA", "GB": "GBR", "EN-US": "ENG", "EN-GB": "ENG", "EN-AU": "ENG",
         "IT": "ITA",
         "DE": "DEU",
         "FR": "FRA",
-        "GB": "GBR",
-        "ES": "ESP",
-        "JP": "JPN",
+        "ES": "ESP", "ES-ES": "ESP", "ES-MX": "ESP",
         "BR": "BRA",
-        "RU": "RUS",
+        "JP": "JPN",
         "CN": "CHN",
-        "EN-US": "ENG",
-        "EN-GB": "ENG",
-        "EN-AU": "ENG",
-        "ES-ES": "ESP",
-        "ES-MX": "ESP"
+        "RU": "RUS",
+        "FA": "PER", "IR": "PER",
+        "NO": "NOR",
+        "SE": "SWE",
+        "DK": "DAN",
+        "PL": "POL",
+        "HI": "HIN",
+        "TR": "TUR",
+        "AR": "ARA",
+        "KO": "KOR",
+        "VI": "VIE",
+        "ID": "IND"
     }
 
-    # From mediainfo
     long_name = {
         "ENGLISH": "ENG",
+        "AMERICAN": "USA",
+        "BRITISH": "GBR",
         "ITALIAN": "ITA",
         "GERMAN": "DEU",
         "FRENCH": "FRA",
         "SPANISH": "ESP",
-        "JAPANESE": "JPN",
         "BRAZILIAN": "BRA",
-        "RUSSIAN": "RUS",
+        "JAPANESE": "JPN",
         "CHINESE": "CHN",
-        "AMERICAN": "USA",
-        "BRITISH": "GBR"
+        "RUSSIAN": "RUS",
+        "PERSIAN": "PER",
+        "FARSI": "PER",
+        "NORWEGIAN": "NOR",
+        "SWEDISH": "SWE",
+        "DANISH": "DAN",
+        "POLISH": "POL",
+        "HINDI": "HIN",
+        "TURKISH": "TUR",
+        "ARABIC": "ARA",
+        "KOREAN": "KOR",
+        "VIETNAMESE": "VIE",
+        "INDONESIAN": "IND"
     }
+
     @staticmethod
     def convert_iso(code) -> list | str | None:
         """ Convert iso 2 to 3 """

{unit3dup-0.9.16 → unit3dup-0.9.18}/pyproject.toml

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