coop-cloud/abra-bash
coop-cloud
/
abra-bash
5
0
Fork 3
Code Pull Requests Releases Activity

fix: fix cached versions lookup logic
continuous-integration/drone/push Build is failing Details

This commit is contained in:
decentral1se 2021-09-06 17:25:31 +02:00
parent 32b11c9bee
commit 4529c05d2b
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/app-json.py
View File

@ -139,6 +139,11 @@ def get_app_metadata(app_path):
return metadata
def get_cached_versions(cached_apps_json, app_name):
versions = cached_apps_json[app_name]["versions"]
return [list(k)[0] for k in [version.keys() for version in versions]]
def get_app_versions(app_path, cached_apps_json):
versions = []
@ -155,7 +160,7 @@ def get_app_versions(app_path, cached_apps_json):
app_name = basename(app_path)
try:
existing_tags = cached_apps_json[app_name]["versions"].keys()
existing_tags = get_cached_versions(cached_apps_json, app_name)
except KeyError:
existing_tags = []
@ -171,9 +176,8 @@ def get_app_versions(app_path, cached_apps_json):
if service in ("null", "---"):
continue
if (
tag in existing_tags
and service in cached_apps_json[app_name]["versions"][tag]
if tag in existing_tags and service in get_cached_versions(
cached_apps_json, app_name
):
log.info(f"Skipping {tag} because we've already processed it")
existing_versions = cached_apps_json[app_name]["versions"][tag][service]
@ -220,7 +224,7 @@ def main():
skopeo_login()
repos_json = get_repos_json()
clone_all_apps(repos_json)
# clone_all_apps(repos_json)
with open(args.output, "w", encoding="utf-8") as handle:
dump(