Remove Constants file

Validate settings tokens

Author: Buried-In-Code

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.3
+    rev: v0.9.3
     hooks:
       - id: ruff-format
       - id: ruff
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.19
+    rev: 0.7.21
     hooks:
       - id: mdformat
         additional_dependencies:

mediux_posters/__main__.py

@@ -5,15 +5,16 @@
 from typing import Annotated
 from uuid import uuid4
 
+from plexapi.exceptions import Unauthorized
 from typer import Abort, Option, Typer
 
 from mediux_posters import __version__, get_cache_root, setup_logging
 from mediux_posters.cli import settings_app
 from mediux_posters.console import CONSOLE
-from mediux_posters.constants import Constants
 from mediux_posters.mediux import Mediux
-from mediux_posters.services import BaseService
+from mediux_posters.services import BaseService, Jellyfin, Plex
 from mediux_posters.services._base import BaseCollection, BaseMovie, BaseSeries
+from mediux_posters.settings import Settings
 from mediux_posters.utils import MediaType, delete_folder
 
 app = Typer()
@@ -85,9 +86,19 @@ def sync_posters(
     if clean_cache:
         LOGGER.info("Cleaning Cache")
         delete_folder(folder=get_cache_root())
-    mediux = Constants.mediux()
+    settings = Settings.load()
+    settings.save()
+    mediux = Mediux()
+    service_list = []
+    if settings.jellyfin.token:
+        service_list.append(Jellyfin(settings=settings.jellyfin))
+    try:
+        if settings.plex.token:
+            service_list.append(Plex(settings=settings.plex))
+    except Unauthorized as err:
+        LOGGER.warning(err)
 
-    for service in Constants.service_list():
+    for service in service_list:
         for mediatype, func in {
             MediaType.SERIES: service.list_series,
             MediaType.COLLECTION: service.list_collections,
@@ -104,7 +115,7 @@ def sync_posters(
                 set_list = mediux.list_sets(mediatype=entry.mediatype, tmdb_id=entry.tmdb_id)
                 if not set_list:
                     continue
-                for username in Constants.settings().priority_usernames:
+                for username in settings.priority_usernames:
                     for set_data in [
                         x for x in set_list if x.get("user_created", {}).get("username") == username
                     ]:
@@ -123,18 +134,12 @@ def sync_posters(
                         )
                         if entry.all_posters_uploaded:
                             break
-                if (
-                    not Constants.settings().only_priority_usernames
-                    and not entry.all_posters_uploaded
-                ):
+                if not settings.only_priority_usernames and not entry.all_posters_uploaded:
                     for set_data in set_list:
                         username = set_data.get("user_created", {}).get("username")
-                        if username in Constants.settings().exclude_usernames:
+                        if username in settings.exclude_usernames:
                             continue
-                        if (
-                            Constants.settings().priority_usernames
-                            and username in Constants.settings().priority_usernames
-                        ):
+                        if settings.priority_usernames and username in settings.priority_usernames:
                             continue
                         LOGGER.info("Downloading '%s' by '%s'", set_data.get("set_name"), username)
                         set_data = mediux.scrape_set(set_id=set_data.get("id"))
@@ -196,7 +201,17 @@ def set_posters(
     if clean_cache:
         LOGGER.info("Cleaning Cache")
         delete_folder(folder=get_cache_root())
-    mediux = Constants.mediux()
+    settings = Settings.load()
+    settings.save()
+    mediux = Mediux()
+    service_list = []
+    if settings.jellyfin.token:
+        service_list.append(Jellyfin(settings=settings.jellyfin))
+    try:
+        if settings.plex.token:
+            service_list.append(Plex(settings=settings.plex))
+    except Unauthorized as err:
+        LOGGER.warning(err)
 
     url_list = [x.strip() for x in file.read_text().splitlines()] if file else urls
     for entry in url_list:
@@ -216,7 +231,7 @@ def set_posters(
         )
         if tmdb_id:
             tmdb_id = int(tmdb_id)
-        for service in Constants.service_list():
+        for service in service_list:
             with CONSOLE.status(
                 f"Searching {type(service).__name__} for '{set_data.get('set_name')} [{tmdb_id}]'"
             ):

mediux_posters/cli/settings.py

@@ -3,16 +3,14 @@
 from typer import Typer
 
 from mediux_posters.console import CONSOLE
-from mediux_posters.constants import Constants
 from mediux_posters.settings import Settings
 
 app = Typer(help="Commands for viewing app settings.")
 
 
 @app.command(name="view", help="Display the current and default settings.")
 def view() -> None:
-    settings = Constants.settings()
-    settings.display()
+    Settings.load().display()
 
 
 @app.command(name="locate", help="Display the path to the settings file.")

mediux_posters/constants.py

@@ -1,15 +1,15 @@
 __all__ = ["Jellyfin", "Plex", "Settings"]
 
 from pathlib import Path
-from typing import Any, ClassVar
+from typing import Annotated, Any, ClassVar
 
 import tomli_w as tomlwriter
-from pydantic import Field
+from pydantic import BeforeValidator, Field
 from rich.panel import Panel
 
 from mediux_posters import get_config_root
 from mediux_posters.console import CONSOLE
-from mediux_posters.utils import BaseModel, flatten_dict
+from mediux_posters.utils import BaseModel, blank_is_none, flatten_dict
 
 try:
     from typing import Self  # Python >= 3.11
@@ -24,12 +24,12 @@
 
 class Jellyfin(BaseModel):
     base_url: str = "http://127.0.0.1:8096"
-    token: str | None = None
+    token: Annotated[str | None, BeforeValidator(blank_is_none)] = None
 
 
 class Plex(BaseModel):
     base_url: str = "http://127.0.0.1:32400"
-    token: str | None = None
+    token: Annotated[str | None, BeforeValidator(blank_is_none)] = None
 
 
 def _stringify_values(content: dict[str, Any]) -> dict[str, Any]:

mediux_posters/settings.py

@@ -1,4 +1,4 @@
-__all__ = ["BaseModel", "MediaType", "delete_folder", "flatten_dict", "slugify"]
+__all__ = ["BaseModel", "MediaType", "blank_is_none", "delete_folder", "flatten_dict", "slugify"]
 
 import logging
 import re
@@ -68,3 +68,8 @@ def flatten_dict(content: dict[str, Any], parent_key: str = "") -> dict[str, Any
         else:
             items[new_key] = value
     return dict(sorted(items.items()))
+
+
+def blank_is_none(value: str) -> str | None:
+    """Enforces blank strings to be None."""
+    return value if value else None