Unit3Dup 0.8.9__tar.gz → 0.8.11__tar.gz

{unit3dup-0.8.9 → unit3dup-0.8.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.8.9
+Version: 0.8.11
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -72,38 +72,27 @@ Install and Upgrade
 
 - pip install unit3dup --upgrade
 
-Ubuntu/Debian Dependencies
---------------------------
-- sudo apt install ffmpeg
-
-Only for pdf
-------------
-- sudo apt install poppler-utils
-
-
 Windows Dependencies
 --------------------
 1. Download and unzip https://www.ffmpeg.org/download.html and add its folder to
    PATH environment user variable
 
 
+Only for pdf
+~~~~~~~~~~~~
 1. Download and unzip poppler for Windows from https://github.com/oschwartz10612/poppler-windows/releases
 2. Put the folder 'bin' in the system path (e.g. ``C:\poppler-24.08.0\Library\bin``)
 3. *Close and reopen a new console window*
 4. Test it: Run ``pdftocairo`` in the terminal
 
 
-Alternative method
-------------------
-
-1. Download the last release (https://github.com/31December99/Unit3Dup/releases)
-
-2. unzip it
-
-3. pip install .
-
-4. unit3dup
+Ubuntu/Debian Dependencies
+--------------------------
+- sudo apt install ffmpeg
 
+Only for pdf
+~~~~~~~~~~~~
+- sudo apt install poppler-utils
 
 
 RUN

{unit3dup-0.8.9 → unit3dup-0.8.11}/README.rst

@@ -41,38 +41,27 @@ Install and Upgrade
 
 - pip install unit3dup --upgrade
 
-Ubuntu/Debian Dependencies
---------------------------
-- sudo apt install ffmpeg
-
-Only for pdf
-------------
-- sudo apt install poppler-utils
-
-
 Windows Dependencies
 --------------------
 1. Download and unzip https://www.ffmpeg.org/download.html and add its folder to
    PATH environment user variable
 
 
+Only for pdf
+~~~~~~~~~~~~
 1. Download and unzip poppler for Windows from https://github.com/oschwartz10612/poppler-windows/releases
 2. Put the folder 'bin' in the system path (e.g. ``C:\poppler-24.08.0\Library\bin``)
 3. *Close and reopen a new console window*
 4. Test it: Run ``pdftocairo`` in the terminal
 
 
-Alternative method
-------------------
-
-1. Download the last release (https://github.com/31December99/Unit3Dup/releases)
-
-2. unzip it
-
-3. pip install .
-
-4. unit3dup
+Ubuntu/Debian Dependencies
+--------------------------
+- sudo apt install ffmpeg
 
+Only for pdf
+~~~~~~~~~~~~
+- sudo apt install poppler-utils
 
 
 RUN

{unit3dup-0.8.9 → unit3dup-0.8.11}/Unit3Dup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.8.9
+Version: 0.8.11
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -72,38 +72,27 @@ Install and Upgrade
 
 - pip install unit3dup --upgrade
 
-Ubuntu/Debian Dependencies
---------------------------
-- sudo apt install ffmpeg
-
-Only for pdf
-------------
-- sudo apt install poppler-utils
-
-
 Windows Dependencies
 --------------------
 1. Download and unzip https://www.ffmpeg.org/download.html and add its folder to
    PATH environment user variable
 
 
+Only for pdf
+~~~~~~~~~~~~
 1. Download and unzip poppler for Windows from https://github.com/oschwartz10612/poppler-windows/releases
 2. Put the folder 'bin' in the system path (e.g. ``C:\poppler-24.08.0\Library\bin``)
 3. *Close and reopen a new console window*
 4. Test it: Run ``pdftocairo`` in the terminal
 
 
-Alternative method
-------------------
-
-1. Download the last release (https://github.com/31December99/Unit3Dup/releases)
-
-2. unzip it
-
-3. pip install .
-
-4. unit3dup
+Ubuntu/Debian Dependencies
+--------------------------
+- sudo apt install ffmpeg
 
+Only for pdf
+~~~~~~~~~~~~
+- sudo apt install poppler-utils
 
 
 RUN

{unit3dup-0.8.9 → unit3dup-0.8.11}/common/settings.py

@@ -13,7 +13,7 @@ from common.utility import ManageTitles
 from common import trackers
 
 config_file = "Unit3Dbot.json"
-version = "0.8.9"
+version = "0.8.11"
 
 if os.name == "nt":
     PW_TORRENT_ARCHIVE_PATH: Path = Path(os.getenv("LOCALAPPDATA", ".")) / "Unit3Dup_config" / "pw_torrent_archive"

{unit3dup-0.8.9 → unit3dup-0.8.11}/common/trackers/itt.py

@@ -21,8 +21,9 @@ itt_data = {
                 "bluray": 3,
                 "fullhd": 3,
                 "hevc": 3,
-                "vu": 2,
                 "hdrip": 3,
+                "uhd": 3,
+                "vu": 2,
                 "web-dl": 4,
                 "webdl": 4,
                 "web": 4,

{unit3dup-0.8.9 → unit3dup-0.8.11}/common/trackers/trackers.py

@@ -30,6 +30,8 @@ class TRACKData:
     def filter_type(self, file_name: str) -> int:
 
         file_name = ManageTitles.clean(file_name)
+        # Remove '-' from the releaser or unknown encoder
+        file_name = file_name.replace("-", " ")
         word_list = file_name.lower().strip().split(" ")
 
         # Caso 1: Cerca un TYPE_ID nel nome del file
@@ -41,5 +43,4 @@ class TRACKData:
         for word in word_list:
             if word in self.codec:
                 return self.type_id.get("encode", -1)
-
         return self.type_id.get("altro", -1)

{unit3dup-0.8.9 → unit3dup-0.8.11}/common/utility.py

@@ -162,8 +162,8 @@ class ManageTitles:
         # Remove v version
         filename_sanitized = re.sub(r"v\d+(?:[ .]\d+)*", "", filename_sanitized).strip()
 
-        # Remove dots, hyphens and extra spaces
-        filename_sanitized = re.sub(r"[.\-_]", " ", filename_sanitized)
+        # Remove dots, extra spaces
+        filename_sanitized = re.sub(r"[._]", " ", filename_sanitized)
 
         # remove spaces, tab, newline
         filename_sanitized = re.sub(r"\s+", " ", filename_sanitized)
@@ -183,6 +183,7 @@ class ManageTitles:
         replacements = [
             (r'\b7 \b1\b', '7.1'),
             (r'\b5 \b1\b', '5.1'),
+            (r'\bDDP5 \b1\b', 'DDP5.1'),
             (r'\b2 \b0\b', '2.0'),
             (r'\bWEB \bDL\b', 'WEB-DL'),
             (r'\bWEB \bDLMUX\b', 'WEB-DLMUX'),

{unit3dup-0.8.9 → unit3dup-0.8.11}/pyproject.toml

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

{unit3dup-0.8.9 → unit3dup-0.8.11}/unit3dup/media_manager/ContentManager.py

@@ -70,7 +70,7 @@ class ContentManager:
         # and not part of the title
         if media.category=='tv':
             # Search for the first result (Sx) in self.path
-            torrent_pack = bool(re.search(r"S\d+(?!.*E\d+)", self.path))
+            torrent_pack = bool(re.search(r"(S\d+(?!.*E\d+))|(S\d+E\d+-E?\d+)", self.path))
         else:
             torrent_pack = False