From c770b5f821925e444f2d90f9b13b8da06d492ee0 Mon Sep 17 00:00:00 2001 From: SinTan1729 Date: Mon, 28 Aug 2023 14:14:56 -0500 Subject: [PATCH] fix: No need to get best version when already available locally --- src/ReVancedBuilder/APKPure_dl.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/ReVancedBuilder/APKPure_dl.py b/src/ReVancedBuilder/APKPure_dl.py index 77c338d..78cc61a 100644 --- a/src/ReVancedBuilder/APKPure_dl.py +++ b/src/ReVancedBuilder/APKPure_dl.py @@ -37,16 +37,6 @@ def apkpure_dl(apk, appname, version, hard_version, session, present_vers, flag) res.raise_for_status() soup = bs(res.text, 'html.parser') - if not hard_version: - apkpure_version = apkpure_best_match(version, soup) - if version != apkpure_version: - print(f"Required version {version} not found in APKPure, choosing version {apkpure_version} instead.") - version=apkpure_version - - if flag == 'checkonly' and present_vers[apk] != version: - print(f"{apk} has an update ({present_vers[apk]} -> {version})") - return - try: if present_vers[apk] == version and flag != 'force' and os.path.isfile(apk+'.apk'): print( @@ -54,6 +44,17 @@ def apkpure_dl(apk, appname, version, hard_version, session, present_vers, flag) return except KeyError: pass + + if not hard_version: + apkpure_version = apkpure_best_match(version, soup) + if version not in [apkpure_version, '0']: + print(f"Required version {version} not found in APKPure, choosing version {apkpure_version} instead.") + version=apkpure_version + + if flag == 'checkonly' and present_vers[apk] != version: + print(f"{apk} has an update ({present_vers[apk]} -> {version})") + return + print(f" Downloading {apk} version {version}...") # Get the version code