Skip to content

Commit

Permalink
Ripple and gatari mirrors (#2)
Browse files Browse the repository at this point in the history
* add nerinyan mirror

* Add ripple and gatari mirrors, shuffle mirrors before running

* disable ripple

* add names
  • Loading branch information
cmyui authored Jun 22, 2024
1 parent 3079909 commit 1404095
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 0 deletions.
23 changes: 23 additions & 0 deletions app/adapters/beatmap_mirrors/gatari.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import logging

from app.adapters.beatmap_mirrors import BeatmapMirror


class GatariMirror(BeatmapMirror):
name = "gatari"
base_url = "https://osu.gatari.pw"

async def fetch_beatmap_zip_data(self, beatmapset_id: int) -> bytes | None:
try:
logging.info(f"Fetching beatmapset osz2 from gatari: {beatmapset_id}")
response = await self.http_client.get(
f"{self.base_url}/d/{beatmapset_id}",
)
response.raise_for_status()
return response.read()
except Exception:
logging.warning(
"Failed to fetch beatmap from gatari.pw",
exc_info=True,
)
return None
9 changes: 9 additions & 0 deletions app/adapters/beatmap_mirrors/mirror_aggregate.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
import asyncio
import logging
import random
import time

from app.adapters.beatmap_mirrors import BeatmapMirror
from app.adapters.beatmap_mirrors.gatari import GatariMirror
from app.adapters.beatmap_mirrors.mino import MinoMirror
from app.adapters.beatmap_mirrors.nerinyan import NerinyanMirror
from app.adapters.beatmap_mirrors.osu_direct import OsuDirectMirror
from app.adapters.beatmap_mirrors.ripple import RippleMirror

BEATMAP_MIRRORS: list[BeatmapMirror] = [
GatariMirror(),
MinoMirror(),
NerinyanMirror(),
OsuDirectMirror(),
# Disabled as ripple only supports ranked maps
# RippleMirror(),
]


Expand Down Expand Up @@ -47,6 +53,9 @@ async def fetch_beatmap_zip_data(beatmapset_id: int) -> bytes | TimedOut | None:

start_time = time.time()

# TODO: prioritization based on reliability, speed, etc.
random.shuffle(BEATMAP_MIRRORS)

coroutines = [
asyncio.create_task(
run_with_semaphore(
Expand Down
23 changes: 23 additions & 0 deletions app/adapters/beatmap_mirrors/ripple.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import logging

from app.adapters.beatmap_mirrors import BeatmapMirror


class RippleMirror(BeatmapMirror):
name = "ripple"
base_url = "https://storage.ripple.moe"

async def fetch_beatmap_zip_data(self, beatmapset_id: int) -> bytes | None:
try:
logging.info(f"Fetching beatmapset osz2 from ripple: {beatmapset_id}")
response = await self.http_client.get(
f"{self.base_url}/d/{beatmapset_id}",
)
response.raise_for_status()
return response.read()
except Exception:
logging.warning(
"Failed to fetch beatmap from ripple.moe",
exc_info=True,
)
return None

0 comments on commit 1404095

Please sign in to comment.