Lenaisten/advent22
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dav_* naming

Browse source
This commit is contained in:
Jörn-Michael Miehe 2022-10-14 22:15:20 +00:00
parent 752c449831
commit 7fc8f8bbc5
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api/advent22_api/dav_common.py
View file

@ -13,16 +13,16 @@ _WEBDAV_CLIENT = WebDAVclient({
}) })
async def list_files(regex: re.Pattern, path: str = "") -> list[str]: async def dav_list_files(regex: re.Pattern, directory: str = "") -> list[str]:
ls = _WEBDAV_CLIENT.list(path) ls = _WEBDAV_CLIENT.list(directory)
return [ return [
path f"{directory}/{path}"
for path in ls for path in ls
if regex.search(path) if regex.search(path)
] ]
async def get_file(path: str) -> BytesIO: async def dav_get_file(path: str) -> BytesIO:
resource = _WEBDAV_CLIENT.resource(path) resource = _WEBDAV_CLIENT.resource(path)
buffer = BytesIO() buffer = BytesIO()
resource.write_to(buffer) resource.write_to(buffer)

6
api/advent22_api/routers/days.py
View file

@ -8,7 +8,7 @@ from fastapi import APIRouter, Depends
from fastapi.responses import StreamingResponse from fastapi.responses import StreamingResponse
from PIL import ImageDraw, ImageFont from PIL import ImageDraw, ImageFont
from ..dav_common import get_file, list_files from ..dav_common import dav_get_file, dav_list_files
from ._image import AdventImage from ._image import AdventImage
router = APIRouter(prefix="/days", tags=["days"]) router = APIRouter(prefix="/days", tags=["days"])
@ -75,9 +75,9 @@ async def load_image(
# Bild laden # Bild laden
rnd = random.Random(f"{loesungswort}{index}") rnd = random.Random(f"{loesungswort}{index}")
dat = rnd.choice(await list_files(_RE_IMAGE_FILE)) dat = rnd.choice(await dav_list_files(_RE_IMAGE_FILE, "/images"))
img_buffer = await get_file(dat) img_buffer = await dav_get_file(dat)
return await AdventImage.load_standard(img_buffer) return await AdventImage.load_standard(img_buffer)