luci-app-freifunk-widgets: switch to nixio.fs

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

diff --git a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua
index 50771d7..7256ba1 100644 (file)
--- a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua
+++ b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua
@@ -11,7 +11,7 @@ You may obtain a copy of the License at
 ]]--
 
 local uci = require "luci.model.uci".cursor()
-local fs = require "luci.fs"
+local fs = require "nixio.fs"
 local utl = require "luci.util"
 m = Map("freifunk-widgets", translate("Widgets"),
         translate("Configure installed widgets."))
@@ -37,9 +37,10 @@ function en.cfgvalue(self, section)
 end
 
 local tmpl = wdg:option(ListValue, "template", translate("Template"))
-for k, v in ipairs(fs.dir('/usr/lib/lua/luci/view/freifunk/widgets/')) do
-       if v ~= "." and v ~= ".." then
-               tmpl:value(v)
+local file
+for file in fs.dir("/usr/lib/lua/luci/view/freifunk/widgets/") do
+       if file ~= "." and file ~= ".." then
+               tmpl:value(file)
        end
 end
 
@@ -64,10 +65,11 @@ function m.on_commit(self)
                        table.insert(active, s[".name"])
                end
        end )
-       for k, v in ipairs(fs.dir(dir)) do
-               filename = string.gsub(v, ".html", "")
+       local file
+       for file in fs.dir(dir) do
+               local filename = string.gsub(file, ".html", "")
                if not utl.contains(active, filename) then
-                       fs.unlink(dir .. v)
+                       fs.unlink(dir .. file)
                end
        end
 end

diff --git a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm
index 87ad5b6..46e063b 100644 (file)
--- a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm
+++ b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm
@@ -13,7 +13,7 @@ You may obtain a copy of the License at
 ]]--
 
 --local utl = require "luci.util"
-local fs = require "luci.fs"
+local fs = require "nixio.fs"
 local title = data.title
 local name = data['.name']
 local file = "/usr/share/customtext/" .. name .. ".html"

diff --git a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm
index 08fc550..ff81ba8 100644 (file)
--- a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm
+++ b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm
@@ -14,7 +14,7 @@ You may obtain a copy of the License at
 
 local sys = require "luci.sys"
 local utl = require "luci.util"
-local fs = require "luci.fs"
+local fs = require "nixio.fs"
 local i18n = require "luci.i18n"
 local url = data.url
 local title = data.title or i18n.translate("RSS")
@@ -37,7 +37,7 @@ cachefile = "/tmp/" .. name .. ".cache"
        <% if not url then %>
                <%:No url found in config%>
        <% else
-               local mtime = luci.fs.mtime(cachefile) or 0
+               local mtime = fs.stat(cachefile, "mtime") or 0
                local now = os.time()
                expire = mtime + cachetime