feat: bundle asset images with repo

app/utils.py

@@ -22,87 +22,16 @@
 
 
 DATA_PATH = Path.cwd() / ".data"
-ACHIEVEMENTS_ASSETS_PATH = DATA_PATH / "assets/medals/client"
-DEFAULT_AVATAR_PATH = DATA_PATH / "avatars/default.jpg"
+ASSETS_PATH = Path.cwd() / "assets"
+ACHIEVEMENTS_ASSETS_PATH = ASSETS_PATH / "medals"
+DEFAULT_AVATAR_PATH = ASSETS_PATH / "default_avatar.jpg"
 
 
 def make_safe_name(name: str) -> str:
     """Return a name safe for usage in sql."""
     return name.lower().replace(" ", "_")
 
 
-def _download_achievement_images_osu(achievements_path: Path) -> bool:
-    """Download all used achievement images (one by one, from osu!)."""
-    achs: list[str] = []
-
-    for resolution in ("", "@2x"):
-        for mode in ("osu", "taiko", "fruits", "mania"):
-            # only osu!std has 9 & 10 star pass/fc medals.
-            for star_rating in range(1, 1 + (10 if mode == "osu" else 8)):
-                achs.append(f"{mode}-skill-pass-{star_rating}{resolution}.png")
-                achs.append(f"{mode}-skill-fc-{star_rating}{resolution}.png")
-
-        for combo in (500, 750, 1000, 2000):
-            achs.append(f"osu-combo-{combo}{resolution}.png")
-
-        for mod in (
-            "suddendeath",
-            "hidden",
-            "perfect",
-            "hardrock",
-            "doubletime",
-            "flashlight",
-            "easy",
-            "nofail",
-            "nightcore",
-            "halftime",
-            "spunout",
-        ):
-            achs.append(f"all-intro-{mod}{resolution}.png")
-
-    log("Downloading achievement images from osu!.", Ansi.LCYAN)
-
-    for ach in achs:
-        resp = httpx.get(f"https://assets.ppy.sh/medals/client/{ach}")
-        if resp.status_code != 200:
-            return False
-
-        log(f"Saving achievement: {ach}", Ansi.LCYAN)
-        (achievements_path / ach).write_bytes(resp.content)
-
-    return True
-
-
-def download_achievement_images(achievements_path: Path) -> None:
-    """Download all used achievement images (using the best available source)."""
-
-    # download individual files from the official osu! servers
-    downloaded = _download_achievement_images_osu(achievements_path)
-
-    if downloaded:
-        log("Downloaded all achievement images.", Ansi.LGREEN)
-    else:
-        # TODO: make the code safe in this state
-        log("Failed to download achievement images.", Ansi.LRED)
-        achievements_path.rmdir()
-
-        # allow passthrough (don't hard crash).
-        # the server will *mostly* work in this state.
-        pass
-
-
-def download_default_avatar(default_avatar_path: Path) -> None:
-    """Download an avatar to use as the server's default."""
-    resp = httpx.get("https://i.cmyui.xyz/U24XBZw-4wjVME-JaEz3.png")
-
-    if resp.status_code != 200:
-        log("Failed to fetch default avatar.", Ansi.LRED)
-        return
-
-    log("Downloaded default avatar.", Ansi.LGREEN)
-    default_avatar_path.write_bytes(resp.content)
-
-
 def has_internet_connectivity(timeout: float = 1.0) -> bool:
     """Check for an active internet connection."""
     COMMON_DNS_SERVERS = (
@@ -187,15 +116,6 @@ def ensure_persistent_volumes_are_available() -> None:
         subdir = DATA_PATH / sub_dir
         subdir.mkdir(exist_ok=True)
 
-    # download achievement images from osu!
-    if not ACHIEVEMENTS_ASSETS_PATH.exists():
-        ACHIEVEMENTS_ASSETS_PATH.mkdir(parents=True)
-        download_achievement_images(ACHIEVEMENTS_ASSETS_PATH)
-
-    # download a default avatar image for new users
-    if not DEFAULT_AVATAR_PATH.exists():
-        download_default_avatar(DEFAULT_AVATAR_PATH)
-
 
 def is_running_as_admin() -> bool:
     try:

tests/conftest.py

@@ -18,26 +18,6 @@
 # (We do not need an asynchronous http client for our tests)
 
 
-@pytest.fixture(autouse=True)
-def mock_out_initial_image_downloads(respx_mock: respx.MockRouter) -> None:
-    # mock out default avatar download
-    respx_mock.get("https://i.cmyui.xyz/U24XBZw-4wjVME-JaEz3.png").mock(
-        return_value=httpx.Response(
-            status_code=status.HTTP_200_OK,
-            headers={"Content-Type": "image/png"},
-            content=b"i am a png file",
-        ),
-    )
-    # mock out achievement image downloads
-    respx_mock.get(url__regex=r"https://assets.ppy.sh/medals/client/.+").mock(
-        return_value=httpx.Response(
-            status_code=status.HTTP_200_OK,
-            headers={"Content-Type": "image/png"},
-            content=b"i am a png file",
-        ),
-    )
-
-
 @pytest.fixture
 async def app() -> AsyncIterator[ASGIApp]:
     async with LifespanManager(