Unit3DwebUp 0.0.23__tar.gz → 0.0.26__tar.gz

{unit3dwebup-0.0.23 → unit3dwebup-0.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3DwebUp
-Version: 0.0.23
+Version: 0.0.26
 Summary: A Unit3D uploader with a web interface
 Author: Parzival
 License-Expression: GPL-3.0-only
@@ -25,7 +25,7 @@ Requires-Dist: torf==4.3.1
 Requires-Dist: watchdog==6.0.0
 Requires-Dist: uvicorn[standard]==0.40.0
 
-# Unit3DupWeb
+# Unit3DwebUp
 
 ![version](https://img.shields.io/pypi/v/unit3dupWeb.svg)
 ![online](https://img.shields.io/badge/Online-green)

{unit3dwebup-0.0.23 → unit3dwebup-0.0.26}/README.md

@@ -1,4 +1,4 @@
-# Unit3DupWeb
+# Unit3DwebUp
 
 ![version](https://img.shields.io/pypi/v/unit3dupWeb.svg)
 ![online](https://img.shields.io/badge/Online-green)

{unit3dwebup-0.0.23 → unit3dwebup-0.0.26}/Unit3DwebUp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Unit3DwebUp
-Version: 0.0.23
+Version: 0.0.26
 Summary: A Unit3D uploader with a web interface
 Author: Parzival
 License-Expression: GPL-3.0-only
@@ -25,7 +25,7 @@ Requires-Dist: torf==4.3.1
 Requires-Dist: watchdog==6.0.0
 Requires-Dist: uvicorn[standard]==0.40.0
 
-# Unit3DupWeb
+# Unit3DwebUp
 
 ![version](https://img.shields.io/pypi/v/unit3dupWeb.svg)
 ![online](https://img.shields.io/badge/Online-green)

{unit3dwebup-0.0.23 → unit3dwebup-0.0.26}/Unit3DwebUp.egg-info/SOURCES.txt

@@ -7,7 +7,10 @@ Unit3DwebUp.egg-info/entry_points.txt
 Unit3DwebUp.egg-info/requires.txt
 Unit3DwebUp.egg-info/top_level.txt
 unit3dwup/__init__.py
+unit3dwup/lifespan.py
+unit3dwup/schemas.py
 unit3dwup/start.py
+unit3dwup/start_backup.py
 unit3dwup/config/__init__.py
 unit3dwup/config/api_data.py
 unit3dwup/config/constants.py
@@ -27,6 +30,7 @@ unit3dwup/models/keywords.py
 unit3dwup/models/media.py
 unit3dwup/models/media_info.py
 unit3dwup/models/movie.py
+unit3dwup/models/subtitles.py
 unit3dwup/models/tv.py
 unit3dwup/models/tvdb_search.py
 unit3dwup/models/videos.py
@@ -35,6 +39,14 @@ unit3dwup/repositories/db_online.py
 unit3dwup/repositories/interfaces.py
 unit3dwup/repositories/job_repos.py
 unit3dwup/repositories/media_info_factory.py
+unit3dwup/routers/__init__.py
+unit3dwup/routers/jobs.py
+unit3dwup/routers/posters.py
+unit3dwup/routers/process.py
+unit3dwup/routers/scan.py
+unit3dwup/routers/search.py
+unit3dwup/routers/settings.py
+unit3dwup/routers/ws.py
 unit3dwup/services/__init__.py
 unit3dwup/services/auto_async_service.py
 unit3dwup/services/create_torrent_service.py

{unit3dwebup-0.0.23 → unit3dwebup-0.0.26}/pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
     "uvicorn[standard]==0.40.0"
 ]
 name = "Unit3DwebUp"
-version = "0.0.23"
+version = "0.0.26"
 
 description = "A Unit3D uploader with a web interface"
 readme = { file = "README.md", content-type = "text/markdown" }

{unit3dwebup-0.0.23 → unit3dwebup-0.0.26}/unit3dwup/config/__init__.py

@@ -7,4 +7,4 @@ from .settings import get_settings
 from .constants import MediaStatus
 from .logger import get_logger
 
-__version__ = "0.0.23"
+__version__ = "0.0.26"

{unit3dwebup-0.0.23 → unit3dwebup-0.0.26}/unit3dwup/config/settings.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from pydantic import BaseModel, field_validator, model_validator, HttpUrl, Field, ValidationError
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from unit3dwup.config.logger import get_logger
+from unit3dwup.services.utility import ManageTitles
 
 
 # /// Class to help avoid typos...
@@ -27,11 +28,6 @@ class BaseConfigModel(BaseModel):
         return v
 
 
-# /// version
-class Unit3DwebUp(BaseConfigModel):
-    VERSION: str = "build"
-
-
 # /// TRACKER CONFIG
 class TrackerConfig(BaseConfigModel):
     ITT_URL: HttpUrl
@@ -66,7 +62,7 @@ class TrackerConfig(BaseConfigModel):
     def validate_api_keys(cls, v, info):
         if info.field_name.endswith("_KEY") or "APIKEY" in info.field_name:
             if v is not None and len(v) < 5:
-                raise ValueError(f"{info.field_name} too short")
+                raise ValueError(f"{v} too short")
         return v
 
 
@@ -98,7 +94,7 @@ class TorrentClientConfig(BaseConfigModel):
     @classmethod
     def validate_ports(cls, v):
         if not 1 <= v <= 65535:
-            raise ValueError("invalid port range")
+            raise ValueError(f"{v} invalid port range")
         return v
 
     @model_validator(mode="after")
@@ -117,7 +113,7 @@ class TorrentClientConfig(BaseConfigModel):
 
 # /// USER PREFERENCES
 class UserPreferences(BaseConfigModel):
-    RELEASER_SIGN: str = ""
+    RELEASER_SIGN: str | None = None
     TAG_POSITION_MOVIE: list[str]
     TAG_POSITION_SERIE: list[str]
     PTSCREENS_PRIORITY: int = 0
@@ -141,7 +137,7 @@ class UserPreferences(BaseConfigModel):
     SCAN_PATH: str = None
     COMPRESS_SCSHOT: int = 4
     TORRENT_COMMENT: str | None = "no_comment"
-    PREFERRED_LANG: str | None = "all"
+    PREFERRED_LANG: str = "all"
     ANON: bool = False
     WEBP_ENABLED: bool = False
     PERSONAL_RELEASE: bool = False
@@ -151,7 +147,7 @@ class UserPreferences(BaseConfigModel):
     @classmethod
     def validate_interval(cls, v):
         if v < 5:
-            raise ValueError("WATCHER_INTERVAL too low")
+            raise ValueError(f"WATCHER_INTERVAL {v} too low")
         return v
 
     @field_validator("TAG_POSITION_MOVIE", "TAG_POSITION_SERIE", mode="before")
@@ -161,13 +157,19 @@ class UserPreferences(BaseConfigModel):
             return [x.strip() for x in v.split(",") if x.strip()]
         return v
 
+    @field_validator("PREFERRED_LANG")
+    @classmethod
+    def validate_preferred_lang(cls, v):
+        if ManageTitles.convert_iso(v) or v.lower() == "all":
+            return v
+        raise ValueError(f"invalid {v} value for PREFERRED_LANG")
+
 
 # /// APP SETTINGS
 class Settings(BaseSettings):
     """
     Set default settings
     """
-    unit3DwebUp: Unit3DwebUp = Field(default_factory=Unit3DwebUp)
     tracker: TrackerConfig = Field(default_factory=TrackerConfig)
     torrent: TorrentClientConfig = Field(default_factory=TorrentClientConfig)
     prefs: UserPreferences = Field(default_factory=UserPreferences)
@@ -178,7 +180,7 @@ class Settings(BaseSettings):
 
     model_config = SettingsConfigDict(
         env_nested_delimiter="__",
-        env_file= ENV_FILE if not os.getenv("DOCKER") else None,
+        env_file=ENV_FILE if not os.getenv("DOCKER") else None,
         extra="ignore"
     )
 
@@ -193,10 +195,17 @@ def get_settings() -> Settings:
     try:
         settings = Settings()
     except ValidationError as e:
+        """
+        https://pydantic.dev/docs/validation/latest/errors/validation_errors/
+        /// Pydantic Validation Error example
+            "loc": ("prefs", "PREFERRED_LANG"),
+            "msg": "Value error, invalid fr value for PREFERRED_LANG",
+            "type": "value_error"
+        """
         for err in e.errors():
             field_path = ".".join(str(loc) for loc in err["loc"])
-            logger.warning(f"{field_path} value not set or invalid")
-            logger.warning("-" * 50)
+            logger.warning(f"{field_path}: {err['msg']}")
+        logger.warning("-" * 50)
 
         raise SystemExit(1)
 

{unit3dwebup-0.0.23 → unit3dwebup-0.0.26}/unit3dwup/config/tags.py

@@ -250,6 +250,8 @@ SIGNS_LIST = {
     "ITT": "releaser",
     "JEDDAK-MIRCREW": "releaser",
     "JOHNSEED": "releaser",
+    "K-Z": "releaser",
+    "KARIDO": "releaser",
     "KINGOFROME": "releaser",
     "KIN": "releaser",
     "KISSY": "releaser",
@@ -278,6 +280,9 @@ SIGNS_LIST = {
     "MADSKY": "releaser",
     "MADTIA": "releaser",
     "MAX": "releaser",
+    "MEM.GP" : "releaser",
+    "MEMGP": "releaser",
+    "MEM": "releaser",
     "MAX2014": "releaser",
     "ME7ALH": "releaser",
     "MIK0YAN": "releaser",

unit3dwebup-0.0.26/unit3dwup/lifespan.py

@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+import asyncio
+import os
+
+from contextlib import asynccontextmanager
+from pathlib import Path
+
+from unit3dwup.config import get_settings
+from unit3dwup.config import get_logger
+
+from unit3dwup.repositories.job_repos import JobRedisRepo
+
+from unit3dwup.services.lifespan_service import update_mounted_paths, checking_env_file
+
+from unit3dwup.external.websocket import WebSocketManager
+
+from fastapi import FastAPI
+
+from watchdog.observers import Observer
+from watchdog.events import FileSystemEventHandler
+
+
+class RedisEventHandler(FileSystemEventHandler):
+    """
+        Watch only a specific folder
+        This event is shared by app.state FastApi
+        it uses a queue 'redis_event'
+     """
+
+    def __init__(self, app):
+        self.app = app
+
+    def on_created(self, event):
+        self.app.state.redis_events.put_nowait({
+            "type": "created",
+            "path": event.src_path,
+        })
+
+    def on_deleted(self, event):
+        self.app.state.redis_events.put_nowait({
+            "type": "deleted",
+            "path": event.src_path,
+        })
+
+
+async def redis_event_consumer(app: FastAPI):
+    """
+    :param app: it is mr FastApi
+    :return: None
+
+    It is a consumer. Wait for any news from the queue and extract the new path created or deleted
+    """
+
+    # > The queue :|
+    queue = app.state.redis_events
+
+    # Logger
+    logger = get_logger("settings_logger")
+
+    while True:
+        event = await queue.get()
+        try:
+            app.state.folder_event = event
+            relative = Path(app.state.folder_event['path']).relative_to(Path(app.state.watcher_path))
+            new_path = Path(app.state.settings.prefs.WATCHER_PATH) / relative.parts[0]
+
+            # Send logs to the client
+            await app.state.ws_manager.broadcast({
+                "type": "log",
+                "level": "info",
+                "message": f"{app.state.folder_event['type']} {new_path}",
+            })
+        except Exception as e:
+            logger.debug("Consumer Folder error", e)
+        finally:
+            queue.task_done()
+
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    """
+    Lifespan initialize DB and app configuration
+    We need to shared state
+    https://fastapi.tiangolo.com/advanced/events/
+
+    :param app: FastAPI
+    :return: None
+    """
+    # Load the configuration file
+    settings = get_settings()
+    app.state.settings = settings
+
+    # Check configuration file
+    await checking_env_file(app=app)
+
+    # Create a new state for the watcher queue
+    app.state.redis_events = asyncio.Queue()
+
+    # Environment variabile in the container backend
+    redis_host = os.getenv("REDIS_HOST", "localhost")
+    redis_port = int(os.getenv("REDIS_PORT", 6379))
+
+    # Build redis url
+    REDIS_URL = f"redis://{redis_host}:{redis_port}"
+
+    # Connect to redis
+    job = JobRedisRepo(url=REDIS_URL)
+    await job.connect(app=app)
+
+    # Store the job reference to app.state
+    app.state.job = job
+
+    # RestartDocker notify
+    # Set flag to true when setEnv is called from the frontend
+    app.state.restart_docker = False
+
+    # Create a new profile from user_preferences Job_id is '0'
+    # Later will be recalled from the setting endpoint
+    await job.create_profile(dict(settings.prefs))
+
+    # The WebSocket. Send to client progress bar value( Torrent creation) and short log message
+    app.state.ws_manager = WebSocketManager()
+
+    # Update mounted paths string
+    await update_mounted_paths(app=app)
+
+    # Watcher zone
+    # Shared event
+    app.state.folder_event = None
+
+    # back to watcher
+    observer = Observer()
+
+    # Callback
+    handler = RedisEventHandler(app)
+
+    # Start to watch
+    observer.schedule(handler, app.state.watcher_path, recursive=True)
+    if app.state.settings.prefs.WATCHER_DESTINATION_PATH != os.getcwd():
+        observer.start()
+
+    # Create a consumer that works in the background
+    consumer_task = asyncio.create_task(redis_event_consumer(app))
+
+    # Goes..
+    yield
+
+    # Come back to clean and close
+    if app.state.settings.prefs.WATCHER_DESTINATION_PATH != os.getcwd():
+        observer.stop()
+        observer.join()
+
+    consumer_task.cancel()
+    await job.close()

{unit3dwebup-0.0.23 → unit3dwebup-0.0.26}/unit3dwup/models/media.py

@@ -9,6 +9,7 @@ from unit3dwup.config.tags import crew_patterns, platform_patterns
 from unit3dwup.config.tags import SIGNS_LIST, TAGS_LIST, BAN_LIST
 from unit3dwup.config.constants import MediaStatus
 from unit3dwup.config.settings import get_settings
+from unit3dwup.config.logger import get_logger
 
 from unit3dwup.services.utility import ManageTitles, System
 from unit3dwup.services import utility
@@ -35,6 +36,7 @@ class Media:
         self.subfolder: str = subfolder
         self.title: str = (Path(self.folder) / self.subfolder).name
         self._torrent_file_path = Path(torrent_archive_path) / "ITT" / f"{self.title}.torrent"
+        self.logger = get_logger(self.__class__.__name__)
 
         # // Assign a job id
         path = Path(self.folder) / self.subfolder
@@ -95,6 +97,7 @@ class Media:
         self._screen_shots: list | None = None
         self._job_id_list: str | None = None
         self._imdb_from_tvdb: str | None = None
+        self._can_upload: bool = True
 
     @property
     def title_sanitized(self) -> str:
@@ -287,10 +290,13 @@ class Media:
     @property
     def guess_episode(self) -> int | None:
         if not self._guess_episode and System.category_list.get(System.TV_SHOW) in self.category:
-            if isinstance(self.guess_filename.guessit_episode,list):
+            if isinstance(self.guess_filename.guessit_episode, list):
                 self._guess_episode = 0
             else:
-                self._guess_episode = int(str(self.guess_filename.guessit_episode))
+                if self.guess_filename.guessit_episode:
+                    self._guess_episode = int(str(self.guess_filename.guessit_episode))
+                else:
+                    self._guess_episode = 0
         return self._guess_episode
 
     @guess_episode.setter
@@ -471,6 +477,14 @@ class Media:
     def is_folder(self, value: bool):
         self._is_folder = value
 
+    @property
+    def can_upload(self) -> bool:
+        return self._can_upload
+
+    @can_upload.setter
+    def can_upload(self, value: bool):
+        self._can_upload = value
+
     @property
     def screen_shots(self) -> list[str]:
         return self._screen_shots
@@ -505,34 +519,39 @@ class Media:
         return self._languages
 
     @property
-    def resolution(self) -> str | None:
-        if not self._resolution:
-            if self.mediafile and self.mediafile.video_height:
-                # Pick the highest standard resolution whose height fits the
-                # video. The previous `min(abs())` heuristic mis-classified
-                # 1080p widescreen content as 720p (a 1080p movie in 2.39:1
-                # has a video_height of ~800, which is closer to 720 than to
-                # 1080). A 50px tolerance rounds up when the height is just
-                # below a step (cropped masters, encoder padding).
-                tolerance = 50
-                ladder = sorted(
-                    (int(r) for r in System.RESOLUTIONS), reverse=True
-                )
-                height = int(self.mediafile.video_height)
-                chosen = ladder[-1]
-                for step in ladder:
-                    if height >= step - tolerance:
-                        chosen = step
-                        break
-                closest_resolution = str(chosen)
-                scan_type = self.mediafile.video_scan_type
-                if scan_type:
-                    closest_resolution = f"{closest_resolution}p" if scan_type.lower() == "progressive" else f"{closest_resolution}i"
-                else:
-                    closest_resolution = f"{closest_resolution}i" if self.mediafile.is_interlaced else f"{closest_resolution}p"
-                self._resolution = closest_resolution
-            else:
-                self._resolution = System.NO_RESOLUTION
+    def detected_resolution(self):
+        if not self.mediafile or not self.mediafile.video_width:
+            return None
+
+        width = int(self.mediafile.video_width)
+
+        for limit, label in (
+                (3200, "2160p"),
+                (1600, "1080p"),
+                (1100, "720p"),
+                (960, "576p"),
+        ):
+            if width >= limit:
+                return label
+
+        return f"{self.mediafile.video_height}p"
+
+    @property
+    def resolution(self):
+        if self._resolution:
+            return self._resolution
+
+        if not self.mediafile:
+            self._resolution = System.NO_RESOLUTION
+            return self._resolution
+
+        detected = self.detected_resolution
+
+        if detected:
+            self._resolution = detected
+        else:
+            self.logger.warning(f"{self.__class__.__name__}: video resolution not found in {self.file_name}")
+            self._resolution = System.NO_RESOLUTION
         return self._resolution
 
     @staticmethod
@@ -586,7 +605,7 @@ class Media:
             "platform_list": self.platform_list,
             "screen_shots": self.screen_shots,
             "job_id_list": self.job_id_list,
-
+            "can_upload": self.can_upload,
         }
 
     @classmethod
@@ -620,4 +639,5 @@ class Media:
         m.category = data.get("category")
         m.screen_shots = data.get("screen_shots")
         m.job_id_list = data.get("job_id_list")
+        m.can_upload = data.get("can_upload", False)
         return m

{unit3dwebup-0.0.23 → unit3dwebup-0.0.26}/unit3dwup/models/media_info.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import re, os
 from dataclasses import dataclass, field
 from typing import Optional, List, Dict, Any
+from unit3dwup.models.subtitles import SubtitleTrack
 
 
 @dataclass(slots=True)
@@ -18,6 +19,7 @@ class MediaFile:
     video_tracks: List[Dict] = field(default_factory=list)
     audio_tracks: List[Dict] = field(default_factory=list)
     general_track: Dict = field(default_factory=dict)
+    text_tracks: List[Dict] = field(default_factory=list)
 
     @property
     def media_description(self) -> str:
@@ -82,16 +84,30 @@ class MediaFile:
         return self.audio_tracks[0].get("language", "Unknown") if self.audio_tracks else "Unknown"
 
     @property
-    def subtitle_tracks(self) -> List[Dict]:
-        return [t for t in self.video_tracks if t.get("track_type") == "Text"]
+    def subtitles(self) -> list:
+        tracks: list[SubtitleTrack] = []
+
+        def parse_bool(value: str) -> bool:
+            return str(value).lower() in ("yes", "true", "1")
+
+        for t in self.text_tracks:
+            if t.get("track_type") != "Text":
+                continue
+
+            tracks.append(
+                SubtitleTrack(
+                    track_id=int(t.get("track_id", 0)),
+                    language=t.get("language", "und"),
+                    title=t.get("title", ""),
+                    default=parse_bool(t.get("default", "No")),
+                    forced=parse_bool(t.get("forced", "No")),
+                )
+            )
+        return tracks
 
     @property
-    def available_languages(self) -> list[Any | None] | list[str]:
-        langs = {
-            t.get("language")
-            for t in (self.audio_tracks + self.subtitle_tracks)
-            if t.get("language")
-        }
+    def available_languages(self) -> list[str]:
+        langs = {t.language for t in self.subtitles if t.language}
         return list(langs) or ["not found"]
 
     @property
@@ -123,6 +139,7 @@ class MediaFile:
             "media_to_string": self.media_to_string,
             "video_tracks": self.video_tracks,
             "audio_tracks": self.audio_tracks,
+            "text_tracks": self.text_tracks,
             "general_track": self.general_track,
         }
 
@@ -139,4 +156,5 @@ class MediaFile:
             video_tracks=data.get("video_tracks", []),
             audio_tracks=data.get("audio_tracks", []),
             general_track=data.get("general_track", {}),
+            text_tracks=data.get("text_tracks", []),
         )

unit3dwebup-0.0.26/unit3dwup/models/subtitles.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+from dataclasses import dataclass
+
+@dataclass
+class SubtitleTrack:
+    track_id: int
+    language: str
+    title: str
+    default: bool
+    forced: bool
+
+
+@dataclass
+class SubtitleInfo:
+    total: int
+    tracks: list[SubtitleTrack]

{unit3dwebup-0.0.23 → unit3dwebup-0.0.26}/unit3dwup/repositories/media_info_factory.py

@@ -19,10 +19,12 @@ class MediaFileFactory:
         video = [track for track in data if track.get("track_type") == "Video"]
         audio = [track for track in data if track.get("track_type") == "Audio"]
         general = next((track for track in data if track.get("track_type") == "General"), {})
+        text = [track for track in data if track.get("track_type") == "Text"]
 
         return MediaFile(
             file_path=path,
             video_tracks=video,
             audio_tracks=audio,
             general_track=general,
+            text_tracks=text,
         )

unit3dwebup-0.0.26/unit3dwup/routers/jobs.py

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+import inspect
+import json
+
+from fastapi import APIRouter, Request
+
+from unit3dwup.config import get_logger
+
+from unit3dwup.schemas import ClearJobListRequest
+
+router = APIRouter()
+
+
+@router.post("/cjoblist")
+async def clear_job_list_id(payload: ClearJobListRequest, request: Request):
+    """
+        This endpoint deletes a job list and all related posters
+
+        Required:
+        - job_list_id: identifier of the job list
+
+        Returns:
+        - status: operation result
+        """
+
+    app = request.app
+
+    # Load the job list
+    # Carica la joblist per ottenere il percorso e inviarlo a log. Mi sembra troppo per una stampa
+    job_list = await app.state.job.get_job_list(job_id=payload.job_list_id)
+    results = [json.loads(await app.state.job.get_job(job_id)) for job_id in job_list]
+
+    # Logger
+    frame = inspect.currentframe()
+    logger = get_logger(frame.f_code.co_name)
+
+    # Delete the job list
+    # TODO: delete all job ids
+    await app.state.job.delete_job_list(job_id=payload.job_list_id)
+
+    if results:
+        await app.state.ws_manager.broadcast({
+            "type": "log",
+            "level": "success",
+            "message": f"Clear JobList {payload.job_list_id} {results[0]['folder']}",
+        })
+        logger.info(f"-> Clear JobList ID° {payload.job_list_id} {results[0]['folder']}\n")
+    else:
+        await app.state.ws_manager.broadcast({
+            "type": "log",
+            "level": "error",
+            "message": f"Clear JobList : JobList id not found",
+        })
+        logger.info(f"-> Clear JobList : JobList ID non trovato\n")