self.packages = { }
self.beenthere = { }
self.uci = luci.model.uci
+ self.dep = luci.uvl.dependencies
self.log = luci.uvl.loghelper
self.datatypes = luci.uvl.datatypes
end
+--- Parse given scheme and return the scheme tree.
+-- @param scheme Name of the scheme to parse
+-- @return Table containing the parsed scheme or nil on error
+-- @return String containing the reason for errors (if any)
+function UVL.get_scheme( self, scheme )
+ if not self.packages[scheme] then
+ local ok, err = pcall( self.read_scheme, self, scheme )
+ if not ok then
+ return nil, self.log.scheme_error( scheme, err )
+ end
+ end
+ return self.packages[scheme], nil
+end
+
+--- Return a table containing the dependencies of specified section or option.
+-- @param config Name of the configuration or parsed scheme object
+-- @param section Type of the section
+-- @param option Name of the option (optional)
+-- @return Table containing the dependencies or nil on error
+-- @return String containing the reason for errors (if any)
+function UVL.get_dependencies( self, config, section, option )
+ config = ( type(config) == "string" and self:get_scheme(config) or config )
+
+ local deps = { }
+ local dt
+
+ if not config.sections[section] then return deps end
+
+ if option and config.variables[section][option] then
+ dt = config.variables[section][option].depends
+ else
+ dt = config.sections[section].depends
+ end
+
+ if dt then
+ for _, d in ipairs(dt) do
+ local sdeps = { }
+ for k, v in pairs(d) do
+ local r = self.dep._parse_reference( k )
+ if r then
+ sdeps[r] = v
+ else
+ return nil,
+ 'Ambiguous dependency reference "%s" for object "%s" given'
+ %{ k, self.log.id( config.name, section, option ) }
+ end
+ end
+ table.insert( deps, sdeps )
+ end
+ end
+ return deps
+end
+
--- Validate given configuration, section or option.
-- @param config Name of the configuration to validate
-- @param section Name of the section to validate (optional)
local sc = { }
if not co then
- return false, 'Unable to load configuration "' .. config .. '"'
+ return false, 'Unable to load configuration "%s"' % config
end
local function _uci_foreach( type, func )
for k, v in pairs(co) do
if not self.beenthere[config..'.'..k] then
return false, self.log.config_error( config,
- "Section '" .. config .. '.' .. co[k]['.type'] ..
- "' not found in scheme" )
+ 'Section "%s" not found in scheme'
+ % self.log.id( config, co[k]['.type'] ) )
end
end
end
if s.required and sc[k] == 0 then
return false, self.log.config_error( config,
- 'Required section "' .. k .. '" not found in config' )
+ 'Required section "%s" not found in config' % k )
elseif s.unique and sc[k] > 1 then
return false, self.log.config_error( config,
- 'Unique section "' .. k .. '" occurs multiple times in config' )
+ 'Unique section "%s" occurs multiple times in config' % k )
end
end
local co = self.uci.get_all( config )
if not co then
- return false, 'Unable to load configuration "' .. config .. '"'
+ return false, 'Unable to load configuration "%s"' % config
end
if co[section] then
self, co, co[section]['.type'], config, section
) )
else
- return false, 'Section "' .. config .. '.' .. section ..
- '" not found in config. Nothing to do.'
+ return false, 'Section "%s" not found in config. Nothing to do.'
+ % self.log.id( config, section )
end
end
local co = self.uci.get_all( config )
if not co then
- return false, 'Unable to load configuration "' .. config .. '"'
+ return false, 'Unable to load configuration "%s"' % config
end
if co[section] and co[section][option] then
self, co, co[section]['.type'], config, section, option
) )
else
- return false, 'Option "' ..
- config .. '.' .. section .. '.' .. option ..
- '" not found in config. Nothing to do.'
+ return false, 'Option "%s" not found in config. Nothing to do.'
+ % self.log.id( config, section, option )
end
end
function UVL._validate_section( self, section )
if section:values() then
+ if section:section().named == true and
+ section:values()['.anonymous'] == true
+ then
+ return false, self.log.section_error( section,
+ 'The section of type "%s" is stored anonymously in config but must be named'
+ % section:sid() )
+ end
for _, v in ipairs(section:variables()) do
local ok, err = self:_validate_option( v )
return false, err
end
else
- return false, 'Option "' .. section:sid() .. '" not found in config'
+ return false, 'Option "%s" not found in config' % section:sid()
end
if STRICT_UNKNOWN_OPTIONS and not section:section().dynamic then
if k:sub(1,1) ~= "." and not self.beenthere[
section:cid() .. '.' .. k
] then
- return false, "Option '" .. section:sid() .. '.' .. k ..
- "' not found in scheme"
+ return false, 'Option "%s" not found in scheme'
+ % self.log.id( section:sid(), k )
end
end
end
local val = option:value()
if not item and not ( option:section() and option:section().dynamic ) then
- return false, 'Option "' .. option:cid() ..
- '" not found in scheme'
+ return false, 'Option "%s" not found in scheme' % option:cid()
elseif item then
if item.required and not val then
- return false, 'Mandatory variable "' .. option:cid() ..
- '" does not have a value'
+ return false, 'Mandatory variable "%s" does not have a value'
+ % option:cid()
end
- if item.type == "enum" and val then
+ if ( item.type == "reference" or item.type == "enum" ) and val then
if not item.values or not item.values[val] then
- return false, 'Value "' .. ( val or '<nil>' ) ..
- '" of given option "' .. option:cid() ..
- '" is not defined in enum { ' ..
- table.concat( luci.util.keys(item.values), ", " ) ..
- ' }'
+ return false,
+ 'Value "%s" of given option "%s" is not defined in %s { %s }'
+ %{ val or '<nil>', option:cid(), item.type,
+ table.concat( luci.util.keys(item.values or {}), ", " ) }
end
elseif item.type == "list" and val then
if type(val) ~= "table" and STRICT_LIST_TYPE then
- return false, 'Option "' .. option:cid() ..
- '" is defined as list but stored as plain value'
+ return false,
+ 'Option "%s" is defined as list but stored as plain value'
+ % option:cid()
end
end
val = ( type(val) == "table" and val or { val } )
for i, v in ipairs(val) do
if not self.datatypes[item.datatype]( v ) then
- return false, 'Value' .. ( #val>1 and ' #'..i or '' ) ..
- ' "' .. ( v or '<nil>' ) ..
- '" of given option "' .. option:cid() ..
- '" does not validate as datatype "' ..
- item.datatype .. '"'
+ return false,
+ 'Value%s "%s" of given option "%s" does not validate as datatype "%s"'
+ %{ ( #val>1 and ' #' .. i or '' ), v,
+ option:cid(), item.datatype }
end
end
else
- return false, 'Unknown datatype "' ..
- item.datatype .. '" encountered'
+ return false, 'Unknown datatype "%s" encountered'
+ % item.datatype
end
end
return self:_read_scheme_parts( scheme, schemes )
else
- error(
- 'Can not find scheme "' .. scheme ..
- '" in "' .. self.schemedir .. '"'
- )
+ error( 'Can not find scheme "%s" in "%s"' %{ scheme, self.schemedir } )
end
end
self.packages[r[1]] =
self.packages[r[1]] or {
+ ["name"] = r[1];
["sections"] = { };
["variables"] = { };
}
'dependency specification in "%s"',
v.name or '<nil>', scheme or '<nil>', k
)
- elseif k == "dynamic" or k == "unique" or k == "required" then
+ elseif k == "dynamic" or k == "unique" or
+ k == "required" or k == "named"
+ then
s[k] = _bool(v2)
else
s[k] = v2
s.dynamic = s.dynamic or false
s.unique = s.unique or false
s.required = s.required or false
+ s.named = s.named or false
end
end
end
'validator specification in "%s"',
v.name, scheme, k
)
+ elseif k == "valueof" then
+ local values, err = self:_read_reference( v2 )
+
+ _assert( values,
+ 'Variable "%s" in scheme "%s" has invalid ' ..
+ 'reference specification:\n%s',
+ v.name, scheme, err )
+
+ t.type = "reference"
+ t.values = values
elseif k == "required" then
t[k] = _bool(v2)
else
- t[k] = v2
+ t[k] = t[k] or v2
end
end
end
t.values[v.value] = v.title or v.value
end
+ if not t.enum_depends then
+ t.enum_depends = { }
+ end
+
if v.default then
_assert( not t.default,
'Enum "%s" in scheme "%s", section "%s" redeclares ' ..
t.default = v.value
end
+
+ if v.depends then
+ t.enum_depends[v.value] = _assert(
+ self:_read_dependency(
+ v.depends, t.enum_depends[v.value]
+ ),
+ 'Invalid reference "%s" in "%s.%s.%s.%s"',
+ v.depends, scheme, r[2], r[3], v.value
+ )
+ end
end
end
end
end
end
+-- Read a reference specification (XXX: We should validate external configs too...)
+function UVL._read_reference( self, values )
+ local val = { }
+ values = ( type(values) == "table" and values or { values } )
+
+ for _, value in ipairs(values) do
+ local ref = luci.util.split(value, ".")
+
+ if #ref == 2 or #ref == 3 then
+ self.uci.load_config(ref[1])
+ local co = self.uci.get_all(ref[1])
+
+ if not co then
+ return nil, 'Can not load config "%s" for reference "%s"'
+ %{ ref[1], value }
+ end
+
+ for k, v in pairs(co) do
+ if v['.type'] == ref[2] then
+ if #ref == 2 then
+ if v['.anonymous'] == true then
+ return nil, 'Illegal reference "%s" to an anonymous section'
+ % value
+ end
+ val[k] = k -- XXX: title/description would be nice
+ elseif v[ref[3]] then
+ val[v[ref[3]]] = v[ref[3]] -- XXX: dito
+ end
+ end
+ end
+ else
+ return nil, 'Malformed reference "%s"' % value
+ end
+ end
+
+ return val, nil
+end
+
-- Resolve given path
function UVL._resolve_function( self, value )
local path = luci.util.split(value, ".")