api/advent22_api/core/depends.py

@@ -100,33 +100,21 @@ async def get_all_auto_image_names(
     return dict(zip(days, rnd.shuffled(ls)))
 
 
-async def get_all_manual_image_names(
-    manual_image_names: list[str] = Depends(list_images_manual),
-) -> dict[int, str]:
-    """
-    Bilder: "manual" zuordnen
-    """
-
-    num_re = re.compile(r"/(\d+)\.", flags=re.IGNORECASE)
-    return {
-        int(num_match.group(1)): name
-        for name in manual_image_names
-        if (num_match := num_re.search(name)) is not None
-    }
-
-
 async def get_all_image_names(
     auto_image_names: dict[int, str] = Depends(get_all_auto_image_names),
-    manual_image_names: dict[int, str] = Depends(get_all_manual_image_names),
+    manual_image_names: list[str] = Depends(list_images_manual),
 ) -> dict[int, str]:
     """
     Bilder "auto" und "manual" zu Tagen zuordnen
     """
 
-    result = auto_image_names.copy()
-    result.update(manual_image_names)
+    num_re = re.compile(r"/(\d+)\.", flags=re.IGNORECASE)
 
-    return result
+    for name in manual_image_names:
+        assert (num_match := num_re.search(name)) is not None
+        auto_image_names[int(num_match.group(1))] = name
+
+    return auto_image_names
 
 
 @dataclass(slots=True, frozen=True)
@@ -196,7 +184,6 @@ async def get_day_image(
     day: int,
     days: list[int] = Depends(get_all_sorted_days),
     cfg: Config = Depends(get_config),
-    manual_image_names: dict[int, str] = Depends(get_all_manual_image_names),
     auto_image_names: dict[int, str] = Depends(get_all_auto_image_names),
     day_parts: dict[int, str] = Depends(get_all_parts),
     ttfonts: list[TTFont] = Depends(get_all_ttfonts),
@@ -209,14 +196,14 @@ async def get_day_image(
         return None
 
     try:
-        # Versuche "manual"-Bild zu laden
-        img = await load_image(manual_image_names[day])
+        # Versuche, aus "manual"-Ordner zu laden
+        img = await load_image(f"images_manual/{day}.jpg")
 
         # Als AdventImage verarbeiten
         image = await AdventImage.from_img(img, cfg)
         return image.img
 
-    except (KeyError, RuntimeError):
+    except RuntimeError:
         # Erstelle automatisch generiertes Bild
         return await gen_day_auto_image(
             day=day,

ui/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve --host 0.0.0.0 --port 8080",
+    "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "test:unit-watch": "vue-cli-service test:unit --watch",