Unit3Dup 0.11.7__tar.gz → 0.11.10__tar.gz

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

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

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

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

{unit3dup-0.11.7 → unit3dup-0.11.10}/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.7"
+version = "0.11.10"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(

{unit3dup-0.11.7 → unit3dup-0.11.10}/common/tags.py

@@ -16,6 +16,7 @@ hdr_map = {
     "HDR10+": "HDR10+",
     "HDR10": "HDR10",
     "BLU-RAY / HDR10": "HDR10",
+    "BLU-RAY / HDR10+": "HDR10+",
     "HDR10 / HDR10": "HDR10",
     "HDR10 / HDR10 / HDR10": "HDR10",
     "HDR10 / HDR10+": "HDR10+",
@@ -82,7 +83,7 @@ class SearchTags(object):
         self.title = title
         self.year = year
         self.tags_dict = {}
-        self.tags_position = tags_position
+
         self.TAG_TYPES: dict = tags_list
         self.SIGNS_LIST: dict = sign_list
         self.BAN_LIST: dict = ban_list
@@ -116,6 +117,11 @@ class SearchTags(object):
         tag_esc = re.escape(tag)
         return tag_esc
 
+    @staticmethod
+    def normalize_remux(tag: str) -> str:
+        tag_esc = re.escape(tag)
+        return tag_esc
+
     @staticmethod
     def normalize_video_encoder(tag: str) -> str:
         tag_esc = re.escape(tag)
@@ -139,7 +145,7 @@ class SearchTags(object):
         patterns = []
 
         # Remove banned items from categories
-        self.tags_position = [x for x in self.tags_position if x not in self.BAN_LIST]
+        self.tags_position = [x.lower() for x in self.tags_position if x not in self.BAN_LIST]
 
         # loop sorted TAG_TYPES dictionary
         for i, (tag, category) in enumerate(
@@ -149,6 +155,8 @@ class SearchTags(object):
                 norm = self.normalize_version_tag(tag)
             elif category == "platform":
                 norm = self.normalize_platform_tag(tag)
+            elif category == "remux":
+                norm = self.normalize_remux(tag)
             elif category == "source":
                 norm = self.normalize_sources(tag)
             elif category == "video_encoder":
@@ -180,7 +188,14 @@ class SearchTags(object):
         # /// Read from mediainfo
         updated_category = {}
         for category in self.tags_position:
-            if category == "acodec":
+            if category == "remux":
+                remux_tags = self.tags_dict.get('remux', None)
+                if remux_tags:
+                    if not any('remux' in tag.lower() for tag in remux_tags):
+                        remux_tags.append('REMUX')
+                        self.tags_dict.update({'remux': remux_tags})
+
+            elif category == "acodec":
                 updated_category = self.mediainfo_audio(category=category)
 
             elif category == "vcodec":
@@ -259,7 +274,6 @@ class SearchTags(object):
                     ch = {2: "2.0", 6: "5.1", 8: "7.1"}.get(channel_s, "")
                     if f"{codec_translated} {ch} {atmos}".strip() not in audio_codecs:
                         audio_codecs.append(f"{codec_translated} {ch} {atmos}".strip())
-                    # print(f"Mediainfo {other_format} -> {codec_translated} {ch} {atmos}")
 
                 # Add flags
                 for l in audio.get('other_language', []):
@@ -301,12 +315,8 @@ class SearchTags(object):
 
                 # Check hdr
                 if hdr_format_commercial:
-                    # print(f"hdr_format_commercial: {hdr_format_commercial}")
-                    # print(f"hdr_format: {hdr_format}")
                     hdr = ''
                     if hdr_format_commercial.upper() in hdr_map:
-                        # print(
-                        #     f"hdr_format_commercial: {hdr_format_commercial} -> Tag: {hdr_map[hdr_format_commercial]}")
                         hdr = hdr_map[hdr_format_commercial.upper()]
                         # Check dolby vision
                     if hdr not in hdr_map:
@@ -315,17 +325,14 @@ class SearchTags(object):
                     if 'DOLBY VISION' in hdr_format_commercial.upper() or 'DOLBY VISION' in hdr_format.upper():
                         # Search for fake remux
                         if any("dvhe.08" in s or "Profile 8" in s for s in other_hdr_format):
-                            remux = self.tags_dict.get('remux', '')
-                            if remux:
-                                remux = remux[0]
-                                if 'remux' in remux.lower():
-                                    del self.tags_dict[remux.lower()]
-                                    self.tags_dict.update({'source': 'ENCODE'})
-                                    self.media.file_name = self.media.file_name.replace(remux, 'ENCODE')
-                                    custom_console.bot_warning_log(
-                                        f"<> Warning: Detected REMUX with {other_hdr_format}")
-                                    hdr = f"DOLBY VISION {hdr}"
-                                    return {category: f"{hdr_map.get(hdr, '*HDR')}"}
+                            if self.tags_dict.get('remux', ''):
+                                remux = self.tags_dict.get('remux', '')
+                                remux.append('HYBRID')
+                                self.tags_dict.update({'remux': remux})
+                                custom_console.bot_warning_log(
+                                    f"<> Warning: HYBRID REMUX with {other_hdr_format}")
+                                hdr = f"DOLBY VISION {hdr}"
+                                return {category: f"{hdr_map.get(hdr, '*HDR')}"}
 
                         hdr = f"DOLBY VISION {hdr}"
                     return {category: hdr_map.get(hdr, '*HDR')}

unit3dup-0.11.10/common/trackers/ban_list.py

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

unit3dup-0.11.10/common/trackers/tags_list.py

@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+
+TAGS_LIST = {
+    "REMUX": "remux",
+    "VU": "remux",
+    "UNTOUCHED": "remux",
+    "BDREMUX": "remux",
+    "DLMUX": "remux",
+    "BDMUX": "remux",
+    "DVDMUX": "remux",
+
+    "WEB-DL": "source",
+    "WEBDL": "source",
+    "WEB-DLRIP": "source",
+    "WEBDLRIP": "source",
+    "WEB-DLMUX": "source",
+    "WEBDLMUX": "source",
+    "WEB-MUX": "source",
+    "WEBMUX": "source",
+    "WEBRIP": "source",
+    "FULL DISC": "source",
+    "ENCODE": "source",
+    "CINEMA": "source",
+
+    "3D": "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",
+
+    "ATVP": "platform",
+    "AMZN": "platform",
+    "AMC": "platform",
+    "CN": "platform",
+    "CR": "platform",
+    "DCU": "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",
+    "RERIP": "version",
+
+    "COLLECTION": "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.11.7 → unit3dup-0.11.10}/pyproject.toml

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

unit3dup-0.11.7/common/trackers/ban_list.py

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

unit3dup-0.11.7/common/trackers/tags_list.py

@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-
-TAGS_LIST = {
-            "REMUX": "remux",
-            "WEB-DL": "source",
-            "WEBDL": "source",
-            "WEB-DLRIP": "source",
-            "WEBDLRIP": "source",
-            "WEB-DLMUX": "source",
-            "WEBDLMUX": "source",
-            "WEB-MUX": "source",
-            "WEBMUX": "source",
-            "WEBRIP": "source",
-            "BD-UNTOUCHED": "source",
-            "UNTOUCHED": "source",
-            "FULL DISC": "source",
-            "ENCODE": "source",
-            "DLMUX": "source",
-            "BDMUX": "source",
-            "DVDMUX": "source",
-            "CINEMA": "source",
-
-            "3D": "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",
-            "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",
-            "RERIP": "version",
-
-            "COLLECTION": "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",
-        }