Unit3Dup 0.9.10__tar.gz → 0.9.11__tar.gz

{unit3dup-0.9.10 → unit3dup-0.9.11}/PKG-INFO

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

{unit3dup-0.9.10 → unit3dup-0.9.11}/Unit3Dup.egg-info/PKG-INFO

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

{unit3dup-0.9.10 → unit3dup-0.9.11}/common/p2p_tags.py

@@ -19,6 +19,7 @@ TAG_TYPES = {
     "UHDRIP": "source",
     "BLURAY": "source",
 
+    "ATVP": "platform",
     "AMZN": "platform",
     "AMC": "platform",
     "CN": "platform",
@@ -96,22 +97,25 @@ TAG_TYPES = {
     "DD+": "audio",
     "DDP": "audio",
     "E-AC3": "audio",
+    "E-AC-3": "audio",
     "EAC3": "audio",
     "AC-3": "audio",
     "AAC": "audio",
+    "AAC LC": "audio",
     "AVC": "audio",
 
     "7.1": "channels",
     "5.1": "channels",
     "2.0": "channels",
 
+    "X.264": "video_encoder",
+    "X264": "video_encoder",
+    "X.265": "video_encoder",
+    "X265": "video_encoder",
+
     "H.264": "video",
-    "X.264": "video",
-    "X264": "video",
-    "H264": "video",
     "H.265": "video",
-    "X.265": "video",
-    "X265": "video",
+    "H264": "video",
     "H265": "video",
     "HEVC": "video",
     "DV": "video",
@@ -230,15 +234,12 @@ class P2pTags:
         }
 
         video_translate = {
-            "x264": "H.264",
-            "X.264": "H.264",
-            "X264": "H.264",
             "AVC": "H.264",
+            "X265": "x.265",
+            "X264": "x.264",
             "HEVC": "H.265",
             "H265": "H.265",
-            "X.265": "H.265",
-            "X265": "H.265",
-            "x265": "H.265",
+            "H264": "H.264",
         }
 
         resolution_lower = {"4320P", "2160P", "1080P", "720P", "576P", "480P"}
@@ -284,6 +285,9 @@ class P2pTags:
                 flag_q.append(tag.upper())
             elif cat == "video":
                 other_groups.setdefault(cat, []).append(tag.upper())
+            elif cat == "video_encoder":
+                # Skip video encoder
+                continue
             else:
                 other_groups.setdefault(cat, []).append(tag)
 

{unit3dup-0.9.10 → unit3dup-0.9.11}/common/settings.py

@@ -15,7 +15,7 @@ from common.utility import ManageTitles
 from common import trackers
 
 config_file = "Unit3Dbot.json"
-version = "0.9.10"
+version = "0.9.11"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(os.getenv("LOCALAPPDATA", ".")) / "Unit3Dup_config" / "watcher_destination_path"

{unit3dup-0.9.10 → unit3dup-0.9.11}/common/utility.py

@@ -183,45 +183,45 @@ class ManageTitles:
         filename_sanitized = re.sub(r"v\d+(?:[ .]\d+)*", "", filename_sanitized).strip()
 
         # Remove dots, extra spaces
-        filename_sanitized = re.sub(r"[._]", " ", filename_sanitized)
+        # filename_sanitized = re.sub(r"[._]", " ", filename_sanitized)
 
         # remove spaces, tab, newline
         filename_sanitized = re.sub(r"\s+", " ", filename_sanitized)
 
         # Recover tag
-        filename_sanitized = ManageTitles.recover_tag(filename_sanitized)
+        # filename_sanitized = ManageTitles.recover_tag(filename_sanitized)
 
         # remove double space
         filename_sanitized = re.sub(r"\s+", " ", filename_sanitized).strip()
 
         return filename_sanitized
 
-    @staticmethod
-    def recover_tag(filename_sanitized: str) -> str:
-
-        # Add the tag
-        replacements = [
-            (r'\b7 \b1\b', '7.1'),
-            (r'\b5 \b1\b', '5.1'),
-            (r'\bDDP5 \b1\b', 'DDP5.1'),
-            (r'\bDDP2 \b0\b', 'DDP2.0'),
-            (r'\bDD5 \b1\b', 'DD5.1'),
-            (r'\bDD2 \b0\b', 'DD2.0'),
-            (r'\b2 \b0\b', '2.0'),
-            (r'\bWEB \bDL\b', 'WEB-DL'),
-            (r'\bWEB \bDLMUX\b', 'WEB-DLMUX'),
-            (r'\bBD \bUNTOUCHED\b', 'BD-UNTOUCHED'),
-            (r'\bCINEMA \bMD\b', 'CINEMA-MD'),
-            (r'\bHEVC \bFHC\b', 'HEVC-FHC'),
-            (r'\bCBR \bCBZ\b', 'CBR-CBZ'),
-            (r'\bH \b264\b', 'H.264'),
-            (r'\bH \b265\b', 'H.265'),
-            (r'\bAAC2 \b0\b', 'AAC2.0'),
-        ]
-
-        for tag, replacement in replacements:
-            filename_sanitized = re.sub(tag, replacement, filename_sanitized, flags=re.IGNORECASE)
-        return filename_sanitized
+    # @staticmethod
+    # def recover_tag(filename_sanitized: str) -> str:
+    #
+    #     # Add the tag
+    #     replacements = [
+    #         (r'\b7 \b1\b', '7.1'),
+    #         (r'\b5 \b1\b', '5.1'),
+    #         (r'\bDDP5 \b1\b', 'DDP5.1'),
+    #         (r'\bDDP2 \b0\b', 'DDP2.0'),
+    #         (r'\bDD5 \b1\b', 'DD5.1'),
+    #         (r'\bDD2 \b0\b', 'DD2.0'),
+    #         (r'\b2 \b0\b', '2.0'),
+    #         (r'\bWEB \bDL\b', 'WEB-DL'),
+    #         (r'\bWEB \bDLMUX\b', 'WEB-DLMUX'),
+    #         (r'\bBD \bUNTOUCHED\b', 'BD-UNTOUCHED'),
+    #         (r'\bCINEMA \bMD\b', 'CINEMA-MD'),
+    #         (r'\bHEVC \bFHC\b', 'HEVC-FHC'),
+    #         (r'\bCBR \bCBZ\b', 'CBR-CBZ'),
+    #         (r'\bH \b264\b', 'H.264'),
+    #         (r'\bH \b265\b', 'H.265'),
+    #         (r'\bAAC2 \b0\b', 'AAC2.0'),
+    #     ]
+    #
+    #     for tag, replacement in replacements:
+    #         filename_sanitized = re.sub(tag, replacement, filename_sanitized, flags=re.IGNORECASE)
+    #     return filename_sanitized
 
 
 class MyString:

{unit3dup-0.9.10 → unit3dup-0.9.11}/pyproject.toml

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