Unit3Dup 0.9.6__tar.gz → 0.9.9__tar.gz

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

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

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

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

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

@@ -17,40 +17,41 @@ TAG_TYPES = {
     "VU": "source",
     "UHD": "source",
     "BLURAY": "source",
-    "AMZN": "source",
-    "AMC": "source",
-    "CN": "source",
-    "CR": "source",
-    "DCU": "source",
-    "DISC": "source",
-    "DSCP": "source",
-    "DSNY": "source",
-    "DSNP": "source",
-    "DPLY": "source",
-    "ESPN": "source",
-    "FOOD": "source",
-    "FOX": "source",
-    "PLAY": "source",
-    "HBO": "source",
-    "HMAX": "source",
-    "HGTV": "source",
-    "HIST": "source",
-    "HULU": "source",
-    "MTOD": "source",
-    "NATG": "source",
-    "NF": "source",
-    "NICK": "source",
-    "NOW": "source",
-    "PMNT": "source",
-    "PMTP": "source",
-    "PCOK": "source",
-    "RKTN": "source",
-    "SHO": "source",
-    "SKST": "source",
-    "STAN": "source",
-    "STRP": "source",
-    "STZ": "source",
-    "TIMV": "source",
+
+    "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",
 
     "SUB": "subtitle",
     "SUBS": "subtitle",
@@ -59,6 +60,10 @@ TAG_TYPES = {
     "FRA": "flag",
     "GER": "flag",
     "ESP": "flag",
+    "JPN": "flag",
+    "JAP": "flag",
+    "POR": "flag",
+    "PRT": "flag",
 
     "ATMOS": "audio",
     "TRUEHD": "audio",
@@ -116,6 +121,14 @@ TAG_TYPES = {
     "HDR": "video",
     "HDR10+": "video",
     "FHDRIP": "video",
+    "UHDRIP": "video",
+    "FULL HD": "video",
+    "FULLHD": "video",
+    "HD": "video",
+    "UHD 4K": "video",
+
+    "REPACK": "version",
+    "EXTENDED": "version",
 
     "4320P": "resolution",
     "2160P": "resolution",
@@ -123,6 +136,7 @@ TAG_TYPES = {
     "720P": "resolution",
     "576P": "resolution",
     "480P": "resolution",
+
 }
 
 
@@ -150,7 +164,6 @@ class P2pTags:
 
         # Search for tags in the title
         tags_match = pattern.findall(filename.upper())
-
         # remove dope
         tags_match = list(dict.fromkeys(tags_match))
 
@@ -178,9 +191,12 @@ class P2pTags:
             audio_format = self.mediafile.audio_track[0].get('format', "") if self.mediafile.audio_track else ""
             tags_match.append(audio_format)
 
-        # Add audio language if there is no audio categories
-        if 'flag' not in categories:
-            tags_match.extend(self._audio_lang())
+        # Add tag language if there is no tag
+        flags = self._audio_lang()
+        # are all the language tags from mediaInfo available in the title?
+        if len(flags) != tags_match.count('flag'):
+            missing_flags = [tag for tag in flags if tag not in tags_match]
+            tags_match.extend(missing_flags)
 
         # Add subtitle tag if subtitle_track exist and there is no 'sub' in the title
         if 'subtitle' not in categories:
@@ -254,15 +270,9 @@ class P2pTags:
         if not any(TAG_TYPES.get(tag.upper()) == "resolution" for tag in tags_match):
             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
-
         # /// 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()
@@ -306,6 +316,7 @@ class P2pTags:
 
         # 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
@@ -329,8 +340,12 @@ class P2pTags:
                 for t in l:
                     c = ManageTitles.convert_iso(t)
                     if c:
-                        lang.append(c)
-                        break
+                        if isinstance(c, list):
+                            lang.extend(c)
+                            break
+                        else:
+                            lang.append(c)
+                            break
         return lang
 
     def process(self) -> str:

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

@@ -15,7 +15,7 @@ from common.utility import ManageTitles
 from common import trackers
 
 config_file = "Unit3Dbot.json"
-version = "0.9.6"
+version = "0.9.9"
 
 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) != 7:
+        if len(position_list) != 9:
             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", "channels", "flag", "subtitle", "video"]:
+            if tag.lower() not in ["version","resolution", "platform","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", "channels", "flag", "subtitle", "video"],
+                "TAGS_POSITION": ["version","resolution", "platform", "source", "audio", "channels", "flag", "subtitle", "video"],
                 "YOUTUBE_FAV_CHANNEL_ID": "UCGCbxpnt25hWPFLSbvwfg_w",
                 "YOUTUBE_CHANNEL_ENABLE": "False",
                 "DUPLICATE_ON": "true",

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

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