Unit3Dup 0.8.7__tar.gz → 0.8.8__tar.gz

{unit3dup-0.8.7 → unit3dup-0.8.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.8.7
+Version: 0.8.8
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -75,7 +75,7 @@ pip install unit3dup
 
 Upgrade
 -------
-pip install --upgrade unit3dup
+pip install unit3dup --upgrade
 
 Ubuntu/Debian Dependencies
 --------------------------

{unit3dup-0.8.7 → unit3dup-0.8.8}/README.rst

@@ -44,7 +44,7 @@ pip install unit3dup
 
 Upgrade
 -------
-pip install --upgrade unit3dup
+pip install unit3dup --upgrade
 
 Ubuntu/Debian Dependencies
 --------------------------

{unit3dup-0.8.7 → unit3dup-0.8.8}/Unit3Dup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3Dup
-Version: 0.8.7
+Version: 0.8.8
 Summary: An uploader for the Unit3D torrent tracker
 Author: Parzival
 License-Expression: MIT
@@ -75,7 +75,7 @@ pip install unit3dup
 
 Upgrade
 -------
-pip install --upgrade unit3dup
+pip install unit3dup --upgrade
 
 Ubuntu/Debian Dependencies
 --------------------------

{unit3dup-0.8.7 → unit3dup-0.8.8}/Unit3Dup.egg-info/SOURCES.txt

@@ -102,5 +102,7 @@ unit3dup/media_manager/TorrentManager.py
 unit3dup/media_manager/VideoManager.py
 unit3dup/media_manager/__init__.py
 unit3dup/media_manager/common.py
+unit3dup/web/__init__.py
+unit3dup/web/main.py
 view/__init__.py
 view/custom_console.py

{unit3dup-0.8.7 → unit3dup-0.8.8}/Unit3Dup.egg-info/top_level.txt

@@ -3,5 +3,6 @@ common
 dist
 docs
 tests
+tracker_cache
 unit3dup
 view

{unit3dup-0.8.7 → unit3dup-0.8.8}/common/external_services/imageHost.py

@@ -5,7 +5,6 @@ import json
 import time
 import requests
 
-from PIL import Image
 from abc import ABC, abstractmethod
 from common import config_settings
 from view import custom_console
@@ -163,6 +162,20 @@ class ImgFi(ImageUploader):
     def get_field_name(self) -> str:
         return 'source'
 
+class PassIMA(ImageUploader):
+
+    priority= config_settings.user_preferences.PASSIMA_PRIORITY
+    def get_endpoint(self) -> str:
+        return "https://passtheima.ge/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:
@@ -213,6 +226,10 @@ class ImageUploaderFallback:
 
         if uploader_host == "ImgFi":
             return response['image']['url']
+
+        if uploader_host == "PassIMA":
+            return response['image']['url']
+
         return None
 
 class Build:
@@ -232,6 +249,7 @@ class Build:
         self.LENSDUMP_KEY= config_settings.tracker_config.LENSDUMP_KEY
         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.extracted_frames = extracted_frames
 
 
@@ -251,6 +269,7 @@ class Build:
                 PtScreens(img_bytes, self.PTSCREENS_KEY,image_name=image_name),
                 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),
             ]
 
             # Sorting list based on priority

{unit3dup-0.8.7 → unit3dup-0.8.8}/common/settings.py

@@ -13,7 +13,7 @@ from common.utility import ManageTitles
 from common import trackers
 
 config_file = "Unit3Dbot.json"
-version = "0.8.7"
+version = "0.8.8"
 
 if os.name == "nt":
     PW_TORRENT_ARCHIVE_PATH: Path = Path(os.getenv("LOCALAPPDATA", ".")) / "Unit3Dup_config" / "pw_torrent_archive"
@@ -46,6 +46,14 @@ def get_default_path(field: str)-> str:
     return str(default_paths[field])
 
 
+
+class Ccolors:
+    OKCYAN = '\033[96m'
+    OKGREEN = '\033[92m'
+    WARNING = '\033[93m'
+    FAIL = '\033[91m'
+    ENDC = '\033[0m'
+
 class TrackerConfig(BaseModel):
     ITT_URL: str
     ITT_APIKEY: str | None = None
@@ -60,6 +68,7 @@ class TrackerConfig(BaseModel):
     LENSDUMP_KEY: str | None = None
     PTSCREENS_KEY: str | None = None
     IMGFI_KEY: str | None = None
+    PASSIMA_KEY: str | None = None
     YOUTUBE_KEY: str | None = None
     IGDB_CLIENT_ID: str | None = None
     IGDB_ID_SECRET: str | None = None
@@ -92,6 +101,7 @@ class UserPreferences(BaseModel):
     FREE_IMAGE_PRIORITY: int = 2
     IMGBB_PRIORITY: int = 3
     IMGFI_PRIORITY: int = 4
+    PASSIMA_PRIORITY: int = 5
     NUMBER_OF_SCREENSHOTS: int = 4
     YOUTUBE_FAV_CHANNEL_ID: str | None = None
     YOUTUBE_CHANNEL_ENABLE: bool = False
@@ -419,7 +429,7 @@ 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','WATCHER_INTERVAL','SIZE_TH', 'FAST_LOAD']:
+                             'LENSDUMP_PRIORITY','PASSIMA_PRIORITY','WATCHER_INTERVAL','SIZE_TH', 'FAST_LOAD']:
                     section[field] = Validate.integer(value=section[field], field_name=field)
 
                 if field == 'PREFERRED_LANG':
@@ -502,6 +512,7 @@ class Load:
                 "LENSDUMP_KEY": "no_key",
                 "PTSCREENS_KEY": "no_key",
                 "IMGFI_KEY": "no_key",
+                "PASSIMA_KEY": "no_key",
                 "YOUTUBE_KEY": "no_key",
                 "IGDB_CLIENT_ID": "no_key",
                 "IGDB_ID_SECRET": "no_key",
@@ -532,6 +543,7 @@ class Load:
                 "FREE_IMAGE_PRIORITY": 2,
                 "IMGBB_PRIORITY": 3,
                 "IMGFI_PRIORITY": 4,
+                "PASSIMA_PRIORITY": 5,
                 "NUMBER_OF_SCREENSHOTS": 4,
                 "YOUTUBE_FAV_CHANNEL_ID": "UCGCbxpnt25hWPFLSbvwfg_w",
                 "YOUTUBE_CHANNEL_ENABLE": "False",
@@ -741,10 +753,11 @@ class JsonConfig:
                 return json.loads(json_data)
 
         except json.JSONDecodeError as e:
-            print(f"Config Loading error.. {e}")
-            print(r"Try to Check '\\ characters. Example: ")
-            print(r"C:\myfolder -> not correct ")
-            print(r"C:/myfolder -> CORRECT ")
+            print(f"* Please fix the error{Ccolors.WARNING} near Line {e.lineno}{Ccolors.ENDC}"
+                  f" and {Ccolors.WARNING}Column {e.colno}{Ccolors.ENDC} in the config file: *\n")
+            print(f"{e.msg}\n")
+            # Seek And...
+            self.aim(line=e.lineno,col=e.colno)
             exit(1)
         except FileNotFoundError:
             print(f"Configuration '{self.default_json_path}' not found")
@@ -797,3 +810,34 @@ class JsonConfig:
 
         print(message)
 
+    def aim(self, line: int, col: int):
+        """
+             Try to identify the exact location of json error
+        Args:
+            line: Error line from the try block
+            col:  Error line from the try block
+        Returns:
+              None
+        """
+
+        # Open the configuration file
+        with open(self.default_json_path, 'r') as file:
+            lines = file.readlines()
+
+        # Test the line value
+        if line <= len(lines):
+            # Create a "context" around the error....
+            line_context1 = lines[line -2].rstrip('\n')
+            line_context2 = lines[line + 1].rstrip('\n')
+
+            # Try to identify the position
+            line_text = lines[line - 1].rstrip('\n')
+            print(f"{line_context1}")
+            print(f"{Ccolors.WARNING}>>> {line_text}{Ccolors.ENDC}")
+
+            # Put the cursor under the error
+            cursor = ' ' * (col-1) + '^'
+            print(f"{Ccolors.WARNING}    {cursor}{Ccolors.ENDC}")
+            print(f"{line_context2}")
+        else:
+            print("Line number is out of range !")

{unit3dup-0.8.7 → unit3dup-0.8.8}/pyproject.toml

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

unit3dup-0.8.8/unit3dup/web/main.py

@@ -0,0 +1,46 @@
+from fastapi import FastAPI, APIRouter
+from random import randint
+from common.torrent_clients import TransmissionClient, QbittorrentClient, RTorrentClient
+from common.command import CommandLine
+from common.settings import Load,DEFAULT_JSON_PATH
+
+from unit3dup.torrent import View
+from unit3dup import pvtTracker
+from unit3dup.bot import Bot
+from view import custom_console
+
+
+import uvicorn
+import argparse
+from random import randint
+
+app = FastAPI()
+
+# Classe che gestisce gli endpoint
+class WebApp:
+    def __init__(self, config: Load):
+        self.router = APIRouter()
+        self.numb = randint(0, 100)
+        self._setup_routes()
+
+    def _setup_routes(self):
+        # Add the endpoints
+        self.router.add_api_route("/", self.root, methods=["GET"])
+        self.router.add_api_route("/upload/{name}", self.upload, methods=["GET"])
+
+    async def root(self):
+        return {"message": f"Hello World {self.numb}"}
+
+    async def upload(self, name: str):
+
+
+
+        return {"message": f"Hello {name}, numb is {self.numb}"}
+
+
+def web():
+    web_app = WebApp(config=Load().load_config())
+    app.include_router(web_app.router)
+    uvicorn.run("unit3dup.web.main:app", host="127.0.0.1", port=8000, reload=True)
+
+