X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fcbi%2Fluasrc%2Fcbi.lua;h=09ba553ec2f0f985b6ef8d6717bf2c8e306cf4ab;hp=2585e54590ac53c74456cde98463923d183dde67;hb=9befed193ae828c2b58390e8c0efafdab37f45b8;hpb=8003e3b6482e770483499debdb916d1c08d4d7e5 diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua index 2585e5459..09ba553ec 100644 --- a/libs/cbi/luasrc/cbi.lua +++ b/libs/cbi/luasrc/cbi.lua @@ -47,24 +47,27 @@ REMOVE_PREFIX = "cbi.rts." -- Loads a CBI map from given file, creating an environment and returns it function load(cbimap, ...) require("luci.fs") - require("luci.i18n") + local i18n = require "luci.i18n" require("luci.config") require("luci.util") local cbidir = luci.util.libpath() .. "/model/cbi/" - local func, err = loadfile(cbidir..cbimap..".lua") - - if not func then - return nil - end + local func, err = loadfile(cbimap) or loadfile(cbidir..cbimap..".lua") + assert(func, err) luci.i18n.loadc("cbi") + luci.i18n.loadc("uvl") - luci.util.resfenv(func) - luci.util.updfenv(func, luci.cbi) - luci.util.extfenv(func, "translate", luci.i18n.translate) - luci.util.extfenv(func, "translatef", luci.i18n.translatef) - luci.util.extfenv(func, "arg", {...}) + local env = { + translate=i18n.translate, + translatef=i18n.translatef, + arg={...} + } + + setfenv(func, setmetatable(env, {__index = + function(tbl, key) + return rawget(tbl, key) or _M[key] or _G[key] + end})) local maps = {func()} @@ -78,8 +81,42 @@ function load(cbimap, ...) return maps end +local function _uvl_validate_section(node, name) + local co = node.map:get() + + luci.uvl.STRICT_UNKNOWN_OPTIONS = false + luci.uvl.STRICT_UNKNOWN_SECTIONS = false -function _uvl_strip_remote_dependencies(deps) + local function tag_fields(e) + if e.option and node.fields[e.option] then + node.fields[e.option].error = e + elseif e.childs then + for _, c in ipairs(e.childs) do tag_fields(c) end + end + end + + local function tag_section(e) + local s = { } + for _, c in ipairs(e.childs) do + if c.childs and not c:is(luci.uvl.errors.ERR_DEPENDENCY) then + table.insert( s, c.childs[1]:string() ) + else + table.insert( s, c:string() ) + end + end + if #s > 0 then node.error = s end + end + + local stat, err = node.map.validator:validate_section(node.config, name, co) + if err then + node.map.save = false + tag_fields(err) + tag_section(err) + end + +end + +local function _uvl_strip_remote_dependencies(deps) local clean = {} for k, v in pairs(deps) do @@ -174,6 +211,7 @@ function Map.__init__(self, config, ...) self.config = config self.parsechain = {self.config} self.template = "cbi/map" + self.apply_on_parse = nil self.uci = uci.cursor() self.save = true if not self.uci:load(self.config) then @@ -182,7 +220,7 @@ function Map.__init__(self, config, ...) self.validator = luci.uvl.UVL() self.scheme = self.validator:get_scheme(self.config) - + end function Map.get_scheme(self, sectiontype, option) @@ -211,15 +249,22 @@ function Map.parse(self, ...) 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 - + if self.apply_on_parse then + self.uci:apply(self.parsechain) + else + self._apply = function() + local cmd = self.uci:apply(self.parsechain, true) + return io.popen(cmd) + end + end + -- Reparse sections Node.parse(self, ...) - + end for i, config in ipairs(self.parsechain) do self.uci:unload(config) @@ -227,6 +272,15 @@ function Map.parse(self, ...) end end +function Map.render(self, ...) + Node.render(self, ...) + if self._apply then + local fp = self._apply() + fp:read("*a") + fp:close() + end +end + -- Creates a child section function Map.section(self, class, ...) if instanceof(class, AbstractSection) then @@ -585,7 +639,7 @@ NamedSection = class(AbstractSection) function NamedSection.__init__(self, map, section, stype, ...) AbstractSection.__init__(self, map, stype, ...) Node._i18n(self, map.config, section, nil, ...) - + -- Defaults self.addremove = false @@ -624,27 +678,9 @@ function NamedSection.parse(self) 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 + _uvl_validate_section(self, s) end end AbstractSection.parse_optionals(self, s) @@ -699,12 +735,40 @@ end function TypedSection.parse(self) if self.addremove then + -- Remove + local crval = REMOVE_PREFIX .. self.config + local name = luci.http.formvaluetable(crval) + for k,v in pairs(name) do + if k:sub(-2) == ".x" then + k = k:sub(1, #k - 2) + end + 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 + _uvl_validate_section(self, k) + end + end + AbstractSection.parse_optionals(self, k) + end + + if self.addremove then -- Create + local created local crval = CREATE_PREFIX .. self.config .. "." .. self.sectiontype local name = luci.http.formvalue(crval) if self.anonymous then if name then - self:create() + created = self:create() end else if name then @@ -720,50 +784,14 @@ function TypedSection.parse(self) end if name and #name > 0 then - self:create(name) + created = self:create(name) and name end end end - -- Remove - crval = REMOVE_PREFIX .. self.config - name = luci.http.formvaluetable(crval) - for k,v in pairs(name) do - 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 + if created then + AbstractSection.parse_optionals(self, created) end - AbstractSection.parse_optionals(self, k) end end @@ -838,6 +866,7 @@ function AbstractValue.__init__(self, map, section, option, ...) self.cast = (vs.type == "list") and "list" or "string" self.title = self.title or vs.title self.description = self.description or vs.descr + self.default = vs.default if vs.depends and not self.override_dependencies then for i, deps in ipairs(vs.depends) do @@ -1214,8 +1243,9 @@ function DynamicList.validate(self, value, section) local valid = {} for i, v in ipairs(value) do - if v and #v > 0 and - not luci.http.formvalue("cbi.rle."..section.."."..self.option.."."..i) then + if v and #v > 0 + and not luci.http.formvalue("cbi.rle."..section.."."..self.option.."."..i) + and not luci.http.formvalue("cbi.rle."..section.."."..self.option.."."..i..".x") then table.insert(valid, v) end end