diff --git a/bin/app-json.py b/bin/app-json.py index 3942da0..cbec547 100755 --- a/bin/app-json.py +++ b/bin/app-json.py @@ -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(