From b7761a61614cc2084651902b99cdd66e1a7654be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C4=8Cavoj?= Date: Fri, 11 Sep 2020 23:43:07 +0200 Subject: [PATCH] mod: ftb: Remove Neptune API logic used for pack slug resolution --- picomc/mod/ftb.py | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/picomc/mod/ftb.py b/picomc/mod/ftb.py index c05cfab..c94f557 100644 --- a/picomc/mod/ftb.py +++ b/picomc/mod/ftb.py @@ -14,8 +14,6 @@ MODPACK_URL = BASE_URL + "public/modpack/{}" VERSION_URL = MODPACK_URL + "/{}" -NEPTUNE_URL = "https://meta.ftb.neptunepowered.org/pack/{}/" - class FTBError(Exception): pass @@ -25,10 +23,6 @@ class InvalidVersionError(FTBError): pass -class InvalidPackSlugError(FTBError): - pass - - class APIError(FTBError): pass @@ -51,22 +45,15 @@ def get_version_manifest(pack_id, version_id): return j -def resolve_packid(pack): - pack = pack.replace("_", "-") - resp = requests.get(NEPTUNE_URL.format(pack)) - if resp.status_code == 404: - raise InvalidPackSlugError(pack) - resp.raise_for_status() - return resp.json()["id"] - - def resolve_pack_meta(pack: str, pack_version=None, use_beta=False): if pack.isascii() and pack.isdecimal(): # We got pack ID pack_id = int(pack) else: # We got pack slug - pack_id = resolve_packid(pack) + raise NotImplementedError( + "Pack slug resolution is currently not available. Please use the numerical pack ID." + ) pack_manifest = get_pack_manifest(pack_id) @@ -89,7 +76,10 @@ def filt(v): def install(pack_id, version, launcher, im, instance_name, use_beta): - pack_manifest, version_manifest = resolve_pack_meta(pack_id, version, use_beta) + try: + pack_manifest, version_manifest = resolve_pack_meta(pack_id, version, use_beta) + except NotImplementedError as ex: + die(ex) pack_name = pack_manifest["name"] pack_version = version_manifest["name"]