diff --git a/custom-catalog/apps.json b/custom-catalog/apps.json new file mode 100644 index 0000000..5d19da0 --- /dev/null +++ b/custom-catalog/apps.json @@ -0,0 +1,15 @@ +{ + "0testapp": { + "antifeatures": [ + "non-free-assets" + ], + "branch": "master", + "category": "games", + "level": 8, + "potential_alternative_to": [ + "Google Agenda", + "Microsoft Outlook" + ], + "state": "working" + } +} diff --git a/custom-catalog/catalog_list.py b/custom-catalog/catalog_list.py deleted file mode 100644 index 85b1a07..0000000 --- a/custom-catalog/catalog_list.py +++ /dev/null @@ -1,27 +0,0 @@ -import os -import yaml - -CATALOG_LIST_PATH = "/etc/yunohost/apps_catalog.yml" -assert os.path.exists(CATALOG_LIST_PATH), f"Catalog list yaml file '{CATALOG_LIST_PATH} does not exists" - - -def reset(): - with open(CATALOG_LIST_PATH, "w") as f: - catalog_list = [{"id": "default", "url": "https://app.yunohost.org/default/"}] - yaml.safe_dump(catalog_list, f, default_flow_style=False) - - -def add(): - with open(CATALOG_LIST_PATH) as f: - catalog_list = yaml.load(f, Loader=yaml.FullLoader) - ids = [catalog["id"] for catalog in catalog_list] - if "custom" not in ids: - catalog_list.append({"id": "custom", "url": None}) - with open(CATALOG_LIST_PATH, "w") as f: - yaml.safe_dump(catalog_list, f, default_flow_style=False) - - -def override(): - with open(CATALOG_LIST_PATH, "w") as f: - catalog_list = [{"id": "custom", "url": None}] - yaml.safe_dump(catalog_list, f, default_flow_style=False) diff --git a/custom-catalog/catalog_builder.py b/custom-catalog/catalog_manager.py similarity index 70% rename from custom-catalog/catalog_builder.py rename to custom-catalog/catalog_manager.py index 64d7f11..a05bbd4 100755 --- a/custom-catalog/catalog_builder.py +++ b/custom-catalog/catalog_manager.py @@ -1,19 +1,21 @@ #!/usr/bin/python3 +import sys import os import json import toml -import shutil +import yaml import time -import subprocess from collections import OrderedDict +CATALOG_LIST_PATH = "/etc/yunohost/apps_catalog.yml" +assert os.path.exists(CATALOG_LIST_PATH), f"Catalog list yaml file '{CATALOG_LIST_PATH} does not exists" now = time.time() my_env = os.environ.copy() my_env["GIT_TERMINAL_PROMPT"] = "0" -DEFAULT_APPS_FOLDER = "/ynh-dev/custom-apps/" +DEFAULT_APPS_FOLDER = "/ynh-dev/custom-catalog/" DEFAULT_APP_BRANCH = "master" @@ -27,13 +29,15 @@ def build(folder=DEFAULT_APPS_FOLDER): app_list = json.load(f) apps = {} + fail = False for app, infos in app_list.items(): app = app.lower() try: app_dict = build_app_dict(app, infos, folder) except Exception as e: - print(f"Processing {app} failed: {str(e)}") + print(f"[\033[1m\033[31mFAIL\033[00m] Processing {app} failed: {str(e)}") + fail = True continue apps[app_dict["id"]] = app_dict @@ -54,6 +58,8 @@ def build(folder=DEFAULT_APPS_FOLDER): with open(output_file, "w") as f: f.write(json.dumps(data, sort_keys=True, indent=2)) + if fail: + sys.exit(1) def build_app_dict(app, infos, folder): app_folder = os.path.join(folder, app + "_ynh") @@ -93,6 +99,22 @@ def build_app_dict(app, infos, folder): ), } +def reset(): + with open(CATALOG_LIST_PATH, "w") as f: + catalog_list = [{"id": "default", "url": "https://app.yunohost.org/default/"}] + yaml.safe_dump(catalog_list, f, default_flow_style=False) -if __name__ == "__main__": - build() + +def add(): + with open(CATALOG_LIST_PATH) as f: + catalog_list = yaml.load(f, Loader=yaml.FullLoader) + ids = [catalog["id"] for catalog in catalog_list] + if "custom" not in ids: + catalog_list.append({"id": "custom", "url": None}) + with open(CATALOG_LIST_PATH, "w") as f: + yaml.safe_dump(catalog_list, f, default_flow_style=False) + +def override(): + with open(CATALOG_LIST_PATH, "w") as f: + catalog_list = [{"id": "custom", "url": None}] + yaml.safe_dump(catalog_list, f, default_flow_style=False) diff --git a/ynh-dev b/ynh-dev index 9871bbd..dd6a184 100755 --- a/ynh-dev +++ b/ynh-dev @@ -19,7 +19,11 @@ function show_usage() { test [PKG] Deploy, update and run tests for some packages Tests for single modules and functions can ran with e.g. ./ynh-dev test yunohost/appurl:urlavailable - + catalog + build Rebuild the custom catalog + add Add the custom catalog in Yunohost catalog list + override Override default catalog with the custom catalog + reset Reset the catalog list to Yunohost's default EOF } @@ -489,7 +493,7 @@ function catalog() { assert_inside_vm local ACTION="$1" - local CUSTOM_APPS_FOLDER=${2:-"/ynh-dev/custom-apps"} + local CUSTOM_APPS_FOLDER=${2:-"/ynh-dev/custom-catalog"} local CUSTOM_CAT_PATH="${CUSTOM_APPS_FOLDER}/catalog.json" local CACHE_FOLDER="/var/cache/yunohost/repo" @@ -498,22 +502,22 @@ function catalog() case "${ACTION}" in build) info "Rebuilding custom app catalog" - python3 -c "from catalog_builder import build; build(folder='${CUSTOM_APPS_FOLDER}')" && success "Successfully build custom catalog list in '${CUSTOM_CAT_PATH}'" + python3 -c "from catalog_manager import build; build(folder='${CUSTOM_APPS_FOLDER}')" && success "Successfully build custom catalog list in '${CUSTOM_CAT_PATH}'" ;; add) info "Injecting custom catalog in YunoHost catalog list" create_sym_link "${CUSTOM_CAT_PATH}" "${CACHE_FOLDER}/custom.json" - python3 -c "from catalog_list import add; add()" && success "Custom catalog '${CUSTOM_CAT_PATH}' added to catalog list" + python3 -c "from catalog_manager import add; add()" && success "Custom catalog '${CUSTOM_CAT_PATH}' added to catalog list" ;; override) info "Overriding default catalog by custom one" create_sym_link "${CUSTOM_CAT_PATH}" "${CACHE_FOLDER}/custom.json" - python3 -c "from catalog_list import override; override()" && success "Default catalog is now overrided by '$CUSTOM_CAT_PATH'" + python3 -c "from catalog_manager import override; override()" && success "Default catalog is now overrided by '$CUSTOM_CAT_PATH'" ;; reset) info "Reseting to YunoHost default catalog list" [ -e "$CACHE_FOLDER/custom.json" ] && rm "$CACHE_FOLDER/custom.json" - python3 -c "from catalog_list import reset; reset()" || exit 1 + python3 -c "from catalog_manager import reset; reset()" || exit 1 success "Returned to default" ;; *)