Unit3Dup 0.9.4__tar.gz → 0.9.6__tar.gz

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

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

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

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

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

@@ -3,14 +3,17 @@ import os
 import re
 from common.utility import ManageTitles
 from common.mediainfo import MediaFile
+from collections import deque
 
 TAG_TYPES = {
     "WEB-DL": "source",
     "WEBDL": "source",
     "WEB-DLMUX": "source",
     "WEBDLMUX": "source",
+    "WEBMUX": "source",
     "WEBRIP": "source",
     "BD-UNTOUCHED": "source",
+    "REMUX": "source",
     "VU": "source",
     "UHD": "source",
     "BLURAY": "source",
@@ -57,10 +60,15 @@ TAG_TYPES = {
     "GER": "flag",
     "ESP": "flag",
 
+    "ATMOS": "audio",
     "TRUEHD": "audio",
+    "DTSHD": "audio",
+    "DTS-HD": "audio",
+    "DTS-HD MA": "audio",
     "DDP7.1": "audio",
     "DDP5.1": "audio",
     "DDP2.0": "audio",
+    "DTS": "audio",
 
     "DD7.1": "audio",
     "DD5.1": "audio",
@@ -86,9 +94,9 @@ TAG_TYPES = {
     "AAC": "audio",
     "AVC": "audio",
 
-    "7.1": "audio",
-    "5.1": "audio",
-    "2.0": "audio",
+    "7.1": "channels",
+    "5.1": "channels",
+    "2.0": "channels",
 
     "H.264": "video",
     "X.264": "video",
@@ -107,6 +115,7 @@ TAG_TYPES = {
     "HDR10PLUS": "video",
     "HDR": "video",
     "HDR10+": "video",
+    "FHDRIP": "video",
 
     "4320P": "resolution",
     "2160P": "resolution",
@@ -161,7 +170,7 @@ class P2pTags:
 
         # Add video codec only if there is no video categories
         if 'video' not in categories:
-            video_codec = self.mediafile.video_track[0].get('encoded_library_name', "") if self.mediafile.video_track else ""
+            video_codec = self.mediafile.video_track[0].get('format', "") if self.mediafile.video_track else ""
             tags_match.append(video_codec)
 
         # Add audio codec only if there is no audio categories
@@ -191,6 +200,19 @@ class P2pTags:
             "DDP": "DD+",
         }
 
+        # Translate video codec
+        video_translate = {
+            "H.264": "x264",
+            "X.264": "x264",
+            "X264": "x264",
+            "AVC": "x264",
+            "H.265": "x265",
+            "H265": "x265",
+            "X.265": "x265",
+            "X265": "x265",
+            "HEVC": "x265",
+        }
+
         # lower the res..
         resolution_lower = {"4320P", "2160P", "1080P", "720P", "576P", "480P"}
         codec_lower = {'X.264', 'X265', 'X.265', 'X264'}
@@ -203,20 +225,23 @@ class P2pTags:
             t = tag.upper()
             if t in audio_translate:
                 codec = audio_translate[t]
-
                 # Add channels only if it does not exist
                 if ch and not has_channel_tag:
                     tag = f"{codec} {ch}"
                 else:
                     tag = codec
 
+            elif t in video_translate:
+                tag = video_translate[t]
+
             # Lower the res
             elif t in resolution_lower:
                 tag = t.lower()
 
             # Fix the 'sub' word
             elif t == "SUB":
-                tag = "SUBS"
+                sub_tag = "SUBS" if len(self.mediafile.subtitle_track) > 1 else "SUB"
+                tag = sub_tag
 
             elif t in codec_lower:
                 tag = t.lower()
@@ -230,15 +255,67 @@ class P2pTags:
             tags_match.append(self.mediafile_resolution)
 
         # Assign an index to the 'precedence' keywords
-        precedence_index = {}
-        for i, v in enumerate(self.tags_position):
-            precedence_index[v] = i
-
-        # Started based on precedence
-        self.tags_sorted = sorted(
-            tags_match,
-            key=lambda tag: precedence_index.get(TAG_TYPES[tag.upper()], 100)
-        )
+        # precedence_index = {}
+        # for i, v in enumerate(self.tags_position):
+        #     precedence_index[v] = i
+
+        # /// Sort tags based on 2 rules:
+        # 1) Order by tag_positions
+        # 2) For audio and flag categories alternate them (audio/flag/audio/flag)
+
+        # We can't sort each tags so we create dedicated list
+        audio_q = deque()
+        flag_q = deque()
+        channel_q = deque()
+
+        # This dict is for other categories
+        other_groups = {}
+
+        # Isolate audio and flag tags
+        # All other tags will follow the normal precedence order
+        for tag in tags_match:
+            cat = TAG_TYPES.get(tag.upper(), "unknown")
+            if cat == "audio":
+                # Add audio tag to its queue
+                audio_q.append(tag)
+            elif cat == "channels":
+                channel_q.append(tag)
+            elif cat == "flag":
+                # Add flag tag to its queue
+                flag_q.append(tag)
+            else:
+                # Add the other tags to other_groups
+                other_groups.setdefault(cat, []).append(tag)
+
+        # Alternate only if we have at least 2 audio and 2 flag tags
+        if len(audio_q) >= 2 and len(flag_q) >= 2:
+            mixed_audio_ch_flag = []
+            # Alternate
+            while audio_q or flag_q:
+                if audio_q:
+                    # get the first left audio and append to new list
+                    mixed_audio_ch_flag.append(audio_q.popleft())
+                if channel_q:
+                    mixed_audio_ch_flag.append(channel_q.popleft())
+                if flag_q:
+                    # get the first right flag and append to new list
+                    mixed_audio_ch_flag.append(flag_q.popleft())
+        else:
+            # otherwise goes for normal precedence
+            mixed_audio_ch_flag = list(audio_q) + list(channel_q) + list(flag_q)
+
+        # Rebuild the title ordering each tag+ audio/flag by tag_position
+        result = []
+        for cat in self.tags_position:
+            if cat in ("audio", "channels", "flag"):
+                # Insert the audio/flag processed tags
+                if mixed_audio_ch_flag:
+                    result.extend(mixed_audio_ch_flag)
+                    # clear
+                    mixed_audio_ch_flag = []
+            elif cat in other_groups:
+                result.extend(other_groups[cat])
+        self.tags_sorted = result
 
     def _audio_lang(self) -> list:
 

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

@@ -15,7 +15,7 @@ from common.utility import ManageTitles
 from common import trackers
 
 config_file = "Unit3Dbot.json"
-version = "0.9.4"
+version = "0.9.6"
 
 if os.name == "nt":
     WATCHER_DESTINATION_PATH: Path = Path(os.getenv("LOCALAPPDATA", ".")) / "Unit3Dup_config" / "watcher_destination_path"
@@ -250,12 +250,12 @@ class Validate:
             print(f"-> Invalid TAG position. The list is empty !")
             exit(1)
 
-        if len(position_list) != 6:
+        if len(position_list) != 7:
             print(f"-> Invalid TAG position list. Wrong number of elements !")
             exit(1)
 
         for tag in position_list:
-            if tag.lower() not in ["resolution", "source", "audio", "flag", "subtitle", "video"]:
+            if tag.lower() not in ["resolution", "source", "audio", "channels", "flag", "subtitle", "video"]:
                 print(f"-> Invalid TAG position '{tag}'. Please fix your configuration file")
                 exit(1)
 
@@ -578,7 +578,7 @@ class Load:
                 "PASSIMA_PRIORITY": 5,
                 "IMARIDE_PRIORITY": 6,
                 "NUMBER_OF_SCREENSHOTS": 4,
-                "TAGS_POSITION": ["resolution", "source", "audio", "flag", "subtitle", "video"],
+                "TAGS_POSITION": ["resolution", "source", "audio", "channels", "flag", "subtitle", "video"],
                 "YOUTUBE_FAV_CHANNEL_ID": "UCGCbxpnt25hWPFLSbvwfg_w",
                 "YOUTUBE_CHANNEL_ENABLE": "False",
                 "DUPLICATE_ON": "true",

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

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

{unit3dup-0.9.4 → unit3dup-0.9.6}/unit3dup/bot.py

@@ -54,6 +54,14 @@ class Bot:
         """
         custom_console.panel_message("Analyzing your media files... Please wait")
 
+        # Check permission
+        try:
+            os.stat(self.path)
+        except PermissionError:
+            custom_console.bot_error_log(f"Permission denied: {self.path}")
+            return False
+
+        # Exists
         if not os.path.exists(self.path):
             custom_console.bot_error_log("Path doesn't exist")
             return False

{unit3dup-0.9.4 → unit3dup-0.9.6}/unit3dup/media.py

@@ -222,7 +222,7 @@ class Media:
         if not self._display_name:
             self._guess_filename = title.Guessit(self.title_sanitized)
             guess = self._guess_filename.guessit
-            p2p_tags = P2pTags(filename=self.file_name,
+            p2p_tags = P2pTags(filename=self.title_sanitized,
                                title=guess.get("title", None),
                                year=guess.get("year", ""),
                                episode_title=guess.get("episode_title", None),
@@ -350,7 +350,6 @@ class Media:
             }:
                 # Read from the current video file the height field
                 file_path = os.path.join(self.folder, self.file_name)
-
                 # Media file
                 self._media_file = MediaFile(file_path)
         return self._media_file