Replace 'yunohost app setting' by a good old grep for more speed (close #3)

conf/ynh-piratebox

@@ -128,38 +128,19 @@ stop_fakedns() {
 
 ## Tools
 
-moulinette_get() {
-  var=${1}
-  gotcha=0
+ynh_setting_get() {
+  app=${1}
+  setting=${2}
 
-  while [ "${gotcha}" -eq 0 ]; do
-    value=$(yunohost app setting piratebox "${var}")
-
-    if [[ "${value}" =~ "An instance is already running" ]]; then
-      sleep $(($((RANDOM%5)) + 1))
-    else
-      gotcha=1
-    fi
-  done
-
-  echo "${value}"
+  grep "^${setting}:" "/etc/yunohost/apps/${app}/settings.yml" | sed s/^[^:]\\+:\\s*[\"\']\\?// | sed s/\\s*[\"\']\$//
 }
 
-moulinette_hotspot_get() {
-  var=${1}
-  gotcha=0
-
-  while [ "${gotcha}" -eq 0 ]; do
-    value=$(yunohost app setting hotspot "${var}")
-
-    if [[ "${value}" =~ "An instance is already running" ]]; then
-      sleep $(($((RANDOM%5)) + 1))
-    else
-      gotcha=1
-    fi
-  done
+ynh_setting_set() {
+  app=${1}
+  setting=${2}
+  value=${3}
 
-  echo "${value}"
+  yunohost app setting "${app}" "${setting}" -v "${value}"
 }
 
 if [ "$1" != restart ]; then
@@ -170,7 +151,7 @@ if [ "$1" != restart ]; then
     systemctl restart php5-fpm
   fi
 
-  ynh_wifi_device_id=$(moulinette_get wifi_device_id)
+  ynh_wifi_device_id=$(ynh_setting_get piratebox wifi_device_id)
 
   if [[ ! "${1}" =~ stop ]]; then
     exitcode=0
@@ -187,19 +168,19 @@ if [ "$1" != restart ]; then
 
   echo -n "Retrieving Yunohost settings... "
 
-  ynh_service_enabled=$(moulinette_get service_enabled)
-  ynh_opt_renaming=$(moulinette_get opt_renaming)
-  ynh_opt_deleting=$(moulinette_get opt_deleting)
-  ynh_opt_chat=$(moulinette_get opt_chat)
-  ynh_opt_name=$(moulinette_get opt_name)
+  ynh_service_enabled=$(ynh_setting_get piratebox service_enabled)
+  ynh_opt_renaming=$(ynh_setting_get piratebox opt_renaming)
+  ynh_opt_deleting=$(ynh_setting_get piratebox opt_deleting)
+  ynh_opt_chat=$(ynh_setting_get piratebox opt_chat)
+  ynh_opt_name=$(ynh_setting_get piratebox opt_name)
 
   if [ "${ynh_wifi_device_id}" -eq 0 ]; then
-    ynh_wifi_device="$(moulinette_hotspot_get wifi_device)"
+    ynh_wifi_device="$(ynh_setting_get hotspot wifi_device)"
   else
     ynh_wifi_device="hotspot${ynh_wifi_device_id}"
   fi
 
-  IFS='|' read -a ynh_ip4_nat_prefix <<< "$(moulinette_hotspot_get ip4_nat_prefix)"
+  IFS='|' read -a ynh_ip4_nat_prefix <<< "$(ynh_setting_get hotspot ip4_nat_prefix)"
   ynh_ip4_nat_prefix=${ynh_ip4_nat_prefix[${ynh_wifi_device_id}]}
 
   echo "OK"

sources/controller.php

@@ -18,16 +18,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-function moulinette_get($var) {
-  return htmlspecialchars(exec('sudo yunohost app setting piratebox '.escapeshellarg($var)));
-}
+function ynh_setting_get($setting, $app = 'piratebox') {
+  $value = exec("sudo grep \"^$setting:\" /etc/yunohost/apps/$app/settings.yml");
+  $value = preg_replace('/^[^:]+:\s*["\']?/', '', $value);
+  $value = preg_replace('/\s*["\']$/', '', $value);
 
-function moulinette_set($var, $value) {
-  return exec('sudo yunohost app setting piratebox '.escapeshellarg($var).' -v '.escapeshellarg($value));
+  return htmlspecialchars($value);
 }
 
-function moulinette_hotspot_get($var) {
-  return htmlspecialchars(exec('sudo yunohost app setting hotspot '.escapeshellarg($var)));
+function ynh_setting_set($setting, $value) {
+  return exec('sudo yunohost app setting piratebox '.escapeshellarg($setting).' -v '.escapeshellarg($value));
 }
 
 function stop_service() {
@@ -53,8 +53,8 @@ function service_faststatus() {
 }
 
 dispatch('/', function() {
-  $ssids = explode('|', moulinette_hotspot_get('wifi_ssid'));
-  $wifi_device_id = moulinette_get('wifi_device_id');
+  $ssids = explode('|', ynh_setting_get('wifi_ssid', 'hotspot'));
+  $wifi_device_id = ynh_setting_get('wifi_device_id');
   $wifi_ssid_list = '';
   $wifi_ssid = '';
 
@@ -70,15 +70,15 @@ dispatch('/', function() {
   }
 
   set('faststatus', service_faststatus() == 0);
-  set('service_enabled', moulinette_get('service_enabled'));
+  set('service_enabled', ynh_setting_get('service_enabled'));
   set('wifi_device_id', $wifi_device_id);
   set('wifi_ssid', $wifi_ssid);
   set('wifi_ssid_list', $wifi_ssid_list);
-  set('opt_renaming', moulinette_get('opt_renaming'));
-  set('opt_deleting', moulinette_get('opt_deleting'));
-  set('opt_chat', moulinette_get('opt_chat'));
-  set('opt_name', moulinette_get('opt_name'));
-  set('opt_domain', moulinette_get('opt_domain'));
+  set('opt_renaming', ynh_setting_get('opt_renaming'));
+  set('opt_deleting', ynh_setting_get('opt_deleting'));
+  set('opt_chat', ynh_setting_get('opt_chat'));
+  set('opt_name', ynh_setting_get('opt_name'));
+  set('opt_domain', ynh_setting_get('opt_domain'));
 
   return render('settings.html.php');
 });
@@ -106,14 +106,14 @@ dispatch_put('/settings', function() {
 
   stop_service();
   
-  moulinette_set('service_enabled', $service_enabled);
+  ynh_setting_set('service_enabled', $service_enabled);
 
   if($service_enabled == 1) {
-    moulinette_set('opt_name', $_POST['opt_name']);
-    moulinette_set('opt_renaming', isset($_POST['opt_renaming']) ? 1 : 0);
-    moulinette_set('opt_deleting', isset($_POST['opt_deleting']) ? 1 : 0);
-    moulinette_set('opt_chat', isset($_POST['opt_chat']) ? 1 : 0);
-    moulinette_set('wifi_device_id', $_POST['wifi_device_id']);
+    ynh_setting_set('opt_name', $_POST['opt_name']);
+    ynh_setting_set('opt_renaming', isset($_POST['opt_renaming']) ? 1 : 0);
+    ynh_setting_set('opt_deleting', isset($_POST['opt_deleting']) ? 1 : 0);
+    ynh_setting_set('opt_chat', isset($_POST['opt_chat']) ? 1 : 0);
+    ynh_setting_set('wifi_device_id', $_POST['wifi_device_id']);
 
     $retcode = start_service();