68a3b5f394
Always output empty objects or nothing at all where objects are expected, but no elements exist. Also remove a few unneeded "requires", a few basic modules are provided by announce.lua by default.
35 lines
635 B
Lua
35 lines
635 B
Lua
#!/usr/bin/lua
|
|
|
|
module('gluon.announce', package.seeall)
|
|
|
|
fs = require 'nixio.fs'
|
|
json = require 'luci.json'
|
|
uci = require('luci.model.uci').cursor()
|
|
util = require 'luci.util'
|
|
|
|
local function collect_entry(entry)
|
|
if fs.stat(entry, 'type') == 'dir' then
|
|
return collect_dir(entry)
|
|
else
|
|
return setfenv(loadfile(entry), _M)()
|
|
end
|
|
end
|
|
|
|
function collect_dir(dir)
|
|
local ret = { [json.null] = true }
|
|
|
|
for entry in fs.dir(dir) do
|
|
if entry:sub(1, 1) ~= '.' then
|
|
local ok, val = pcall(collect_entry, dir .. '/' .. entry)
|
|
if ok then
|
|
ret[entry] = val
|
|
else
|
|
io.stderr:write(val, '\n')
|
|
end
|
|
end
|
|
end
|
|
|
|
return ret
|
|
end
|
|
|