From f5a331282764fcc401b76e578ff1e0a08a9cc63f Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Wed, 23 Aug 2023 11:00:55 +0800
Subject: [PATCH] luci-app-argon-config: sync upstream

---
 .../htdocs/luci-static/resources/view/argon-config.js  | 10 +++++-----
 luci-app-argon-config/root/usr/libexec/rpcd/luci.argon |  8 ++++++++
 .../usr/share/rpcd/acl.d/luci-app-argon-config.json    |  3 +--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js b/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js
index c961f07..f76641b 100644
--- a/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js
+++ b/luci-app-argon-config/htdocs/luci-static/resources/view/argon-config.js
@@ -6,9 +6,9 @@
 'require ui';
 'require view';
 
-var callSystemInfo = rpc.declare({
-	object: 'system',
-	method: 'info'
+var callAvailSpace = rpc.declare({
+	object: 'luci.argon',
+	method: 'avail'
 });
 
 var callRemoveArgon = rpc.declare({
@@ -34,7 +34,7 @@ return view.extend({
 	load: function() {
 		return Promise.all([
 			uci.load('argon'),
-			L.resolveDefault(callSystemInfo(), {}),
+			L.resolveDefault(callAvailSpace(), {}),
 			L.resolveDefault(fs.list(bg_path), {})
 		]);
 	},
@@ -112,7 +112,7 @@ return view.extend({
 		}
 
 		s = m.section(form.TypedSection, null, _('Upload background (available space: %1024.2mB)')
-			.format(data[1].root.avail * 1024),
+			.format(data[1].avail * 1024),
 			_('You can upload files such as gif/jpg/mp4/png/webm/webp files, to change the login page background.'));
 		s.addremove = false;
 		s.anonymous = true;
diff --git a/luci-app-argon-config/root/usr/libexec/rpcd/luci.argon b/luci-app-argon-config/root/usr/libexec/rpcd/luci.argon
index 863cd5c..9a9468b 100755
--- a/luci-app-argon-config/root/usr/libexec/rpcd/luci.argon
+++ b/luci-app-argon-config/root/usr/libexec/rpcd/luci.argon
@@ -9,6 +9,8 @@ readonly tmp_path="/tmp/argon_background.tmp"
 case "$1" in
 "list")
 	json_init
+	json_add_object "avail"
+	json_close_object
 	json_add_object "remove"
 		json_add_string "filename" "filename"
 	json_close_object
@@ -20,6 +22,12 @@ case "$1" in
 	;;
 "call")
 	case "$2" in
+	"avail")
+		json_init
+		json_add_int "avail" "$(df | grep -E '/$' | awk '{print $4}')"
+		json_dump
+		json_cleanup
+		;;
 	"remove")
 		read -r input
 		json_load "$input"
diff --git a/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json b/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json
index 234c210..6c36184 100644
--- a/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json
+++ b/luci-app-argon-config/root/usr/share/rpcd/acl.d/luci-app-argon-config.json
@@ -6,8 +6,7 @@
 				"/www/luci-static/argon/background/*": [ "list" ]
 			},
 			"ubus": {
-				"luci.argon": [ "remove", "rename" ],
-				"system": [ "info" ]
+				"luci.argon": [ "avail", "remove", "rename" ]
 			},
 			"uci": [ "argon" ]
 		},