Unit3Dup 0.8.18__py3-none-any.whl → 0.8.20__py3-none-any.whl

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

common/settings.py

@@ -13,7 +13,7 @@ from common.utility import ManageTitles
 from common import trackers
 
 config_file = "Unit3Dbot.json"
-version = "0.8.18"
+version = "0.8.20"
 
 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,6 +103,8 @@ 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
@@ -429,7 +432,8 @@ class Config(BaseModel):
                     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 +535,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,6 +567,7 @@ 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",

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/__main__.py

@@ -151,7 +151,7 @@ def main():
     # Dump
     if cli.args.dump:
         print("NOT YET IMPLEMENTED")
-        # torrent_info.view_search(" ", inkey=False)
+        # torrent_info.view_search(" ", inkey=False,save=True) # Fix aggiunto Save
         return
 
     if cli.args.info:

unit3dup/duplicate.py

@@ -139,7 +139,7 @@ class Duplicate:
         return self.search(torrent=self.torrent_info.search(self.query.guessit_title))
 
 
-    def process_dead_torrents(self, tmdb_id: int)-> list[requests] | None:
+    def process_dead_torrents(self, tmdb_id: int)-> list[requests.Response] | None:
          # Get the dead torrents
          torrents = self.torrent_info.get_by_tmdb_id(tmdb_id=tmdb_id)
          dead_torrents = []

unit3dup/media_manager/ContentManager.py

@@ -90,13 +90,15 @@ class ContentManager:
             media.display_name = self.display_name
 
             # Add language to the title from the media file when it's absent
-            for found_languages in media.audio_languages:
-                if found_languages not in media.display_name.upper():
-                    media.display_name = f"{media.display_name}  {found_languages}"
+            if media.category == 'tv':
+                for found_languages in media.audio_languages:
+                    if found_languages not in media.display_name.upper():
+                        media.display_name = f"{media.display_name}  {found_languages}"
             return media
         else:
             return False
 
+
     def search_ids(self):
         _id = re.findall(r"\{(imdb-\d+|tmdb-\d+|igdb-\d+)}", self.file_name, re.IGNORECASE)
         if _id:

unit3dup/media_manager/common.py

@@ -166,7 +166,7 @@ class UserContent:
             return False
 
     @staticmethod
-    def can_ressed(content: Media, tracker_name: str,  cli: argparse.Namespace, tmdb_id :int) -> list[requests]:
+    def can_ressed(content: Media, tracker_name: str,  cli: argparse.Namespace, tmdb_id :int) -> list[requests.Response]:
         """
            Search for a duplicate and compare with the user content. Delta = config.SIZE_TH
 

unit3dup/pvtTracker.py

@@ -97,21 +97,10 @@ class Tracker(Myhttp):
                 exit(1)
 
     def _post(self, file: dict, data: dict, params: dict):
-        with open(file['torrent'], "rb") as torrent:
-
-            # // Send content and mime type
-            file_ = {
-                "torrent": ("filename.torrent", torrent, "application/octet-stream"),
-            }
-
-            # // Send nfo
-            if file.get('nfo', None):
-                file_.update({"nfo": ("filename.nfo", file['nfo'], "text/plain")})
-
             try:
                 return requests.post(
                     url=self.upload_url,
-                    files=file_,
+                    files=file,
                     data=data,
                     headers=self.headers,
                     params=params,
@@ -327,12 +316,24 @@ class Torrents(Tracker):
 
 
 class Uploader(Tracker):
-    def upload_t(self, data: dict, torrent_path: str, torrent_archive_path: str, nfo_path = None) -> requests:
-        file_torrent = {"torrent": torrent_archive_path}
-        if nfo_path:
-            file_torrent.update({"nfo": self.encode_utf8(file_path=nfo_path)})
+    def upload_t(self, data: dict, torrent_archive_path: str, nfo_path=None) -> requests.Response:
+        files = {}
+        # Binary mode
+        with open(torrent_archive_path, 'rb') as torrent_file:
+            files['torrent'] = ('upload.torrent', torrent_file, 'application/x-bittorrent')
+
+            # Add the info file
+            if nfo_path:
+                with open(nfo_path, 'rb') as nfo_file:
+                    files['nfo'] = ('file.nfo', nfo_file, 'text/plain')
+                    # Post both
+                    response = self._post(file=files, data=data, params=self.params)
+            else:
+                # Post the torrent
+                response = self._post(file=files, data=data, params=self.params)
+
+        return response
 
-        return self._post(file=file_torrent, data=data, params=self.params)
 
     @staticmethod
     def encode_utf8(file_path:str) -> bytes | io.BytesIO:

unit3dup/upload.py

@@ -15,9 +15,6 @@ from view import custom_console
 
 class UploadBot:
     def __init__(self, content: Media, tracker_name: str, cli: argparse):
-
-        self.API_TOKEN = config_settings.tracker_config.ITT_APIKEY
-        self.BASE_URL = config_settings.tracker_config.ITT_URL
         self.cli = cli
         self.content = content
         self.tracker_name = tracker_name
@@ -26,7 +23,7 @@ class UploadBot:
         self.sign = (f"[url=https://github.com/31December99/Unit3Dup][code][color=#00BFFF][size=14]Uploaded with Unit3Dup"
                      f" {Load.version}[/size][/color][/code][/url]")
 
-    def message(self,tracker_response: requests.Response) -> (requests, dict):
+    def message(self,tracker_response: requests.Response, torrent_archive: str) -> (requests, dict):
 
         name_error = ''
         info_hash_error = ''
@@ -38,6 +35,10 @@ class UploadBot:
             tracker_response_body = json.loads(tracker_response.text)
             custom_console.bot_log(f"\n[RESPONSE]-> '{self.tracker_name}'.....{tracker_response_body['message'].upper()}\n\n")
             custom_console.rule()
+            # https://github.com/HDInnovations/UNIT3D/pull/4910/files
+            # 08/09/2025
+            # We have to download the torrent file to get the new random info_hash generated
+            self.download_file(url=tracker_response_body["data"],destination_path=torrent_archive)
             return tracker_response_body["data"],{}
 
         elif tracker_response.status_code == 401:
@@ -110,7 +111,17 @@ class UploadBot:
 
     def send(self, torrent_archive: str, nfo_path = None) -> (requests, dict):
 
-        tracker_response=self.tracker.upload_t(data=self.tracker.data, torrent_path=self.content.torrent_path,
-                                        torrent_archive_path = torrent_archive,nfo_path=nfo_path)
-        return self.message(tracker_response)
+        tracker_response=self.tracker.upload_t(data=self.tracker.data,torrent_archive_path = torrent_archive,
+                                               nfo_path=nfo_path)
+        return self.message(tracker_response=tracker_response, torrent_archive=torrent_archive)
+
 
+    @staticmethod
+    def download_file(url: str, destination_path: str) -> bool:
+        download = requests.get(url)
+        if download.status_code == 200:
+            # File archived
+            with open(destination_path, "wb") as file:
+                file.write(download.content)
+            return True
+        return False

{unit3dup-0.8.18.dist-info → unit3dup-0.8.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.8.18
+Version: 0.8.20
 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.18.dist-info → unit3dup-0.8.20.dist-info}/RECORD

@@ -8,12 +8,12 @@ common/extractor.py,sha256=WKZwt2kQfKO2VJ1rtwE_j6Zl84zICnowZq_Ql16wmRc,4564
 common/frames.py,sha256=p_jsaXII5tZTVt5ymu-w1hk2c_UMeOn3PZeuVR-wXWY,7973
 common/mediainfo.py,sha256=U2r1jJejBsV8GP3iPk4O8_NkHO5RQ9Kkh2bKwVNUBmg,6229
 common/mediainfo_string.py,sha256=8vuWlF2bqWRKpDbn81bV2fPA7hbl7RwOnxN2i4E3zNE,3958
-common/settings.py,sha256=MoAZtb9SLhLERwvyLVXSF7V061gui4O-Y8DHDqxSoBY,32782
+common/settings.py,sha256=9mpP39TF_xvX05ZS66COmj3klUh1xkWqOvPYNQBD2HQ,32983
 common/title.py,sha256=nFainfUBTYW9ML4Y-CB9ZFD_Es-OZXcAMPUo6D09u3k,3793
 common/torrent_clients.py,sha256=NOIpYtLG_bA19HwcH9ahGFmGNtRkoMO6nAjma-JzDfs,12040
-common/utility.py,sha256=1CJQKK7OejlX1eFo-A2dqHtDRgTbJ_7XbJYWT2oZISQ,8811
+common/utility.py,sha256=8uvLzMk-1keX2grxgzhqeS5VV6EKrmocSESihU8xzhY,8971
 common/external_services/__init__.py,sha256=rU7HPEcZ7WQFD8eqDzuye2xHPBjxXPwPqpt7IT08mkM,178
-common/external_services/imageHost.py,sha256=BpdtGZUtZHl4QJwFKyJs_BI6z4gHI4wu_Beu-fnfkDw,9588
+common/external_services/imageHost.py,sha256=00sVVmSFQD0AE1I8batCJQUxNn734NpNz8p1qDWyzHc,10215
 common/external_services/imdb.py,sha256=AIo8CO-SfP_uNocDeNY08hpvCAnuotoI7hYUytDiMQA,579
 common/external_services/mediaresult.py,sha256=Yz-h7QROkfNHwaSSXZ1JRDSmG2YIZkmtQO5vmpkYWZ4,677
 common/external_services/ftpx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -63,19 +63,19 @@ common/trackers/itt.py,sha256=cB0D5ZpMbGgEOAKloET9dS_fAFclhzwPPwRFt-LStX0,4019
 common/trackers/sis.py,sha256=AahQH-FxAqS19vgEFylOJzeY0_SHr27_Tibs7lraSdI,3480
 common/trackers/trackers.py,sha256=sts5l_x27V2Op1Y6Au5FoQujspSkWMPWyEYMfcmVYLA,1467
 unit3dup/__init__.py,sha256=seXz3lHgdrUBiOnhC6Je47npS66UZ0c62VFuoH3z5Mk,78
-unit3dup/__main__.py,sha256=OR0GRGEeV54TRBj3lA2aKdnHLzjLllQSzgH672QgzFg,9070
+unit3dup/__main__.py,sha256=9Jd80f9JxWf6TC6uztz_Q-qgbCUXcXsqmtFxXGdTqXE,9100
 unit3dup/automode.py,sha256=JbHIvK5mHbNxpq_m5o26FEpqEUlL9XbTyUUPvKD6EqQ,4412
 unit3dup/bot.py,sha256=2P24z_8UM58binKqrM0eIXxPTiWEduyK2bdfVkmxPEQ,8759
-unit3dup/duplicate.py,sha256=Ji1Y9vVLmhFQ5rgkUU-s7uXl-jC8akAa8OiQOfjFa9g,10428
+unit3dup/duplicate.py,sha256=0soPxYGTB6P5tb-iIUbZTdcI0-8CJntzoG5PnKNJ1vg,10437
 unit3dup/exceptions.py,sha256=DhlcbbZEuvEYk5VSZTnle8oRg5I8Pq6Y6fxXTdOOOfo,4078
 unit3dup/media.py,sha256=u0N2Wu4yt_oCUq_FPwnFq0oV8_lHDYAeXW4uhqpgJAI,13677
 unit3dup/pvtDocu.py,sha256=ZLMaal2fn6ZcFPLtET0LTmYEPjhJmLitEjkICHrm9CQ,4594
 unit3dup/pvtTorrent.py,sha256=cItlsCpcUJL23iXQHy0YzrrvV3JSl54UlBgm8_UROAs,2559
-unit3dup/pvtTracker.py,sha256=U4xMmhiqMNZaIOgEi3pnP-3H75e7Gagndh8GDFEP7Cs,18647
+unit3dup/pvtTracker.py,sha256=HqrXq3kmkuXOPQSw-11PdY_HsmzZpc5osYswh5_3UEY,18690
 unit3dup/pvtVideo.py,sha256=w_T6wEeGrsHkuR3KObJc4mNpJgg9hhHh_9LoxFlaqjM,3900
 unit3dup/torrent.py,sha256=surV0royo_GCEvdlPIP1S9gvFvJb1u26XM11rZOGVEg,20064
-unit3dup/upload.py,sha256=gjB8u2oP2FPXZ8t9SMIzkUEr52hKRy_zSR8OWJlW2xc,6075
-unit3dup/media_manager/ContentManager.py,sha256=raLiFLWN4kpyjPup70xaa77yRdL8FkmCMMrN9hjq6A4,7435
+unit3dup/upload.py,sha256=qGn9L-l2gL2K8hbU97c-fnWZFNe2vehFaPgDiQHUxfU,6612
+unit3dup/media_manager/ContentManager.py,sha256=8oibia1wQGY2M1e1WYJPpEKbDIFVkoyOdzbAwtEz020,7489
 unit3dup/media_manager/DocuManager.py,sha256=oFt7jlxj-gIUty9PADBQV5a24bsv3yhjKhwI6niOhf4,3116
 unit3dup/media_manager/GameManager.py,sha256=9EmPeNrirOwaVOj-vkLr29Xo7daIA4ssqrrt0WyMl30,4090
 unit3dup/media_manager/MediaInfoManager.py,sha256=0NO9dgD7seJM67B3DRnwvRIdoy7bfquBUox-PnHInK8,1081
@@ -83,15 +83,15 @@ unit3dup/media_manager/SeedManager.py,sha256=Vqpf_xpGbxsJHg0C3-kL0_tdF4f2FRPlZH7
 unit3dup/media_manager/TorrentManager.py,sha256=qqM1d1TyfBuruXtKLRbQ8gFk3_2JNH9dOa6Yg-QnDCw,6507
 unit3dup/media_manager/VideoManager.py,sha256=O1NzGnWiWPfMgjyV6h9_b9b8M5tzFtpje9cvI2g6Nc0,5437
 unit3dup/media_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-unit3dup/media_manager/common.py,sha256=hG2zOw7ocQfZyI1dhusbehxswpIrZK7T2aAbCNwULqA,10138
+unit3dup/media_manager/common.py,sha256=EDsD1FVNiWPS9teHs5vyGkYkC92gzFdSanMyMAR5vpU,10147
 unit3dup/web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unit3dup/web/main.py,sha256=BzjKDgAjKZMnoQwx7nDDbs_64kCrFO1VYpbHmsGiFVc,1267
-unit3dup-0.8.18.dist-info/licenses/LICENSE,sha256=GNAZDLhU0xz8QPbIyHAOYlVnQYDvKWk2N9fZJMhqaG8,1090
+unit3dup-0.8.20.dist-info/licenses/LICENSE,sha256=GNAZDLhU0xz8QPbIyHAOYlVnQYDvKWk2N9fZJMhqaG8,1090
 view/__init__.py,sha256=XIzb6rl58HmYPnksD73cYMFF88dn6FHa3u7bOHFbChk,81
 view/custom_console.py,sha256=OITmkEoQH9N_uE5ElPaSdc8XvaLzE9wcwTbOHtcMvrI,5629
 view/web_console.py,sha256=YkxutJK5GqswMKEF77EllphPYQW0eb8OIBlplucHhvM,7697
-unit3dup-0.8.18.dist-info/METADATA,sha256=2csisJh3MRKDo68f3R0pIBZ0i4I2ccLDtbTeKN8KsLE,4864
-unit3dup-0.8.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unit3dup-0.8.18.dist-info/entry_points.txt,sha256=fxXSyI6-r6jy9_v-C5ZHm03q1aC3tE9EvCQZxC1NQnI,52
-unit3dup-0.8.18.dist-info/top_level.txt,sha256=19NVMnQNkJxBUKebRNaYCRs56A5CO4U1L67GMQCPiLU,21
-unit3dup-0.8.18.dist-info/RECORD,,
+unit3dup-0.8.20.dist-info/METADATA,sha256=coV9AlZNj15u_x7sZ-znoweTOOAkfs_V-dxKnqxj-cw,5826
+unit3dup-0.8.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unit3dup-0.8.20.dist-info/entry_points.txt,sha256=fxXSyI6-r6jy9_v-C5ZHm03q1aC3tE9EvCQZxC1NQnI,52
+unit3dup-0.8.20.dist-info/top_level.txt,sha256=19NVMnQNkJxBUKebRNaYCRs56A5CO4U1L67GMQCPiLU,21
+unit3dup-0.8.20.dist-info/RECORD,,