From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 10 Dec 2019 08:04:39 +0000 (+0100)
Subject: luci-app-opkg: convert menu entries to JSON
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=870a4061208be34401875065c977b19933ceca92;p=oweals%2Fluci.git

luci-app-opkg: convert menu entries to JSON

Also fix an empty string test in an controller action while we touch it.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/applications/luci-app-opkg/luasrc/controller/opkg.lua b/applications/luci-app-opkg/luasrc/controller/opkg.lua
index 29c9a0864..ebdcf1b09 100644
--- a/applications/luci-app-opkg/luasrc/controller/opkg.lua
+++ b/applications/luci-app-opkg/luasrc/controller/opkg.lua
@@ -3,14 +3,6 @@
 
 module("luci.controller.opkg", package.seeall)
 
-function index()
-	entry({"admin", "system", "opkg"}, template("opkg"), _("Software"), 30)
-	entry({"admin", "system", "opkg", "list"}, call("action_list")).leaf = true
-	entry({"admin", "system", "opkg", "exec"}, post("action_exec")).leaf = true
-	entry({"admin", "system", "opkg", "statvfs"}, call("action_statvfs")).leaf = true
-	entry({"admin", "system", "opkg", "config"}, post_on({ data = true }, "action_config")).leaf = true
-end
-
 function action_list(mode)
 	local util = require "luci.util"
 	local cmd
@@ -26,7 +18,7 @@ function action_list(mode)
 			fd:close()
 		end
 
-		if not lists_dir or #lists_dir == "" then
+		if not lists_dir or #lists_dir == 0 then
 			lists_dir = "/tmp/opkg-lists"
 		end
 
diff --git a/applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json b/applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json
new file mode 100644
index 000000000..9356b586d
--- /dev/null
+++ b/applications/luci-app-opkg/root/usr/share/luci/menu.d/luci-app-opkg.json
@@ -0,0 +1,44 @@
+{
+	"admin/system/opkg": {
+		"title": "Software",
+		"order": 30,
+		"action": {
+			"type": "template",
+			"path": "opkg"
+		}
+	},
+
+	"admin/system/opkg/list/*": {
+		"action": {
+			"type": "call",
+			"module": "luci.controller.opkg",
+			"function": "action_list"
+		}
+	},
+
+	"admin/system/opkg/exec/*": {
+		"action": {
+			"type": "call",
+			"post": true,
+			"module": "luci.controller.opkg",
+			"function": "action_exec"
+		}
+	},
+
+	"admin/system/opkg/statvfs/*": {
+		"action": {
+			"type": "call",
+			"module": "luci.controller.opkg",
+			"function": "action_statvfs"
+		}
+	},
+
+	"admin/system/opkg/config/*": {
+		"action": {
+			"type": "call",
+			"post": { "data": true },
+			"module": "luci.controller.opkg",
+			"function": "action_config"
+		}
+	}
+}