From 8027e9268373410cb11989cf21c6e37624742471 Mon Sep 17 00:00:00 2001
From: Laurent Peuch <cortex@worlddomination.be>
Date: Tue, 4 Jun 2019 19:47:16 +0200
Subject: [PATCH] [mod] using yunohost format for config-panel arguments

---
 src/yunohost/app.py | 56 ++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 38f62d51d..a200ecae1 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -1635,24 +1635,28 @@ def app_config_show_panel(app):
         for section in tab.get("sections", []):
             section_id = section["id"]
             for option in section.get("options", []):
-                option_id = option["id"]
-                generated_id = ("YNH_CONFIG_%s_%s_%s" % (tab_id, section_id, option_id)).upper()
-                option["id"] = generated_id
-                logger.debug(" * '%s'.'%s'.'%s' -> %s", tab.get("name"), section.get("name"), option.get("name"), generated_id)
+                option_name = option["name"]
+                generated_name = ("YNH_CONFIG_%s_%s_%s" % (tab_id, section_id, option_name)).upper()
+                option["name"] = generated_name
+                logger.debug(" * '%s'.'%s'.'%s' -> %s", tab.get("name"), section.get("name"), option.get("name"), generated_name)
 
-                if generated_id in parsed_values:
-                    # XXX we should probably uses the one of install here but it's at a POC state right now
-                    option_type = option["type"]
-                    if option_type == "bool":
-                        assert parsed_values[generated_id].lower() in ("true", "false")
-                        option["value"] = True if parsed_values[generated_id].lower() == "true" else False
-                    elif option_type == "integer":
-                        option["value"] = int(parsed_values[generated_id])
-                    elif option_type == "text":
-                        option["value"] = parsed_values[generated_id]
+                if generated_name in parsed_values:
+                    # code is not adapted for that so we have to mock expected format :/
+                    if option.get("type") == "boolean":
+                        if parsed_values[generated_name].lower() in ("true", "1", "y"):
+                            option["default"] = parsed_values[generated_name]
+                        else:
+                            del option["default"]
+
+                    args_dict = _parse_args_in_yunohost_format(
+                        [{option["name"]: parsed_values[generated_name]}],
+                        [option]
+                    )
+                    print("%s ----> %s ----> %s" % (option["name"], repr(option.get("default", "[removed -> false]")), args_dict[option["name"]]))
+                    option["default"] = args_dict[option["name"]]
                 else:
-                    logger.debug("Variable '%s' is not declared by config script, using default", generated_id)
-                    option["value"] = option["default"]
+                    logger.debug("Variable '%s' is not declared by config script, using default", generated_name)
+                    option["default"] = option["default"]
 
     return {
         "app_id": app_id,
@@ -1685,26 +1689,29 @@ def app_config_apply(app, args):
         "YNH_APP_INSTANCE_NUMBER": str(app_instance_nb),
     }
     args = dict(urlparse.parse_qsl(args, keep_blank_values=True)) if args else {}
+    print(json.dumps(args, sort_keys=True, indent=4))
+    print("------------------------------------------")
 
     for tab in config_panel.get("panel", []):
         tab_id = tab["id"]  # this makes things easier to debug on crash
         for section in tab.get("sections", []):
             section_id = section["id"]
             for option in section.get("options", []):
-                option_id = option["id"]
-                generated_id = ("YNH_CONFIG_%s_%s_%s" % (tab_id, section_id, option_id)).upper()
+                option_name = option["name"]
+                generated_name = ("YNH_CONFIG_%s_%s_%s" % (tab_id, section_id, option_name)).upper()
 
-                if generated_id in args:
-                    logger.debug("include into env %s=%s", generated_id, args[generated_id])
-                    env[generated_id] = args[generated_id]
+                if generated_name in args:
+                    logger.debug("include into env %s=%s", generated_name, args[generated_name])
+                    env[generated_name] = args[generated_name]
                 else:
-                    logger.debug("no value for key id %s", generated_id)
+                    logger.debug("no value for key id %s", generated_name)
 
     # for debug purpose
     for key in args:
         if key not in env:
             logger.warning("Ignore key '%s' from arguments because it is not in the config", key)
 
+    print(json.dumps(env, sort_keys=True, indent=4))
     return_code = hook_exec(config_script,
                             args=["apply"],
                             env=env,
@@ -1824,7 +1831,10 @@ def _get_app_config_panel(app_id):
 
                 for option_key, option_value in options:
                     option = dict(option_value)
-                    option["id"] = option_key
+                    option["name"] = option_key
+                    option["ask"] = {"en": option["ask"]}
+                    if "help" in option:
+                        option["help"] = {"en": option["help"]}
                     section["options"].append(option)
 
                 panel["sections"].append(section)