require("luci.template")
require("luci.util")
require("luci.http")
-require("luci.model.uci")
require("luci.uvl")
-local uci = luci.model.uci
+local uci = require("luci.model.uci")
local class = luci.util.class
local instanceof = luci.util.instanceof
self.config = config
self.parsechain = {self.config}
self.template = "cbi/map"
- if not uci.load_config(self.config) then
+ self.uci = uci.cursor()
+ self.save = true
+ if not self.uci:load(self.config) then
error("Unable to read UCI data: " .. self.config)
end
self.validator = luci.uvl.UVL()
self.scheme = self.validator:get_scheme(self.config)
+
end
function Map.get_scheme(self, sectiontype, option)
end
end
-function Map.render(self, ...)
- if self.stateful then
- uci.load_state(self.config)
- else
- uci.load_config(self.config)
- end
- Node.render(self, ...)
-end
-
-- Chain foreign config
function Map.chain(self, config)
-- Use optimized UCI writing
function Map.parse(self, ...)
- if self.stateful then
- uci.load_state(self.config)
- else
- uci.load_config(self.config)
- end
-
Node.parse(self, ...)
- for i, config in ipairs(self.parsechain) do
- uci.save_config(config)
- end
- if luci.http.formvalue("cbi.apply") then
+ if self.save then
for i, config in ipairs(self.parsechain) do
- uci.commit(config)
- if luci.config.uci_oncommit and luci.config.uci_oncommit[config] then
- luci.util.exec(luci.config.uci_oncommit[config])
+ self.uci:save(config)
+ end
+ if luci.http.formvalue("cbi.apply") then
+ for i, config in ipairs(self.parsechain) do
+ self.uci:commit(config)
+ self.uci:apply(config)
+
+ -- Refresh data because commit changes section names
+ self.uci:load(config)
end
-
- -- Refresh data because commit changes section names
- uci.load_config(config)
+
+ -- Reparse sections
+ Node.parse(self, ...)
+
+ end
+ for i, config in ipairs(self.parsechain) do
+ self.uci:unload(config)
end
-
- -- Reparse sections
- Node.parse(self, ...)
-
- end
- for i, config in ipairs(self.parsechain) do
- uci.unload(config)
end
end
-- UCI add
function Map.add(self, sectiontype)
- return uci.add(self.config, sectiontype)
+ return self.uci:add(self.config, sectiontype)
end
-- UCI set
function Map.set(self, section, option, value)
if option then
- return uci.set(self.config, section, option, value)
+ return self.uci:set(self.config, section, option, value)
else
- return uci.set(self.config, section, value)
+ return self.uci:set(self.config, section, value)
end
end
-- UCI del
function Map.del(self, section, option)
if option then
- return uci.delete(self.config, section, option)
+ return self.uci:delete(self.config, section, option)
else
- return uci.delete(self.config, section)
+ return self.uci:delete(self.config, section)
end
end
-- UCI get
function Map.get(self, section, option)
if not section then
- return uci.get_all(self.config)
+ return self.uci:get_all(self.config)
elseif option then
- return uci.get(self.config, section, option)
+ return self.uci:get(self.config, section, option)
else
- return uci.get_all(self.config, section)
+ return self.uci:get_all(self.config, section)
end
end
end
if instanceof(class, AbstractValue) then
- local obj = class(self, ...)
+ local obj = class(self, section, ...)
obj.track_missing = true
section:append(obj)
return obj
self.config = map.config
self.optionals = {}
self.defaults = {}
+ self.fields = {}
+ self.tag_error = {}
+ self.tag_invalid = {}
+ self.tag_deperror = {}
self.optional = true
self.addremove = false
Node._i18n(obj, self.config, self.section or self.sectiontype, option, ...)
self:append(obj)
+ self.fields[option] = obj
return obj
elseif class == true then
error("No valid class was given and autodetection failed.")
function NamedSection.__init__(self, map, section, stype, ...)
AbstractSection.__init__(self, map, stype, ...)
Node._i18n(self, map.config, section, nil, ...)
-
+
-- Defaults
self.addremove = false
local s = self.section
local active = self:cfgvalue(s)
-
if self.addremove then
local path = self.config.."."..s
if active then -- Remove the section
AbstractSection.parse_dynamic(self, s)
if luci.http.formvalue("cbi.submit") then
Node.parse(self, s)
+
+ if not self.override_scheme and self.map.scheme then
+ local co = self.map:get()
+ local stat, err = self.map.validator:validate_section(self.config, s, co)
+ if err then
+ --self.map.save = false
+ if err.code == luci.uvl.errors.ERR_DEPENDENCY then
+ self.tag_deperror[s] = true
+ else
+ self.tag_invalid[s] = true
+ end
+ for i, v in ipairs(err.childs) do
+ if v.option and self.fields[v.option] then
+ if v.code == luci.uvl.errors.ERR_DEPENDENCY then
+ self.fields[v.option].tag_reqerror[s] = true
+ elseif v.code == luci.uvl.errors.ERR_OPTION then
+ self.fields[v.option].tag_invalid[s] = true
+ end
+ end
+ end
+ end
+ end
end
AbstractSection.parse_optionals(self, s)
end
-- Return all matching UCI sections for this TypedSection
function TypedSection.cfgsections(self)
local sections = {}
- uci.foreach(self.map.config, self.sectiontype,
+ self.map.uci:foreach(self.map.config, self.sectiontype,
function (section)
if self:checkscope(section[".name"]) then
table.insert(sections, section[".name"])
self.err_invalid = true
end
- if name and name:len() > 0 then
+ if name and #name > 0 then
self:create(name)
end
end
crval = REMOVE_PREFIX .. self.config
name = luci.http.formvaluetable(crval)
for k,v in pairs(name) do
- luci.util.perror(k)
- luci.util.perror(self:cfgvalue(k))
- luci.util.perror(self:checkscope(k))
if self:cfgvalue(k) and self:checkscope(k) then
self:remove(k)
end
end
end
+ local co
for i, k in ipairs(self:cfgsections()) do
AbstractSection.parse_dynamic(self, k)
if luci.http.formvalue("cbi.submit") then
Node.parse(self, k)
+
+ if not self.override_scheme and self.map.scheme then
+ local co = self.map:get()
+ local stat, err = self.map.validator:validate_section(self.config, k, co)
+ if err then
+ --self.map.save = false
+ if err.code == luci.uvl.errors.ERR_DEPENDENCY then
+ self.tag_deperror[k] = true
+ else
+ self.tag_invalid[k] = true
+ end
+ for i, v in ipairs(err.childs) do
+ if v.option and self.fields[v.option] then
+ if v.code == luci.uvl.errors.ERR_DEPENDENCY then
+ self.fields[v.option].tag_reqerror[k] = true
+ elseif v.code == luci.uvl.errors.ERR_OPTION then
+ self.fields[v.option].tag_invalid[k] = true
+ end
+ end
+ end
+ end
+ end
end
AbstractSection.parse_optionals(self, k)
end
self.config = map.config
self.tag_invalid = {}
self.tag_missing = {}
+ self.tag_reqerror = {}
self.tag_error = {}
self.deps = {}
self.cast = "string"
self:value("")
end
for k, v in pairs(vs.values) do
- self:value(k, v)
+ local deps = {}
+ if not self.override_dependencies
+ and vs.enum_depends and vs.enum_depends[k] then
+ for i, dep in ipairs(vs.enum_depends[k]) do
+ table.insert(deps, _uvl_strip_remote_dependencies(dep))
+ end
+ end
+ self:value(k, v, unpack(deps))
end
end
end
end
function ListValue.value(self, key, val, ...)
+ if luci.util.contains(self.keylist, key) then
+ return
+ end
+
val = val or key
table.insert(self.keylist, tostring(key))
table.insert(self.vallist, tostring(val))
end
function MultiValue.value(self, key, val)
+ if luci.util.contains(self.keylist, key) then
+ return
+ end
+
val = val or key
table.insert(self.keylist, tostring(key))
table.insert(self.vallist, tostring(val))
projects / project / luci.git / blobdiff