api/ovdashboard_api/async_helpers.py

@@ -40,7 +40,7 @@ def get_ttl_hash() -> int:
     https://stackoverflow.com/a/55900800
     """
 
-    return round(time() / SETTINGS.cache_time)
+    return round(time() / SETTINGS.cache_seconds)
 
 
 def timed_alru_cache(*decorator_args, **decorator_kwargs):

api/ovdashboard_api/main.py

@@ -40,8 +40,8 @@ def main() -> None:
     if webdav_check():
         uvicorn_run(
             app="ovdashboard_api.main:app",
-            host=SETTINGS.main_host,
-            port=SETTINGS.main_port,
+            host="0.0.0.0",
+            port=8000,
             reload=not SETTINGS.production_mode,
         )
 

api/ovdashboard_api/routers/__init__.py

@@ -9,16 +9,13 @@ from fastapi import APIRouter
 from ..settings import SETTINGS
 from . import aggregate, calendar, image, misc, text, ticker
 
-main_router = APIRouter(prefix=f"/{SETTINGS.api_prefix}")
-
-main_router.include_router(misc.router)
-
+main_router = APIRouter(prefix=f"/{SETTINGS.api_v1_prefix}")
 main_router.include_router(text.router)
 main_router.include_router(ticker.router)
 main_router.include_router(image.router)
-
 main_router.include_router(calendar.router)
 main_router.include_router(aggregate.router)
+main_router.include_router(misc.router)
 
 __all__ = [
     "main_router",

api/ovdashboard_api/routers/misc.py

@@ -31,7 +31,7 @@ async def get_ip() -> str:
     ) as s:
         s.settimeout(0)
         try:
-            s.connect((SETTINGS.ping_host, SETTINGS.ping_port))
+            s.connect((SETTINGS.ping_address, SETTINGS.ping_port))
             IP = s.getsockname()[0]
 
         except Exception:

api/ovdashboard_api/settings.py

@@ -49,16 +49,14 @@ class Settings(BaseSettings):
 
     production_mode: bool = False
     log_level: str = "INFO" if production_mode else "DEBUG"
-    cache_time: int = 30
+    cache_seconds: int = 30
     cache_size: int = 30
 
     # doesn't even have to be reachable
-    ping_host: str = "10.0.0.0"
+    ping_address: str = "10.0.0.0"
     ping_port: int = 1
 
-    main_host: str = "0.0.0.0"
-    main_port: int = 8000
-    api_prefix: str = "api/v1"
+    api_v1_prefix: str = "api/v1"
     openapi_url: str = "/openapi.json"
     docs_url: Optional[str] = None if production_mode else "/docs"
     redoc_url: Optional[str] = None if production_mode else "/redoc"