From 436f3eaff5bdd4544c3cc43a9f57a2788d365d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Thu, 16 Dec 2021 04:08:01 +0100
Subject: [PATCH] manman-sync fix storing data

---
 .../gluon/config-mode/wizard/0100-manman-sync.lua  | 14 +++++++-------
 .../files/etc/config/gluon-manman-sync             | 13 +++++++++++++
 .../gluon-manman-sync/luasrc/usr/bin/manman-sync   |  4 ++--
 package/gluon-manman-sync/src/respondd.c           |  6 +++---
 4 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 package/gluon-manman-sync/files/etc/config/gluon-manman-sync

diff --git a/package/gluon-config-mode-manman-sync/luasrc/lib/gluon/config-mode/wizard/0100-manman-sync.lua b/package/gluon-config-mode-manman-sync/luasrc/lib/gluon/config-mode/wizard/0100-manman-sync.lua
index db4aced8..7638d4c4 100644
--- a/package/gluon-config-mode-manman-sync/luasrc/lib/gluon/config-mode/wizard/0100-manman-sync.lua
+++ b/package/gluon-config-mode-manman-sync/luasrc/lib/gluon/config-mode/wizard/0100-manman-sync.lua
@@ -12,18 +12,18 @@ return function(form, uci)
 
 	local o
 
-	local manman = s:option(Flag, "manman_sync", pkg_i18n.translate("Enable ManMan sync"))
-	manman.default = uci:get_bool("gluon", "manman_sync", "enabled")
+	local manman = s:option(Flag, 'manman_sync', pkg_i18n.translate('Enable ManMan sync'))
+	manman.default = uci:get_bool('gluon-manman-sync', 'sync', 'enabled')
 	function manman:write(data)
-		uci:set("gluon", "manman_sync", "enabled", data)
+		uci:set('gluon-manman-sync', 'sync', 'enabled', data)
 	end
 
-	local id = s:option(Value, "manman_id", pkg_i18n.translate("ManMan location ID"))
+	local id = s:option(Value, 'manman_id', pkg_i18n.translate('ManMan location ID'))
 	id:depends(manman, true)
-	id.default = uci:get("gluon", "manman_sync", "node_id")
-	id.datatype = "uinteger"
+	id.default = uci:get('gluon-manman-sync', 'sync', 'node_id')
+	id.datatype = 'uinteger'
 	function id:write(data)
-		uci:set("gluon", "manman_sync", "node_id", data)
+		uci:set('gluon-manman-sync', 'sync', 'node_id', data)
 	end
 
 	function s:write()
diff --git a/package/gluon-manman-sync/files/etc/config/gluon-manman-sync b/package/gluon-manman-sync/files/etc/config/gluon-manman-sync
new file mode 100644
index 00000000..635b8ffc
--- /dev/null
+++ b/package/gluon-manman-sync/files/etc/config/gluon-manman-sync
@@ -0,0 +1,13 @@
+package gluon-manman-sync
+
+config sync 'sync'
+	option enabled '0'
+  option node_id ''
+  option last_data_hash ''
+  option last_data ''
+
+config rollback 'rollback'
+  option success '1'
+  option checked_at ''
+  option previous_hash ''
+  option new_hash ''
diff --git a/package/gluon-manman-sync/luasrc/usr/bin/manman-sync b/package/gluon-manman-sync/luasrc/usr/bin/manman-sync
index 6771215d..4080e384 100755
--- a/package/gluon-manman-sync/luasrc/usr/bin/manman-sync
+++ b/package/gluon-manman-sync/luasrc/usr/bin/manman-sync
@@ -11,8 +11,8 @@ local mappings = {
   tunnel = 'vpn'
 }
 
-if uci:get_bool('gluon', 'manman_sync', 'enabled') then
-  local location_id = uci:get('gluon', 'manman_sync', 'location_id')
+if uci:get_bool('gluon-manman-sync', 'sync', 'enabled') then
+  local location_id = uci:get('gluon-manman-sync', 'sync', 'location_id')
 
   if not location_id then
     print('E: manman location_id missing')
diff --git a/package/gluon-manman-sync/src/respondd.c b/package/gluon-manman-sync/src/respondd.c
index 959615c8..52199b87 100644
--- a/package/gluon-manman-sync/src/respondd.c
+++ b/package/gluon-manman-sync/src/respondd.c
@@ -41,16 +41,16 @@ static struct json_object * get_autoupdater(void) {
 	ctx->flags &= ~UCI_FLAG_STRICT;
 
 	struct uci_package *p;
-	if (uci_load(ctx, "gluon", &p))
+	if (uci_load(ctx, "gluon-manman-sync", &p))
 		goto error;
 
-	struct uci_section *s = uci_lookup_section(ctx, p, "manman_sync");
+	struct uci_section *s = uci_lookup_section(ctx, p, "sync");
 	if (!s)
 		goto error;
 
 	struct json_object *ret = json_object_new_object();
 
-	json_object_object_add(ret, "nodeid", gluonutil_wrap_string(uci_lookup_option_string(ctx, s, "nodeid")));
+	json_object_object_add(ret, "node_id", gluonutil_wrap_string(uci_lookup_option_string(ctx, s, "node_id")));
 
 	const char *enabled = uci_lookup_option_string(ctx, s, "enabled");
 	json_object_object_add(ret, "enabled", json_object_new_boolean(enabled && !strcmp(enabled, "1")));