SinTan1729/ReVancedBuilder
1
0
Fork 0
mirror of https://github.com/SinTan1729/ReVancedBuilder.git synced 2024-12-26 12:48:36 -06:00
Code Issues Projects Releases Packages Wiki Activity

fix: Work around packaging.version changing the version string slightly

Browse source
This commit is contained in:
Sayantan Santra 2024-04-01 17:52:51 -05:00
parent f4cd430e9d
commit 2934f8b0f7
Signed by: SinTan1729
GPG key ID: EB3E68BFBA25C85F
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/ReVancedBuilder/APKPure_dl.py
View file

@ -16,22 +16,24 @@ from ReVancedBuilder.Cleanup import err_exit
def apkpure_best_match(version, soup): def apkpure_best_match(version, soup):
try: try:
vers_list = [Version(x['data-dt-version']) vers_list_str = [x['data-dt-version'] for x in soup.css.select(f"a[data-dt-apkid^=\"b/APK/\"]")]
for x in soup.css.select(f"a[data-dt-apkid^=\"b/APK/\"]")]
except: except:
err_exit( err_exit(
f" There was some error getting list of versions of {apk}...", appstate) f" There was some error getting list of versions of {apk}...", appstate)
vers_list = map(lambda x: Version(x), vers_list_str)
if version != '0': if version != '0':
vers_list = filter(lambda x: x <= Version(version), vers_list) vers_list = filter(lambda x: x <= Version(version), vers_list)
return str(max(vers_list)) max_ver = max(vers_list)
return next(filter(lambda x: Version(x) == max_ver, vers_list_str))
# Download an apk from apkpure.net # Download an apk from apkpure.net
def apkpure_dl(apk, appname, version, hard_version, session, present_vers, flag): def apkpure_dl(apk, appname, version, hard_version, session, present_vers, flag):
res = session.get(f"https://apkpure.net/{appname}/{apk}/versions") res = session.get(f"https://apkpure.com/{appname}/{apk}/versions")
res.raise_for_status() res.raise_for_status()
soup = bs(res.text, 'html.parser') soup = bs(res.text, 'html.parser')
@ -72,7 +74,7 @@ def apkpure_dl(apk, appname, version, hard_version, session, present_vers, flag)
f" There was some error while downloading {apk}...", appname) f" There was some error while downloading {apk}...", appname)
res = session.get( res = session.get(
f"https://d.apkpure.net/b/APK/{apk}?versionCode={ver_code}", stream=True) f"https://d.apkpure.com/b/APK/{apk}?versionCode={ver_code}", stream=True)
res.raise_for_status() res.raise_for_status()
with open(apk+'.apk', 'wb') as f: with open(apk+'.apk', 'wb') as f:
for chunk in res.iter_content(chunk_size=8192): for chunk in res.iter_content(chunk_size=8192):
@ -115,7 +117,6 @@ def get_apks(appstate):
print(f"Checking {pretty_name}...") print(f"Checking {pretty_name}...")
try: try:
required_ver = build_config[app]['version'] required_ver = build_config[app]['version']
required_ver = Version(required_ver)
hard_version = True hard_version = True
print(f"Using version {required_ver} of {apk} from build_config.") print(f"Using version {required_ver} of {apk} from build_config.")
except: except:
@ -134,15 +135,17 @@ def get_apks(appstate):
required_ver = Version('0') required_ver = Version('0')
else: else:
required_ver = min(map(lambda x: Version(x), compatible_vers)) required_ver = min(map(lambda x: Version(x), compatible_vers))
required_ver = next(filter(lambda x: Version(x) == required_ver, compatible_vers))
print(f"Chosen required version of {apk} is {required_ver}.") print(f"Chosen required version of {apk} is {required_ver}.")
if appstate['present_vers'][apk] == str(required_ver): if appstate['present_vers'][apk] == required_ver:
print("It's already present on disk, so skipping download.") print("It's already present on disk, so skipping download.")
else: else:
apkpure_dl(apk, apkpure_appname, str(required_ver), apkpure_dl(apk, apkpure_appname, required_ver,
hard_version, session, present_vers, flag) hard_version, session, present_vers, flag)
present_vers.update({apk: str(required_ver)}) present_vers.update({apk: required_ver})
appstate['present_vers'] = present_vers appstate['present_vers'] = present_vers
return appstate return appstate