From fcd2ef9d2086fe12c95a2ca958cd086c98a1eff3 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sun, 24 Oct 2021 18:16:21 +0200
Subject: [PATCH] [enh] helpers: allow to get/set/delete app settings without
 explicitly passing app id everytime...

---
 data/helpers.d/setting                   |  6 +++++
 tests/test_helpers.d/ynhtest_settings.sh | 29 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 tests/test_helpers.d/ynhtest_settings.sh

diff --git a/data/helpers.d/setting b/data/helpers.d/setting
index cd231c6ba..a2cf3a93d 100644
--- a/data/helpers.d/setting
+++ b/data/helpers.d/setting
@@ -8,6 +8,7 @@
 #
 # Requires YunoHost version 2.2.4 or higher.
 ynh_app_setting_get() {
+    local _globalapp=${app-:}
     # Declare an array to define the options of this helper.
     local legacy_args=ak
     local -A args_array=([a]=app= [k]=key=)
@@ -15,6 +16,7 @@ ynh_app_setting_get() {
     local key
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
+    app="${app:-$_globalapp}"
 
     if [[ $key =~ (unprotected|protected|skipped)_ ]]; then
         yunohost app setting $app $key
@@ -32,6 +34,7 @@ ynh_app_setting_get() {
 #
 # Requires YunoHost version 2.2.4 or higher.
 ynh_app_setting_set() {
+    local _globalapp=${app-:}
     # Declare an array to define the options of this helper.
     local legacy_args=akv
     local -A args_array=([a]=app= [k]=key= [v]=value=)
@@ -40,6 +43,7 @@ ynh_app_setting_set() {
     local value
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
+    app="${app:-$_globalapp}"
 
     if [[ $key =~ (unprotected|protected|skipped)_ ]]; then
         yunohost app setting $app $key -v $value
@@ -56,6 +60,7 @@ ynh_app_setting_set() {
 #
 # Requires YunoHost version 2.2.4 or higher.
 ynh_app_setting_delete() {
+    local _globalapp=${app-:}
     # Declare an array to define the options of this helper.
     local legacy_args=ak
     local -A args_array=([a]=app= [k]=key=)
@@ -63,6 +68,7 @@ ynh_app_setting_delete() {
     local key
     # Manage arguments with getopts
     ynh_handle_getopts_args "$@"
+    app="${app:-$_globalapp}"
 
     if [[ "$key" =~ (unprotected|skipped|protected)_ ]]; then
         yunohost app setting $app $key -d
diff --git a/tests/test_helpers.d/ynhtest_settings.sh b/tests/test_helpers.d/ynhtest_settings.sh
new file mode 100644
index 000000000..e916c146b
--- /dev/null
+++ b/tests/test_helpers.d/ynhtest_settings.sh
@@ -0,0 +1,29 @@
+ynhtest_settings() {
+
+    test -n "$app"
+
+    mkdir -p "/etc/yunohost/apps/$app"
+    echo "label: $app" > "/etc/yunohost/apps/$app/settings.yml"
+
+    test -z "$(ynh_app_setting_get --key="foo")"
+    test -z "$(ynh_app_setting_get --key="bar")"
+    test -z "$(ynh_app_setting_get --app="$app" --key="baz")"
+
+    ynh_app_setting_set --key="foo" --value="foovalue"
+    ynh_app_setting_set --app="$app" --key="bar" --value="barvalue"
+    ynh_app_setting_set "$app" baz bazvalue
+    
+    test "$(ynh_app_setting_get --key="foo")" == "foovalue"
+    test "$(ynh_app_setting_get --key="bar")" == "barvalue"
+    test "$(ynh_app_setting_get --app="$app" --key="baz")" == "bazvalue"
+    
+    ynh_app_setting_delete --key="foo"
+    ynh_app_setting_delete --app="$app" --key="bar"
+    ynh_app_setting_delete "$app" baz
+
+    test -z "$(ynh_app_setting_get --key="foo")"
+    test -z "$(ynh_app_setting_get --key="bar")"
+    test -z "$(ynh_app_setting_get --app="$app" --key="baz")"
+
+    rm -rf "/etc/yunohost/apps/$app"
+}