diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2020-02-06 12:07:08 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2020-02-06 12:54:07 +0100 |
| commit | 556e14c74307a9b93291e7c25d5eb71ab3260ab6 (patch) | |
| tree | 47facc735b1c06ae201d66375d6778c826cc5fbd /applications/luci-app-statistics/root/usr/bin/stat-genconfig | |
| parent | e6f76f21ba7f0e8f903d5251a620386cd02b524b (diff) | |
luci-app-statistics: convert plugin definitions to JSON
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'applications/luci-app-statistics/root/usr/bin/stat-genconfig')
| -rwxr-xr-x | applications/luci-app-statistics/root/usr/bin/stat-genconfig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/applications/luci-app-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig index 82431fbd39..b5a880e134 100755 --- a/applications/luci-app-statistics/root/usr/bin/stat-genconfig +++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig @@ -20,6 +20,7 @@ require("luci.model.uci") require("luci.sys.iptparser") require("luci.util") require("luci.i18n") +require("luci.jsonc") require("nixio.fs") local ipt = luci.sys.iptparser.IptParser() @@ -284,11 +285,8 @@ plugins = { }, } -local plugin_dir = "/usr/lib/lua/luci/statistics/plugins/" +local plugin_dir = "/usr/share/luci/statistics/plugins/" for filename in nixio.fs.dir(plugin_dir) do - local plugin_fun = loadfile(plugin_dir .. filename) - setfenv(plugin_fun, { _ = luci.i18n.translate }) - local plugin = plugin_fun() local name = filename:gsub("%.lua", "") if (name == "exec") then plugins[name] = config_exec @@ -299,7 +297,10 @@ for filename in nixio.fs.dir(plugin_dir) do elseif (name == "network") then plugins[name] = config_network else - plugins[name] = plugin.legend + local plugin_def = luci.jsonc.parse(nixio.fs.readfile(plugin_dir .. filename)) + if type(plugin_def) == "table" then + plugins[name] = plugin_def.legend + end end end |