Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-freifunk: switch to nixio.fs

Browse source 
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich 2015-01-15 15:11:57 +01:00
parent 921df0f3fc
commit 9780ee382e
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua
View file

@ -11,7 +11,7 @@ You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
]] ]]
local fs = require "luci.fs" local fs = require "nixio.fs"
local util = require "luci.util" local util = require "luci.util"
local uci = require "luci.model.uci".cursor() local uci = require "luci.model.uci".cursor()
local profiles = "/etc/config/profile_" local profiles = "/etc/config/profile_"
@ -22,13 +22,10 @@ c = m:section(NamedSection, "community", "public", nil, translate("These are the
community = c:option(ListValue, "name", translate ("Community")) community = c:option(ListValue, "name", translate ("Community"))
community.rmempty = false community.rmempty = false
local list = { } local profile
local list = fs.glob(profiles .. "*") for profile in fs.dir(profiles) do
local name = uci:get_first(profile, "community", "name") or "?"
for k,v in ipairs(list) do community:value(profile, name)
local name = uci:get_first(v, "community", "name") or "?"
local n = string.gsub(v, profiles, "")
community:value(n, name)
end end

2
modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm
View file

@ -16,7 +16,7 @@ $Id$
<% <%
local uci = require "luci.model.uci".cursor() local uci = require "luci.model.uci".cursor()
local tpl = require "luci.template" local tpl = require "luci.template"
local fs = require "luci.fs" local fs = require "nixio.fs"
local ff = {} local ff = {}
local ff = uci:get_all("freifunk") local ff = uci:get_all("freifunk")