YunoHost/yunodevtools
1
0
Fork 0
mirror of https://github.com/YunoHost/yunodevtools.git synced 2024-09-03 20:16:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve + python3 support

Browse source
This commit is contained in:
Kay0u 2019-12-18 21:21:19 +08:00
parent 9fd1a224f8
commit ab5ad2c1dc
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
list_builder.py
View file

@ -55,13 +55,13 @@ def include_translations_in_manifest(app_name, manifest):
key = "%s_manifest_arguments_%s_%s" % (app_name, category, question["name"]) key = "%s_manifest_arguments_%s_%s" % (app_name, category, question["name"])
# don't overwrite already existing translation in manifests for now # don't overwrite already existing translation in manifests for now
if key in translations and translations[key] and not current_lang not in question["ask"]: if key in translations and translations[key] and not current_lang not in question["ask"]:
print "[ask]", current_lang, key print("[ask]", current_lang, key)
question["ask"][current_lang] = translations[key] question["ask"][current_lang] = translations[key]
key = "%s_manifest_arguments_%s_help_%s" % (app_name, category, question["name"]) key = "%s_manifest_arguments_%s_help_%s" % (app_name, category, question["name"])
# don't overwrite already existing translation in manifests for now # don't overwrite already existing translation in manifests for now
if key in translations and translations[key] and not current_lang not in question.get("help", []): if key in translations and translations[key] and not current_lang not in question.get("help", []):
print "[help]", current_lang, key print("[help]", current_lang, key)
question["help"][current_lang] = translations[key] question["help"][current_lang] = translations[key]
return manifest return manifest
@ -183,24 +183,22 @@ for app, info in apps_list.items():
previous_high_quality = already_built_file.get(app, {}).get("high_quality") previous_high_quality = already_built_file.get(app, {}).get("high_quality")
if app_rev == "HEAD": if app_rev == "HEAD":
app_rev = subprocess.check_output(["git", "ls-remote", app_url, "refs/heads/"+app_branch]).split()[0] app_rev = subprocess.check_output(["git", "ls-remote", app_url, "refs/heads/"+app_branch]).split()[0].decode('utf-8')
if not re.match(r"^[0-9a-f]+$", app_rev): if not re.match(r"^[0-9a-f]+$", app_rev):
error("Revision for %s did not match expected regex" % app) error("Revision for %s did not match expected regex" % app)
continue continue
if previous_rev is None: if previous_rev is None:
previous_rev = 'HEAD' previous_rev = app_rev
# If this is a github repo, we are able to optimize things a bit by looking at the diff # If this is a github repo, we are able to optimize things a bit by looking at the diff
# and not actually updating the app if only README or other not-so-important files were edited # and not actually updating the app if only README or other not-so-important files were edited
if previous_rev != app_rev and forge_type == "github": if previous_rev != app_rev and forge_type == "github":
url = "https://api.github.com/repos/{}/{}/compare/{}...{}".format(owner, repo, previous_rev, app_branch) url = "https://api.github.com/repos/{}/{}/compare/{}...{}".format(owner, repo, previous_rev, app_rev)
diff = get_json(url) diff = get_json(url)
if not diff or not diff["commits"]: if diff and diff["commits"]:
app_rev = previous_rev if previous_rev != 'HEAD' else app_rev
else:
# Only if those files got updated, do we want to update the # Only if those files got updated, do we want to update the
# commit (otherwise that would trigger an unecessary upgrade) # commit (otherwise that would trigger an unecessary upgrade)
ignore_files = [ "README.md", "LICENSE", ".gitignore", "check_process", ".travis.yml" ] ignore_files = [ "README.md", "LICENSE", ".gitignore", "check_process", ".travis.yml" ]
@ -211,12 +209,12 @@ for app, info in apps_list.items():
app_rev = diff["commits"][-1]["sha"] app_rev = diff["commits"][-1]["sha"]
else: else:
print("This app points to HEAD but no significant changes where found compared to HEAD, so keeping the previous commit") print("This app points to HEAD but no significant changes where found compared to HEAD, so keeping the previous commit")
app_rev = previous_rev if previous_rev != 'HEAD' else app_rev app_rev = previous_rev
print("Previous commit : %s" % previous_rev) print("Previous commit : %s" % previous_rev)
print("Current commit : %s" % app_rev) print("Current commit : %s" % app_rev)
if previous_rev == app_rev and previous_url == app_url: if previous_rev == app_rev and previous_url == app_url and app in already_built_file:
print("Already up to date, ignoring") print("Already up to date, ignoring")
result_dict[app] = already_built_file[app] result_dict[app] = already_built_file[app]
if previous_state != app_state: if previous_state != app_state:
@ -235,7 +233,7 @@ for app, info in apps_list.items():
result_dict[app]["high_quality"] = app_high_quality result_dict[app]["high_quality"] = app_high_quality
print("... but high_quality status changed, updating it from '%s' to '%s'" % (previous_high_quality, app_high_quality)) print("... but high_quality status changed, updating it from '%s' to '%s'" % (previous_high_quality, app_high_quality))
print "update translations but don't download anything" print("update translations but don't download anything")
result_dict[app]['manifest'] = include_translations_in_manifest(app, result_dict[app]['manifest']) result_dict[app]['manifest'] = include_translations_in_manifest(app, result_dict[app]['manifest'])
continue continue