require("luci.util")
require("luci.http")
require("luci.model.uci")
+require("luci.uvl")
local uci = luci.model.uci
local class = luci.util.class
FORM_VALID = 1
FORM_INVALID = -1
+AUTO = true
+
CREATE_PREFIX = "cbi.cts."
REMOVE_PREFIX = "cbi.rts."
return maps
end
+
+function _uvl_strip_remote_dependencies(deps)
+ local clean = {}
+
+ for k, v in pairs(deps) do
+ k = k:gsub("%$config%.%$section%.", "")
+ if k:match("^[%w_]+$") and type(v) == "string" then
+ clean[k] = v
+ end
+ end
+
+ return clean
+end
+
+
-- Node pseudo abstract class
Node = class()
if not uci.load_config(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)
+ if not option then
+ return self.scheme and self.scheme.sections[sectiontype]
+ else
+ return self.scheme and self.scheme.variables[sectiontype]
+ and self.scheme.variables[sectiontype][option]
+ end
end
function Map.render(self, ...)
-- Appends a new option
function AbstractSection.option(self, class, option, ...)
+ -- Autodetect from UVL
+ if class == true and self.map:get_scheme(self.sectiontype, option) then
+ local vs = self.map:get_scheme(self.sectiontype, option)
+ if vs.type == "boolean" then
+ class = Flag
+ elseif vs.type == "list" then
+ class = DynamicList
+ elseif vs.type == "enum" or vs.type == "reference" then
+ class = ListValue
+ else
+ class = Value
+ end
+ end
+
if instanceof(class, AbstractValue) then
- local obj = class(self.map, option, ...)
+ local obj = class(self.map, self, option, ...)
Node._i18n(obj, self.config, self.section or self.sectiontype, option, ...)
self:append(obj)
return obj
+ elseif class == true then
+ error("No valid class was given and autodetection failed.")
else
- error("class must be a descendent of AbstractValue")
+ error("class must be a descendant of AbstractValue")
end
end
]]--
NamedSection = class(AbstractSection)
-function NamedSection.__init__(self, map, section, type, ...)
- AbstractSection.__init__(self, map, type, ...)
+function NamedSection.__init__(self, map, section, stype, ...)
+ AbstractSection.__init__(self, map, stype, ...)
Node._i18n(self, map.config, section, nil, ...)
+ -- Defaults
+ self.addremove = false
+
+ -- Use defaults from UVL
+ if not self.override_scheme and self.map:get_scheme(self.sectiontype) then
+ local vs = self.map:get_scheme(self.sectiontype)
+ self.addremove = not vs.unique and not vs.required
+ self.dynamic = vs.dynamic
+ self.title = self.title or vs.title
+ self.description = self.description or vs.descr
+ end
+
self.template = "cbi/nsection"
self.section = section
- self.addremove = false
end
function NamedSection.parse(self)
self.template = "cbi/tsection"
self.deps = {}
-
self.anonymous = false
+
+ -- Use defaults from UVL
+ if not self.override_scheme and self.map:get_scheme(self.sectiontype) then
+ local vs = self.map:get_scheme(self.sectiontype)
+ self.addremove = not vs.unique and not vs.required
+ self.dynamic = vs.dynamic
+ self.anonymous = not vs.named
+ self.title = self.title or vs.title
+ self.description = self.description or vs.descr
+ end
end
-- Return all matching UCI sections for this TypedSection
]]--
AbstractValue = class(Node)
-function AbstractValue.__init__(self, map, option, ...)
+function AbstractValue.__init__(self, map, section, option, ...)
Node.__init__(self, ...)
- self.option = option
- self.map = map
- self.config = map.config
+ self.section = section
+ self.option = option
+ self.map = map
+ self.config = map.config
self.tag_invalid = {}
self.tag_missing = {}
self.tag_error = {}
self.default = nil
self.size = nil
self.optional = false
+
+ -- Use defaults from UVL
+ if not self.override_scheme
+ and self.map:get_scheme(self.section.sectiontype, self.option) then
+ local vs = self.map:get_scheme(self.section.sectiontype, self.option)
+ self.rmempty = not vs.required
+ self.cast = (vs.type == "list") and "list" or "string"
+ self.title = self.title or vs.title
+ self.description = self.description or vs.descr
+
+ if vs.depends and not self.override_dependencies then
+ for i, deps in ipairs(vs.depends) do
+ deps = _uvl_strip_remote_dependencies(deps)
+ if next(deps) then
+ self:depends(deps)
+ end
+ end
+ end
+ end
end
-- Add a dependencie to another section field
function AbstractValue.render(self, s, scope)
if not self.optional or self:cfgvalue(s) or self:formcreated(s) then
scope = scope or {}
- scope.section = s
- scope.cbid = self:cbid(s)
+ scope.section = s
+ scope.cbid = self:cbid(s)
+ scope.striptags = luci.util.striptags
scope.ifattr = function(cond,key,val)
if cond then
-- DummyValue - This does nothing except being there
DummyValue = class(AbstractValue)
-function DummyValue.__init__(self, map, ...)
- AbstractValue.__init__(self, map, ...)
+function DummyValue.__init__(self, ...)
+ AbstractValue.__init__(self, ...)
self.template = "cbi/dvalue"
self.value = nil
end
function ListValue.__init__(self, ...)
AbstractValue.__init__(self, ...)
self.template = "cbi/lvalue"
+
self.keylist = {}
self.vallist = {}
-
self.size = 1
self.widget = "select"
+
+ if not self.override_scheme
+ and self.map:get_scheme(self.section.sectiontype, self.option) then
+ local vs = self.map:get_scheme(self.section.sectiontype, self.option)
+ if self.value and vs.values and not self.override_values then
+ if self.rmempty or self.optional then
+ self:value("")
+ end
+ for k, v in pairs(vs.values) do
+ self:value(k, v)
+ end
+ end
+ end
end
function ListValue.value(self, key, val, ...)
function MultiValue.__init__(self, ...)
AbstractValue.__init__(self, ...)
self.template = "cbi/mvalue"
+
self.keylist = {}
self.vallist = {}
MultiValue.__init__(self, ...)
self.cast = "table"
self.valuelist = self.cfgvalue
+
+ if not self.override_scheme
+ and self.map:get_scheme(self.section.sectiontype, self.option) then
+ local vs = self.map:get_scheme(self.section.sectiontype, self.option)
+ if self.value and vs.values and not self.override_values then
+ for k, v in pairs(vs.values) do
+ self:value(k, v)
+ end
+ end
+ end
end
function StaticList.validate(self, value)
AbstractValue.__init__(self, ...)
self.template = "cbi/dynlist"
self.cast = "table"
-
self.keylist = {}
self.vallist = {}
end
projects / project / luci.git / blobdiff