Unit3Dup 0.9.5__tar.gz → 0.9.8__tar.gz

{unit3dup-0.9.5 → unit3dup-0.9.8}/PKG-INFO

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

{unit3dup-0.9.5 → unit3dup-0.9.8}/Unit3Dup.egg-info/PKG-INFO

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

{unit3dup-0.9.5 → unit3dup-0.9.8}/common/p2p_tags.py

@@ -3,7 +3,7 @@ import os
 import re
 from common.utility import ManageTitles
 from common.mediainfo import MediaFile
-from collections import defaultdict, deque
+from collections import deque
 
 TAG_TYPES = {
     "WEB-DL": "source",
@@ -13,6 +13,7 @@ TAG_TYPES = {
     "WEBMUX": "source",
     "WEBRIP": "source",
     "BD-UNTOUCHED": "source",
+    "REMUX": "source",
     "VU": "source",
     "UHD": "source",
     "BLURAY": "source",
@@ -58,14 +59,20 @@ TAG_TYPES = {
     "FRA": "flag",
     "GER": "flag",
     "ESP": "flag",
+    "JPN": "flag",
+    "JAP": "flag",
+    "POR": "flag",
+    "PRT": "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",
@@ -112,6 +119,12 @@ TAG_TYPES = {
     "HDR10PLUS": "video",
     "HDR": "video",
     "HDR10+": "video",
+    "FHDRIP": "video",
+    "UHDRIP": "video",
+    "FULL HD": "video",
+    "FULLHD": "video",
+    "HD": "video",
+    "UHD 4K": "video",
 
     "4320P": "resolution",
     "2160P": "resolution",
@@ -146,7 +159,6 @@ class P2pTags:
 
         # Search for tags in the title
         tags_match = pattern.findall(filename.upper())
-
         # remove dope
         tags_match = list(dict.fromkeys(tags_match))
 
@@ -166,8 +178,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
@@ -175,9 +186,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:
@@ -197,6 +211,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'}
@@ -209,13 +236,15 @@ 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()
@@ -236,15 +265,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()
@@ -311,8 +334,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.5 → unit3dup-0.9.8}/common/settings.py

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

{unit3dup-0.9.5 → unit3dup-0.9.8}/pyproject.toml

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

{unit3dup-0.9.5 → unit3dup-0.9.8}/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