mirror of
https://github.com/YunoHost/apps.git
synced 2024-09-03 20:06:07 +02:00
Moar preparations for packaging v2 apps in catalog
This commit is contained in:
parent
3df7f1d480
commit
d8dded5b7b
1 changed files with 16 additions and 9 deletions
|
@ -172,9 +172,13 @@ def build_catalog():
|
||||||
|
|
||||||
result_dict[app_dict["id"]] = app_dict
|
result_dict[app_dict["id"]] = app_dict
|
||||||
|
|
||||||
#####################
|
#############################
|
||||||
# Current version 2 #
|
# Current catalog API v2 #
|
||||||
#####################
|
#############################
|
||||||
|
|
||||||
|
result_dict_with_manifest_v1 = copy.deepcopy(result_dict)
|
||||||
|
result_dict_with_manifest_v1 = {name: infos for name, infos in result_dict_with_manifest_v1.items() if float(str(infos["manifest"].get("packaging_format", "")).strip() or "0") < 2}
|
||||||
|
|
||||||
categories = yaml.load(open("categories.yml").read())
|
categories = yaml.load(open("categories.yml").read())
|
||||||
antifeatures = yaml.load(open("antifeatures.yml").read())
|
antifeatures = yaml.load(open("antifeatures.yml").read())
|
||||||
os.system("mkdir -p ./builds/default/v2/")
|
os.system("mkdir -p ./builds/default/v2/")
|
||||||
|
@ -182,7 +186,7 @@ def build_catalog():
|
||||||
f.write(
|
f.write(
|
||||||
json.dumps(
|
json.dumps(
|
||||||
{
|
{
|
||||||
"apps": result_dict,
|
"apps": result_dict_with_manifest_v1,
|
||||||
"categories": categories,
|
"categories": categories,
|
||||||
"antifeatures": antifeatures,
|
"antifeatures": antifeatures,
|
||||||
},
|
},
|
||||||
|
@ -190,12 +194,14 @@ def build_catalog():
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
###################################
|
#############################################
|
||||||
# Catalog API v3 with manifest v2 #
|
# Catalog catalog API v3 (with manifest v2) #
|
||||||
###################################
|
#############################################
|
||||||
|
|
||||||
result_dict_with_manifest_v2 = copy.deepcopy(result_dict)
|
result_dict_with_manifest_v2 = copy.deepcopy(result_dict)
|
||||||
for app in result_dict_with_manifest_v2.values():
|
for app in result_dict_with_manifest_v2.values():
|
||||||
|
packaging_format = float(str(app["manifest"].get("packaging_format", "")).strip() or "0")
|
||||||
|
if packaging_format < 2:
|
||||||
app["manifest"] = convert_v1_manifest_to_v2_for_catalog(app["manifest"])
|
app["manifest"] = convert_v1_manifest_to_v2_for_catalog(app["manifest"])
|
||||||
|
|
||||||
os.system("mkdir -p ./builds/default/v3/")
|
os.system("mkdir -p ./builds/default/v3/")
|
||||||
|
@ -238,7 +244,7 @@ def build_catalog():
|
||||||
result_dict_doc = {
|
result_dict_doc = {
|
||||||
k: infos_for_doc_catalog(v)
|
k: infos_for_doc_catalog(v)
|
||||||
for k, v in result_dict.items()
|
for k, v in result_dict.items()
|
||||||
if v["state"] in ["working", "validated"]
|
if v["state"] == "working"
|
||||||
}
|
}
|
||||||
with open("builds/default/doc_catalog/apps.json", "w") as f:
|
with open("builds/default/doc_catalog/apps.json", "w") as f:
|
||||||
f.write(
|
f.write(
|
||||||
|
@ -261,6 +267,7 @@ def build_app_dict(app, infos):
|
||||||
if infos["revision"] == "HEAD":
|
if infos["revision"] == "HEAD":
|
||||||
relevant_files = [
|
relevant_files = [
|
||||||
"manifest.json",
|
"manifest.json",
|
||||||
|
"manifest.toml",
|
||||||
"config_panel.toml",
|
"config_panel.toml",
|
||||||
"hooks/",
|
"hooks/",
|
||||||
"scripts/",
|
"scripts/",
|
||||||
|
|
Loading…
Add table
Reference in a new issue