Unit3Dup 0.8.19__tar.gz → 0.8.21__tar.gz

{unit3dup-0.8.19 → unit3dup-0.8.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.8.19
+Version: 0.8.21
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -112,6 +112,28 @@ DOC
 Link `Unit3DUP <https://unit3dup.readthedocs.io/en/latest/index.html#>`_
 
 
+ImageHost
+=========
+
+The bot can upload images to the following image hosting platforms:
+
++------------------+----------------------------+
+| **Image Host**   | **URL**                    |
++==================+============================+
+| ``ImgBB``        | https://imgbb.com          |
++------------------+----------------------------+
+| ``FreeImage``    | https://freeimage.host     |
++------------------+----------------------------+
+| ``PtScreens``    | https://ptscreens.com      |
++------------------+----------------------------+
+| ``LensDump``     | https://lensdump.com       |
++------------------+----------------------------+
+| ``ImgFI``        | https://imgfi.com          |
++------------------+----------------------------+
+| ``PassIMA``      | https://passtheima.ge      |
++------------------+----------------------------+
+| ``ImaRide``      | https://www.imageride.net  |
++------------------+----------------------------+
 
 Trackers
 ========
@@ -131,7 +153,7 @@ united by a shared passion for torrents and more
    :alt: Unisciti su Telegram
 
 .. image:: https://img.shields.io/discord/1214696147600408698?label=Discord&logo=discord&style=flat
-   :target: https://discord.gg/8hRTjV8Q
+   :target: https://discord.gg/Skvune9P
    :alt: Discord Server
 
 

{unit3dup-0.8.19 → unit3dup-0.8.21}/README.rst

@@ -81,6 +81,28 @@ DOC
 Link `Unit3DUP <https://unit3dup.readthedocs.io/en/latest/index.html#>`_
 
 
+ImageHost
+=========
+
+The bot can upload images to the following image hosting platforms:
+
++------------------+----------------------------+
+| **Image Host**   | **URL**                    |
++==================+============================+
+| ``ImgBB``        | https://imgbb.com          |
++------------------+----------------------------+
+| ``FreeImage``    | https://freeimage.host     |
++------------------+----------------------------+
+| ``PtScreens``    | https://ptscreens.com      |
++------------------+----------------------------+
+| ``LensDump``     | https://lensdump.com       |
++------------------+----------------------------+
+| ``ImgFI``        | https://imgfi.com          |
++------------------+----------------------------+
+| ``PassIMA``      | https://passtheima.ge      |
++------------------+----------------------------+
+| ``ImaRide``      | https://www.imageride.net  |
++------------------+----------------------------+
 
 Trackers
 ========
@@ -100,7 +122,7 @@ united by a shared passion for torrents and more
    :alt: Unisciti su Telegram
 
 .. image:: https://img.shields.io/discord/1214696147600408698?label=Discord&logo=discord&style=flat
-   :target: https://discord.gg/8hRTjV8Q
+   :target: https://discord.gg/Skvune9P
    :alt: Discord Server
 
 

{unit3dup-0.8.19 → unit3dup-0.8.21}/Unit3Dup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.8.19
+Version: 0.8.21
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -112,6 +112,28 @@ DOC
 Link `Unit3DUP <https://unit3dup.readthedocs.io/en/latest/index.html#>`_
 
 
+ImageHost
+=========
+
+The bot can upload images to the following image hosting platforms:
+
++------------------+----------------------------+
+| **Image Host**   | **URL**                    |
++==================+============================+
+| ``ImgBB``        | https://imgbb.com          |
++------------------+----------------------------+
+| ``FreeImage``    | https://freeimage.host     |
++------------------+----------------------------+
+| ``PtScreens``    | https://ptscreens.com      |
++------------------+----------------------------+
+| ``LensDump``     | https://lensdump.com       |
++------------------+----------------------------+
+| ``ImgFI``        | https://imgfi.com          |
++------------------+----------------------------+
+| ``PassIMA``      | https://passtheima.ge      |
++------------------+----------------------------+
+| ``ImaRide``      | https://www.imageride.net  |
++------------------+----------------------------+
 
 Trackers
 ========
@@ -131,7 +153,7 @@ united by a shared passion for torrents and more
    :alt: Unisciti su Telegram
 
 .. image:: https://img.shields.io/discord/1214696147600408698?label=Discord&logo=discord&style=flat
-   :target: https://discord.gg/8hRTjV8Q
+   :target: https://discord.gg/Skvune9P
    :alt: Discord Server
 
 

{unit3dup-0.8.19 → unit3dup-0.8.21}/common/external_services/imageHost.py

@@ -179,6 +179,21 @@ class PassIMA(ImageUploader):
         return 'source'
 
 
+class ImaRide(ImageUploader):
+
+    priority= config_settings.user_preferences.IMARIDE_PRIORITY
+    def get_endpoint(self) -> str:
+        return "https://www.imageride.net/api/1/upload"
+
+    def get_data(self) -> dict:
+        return {
+            "key": self.key,
+            "title": self.image_name,
+        }
+
+    def get_field_name(self) -> str:
+        return 'source'
+
 class ImageUploaderFallback:
     def __init__(self, uploader):
         self.uploader = uploader
@@ -231,6 +246,9 @@ class ImageUploaderFallback:
         if uploader_host == "PassIMA":
             return response['image']['url']
 
+        if uploader_host == "ImaRide":
+            return response['image']['url']
+
         return None
 
 class Build:
@@ -251,6 +269,7 @@ class Build:
         self.PTSCREENS_KEY= config_settings.tracker_config.PTSCREENS_KEY
         self.IMGFI_KEY = config_settings.tracker_config.IMGFI_KEY
         self.PASSIMA_KEY = config_settings.tracker_config.PASSIMA_KEY
+        self.IMARIDE_KEY = config_settings.tracker_config.IMARIDE_KEY
         self.extracted_frames = extracted_frames
 
 
@@ -271,6 +290,7 @@ class Build:
                 LensDump(img_bytes, self.LENSDUMP_KEY,image_name=image_name),
                 ImgFi(img_bytes, self.IMGFI_KEY,image_name=image_name),
                 PassIMA(img_bytes, self.PASSIMA_KEY, image_name=image_name),
+                ImaRide(img_bytes, self.IMARIDE_KEY, image_name=image_name),
             ]
 
             # Sorting list based on priority

{unit3dup-0.8.19 → unit3dup-0.8.21}/common/external_services/theMovieDB/core/api.py

@@ -395,11 +395,13 @@ class DbOnline(TmdbAPI):
             # todo compare against the media title especially for the favorite channel
             return result[0].items[0].id.videoId
         else:
-            user_youtube_id = custom_console.user_input_str(message="Title not found."
-                                                                    " Please digit a valid Youtube ID (0=skip)->")
-            if user_youtube_id==0:
-                return "not available"
-            return user_youtube_id
+            if not config_settings.user_preferences.SKIP_YOUTUBE:
+                user_youtube_id = custom_console.user_input_str(message="Title not found."
+                                                                        " Please digit a valid Youtube ID (0=skip)->")
+                if user_youtube_id==0:
+                    return "not available"
+                return user_youtube_id
+            return None
 
     def trailer(self, video_id: int) -> str | None:
         # Search for tmdb trailer

{unit3dup-0.8.19 → unit3dup-0.8.21}/common/settings.py

@@ -13,7 +13,7 @@ from common.utility import ManageTitles
 from common import trackers
 
 config_file = "Unit3Dbot.json"
-version = "0.8.19"
+version = "0.8.21"
 
 if os.name == "nt":
     PW_TORRENT_ARCHIVE_PATH: Path = Path(os.getenv("LOCALAPPDATA", ".")) / "Unit3Dup_config" / "pw_torrent_archive"
@@ -69,6 +69,7 @@ class TrackerConfig(BaseModel):
     PTSCREENS_KEY: str | None = None
     IMGFI_KEY: str | None = None
     PASSIMA_KEY: str | None = None
+    IMARIDE_KEY: str | None = None
     YOUTUBE_KEY: str | None = None
     IGDB_CLIENT_ID: str | None = None
     IGDB_ID_SECRET: str | None = None
@@ -102,12 +103,15 @@ class UserPreferences(BaseModel):
     IMGBB_PRIORITY: int = 3
     IMGFI_PRIORITY: int = 4
     PASSIMA_PRIORITY: int = 5
+    IMARIDE_PRIORITY: int = 6
+
     NUMBER_OF_SCREENSHOTS: int = 4
     YOUTUBE_FAV_CHANNEL_ID: str | None = None
     YOUTUBE_CHANNEL_ENABLE: bool = False
     DUPLICATE_ON: bool = False
     SKIP_DUPLICATE: bool = False
     SKIP_TMDB: bool = False
+    SKIP_YOUTUBE: bool = False
     SIZE_TH: int = 50
     WATCHER_INTERVAL: int = 60
     WATCHER_PATH: str | None = None
@@ -421,15 +425,16 @@ class Config(BaseModel):
             else:
                 field = field.upper()
 
-                if field in ['DUPLICATE_ON','SKIP_DUPLICATE','SKIP_TMDB','RESIZE_SCSHOT','ANON','WEBP_ENABLED',
-                             'CACHE_SCR','CACHE_DBONLINE', 'PERSONAL_RELEASE']:
+                if field in ['DUPLICATE_ON','SKIP_DUPLICATE','SKIP_TMDB','SKIP_YOUTUBE','RESIZE_SCSHOT','ANON',
+                             'WEBP_ENABLED', 'CACHE_SCR','CACHE_DBONLINE', 'PERSONAL_RELEASE']:
                     section[field] = Validate.boolean(value=section[field], field_name=field)
 
                 if field in ['TORRENT_COMMENT','WATCHER_PATH','DEFAULT_TRACKER']:
                     section[field] = Validate.string(value=section[field], field_name=field)
 
                 if field in ['NUMBER_OF_SCREENSHOTS','COMPRESS_SCSHOT','IMGBB_PRIORITY','FREE_IMAGE_PRIORITY',
-                             'LENSDUMP_PRIORITY','PASSIMA_PRIORITY','WATCHER_INTERVAL','SIZE_TH', 'FAST_LOAD']:
+                             'LENSDUMP_PRIORITY','PASSIMA_PRIORITY','IMARIDE_PRIORITY', 'WATCHER_INTERVAL','SIZE_TH',
+                             'FAST_LOAD']:
                     section[field] = Validate.integer(value=section[field], field_name=field)
 
                 if field == 'PREFERRED_LANG':
@@ -531,6 +536,7 @@ class Load:
                 "PTSCREENS_KEY": "no_key",
                 "IMGFI_KEY": "no_key",
                 "PASSIMA_KEY": "no_key",
+                "IMARIDE_KEY": "no_key",
                 "YOUTUBE_KEY": "no_key",
                 "IGDB_CLIENT_ID": "no_key",
                 "IGDB_ID_SECRET": "no_key",
@@ -562,12 +568,14 @@ class Load:
                 "IMGBB_PRIORITY": 3,
                 "IMGFI_PRIORITY": 4,
                 "PASSIMA_PRIORITY": 5,
+                "IMARIDE_PRIORITY": 6,
                 "NUMBER_OF_SCREENSHOTS": 4,
                 "YOUTUBE_FAV_CHANNEL_ID": "UCGCbxpnt25hWPFLSbvwfg_w",
                 "YOUTUBE_CHANNEL_ENABLE": "False",
                 "DUPLICATE_ON": "true",
                 "SKIP_DUPLICATE": "false",
                 "SKIP_TMDB": "false",
+                "SKIP_YOUTUBE" :'true',
                 "SIZE_TH": 10,
                 "WATCHER_INTERVAL": 60,
                 "WATCHER_PATH": "no_path",

{unit3dup-0.8.19 → unit3dup-0.8.21}/common/utility.py

@@ -189,6 +189,9 @@ class ManageTitles:
             (r'\b7 \b1\b', '7.1'),
             (r'\b5 \b1\b', '5.1'),
             (r'\bDDP5 \b1\b', 'DDP5.1'),
+            (r'\bDDP2 \b1\b', 'DDP2.0'),
+            (r'\bDD5 \b1\b', 'DD5.1'),
+            (r'\bDD2 \b1\b', 'DD2.0'),
             (r'\b2 \b0\b', '2.0'),
             (r'\bWEB \bDL\b', 'WEB-DL'),
             (r'\bWEB \bDLMUX\b', 'WEB-DLMUX'),
@@ -197,7 +200,7 @@ class ManageTitles:
             (r'\bHEVC \bFHC\b', 'HEVC-FHC'),
             (r'\bCBR \bCBZ\b', 'CBR-CBZ'),
             (r'\bH \b264\b', 'H.264'),
-
+            (r'\bH \b265\b', 'H.265'),
         ]
 
         for tag, replacement in replacements:

{unit3dup-0.8.19 → unit3dup-0.8.21}/pyproject.toml

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

{unit3dup-0.8.19 → unit3dup-0.8.21}/unit3dup/media_manager/ContentManager.py

@@ -129,6 +129,7 @@ class ContentManager:
         # Display name on webpage
         self.display_name, _ = os.path.splitext(os.path.basename(self.file_name))
         self.display_name = ManageTitles.clean_text(self.display_name)
+        self.display_name = re.sub(r'[\[\]()]', '', self.display_name)
         # current media path
         self.torrent_path = self.path
         # Try to get video ID from the string title
@@ -153,6 +154,7 @@ class ContentManager:
         self.file_name = os.path.join(self.path, files_list[0])
         # Display name on webpage
         self.display_name = ManageTitles.clean_text(os.path.basename(self.path))
+        self.display_name = re.sub(r'[\[\]()]', '', self.display_name)
         # current media path
         self.torrent_path = self.path
         # Torrent name

{unit3dup-0.8.19 → unit3dup-0.8.21}/unit3dup/pvtVideo.py

@@ -79,8 +79,10 @@ class Video:
             # Build the description
             build_description = Build(extracted_frames=extracted_frames_webp+extracted_frames, filename= self.display_name)
             self.description = build_description.description()
-            self.description += (f"[b][spoiler=Spoiler: PLAY TRAILER][center][youtube]{self.trailer_key}[/youtube]"
-                                 f"[/center][/spoiler][/b]")
+
+            if self.trailer_key:
+                self.description += (f"[b][spoiler=Spoiler: PLAY TRAILER][center][youtube]{self.trailer_key}[/youtube]"
+                                     f"[/center][/spoiler][/b]")
             self.is_hd = is_hd
 
         # Caching