refac: fix routers text and ticker; issue with prefix does not work with directory

api/ovdashboard_api/routers/v1/__init__.py

@@ -7,15 +7,15 @@ This file: Main API router definition.
 from fastapi import APIRouter
 
 # from . import aggregate, calendar, file, image, misc, text, ticker
-from . import file, misc
+from . import file, image, misc, text, ticker
 
 router = APIRouter(prefix="/api/v1")
 
 router.include_router(misc.router)
 
-# router.include_router(text.router)
+router.include_router(text.router)
-# router.include_router(ticker.router)
+router.include_router(ticker.router)
-# router.include_router(image.router)
+router.include_router(image.router)
 router.include_router(file.router)
 
 # router.include_router(calendar.router)

api/ovdashboard_api/routers/v1/file.py

@@ -15,7 +15,7 @@ from fastapi import APIRouter, Depends
 from fastapi.responses import StreamingResponse
 from magic import Magic
 
-# from ...core.dav_common import webdav_ensure_files, webdav_ensure_path
+from ...core.dav_common import webdav_ensure_files, webdav_ensure_path
 from ...core.webdav import WebDAV
 from ._common import FileNameLister, PrefixFinder, PrefixUnique
 
@@ -40,12 +40,12 @@ file_unique = PrefixUnique(file_finder)
 async def start_router() -> None:
     _logger.debug(f"{router.prefix} router starting.")
 
-    # if not webdav_ensure_path(await file_lister.remote_path):
+    if not webdav_ensure_path(await file_lister.remote_path):
-    #     webdav_ensure_files(
+        webdav_ensure_files(
-    #         await file_lister.remote_path,
+            await file_lister.remote_path,
-    #         "logo.svg",
+            "logo.svg",
-    #         "thw.svg",
+            "thw.svg",
-    #     )
+        )
 
 
 @router.get(

api/ovdashboard_api/routers/v1/image.py

@@ -15,9 +15,9 @@ from fastapi import APIRouter, Depends
 from fastapi.responses import StreamingResponse
 from PIL import Image
 
-from ...config import Config, ImageUIConfig
+from ...core.config import Config, ImageUIConfig, get_config
-from ...dav_common import webdav_ensure_files, webdav_ensure_path
+from ...core.dav_common import webdav_ensure_files, webdav_ensure_path
-from ...dav_file import DavFile
+from ...core.webdav import WebDAV
 from ._common import FileNameLister, PrefixFinder, PrefixUnique
 
 _logger = getLogger(__name__)
@@ -80,10 +80,10 @@ async def get_image(
     prefix: str,
     name: str = Depends(image_unique),
 ) -> StreamingResponse:
-    cfg = await Config.get()
+    cfg = await get_config()
-
+    img = Image.open(
-    dav_file = DavFile(f"{await image_lister.remote_path}/{name}")
+        BytesIO(await WebDAV.read_bytes(f"{await image_lister.remote_path}/{name}"))
-    img = Image.open(BytesIO(await dav_file.as_bytes)).convert(cfg.image.mode)
+    )
 
     img_buffer = BytesIO()
     img.save(img_buffer, **cfg.image.save_params)
@@ -101,6 +101,6 @@ async def get_image(
     response_model=ImageUIConfig,
 )
 async def get_ui_config(
-    cfg: Config = Depends(Config.get),
+    cfg: Config = Depends(get_config),
 ) -> ImageUIConfig:
     return cfg.image

api/ovdashboard_api/routers/v1/text.py

@@ -14,8 +14,8 @@ from typing import Iterator
 from fastapi import APIRouter, Depends
 from markdown import markdown
 
-from ...dav_common import webdav_ensure_files, webdav_ensure_path
+from ...core.dav_common import webdav_ensure_files, webdav_ensure_path
-from ...dav_file import DavFile
+from ...core.webdav import WebDAV
 from ._common import FileNameLister, PrefixFinder, PrefixUnique
 
 _logger = getLogger(__name__)
@@ -73,9 +73,7 @@ async def find_texts(
 async def get_text_content(
     name: str = Depends(text_unique),
 ) -> str:
-    return await DavFile(
+    return await WebDAV.read_str(f"{await text_lister.remote_path}/{name}")
-        f"{await text_lister.remote_path}/{name}",
-    ).as_string
 
 
 @router.get(

api/ovdashboard_api/routers/v1/ticker.py

@@ -12,9 +12,9 @@ from typing import Iterator
 from fastapi import APIRouter, Depends
 from markdown import markdown
 
-from ...config import Config, TickerUIConfig
+from ...core.config import Config, TickerUIConfig, get_config
-from ...dav_common import webdav_ensure_files, webdav_ensure_path
+from ...core.dav_common import webdav_ensure_files, webdav_ensure_path
-from ...dav_file import DavFile
+from ...core.webdav import WebDAV
 from .text import text_lister, text_unique
 
 _logger = getLogger(__name__)
@@ -35,12 +35,10 @@ async def start_router() -> None:
 
 
 async def get_ticker_lines() -> Iterator[str]:
-    cfg = await Config.get()
+    cfg = await get_config()
     file_name = await text_unique(cfg.ticker.file_name)
 
-    ticker = await DavFile(
+    ticker = await WebDAV.read_str(f"{await text_lister.remote_path}/{file_name}")
-        f"{await text_lister.remote_path}/{file_name}",
-    ).as_string
 
     return (line.strip() for line in ticker.split("\n") if line.strip())
 
@@ -48,7 +46,7 @@ async def get_ticker_lines() -> Iterator[str]:
 async def get_ticker_content_lines(
     ticker_lines: Iterator[str] = Depends(get_ticker_lines),
 ) -> Iterator[str]:
-    cfg = await Config.get()
+    cfg = await get_config()
 
     return (
         line for line in ticker_lines if not line.startswith(cfg.ticker.comment_marker)
@@ -62,7 +60,7 @@ async def get_ticker_content(
     if len(ticker_content_padded) == 2:
         return ""
 
-    cfg = await Config.get()
+    cfg = await get_config()
     ticker_content = cfg.ticker.separator.join(
         ticker_content_padded,
     )
@@ -89,6 +87,6 @@ async def get_raw_ticker(
     response_model=TickerUIConfig,
 )
 async def get_ui_config(
-    cfg: Config = Depends(Config.get),
+    cfg: Config = Depends(get_config),
 ) -> TickerUIConfig:
     return cfg.ticker