Unit3Dup 0.9.2__tar.gz → 0.9.4__tar.gz

{unit3dup-0.9.2 → unit3dup-0.9.4}/PKG-INFO

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

{unit3dup-0.9.2 → unit3dup-0.9.4}/Unit3Dup.egg-info/PKG-INFO

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

{unit3dup-0.9.2 → unit3dup-0.9.4}/common/p2p_tags.py

@@ -58,18 +58,33 @@ TAG_TYPES = {
     "ESP": "flag",
 
     "TRUEHD": "audio",
+    "DDP7.1": "audio",
     "DDP5.1": "audio",
     "DDP2.0": "audio",
+
+    "DD7.1": "audio",
     "DD5.1": "audio",
     "DD2.0": "audio",
+
+    "DD+ 7.1": "audio",
+    "DD+ 5.1": "audio",
+    "DD+ 2.0": "audio",
+
+    "DD 7.1": "audio",
+    "DD 5.1": "audio",
+    "DD 2.0": "audio",
+
     "AAC2.0": "audio",
     "AAC5.1": "audio",
     "AC3": "audio",
     "DD": "audio",
+    "DD+": "audio",
+    "DDP": "audio",
     "E-AC3": "audio",
     "EAC3": "audio",
     "AC-3": "audio",
     "AAC": "audio",
+    "AVC": "audio",
 
     "7.1": "audio",
     "5.1": "audio",
@@ -124,7 +139,7 @@ class P2pTags:
             re.IGNORECASE
         )
 
-        # Search for tags
+        # Search for tags in the title
         tags_match = pattern.findall(filename.upper())
 
         # remove dope
@@ -146,11 +161,8 @@ class P2pTags:
 
         # Add video codec only if there is no video categories
         if 'video' not in categories:
-            video_format = self.mediafile.video_track[0].get('format', "") if self.mediafile.video_track else ""
-            video_encode = self.mediafile.video_track[0].get('encoded_library_name',
-                                                             "") if self.mediafile.video_track else ""
-            tags_match.append(video_format)
-            tags_match.append(video_encode)
+            video_codec = self.mediafile.video_track[0].get('encoded_library_name', "") if self.mediafile.video_track else ""
+            tags_match.append(video_codec)
 
         # Add audio codec only if there is no audio categories
         if 'audio' not in categories:
@@ -161,19 +173,32 @@ class P2pTags:
         if 'flag' not in categories:
             tags_match.extend(self._audio_lang())
 
+        # Add subtitle tag if subtitle_track exist and there is no 'sub' in the title
+        if 'subtitle' not in categories:
+            sub_tag = "SUBS" if len(self.mediafile.subtitle_track) > 1 else "SUB"
+            if self.mediafile.subtitle_track:
+                tags_match.append(sub_tag)
+
         # Translate audio codec
         audio_translate = {
             "AC3": "DD",
             "AC-3": "DD",
             "EAC3": "DD+",
             "E-AC3": "DD+",
+            "DDP2.0": "DD+",
+            "DDP5.1": "DD+",
+            "DDP7.1": "DD+",
+            "DDP": "DD+",
         }
+
         # lower the res..
         resolution_lower = {"4320P", "2160P", "1080P", "720P", "576P", "480P"}
+        codec_lower = {'X.264', 'X265', 'X.265', 'X264'}
 
         has_channel_tag = ch in tags_match
         new_tags = []
 
+        # verify the tags found in the title
         for tag in tags_match:
             t = tag.upper()
             if t in audio_translate:
@@ -181,7 +206,7 @@ class P2pTags:
 
                 # Add channels only if it does not exist
                 if ch and not has_channel_tag:
-                    tag = f"{codec}{ch}"
+                    tag = f"{codec} {ch}"
                 else:
                     tag = codec
 
@@ -193,16 +218,16 @@ class P2pTags:
             elif t == "SUB":
                 tag = "SUBS"
 
+            elif t in codec_lower:
+                tag = t.lower()
+
             new_tags.append(tag)
 
         tags_match = new_tags
 
         # Check if a 'resolution' tag exists and add mediafile resolution if it doesn't
         if not any(TAG_TYPES.get(tag.upper()) == "resolution" for tag in tags_match):
-            tags_match.append(self.mediafile_resolution.upper())
-
-        # Fixed priority
-        # precedence = ["resolution", "source", "audio", "flag", "subtitle", "video"]
+            tags_match.append(self.mediafile_resolution)
 
         # Assign an index to the 'precedence' keywords
         precedence_index = {}
@@ -245,7 +270,8 @@ class P2pTags:
             base_name = os.path.basename(self.filename)
             filename, file_ext = os.path.splitext(base_name)
             m = re.search(r'-([A-Za-z0-9]+)$', filename)
-            if m:
+
+            if m and m.group(1) not in TAG_TYPES:
                 self.sign_in_title = f"-{m.group(1)}"
             else:
                 self.sign_in_title = ""

{unit3dup-0.9.2 → unit3dup-0.9.4}/common/settings.py

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

{unit3dup-0.9.2 → unit3dup-0.9.4}/pyproject.toml

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