From 897931daf0d56d335ed83362539511c769d5d859 Mon Sep 17 00:00:00 2001 From: Philenst <20720278+Philenst@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:38:04 +0100 Subject: [PATCH 1/2] Clean up Mino US entries --- app/adapters/osu_mirrors/__init__.py | 10 +++------- app/adapters/osu_mirrors/backends/mino.py | 15 ++------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/app/adapters/osu_mirrors/__init__.py b/app/adapters/osu_mirrors/__init__.py index c72631b..10e68b4 100644 --- a/app/adapters/osu_mirrors/__init__.py +++ b/app/adapters/osu_mirrors/__init__.py @@ -2,12 +2,10 @@ from datetime import datetime from app.adapters.osu_mirrors.backends import AbstractBeatmapMirror -from app.adapters.osu_mirrors.backends.mino import MinoBrazilMirror from app.adapters.osu_mirrors.backends.mino import MinoCentralMirror +from app.adapters.osu_mirrors.backends.mino import MinoUSMirror +from app.adapters.osu_mirrors.backends.mino import MinoBrazilMirror from app.adapters.osu_mirrors.backends.mino import MinoSingaporeMirror -from app.adapters.osu_mirrors.backends.mino import MinoUSCentralMirror -from app.adapters.osu_mirrors.backends.mino import MinoUSEastMirror -from app.adapters.osu_mirrors.backends.mino import MinoUSWestMirror from app.adapters.osu_mirrors.backends.nerinyan import NerinyanMirror from app.adapters.osu_mirrors.backends.osu_direct import OsuDirectMirror from app.adapters.osu_mirrors.selectors.dynamic_round_robin import ( @@ -20,10 +18,8 @@ BEATMAP_MIRRORS: list[AbstractBeatmapMirror] = [ MinoCentralMirror(), - MinoUSEastMirror(), - MinoUSWestMirror(), + MinoUSMirror(), MinoBrazilMirror(), - MinoUSCentralMirror(), MinoSingaporeMirror(), NerinyanMirror(), OsuDirectMirror(), diff --git a/app/adapters/osu_mirrors/backends/mino.py b/app/adapters/osu_mirrors/backends/mino.py index 807687a..38e6fb3 100644 --- a/app/adapters/osu_mirrors/backends/mino.py +++ b/app/adapters/osu_mirrors/backends/mino.py @@ -92,21 +92,10 @@ class MinoCentralMirror(MinoMirror): base_url = "https://central.catboy.best" -class MinoUSCentralMirror(MinoMirror): - name = "mino-us-central" - base_url = "https://usc.catboy.best" - - -class MinoUSEastMirror(MinoMirror): - name = "mino-us-east" - base_url = "https://use.catboy.best" - - -class MinoUSWestMirror(MinoMirror): - name = "mino-us-west" +class MinoUSMirror(MinoMirror): + name = "mino-us" base_url = "https://us.catboy.best" - class MinoSingaporeMirror(MinoMirror): name = "mino-singapore" base_url = "https://sg.catboy.best" From a684d6307a2ee00c962e00740f0590f1c08ab7f8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:20:39 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- app/adapters/osu_mirrors/__init__.py | 4 ++-- app/adapters/osu_mirrors/backends/mino.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/adapters/osu_mirrors/__init__.py b/app/adapters/osu_mirrors/__init__.py index 10e68b4..6a869b8 100644 --- a/app/adapters/osu_mirrors/__init__.py +++ b/app/adapters/osu_mirrors/__init__.py @@ -2,10 +2,10 @@ from datetime import datetime from app.adapters.osu_mirrors.backends import AbstractBeatmapMirror -from app.adapters.osu_mirrors.backends.mino import MinoCentralMirror -from app.adapters.osu_mirrors.backends.mino import MinoUSMirror from app.adapters.osu_mirrors.backends.mino import MinoBrazilMirror +from app.adapters.osu_mirrors.backends.mino import MinoCentralMirror from app.adapters.osu_mirrors.backends.mino import MinoSingaporeMirror +from app.adapters.osu_mirrors.backends.mino import MinoUSMirror from app.adapters.osu_mirrors.backends.nerinyan import NerinyanMirror from app.adapters.osu_mirrors.backends.osu_direct import OsuDirectMirror from app.adapters.osu_mirrors.selectors.dynamic_round_robin import ( diff --git a/app/adapters/osu_mirrors/backends/mino.py b/app/adapters/osu_mirrors/backends/mino.py index 38e6fb3..89f2a51 100644 --- a/app/adapters/osu_mirrors/backends/mino.py +++ b/app/adapters/osu_mirrors/backends/mino.py @@ -96,6 +96,7 @@ class MinoUSMirror(MinoMirror): name = "mino-us" base_url = "https://us.catboy.best" + class MinoSingaporeMirror(MinoMirror): name = "mino-singapore" base_url = "https://sg.catboy.best"