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

Backported UVL optimizations

Browse source
This commit is contained in:
Steven Barth 2008-09-13 09:09:38 +00:00
parent 8f8da32d7e
commit 1fe083b59a
5 changed files with 418 additions and 411 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

415
libs/uvl/luasrc/uvl.lua
View file

@ -19,22 +19,28 @@ $Id$
-- @class module -- @class module
-- @cstyle instance -- @cstyle instance
module( "luci.uvl", package.seeall ) local fs = require "luci.fs"
local uci = require "luci.model.uci"
local util = require "luci.util"
local table = require "table"
local string = require "string"
require("luci.fs") local require, pcall, ipairs, pairs = require, pcall, ipairs, pairs
require("luci.util") local type, error, tonumber, tostring = type, error, tonumber, tostring
require("luci.model.uci") local unpack, loadfile = unpack, loadfile
require("luci.uvl.errors")
require("luci.uvl.datatypes")
require("luci.uvl.validation")
require("luci.uvl.dependencies")
module "luci.uvl"
TYPE_SCHEME = 0x00 local ERR = require "luci.uvl.errors"
TYPE_CONFIG = 0x01 local datatypes = require "luci.uvl.datatypes"
TYPE_SECTION = 0x02 local validation = require "luci.uvl.validation"
TYPE_OPTION = 0x03 local dependencies = require "luci.uvl.dependencies"
TYPE_ENUM = 0x04
local TYPE_SCHEME = 0x00
local TYPE_CONFIG = 0x01
local TYPE_SECTION = 0x02
local TYPE_OPTION = 0x03
local TYPE_ENUM = 0x04
--- Boolean; default true; --- Boolean; default true;
-- treat sections found in config but not in scheme as error -- treat sections found in config but not in scheme as error
@ -55,7 +61,6 @@ STRICT_LIST_TYPE = true
local default_schemedir = "/lib/uci/schema" local default_schemedir = "/lib/uci/schema"
local default_savedir = "/tmp/.uvl" local default_savedir = "/tmp/.uvl"
local ERR = luci.uvl.errors
--- Object constructor --- Object constructor
@ -63,17 +68,17 @@ local ERR = luci.uvl.errors
-- @name UVL -- @name UVL
-- @param schemedir Path to the scheme directory (optional) -- @param schemedir Path to the scheme directory (optional)
-- @return Instance object -- @return Instance object
UVL = luci.util.class() UVL = util.class()
function UVL.__init__( self, schemedir ) function UVL.__init__( self, schemedir )
self.schemedir = schemedir or default_schemedir self.schemedir = schemedir or default_schemedir
self.packages = { } self.packages = { }
self.beenthere = { } self.beenthere = { }
self.depseen = { } self.depseen = { }
self.uci = luci.model.uci self.uci = uci
self.err = luci.uvl.errors self.err = ERR
self.dep = luci.uvl.dependencies self.dep = dependencies
self.datatypes = luci.uvl.datatypes self.datatypes = datatypes
end end
@ -108,19 +113,19 @@ function UVL.validate( self, config, section, option )
end end
--- Validate given configuration. --- Validate given configuration.
-- @param config Name of the configuration to validate -- @param cfg Name of the configuration to validate
-- @return Boolean indicating whether the given config validates -- @return Boolean indicating whether the given config validates
-- @return String containing the reason for errors (if any) -- @return String containing the reason for errors (if any)
function UVL.validate_config( self, config, uci ) function UVL.validate_config( self, cfg, uci )
if not self.packages[config] then if not self.packages[cfg] then
local ok, err = self:read_scheme(config) local ok, err = self:read_scheme(cfg)
if not ok then if not ok then
return false, err return false, err
end end
end end
local co = luci.uvl.config( self, uci or config, uci and config ) local co = config( self, uci or cfg, uci and cfg )
local sc = { } local sc = { }
self.beenthere = { } self.beenthere = { }
@ -140,7 +145,7 @@ function UVL.validate_config( self, config, uci )
end end
end end
for k, v in pairs( self.packages[config].sections ) do for k, v in pairs( self.packages[cfg].sections ) do
sc[k] = 0 sc[k] = 0
_uci_foreach( k, _uci_foreach( k,
function(s) function(s)
@ -158,7 +163,7 @@ function UVL.validate_config( self, config, uci )
end end
end end
for _, k in ipairs(luci.util.keys(sc)) do for _, k in ipairs(util.keys(sc)) do
local so = co:section(k) local so = co:section(k)
if so:scheme('required') and sc[k] == 0 then if so:scheme('required') and sc[k] == 0 then
co:error(ERR.SECT_REQUIRED(so)) co:error(ERR.SECT_REQUIRED(so))
@ -175,16 +180,16 @@ end
-- @param section Name of the section to validate -- @param section Name of the section to validate
-- @return Boolean indicating whether the given config validates -- @return Boolean indicating whether the given config validates
-- @return String containing the reason for errors (if any) -- @return String containing the reason for errors (if any)
function UVL.validate_section( self, config, section, uci ) function UVL.validate_section( self, cfg, section, uci )
if not self.packages[config] then if not self.packages[cfg] then
local ok, err = self:read_scheme( config ) local ok, err = self:read_scheme( cfg )
if not ok then if not ok then
return false, err return false, err
end end
end end
local co = luci.uvl.config( self, uci or config, uci and config ) local co = config( self, uci or cfg, uci and cfg )
local so = co:section( section ) local so = co:section( section )
self.beenthere = { } self.beenthere = { }
@ -207,16 +212,16 @@ end
-- @param option Name of the option to validate -- @param option Name of the option to validate
-- @return Boolean indicating whether the given config validates -- @return Boolean indicating whether the given config validates
-- @return String containing the reason for errors (if any) -- @return String containing the reason for errors (if any)
function UVL.validate_option( self, config, section, option, uci ) function UVL.validate_option( self, cfg, section, option, uci )
if not self.packages[config] then if not self.packages[cfg] then
local ok, err = self:read_scheme( config ) local ok, err = self:read_scheme( cfg )
if not ok then if not ok then
return false, err return false, err
end end
end end
local co = luci.uvl.config( self, uci or config, uci and config ) local co = config( self, uci or cfg, uci and cfg )
local so = co:section( section ) local so = co:section( section )
local oo = so:option( option ) local oo = so:option( option )
@ -255,7 +260,7 @@ function UVL._validate_section( self, section )
end end
end end
local ok, err = luci.uvl.dependencies.check( self, section ) local ok, err = dependencies.check( self, section )
if not ok then if not ok then
section:error(err) section:error(err)
end end
@ -301,8 +306,8 @@ function UVL._validate_option( self, option, nodeps )
for _, v in ipairs(config_values) do for _, v in ipairs(config_values) do
if not scheme_values[v] then if not scheme_values[v] then
return false, option:error( ERR.OPT_BADVALUE( return false, option:error( ERR.OPT_BADVALUE(
option, { v, luci.util.serialize_data( option, { v, util.serialize_data(
luci.util.keys(scheme_values) util.keys(scheme_values)
) } ) }
) ) ) )
end end
@ -329,16 +334,16 @@ function UVL._validate_option( self, option, nodeps )
return false, option:error(ERR.OPT_DATATYPE(option, dt)) return false, option:error(ERR.OPT_DATATYPE(option, dt))
end end
end end
end
if not nodeps then if not nodeps then
local ok, err = luci.uvl.dependencies.check( self, option ) local ok, err = dependencies.check( self, option )
if not ok then if not ok then
option:error(err) option:error(err)
end end
end end
end
local ok, err = luci.uvl.validation.check( self, option ) local ok, err = validation.check( self, option )
if not ok and STRICT_EXTERNAL_VALIDATORS then if not ok and STRICT_EXTERNAL_VALIDATORS then
return false, option:error(err) return false, option:error(err)
end end
@ -350,44 +355,58 @@ end
--- Find all parts of given scheme and construct validation tree. --- Find all parts of given scheme and construct validation tree.
-- This is normally done on demand, so you don't have to call this function -- This is normally done on demand, so you don't have to call this function
-- by yourself. -- by yourself.
-- @param scheme Name of the scheme to parse -- @param shm Name of the scheme to parse
-- @param alias Create an alias for the loaded scheme -- @param alias Create an alias for the loaded scheme
function UVL.read_scheme( self, scheme, alias ) function UVL.read_scheme( self, shm, alias )
local so = luci.uvl.scheme( self, scheme ) local so = scheme( self, shm )
local bc = "%s/bytecode/%s.lua" %{ self.schemedir, scheme } local bc = "%s/bytecode/%s.lua" %{ self.schemedir, shm }
if not luci.fs.access(bc) then if not fs.access(bc) then
local schemes = { } local files = fs.glob(self.schemedir .. '/*/' .. shm)
local files = luci.fs.glob(self.schemedir .. '/*/' .. scheme)
if files then if files then
local ok, err
for i, file in ipairs( files ) do for i, file in ipairs( files ) do
if not luci.fs.access(file) then if not fs.access(file) then
return false, so:error(ERR.SME_READ(so,file)) return false, so:error(ERR.SME_READ(so,file))
end end
local uci = luci.model.uci.cursor( luci.fs.dirname(file), default_savedir ) local uci = uci.cursor( fs.dirname(file), default_savedir )
local sd, err = uci:get_all( luci.fs.basename(file) ) local sname = fs.basename(file)
local sd, err = uci:load( sname )
if not sd then if not sd then
return false, ERR.UCILOAD(so, err) return false, ERR.UCILOAD(so, err)
end end
table.insert( schemes, sd ) ok, err = pcall(function()
uci:foreach(sname, "package", function(s)
self:_parse_package(so, s[".name"], s)
end)
uci:foreach(sname, "section", function(s)
self:_parse_section(so, s[".name"], s)
end)
uci:foreach(sname, "variable", function(s)
self:_parse_var(so, s[".name"], s)
end)
uci:foreach(sname, "enum", function(s)
self:_parse_enum(so, s[".name"], s)
end)
end)
end end
local ok, err = self:_read_scheme_parts( so, schemes ) if ok and alias then self.packages[alias] = self.packages[shm] end
if ok and alias then self.packages[alias] = self.packages[scheme] end return ok and self, err
return ok, err
else else
return false, so:error(ERR.SME_FIND(so, self.schemedir)) return false, so:error(ERR.SME_FIND(so, self.schemedir))
end end
else else
local sc = loadfile(bc) local sc = loadfile(bc)
if sc then if sc then
self.packages[scheme] = sc() self.packages[shm] = sc()
return true return true
else else
return false, so:error(ERR.SME_READ(so,bc)) return false, so:error(ERR.SME_READ(so,bc))
@ -395,11 +414,8 @@ function UVL.read_scheme( self, scheme, alias )
end end
end end
-- Process all given parts and construct validation tree -- helper function to check for required fields
function UVL._read_scheme_parts( self, scheme, schemes ) local function _req( t, n, c, r )
-- helper function to check for required fields
local function _req( t, n, c, r )
for i, v in ipairs(r) do for i, v in ipairs(r) do
if not c[v] then if not c[v] then
local p, o = scheme:sid(), nil local p, o = scheme:sid(), nil
@ -416,11 +432,11 @@ function UVL._read_scheme_parts( self, scheme, schemes )
end end
end end
return true return true
end end
-- helper function to validate references -- helper function to validate references
local function _ref( c, t ) local function _ref( c, t )
local k, n local r, k, n = {}
if c == TYPE_SECTION then if c == TYPE_SECTION then
k = "package" k = "package"
n = 1 n = 1
@ -432,7 +448,9 @@ function UVL._read_scheme_parts( self, scheme, schemes )
n = 3 n = 3
end end
local r = luci.util.split( t[k], "." ) for o in t[k]:gmatch("[^.]+") do
r[#r+1] = o
end
r[1] = ( #r[1] > 0 and r[1] or scheme:sid() ) r[1] = ( #r[1] > 0 and r[1] or scheme:sid() )
if #r ~= n then if #r ~= n then
@ -440,57 +458,44 @@ function UVL._read_scheme_parts( self, scheme, schemes )
end end
return r return r
end end
-- helper function to read bools -- helper function to read bools
local function _bool( v ) local function _bool( v )
return ( v == "true" or v == "yes" or v == "on" or v == "1" ) return ( v == "true" or v == "yes" or v == "on" or v == "1" )
end end
-- Step 0: get package meta information
local ok, err function UVL._parse_package(self, scheme, k, v)
local sid = scheme:sid()
-- Step 0: get package meta information local pkg = self.packages[sid] or {
for i, conf in ipairs( schemes ) do ["name"] = sid;
for k, v in pairs( conf ) do
if v['.type'] == 'package' then
self.packages[scheme:sid()] =
self.packages[scheme:sid()] or {
["name"] = scheme:sid();
["sections"] = { }; ["sections"] = { };
["variables"] = { }; ["variables"] = { };
} }
for k, v2 in pairs(v) do pkg.title = v.title
if k == "title" or k == "description" then pkg.description = v.description
self.packages[scheme:sid()][k] = v2
end
end
end
end
end
-- Step 1: get all sections self.packages[sid] = pkg
for i, conf in ipairs( schemes ) do end
for k, v in pairs( conf ) do
if v['.type'] == 'section' then
ok, err = _req( TYPE_SECTION, k, v, { "name", "package" } ) -- Step 1: get all sections
if err then return false, scheme:error(err) end function UVL._parse_section(self, scheme, k, v)
local ok, err = _req( TYPE_SECTION, k, v, { "name", "package" } )
if err then error(scheme:error(err)) end
local r, err = _ref( TYPE_SECTION, v ) local r, err = _ref( TYPE_SECTION, v )
if err then return false, scheme:error(err) end if err then error(scheme:error(err)) end
self.packages[r[1]] = local p = self.packages[r[1]] or {
self.packages[r[1]] or {
["name"] = r[1]; ["name"] = r[1];
["sections"] = { }; ["sections"] = { };
["variables"] = { }; ["variables"] = { };
} }
local p = self.packages[r[1]]
p.sections[v.name] = p.sections[v.name] or { } p.sections[v.name] = p.sections[v.name] or { }
p.variables[v.name] = p.variables[v.name] or { } p.variables[v.name] = p.variables[v.name] or { }
self.packages[r[1]] = p
local s = p.sections[v.name] local s = p.sections[v.name]
local so = scheme:section(v.name) local so = scheme:section(v.name)
@ -501,7 +506,7 @@ function UVL._read_scheme_parts( self, scheme, schemes )
s.depends = self:_read_dependency( v2, s.depends ) s.depends = self:_read_dependency( v2, s.depends )
if not s.depends then if not s.depends then
return false, scheme:error( return false, scheme:error(
ERR.SME_BADDEP(so, luci.util.serialize_data(s.depends)) ERR.SME_BADDEP(so, util.serialize_data(s.depends))
) )
end end
elseif k == "dynamic" or k == "unique" or elseif k == "dynamic" or k == "unique" or
@ -518,33 +523,29 @@ function UVL._read_scheme_parts( self, scheme, schemes )
s.unique = s.unique or false s.unique = s.unique or false
s.required = s.required or false s.required = s.required or false
s.named = s.named or false s.named = s.named or false
end end
end
end
-- Step 2: get all variables -- Step 2: get all variables
for i, conf in ipairs( schemes ) do function UVL._parse_var(self, scheme, k, v)
for k, v in pairs( conf ) do local ok, err = _req( TYPE_OPTION, k, v, { "name", "section" } )
if v['.type'] == "variable" then if err then error(scheme:error(err)) end
ok, err = _req( TYPE_OPTION, k, v, { "name", "section" } )
if err then return false, scheme:error(err) end
local r, err = _ref( TYPE_OPTION, v ) local r, err = _ref( TYPE_OPTION, v )
if err then return false, scheme:error(err) end if err then error(scheme:error(err)) end
local p = self.packages[r[1]] local p = self.packages[r[1]]
if not p then if not p then
return false, scheme:error( error(scheme:error(
ERR.SME_VBADPACK({scheme:sid(), '', v.name}, r[1]) ERR.SME_VBADPACK({scheme:sid(), '', v.name}, r[1])
) ))
end end
local s = p.variables[r[2]] local s = p.variables[r[2]]
if not s then if not s then
return false, scheme:error( error(scheme:error(
ERR.SME_VBADSECT({scheme:sid(), '', v.name}, r[2]) ERR.SME_VBADSECT({scheme:sid(), '', v.name}, r[2])
) ))
end end
s[v.name] = s[v.name] or { } s[v.name] = s[v.name] or { }
@ -558,26 +559,27 @@ function UVL._read_scheme_parts( self, scheme, schemes )
if k == "depends" then if k == "depends" then
t.depends = self:_read_dependency( v2, t.depends ) t.depends = self:_read_dependency( v2, t.depends )
if not t.depends then if not t.depends then
return false, scheme:error(so:error( error(scheme:error(so:error(
ERR.SME_BADDEP(to, luci.util.serialize_data(v2)) ERR.SME_BADDEP(to, util.serialize_data(v2))
)) )))
end end
elseif k == "validator" then elseif k == "validator" then
t.validators = self:_read_validator( v2, t.validators ) t.validators = self:_read_validator( v2, t.validators )
if not t.validators then if not t.validators then
return false, scheme:error(so:error( error(scheme:error(so:error(
ERR.SME_BADVAL(to, luci.util.serialize_data(v2)) ERR.SME_BADVAL(to, util.serialize_data(v2))
)) )))
end end
elseif k == "valueof" then elseif k == "valueof" then
local values, err = self:_read_reference( v2 ) local values, err = self:_read_reference( v2 )
if err then if err then
return false, scheme:error(so:error( error(scheme:error(so:error(
ERR.REFERENCE(to, luci.util.serialize_data(v2)):child(err) ERR.REFERENCE(to, util.serialize_data(v2)):child(err)
)) )))
end end
t.type = "reference" t.type = "reference"
t.values = values t.values = values
t.valueof = type(v2) == "table" and v2 or {v2}
elseif k == "required" then elseif k == "required" then
t[k] = _bool(v2) t[k] = _bool(v2)
else else
@ -589,40 +591,35 @@ function UVL._read_scheme_parts( self, scheme, schemes )
t.type = t.type or "variable" t.type = t.type or "variable"
t.datatype = t.datatype or "string" t.datatype = t.datatype or "string"
t.required = t.required or false t.required = t.required or false
end end
end
end
-- Step 3: get all enums -- Step 3: get all enums
for i, conf in ipairs( schemes ) do function UVL._parse_enum(self, scheme, k, v)
for k, v in pairs( conf ) do local ok, err = _req( TYPE_ENUM, k, v, { "value", "variable" } )
if v['.type'] == "enum" then if err then error(scheme:error(err)) end
ok, err = _req( TYPE_ENUM, k, v, { "value", "variable" } )
if err then return false, scheme:error(err) end
local r, err = _ref( TYPE_ENUM, v ) local r, err = _ref( TYPE_ENUM, v )
if err then return false, scheme:error(err) end if err then error(scheme:error(err)) end
local p = self.packages[r[1]] local p = self.packages[r[1]]
if not p then if not p then
return false, scheme:error( error(scheme:error(
ERR.SME_EBADPACK({scheme:sid(), '', '', v.value}, r[1]) ERR.SME_EBADPACK({scheme:sid(), '', '', v.value}, r[1])
) ))
end end
local s = p.variables[r[2]] local s = p.variables[r[2]]
if not s then if not s then
return false, scheme:error( error(scheme:error(
ERR.SME_EBADSECT({scheme:sid(), '', '', v.value}, r[2]) ERR.SME_EBADSECT({scheme:sid(), '', '', v.value}, r[2])
) ))
end end
local t = s[r[3]] local t = s[r[3]]
if not t then if not t then
return false, scheme:error( error(scheme:error(
ERR.SME_EBADOPT({scheme:sid(), '', '', v.value}, r[3]) ERR.SME_EBADOPT({scheme:sid(), '', '', v.value}, r[3])
) ))
end end
@ -630,8 +627,8 @@ function UVL._read_scheme_parts( self, scheme, schemes )
local oo = so:option(r[3]) local oo = so:option(r[3])
local eo = oo:enum(v.value) local eo = oo:enum(v.value)
if t.type ~= "enum" then if t.type ~= "enum" and t.type ~= "reference" then
return false, scheme:error(ERR.SME_EBADTYPE(eo)) error(scheme:error(ERR.SME_EBADTYPE(eo)))
end end
if not t.values then if not t.values then
@ -646,7 +643,7 @@ function UVL._read_scheme_parts( self, scheme, schemes )
if v.default then if v.default then
if t.default then if t.default then
return false, scheme:error(ERR.SME_EBADDEF(eo)) error(scheme:error(ERR.SME_EBADDEF(eo)))
end end
t.default = v.value t.default = v.value
end end
@ -657,35 +654,29 @@ function UVL._read_scheme_parts( self, scheme, schemes )
) )
if not t.enum_depends[v.value] then if not t.enum_depends[v.value] then
return false, scheme:error(so:error(oo:error( error(scheme:error(so:error(oo:error(
ERR.SME_BADDEP(eo, luci.util.serialize_data(v.depends)) ERR.SME_BADDEP(eo, util.serialize_data(v.depends))
))) ))))
end end
end end
end
end
end
return self
end end
-- Read a dependency specification -- Read a dependency specification
function UVL._read_dependency( self, values, deps ) function UVL._read_dependency( self, values, deps )
local expr = "%$?[a-zA-Z0-9_]+" local expr = "%$?[%w_]+"
if values then if values then
values = ( type(values) == "table" and values or { values } ) values = ( type(values) == "table" and values or { values } )
for _, value in ipairs(values) do for _, value in ipairs(values) do
local parts = luci.util.split( value, "%s*,%s*", nil, true )
local condition = { } local condition = { }
for i, val in ipairs(parts) do for val in value:gmatch("[^,]+") do
local k, v = unpack(luci.util.split(val, "%s*=%s*", nil, true)) local k, e, v = val:match("%s*([%w$_.]+)%s*(=?)%s*(.*)")
if k and ( if k and (
k:match("^"..expr.."%."..expr.."%."..expr.."$") or k:match("^"..expr.."%."..expr.."%."..expr.."$") or
k:match("^"..expr.."%."..expr.."$") or k:match("^"..expr.."%."..expr.."$") or
k:match("^"..expr.."$") k:match("^"..expr.."$")
) then ) then
condition[k] = v or true condition[k] = (e == '=') and v or true
else else
return nil return nil
end end
@ -694,7 +685,7 @@ function UVL._read_dependency( self, values, deps )
if not deps then if not deps then
deps = { condition } deps = { condition }
else else
table.insert( deps, condition ) deps[#deps+1] = condition
end end
end end
end end
@ -719,7 +710,7 @@ function UVL._read_validator( self, values, validators )
local values = { ... } local values = { ... }
for _, v in ipairs(values) do for _, v in ipairs(values) do
local ok, match = local ok, match =
luci.util.copcall( string.match, v, pattern ) pcall( string.match, v, pattern )
if not ok then if not ok then
return false, match return false, match
@ -738,7 +729,7 @@ function UVL._read_validator( self, values, validators )
if not validators then if not validators then
validators = { validator } validators = { validator }
else else
table.insert( validators, validator ) validators[#validators+1] = validator
end end
else else
return nil return nil
@ -755,10 +746,10 @@ function UVL._read_reference( self, values )
values = ( type(values) == "table" and values or { values } ) values = ( type(values) == "table" and values or { values } )
for _, value in ipairs(values) do for _, value in ipairs(values) do
local ref = luci.util.split(value, ".") local ref = util.split(value, ".")
if #ref == 2 or #ref == 3 then if #ref == 2 or #ref == 3 then
local co = luci.uvl.config( self, ref[1] ) local co = config( self, ref[1] )
if not co:config() then return false, co:errors() end if not co:config() then return false, co:errors() end
for k, v in pairs(co:config()) do for k, v in pairs(co:config()) do
@ -783,10 +774,10 @@ end
-- Resolve given path -- Resolve given path
function UVL._resolve_function( self, value ) function UVL._resolve_function( self, value )
local path = luci.util.split(value, ".") local path = util.split(value, ".")
for i=1, #path-1 do for i=1, #path-1 do
local stat, mod = luci.util.copcall( local stat, mod = pcall(
require, table.concat(path, ".", 1, i) require, table.concat(path, ".", 1, i)
) )
@ -810,10 +801,20 @@ end
--- Object representation of an uvl item - base class. --- Object representation of an uvl item - base class.
uvlitem = luci.util.class() uvlitem = util.class()
function uvlitem.cid(self) function uvlitem.cid(self)
return table.concat( self.cref, '.' ) if #self.cref == 1 then
return self.cref[1]
else
local r = { unpack(self.cref) }
local c = self.c
if c and c[r[2]] and c[r[2]]['.anonymous'] and c[r[2]]['.index'] then
r[2] = '@' .. c[r[2]]['.type'] ..
'[' .. tostring(c[r[2]]['.index']) .. ']'
end
return table.concat( r, '.' )
end
end end
function uvlitem.sid(self) function uvlitem.sid(self)
@ -821,22 +822,15 @@ function uvlitem.sid(self)
end end
function uvlitem.scheme(self, opt) function uvlitem.scheme(self, opt)
local s local s = self.s and self.s.packages
if #self.sref == 4 or #self.sref == 3 then
s = self.s and self.s.packages
s = s and s[self.sref[1]] s = s and s[self.sref[1]]
if #self.sref == 4 or #self.sref == 3 then
s = s and s.variables s = s and s.variables
s = s and s[self.sref[2]] s = s and s[self.sref[2]]
s = s and s[self.sref[3]] s = s and s[self.sref[3]]
elseif #self.sref == 2 then elseif #self.sref == 2 then
s = self.s and self.s.packages
s = s and s[self.sref[1]]
s = s and s.sections s = s and s.sections
s = s and s[self.sref[2]] s = s and s[self.sref[2]]
else
s = self.s and self.s.packages
s = s and s[self.sref[1]]
end end
if s and opt then if s and opt then
@ -847,15 +841,13 @@ function uvlitem.scheme(self, opt)
end end
function uvlitem.config(self, opt) function uvlitem.config(self, opt)
local c local c = self.c
if #self.cref == 4 or #self.cref == 3 then if #self.cref >= 2 and #self.cref <= 4 then
c = self.c and self.c[self.cref[2]] or nil c = c and self.c[self.cref[2]] or nil
if #self.cref >= 3 then
c = c and c[self.cref[3]] or nil c = c and c[self.cref[3]] or nil
elseif #self.cref == 2 then end
c = self.c and self.c[self.cref[2]] or nil
else
c = self.c
end end
if c and opt then if c and opt then
@ -871,13 +863,13 @@ function uvlitem.title(self)
end end
function uvlitem.type(self) function uvlitem.type(self)
if self.t == luci.uvl.TYPE_CONFIG then if self.t == TYPE_CONFIG then
return 'config' return 'config'
elseif self.t == luci.uvl.TYPE_SECTION then elseif self.t == TYPE_SECTION then
return 'section' return 'section'
elseif self.t == luci.uvl.TYPE_OPTION then elseif self.t == TYPE_OPTION then
return 'option' return 'option'
elseif self.t == luci.uvl.TYPE_ENUM then elseif self.t == TYPE_ENUM then
return 'enum' return 'enum'
end end
end end
@ -903,22 +895,25 @@ function uvlitem.parent(self)
if self.p then if self.p then
return self.p return self.p
elseif #self.cref == 3 or #self.cref == 4 then elseif #self.cref == 3 or #self.cref == 4 then
return luci.uvl.section( self.s, self.c, self.cref[1], self.cref[2] ) return section( self.s, self.c, self.cref[1], self.cref[2] )
elseif #self.cref == 2 then elseif #self.cref == 2 then
return luci.uvl.config( self.s, self.c, self.cref[1] ) return config( self.s, self.c, self.cref[1] )
else else
return nil return nil
end end
end end
function uvlitem._loadconf(self, co, c) function uvlitem._loadconf(self, co, c)
co = co or self._configcache
if not co then if not co then
local uci, err = luci.model.uci.cursor(), nil local err
co, err = uci:get_all(c) co, err = uci.cursor():get_all(c)
if err then if err then
self:error(ERR.UCILOAD(self, err)) self:error(ERR.UCILOAD(self, err))
end end
self._configcache = co
end end
return co return co
end end
@ -936,7 +931,7 @@ end
-- @param co Configuration data -- @param co Configuration data
-- @param c Configuration name -- @param c Configuration name
-- @return Config instance -- @return Config instance
scheme = luci.util.class(uvlitem) scheme = util.class(uvlitem)
function scheme.__init__(self, scheme, co, c) function scheme.__init__(self, scheme, co, c)
if not c then if not c then
@ -947,7 +942,7 @@ function scheme.__init__(self, scheme, co, c)
self.sref = { c } self.sref = { c }
self.c = self:_loadconf(co, c) self.c = self:_loadconf(co, c)
self.s = scheme self.s = scheme
self.t = luci.uvl.TYPE_SCHEME self.t = TYPE_SCHEME
end end
--- Add an error to scheme. --- Add an error to scheme.
@ -960,7 +955,7 @@ end
--- Get an associated config object. --- Get an associated config object.
-- @return Config instance -- @return Config instance
function scheme.config(self) function scheme.config(self)
local co = luci.uvl.config( self.s, self.cref[1] ) local co = config( self.s, self.cref[1] )
co.p = self co.p = self
return co return co
@ -972,9 +967,9 @@ function scheme.sections(self)
local v = { } local v = { }
if self.s.packages[self.sref[1]].sections then if self.s.packages[self.sref[1]].sections then
for o, _ in pairs( self.s.packages[self.sref[1]].sections ) do for o, _ in pairs( self.s.packages[self.sref[1]].sections ) do
table.insert( v, luci.uvl.option( v[#v+1] = option(
self.s, self.c, self.cref[1], self.cref[2], o self.s, self.c, self.cref[1], self.cref[2], o
) ) )
end end
end end
return v return v
@ -984,7 +979,7 @@ end
-- @param s Section to select -- @param s Section to select
-- @return Section instance -- @return Section instance
function scheme.section(self, s) function scheme.section(self, s)
local so = luci.uvl.section( self.s, self.c, self.cref[1], s ) local so = section( self.s, self.c, self.cref[1], s )
so.p = self so.p = self
return so return so
@ -1003,7 +998,7 @@ end
-- @param co Configuration data -- @param co Configuration data
-- @param c Configuration name -- @param c Configuration name
-- @return Config instance -- @return Config instance
config = luci.util.class(uvlitem) config = util.class(uvlitem)
function config.__init__(self, scheme, co, c) function config.__init__(self, scheme, co, c)
if not c then if not c then
@ -1014,7 +1009,7 @@ function config.__init__(self, scheme, co, c)
self.sref = { c } self.sref = { c }
self.c = self:_loadconf(co, c) self.c = self:_loadconf(co, c)
self.s = scheme self.s = scheme
self.t = luci.uvl.TYPE_CONFIG self.t = TYPE_CONFIG
end end
--- Get all section objects associated with this config. --- Get all section objects associated with this config.
@ -1023,9 +1018,9 @@ function config.sections(self)
local v = { } local v = { }
if self.s.packages[self.sref[1]].sections then if self.s.packages[self.sref[1]].sections then
for o, _ in pairs( self.s.packages[self.sref[1]].sections ) do for o, _ in pairs( self.s.packages[self.sref[1]].sections ) do
table.insert( v, luci.uvl.option( v[#v+1] = option(
self.s, self.c, self.cref[1], self.cref[2], o self.s, self.c, self.cref[1], self.cref[2], o
) ) )
end end
end end
return v return v
@ -1035,7 +1030,7 @@ end
-- @param s Section to select -- @param s Section to select
-- @return Section instance -- @return Section instance
function config.section(self, s) function config.section(self, s)
local so = luci.uvl.section( self.s, self.c, self.cref[1], s ) local so = section( self.s, self.c, self.cref[1], s )
so.p = self so.p = self
return so return so
@ -1055,14 +1050,14 @@ end
-- @param c Configuration name -- @param c Configuration name
-- @param s Section name -- @param s Section name
-- @return Section instance -- @return Section instance
section = luci.util.class(uvlitem) section = util.class(uvlitem)
function section.__init__(self, scheme, co, c, s) function section.__init__(self, scheme, co, c, s)
self.cref = { c, s } self.cref = { c, s }
self.sref = { c, co and co[s] and co[s]['.type'] or s } self.sref = { c, co and co[s] and co[s]['.type'] or s }
self.c = self:_loadconf(co, c) self.c = self:_loadconf(co, c)
self.s = scheme self.s = scheme
self.t = luci.uvl.TYPE_SECTION self.t = TYPE_SECTION
end end
--- Get all option objects associated with this section. --- Get all option objects associated with this section.
@ -1073,9 +1068,9 @@ function section.variables(self)
for o, _ in pairs( for o, _ in pairs(
self.s.packages[self.sref[1]].variables[self.sref[2]] self.s.packages[self.sref[1]].variables[self.sref[2]]
) do ) do
table.insert( v, luci.uvl.option( v[#v+1] = option(
self.s, self.c, self.cref[1], self.cref[2], o self.s, self.c, self.cref[1], self.cref[2], o
) ) )
end end
end end
return v return v
@ -1085,7 +1080,7 @@ end
-- @param o Option to select -- @param o Option to select
-- @return Option instance -- @return Option instance
function section.option(self, o) function section.option(self, o)
local oo = luci.uvl.option( self.s, self.c, self.cref[1], self.cref[2], o ) local oo = option( self.s, self.c, self.cref[1], self.cref[2], o )
oo.p = self oo.p = self
return oo return oo
@ -1106,22 +1101,22 @@ end
-- @param s Section name -- @param s Section name
-- @param o Option name -- @param o Option name
-- @return Option instance -- @return Option instance
option = luci.util.class(uvlitem) option = util.class(uvlitem)
function option.__init__(self, scheme, co, c, s, o) function option.__init__(self, scheme, co, c, s, o)
self.cref = { c, s, o } self.cref = { c, s, o }
self.sref = { c, co and co[s] and co[s]['.type'] or s, o } self.sref = { c, co and co[s] and co[s]['.type'] or s, o }
self.c = self:_loadconf(co, c) self.c = self:_loadconf(co, c)
self.s = scheme self.s = scheme
self.t = luci.uvl.TYPE_OPTION self.t = TYPE_OPTION
end end
--- Get the value of this option. --- Get the value of this option.
-- @return The associated configuration value -- @return The associated configuration value
function option.value(self) function option.value(self)
local v = self:config() local v = self:config() or self:scheme('default')
if v and self:scheme('multival') then if v and self:scheme('multival') then
v = luci.util.split( v, "%s+", nil, true ) v = util.split( v, "%s+", nil, true )
end end
return v return v
end end
@ -1159,12 +1154,12 @@ end
-- @param o Enum name -- @param o Enum name
-- @param v Enum value -- @param v Enum value
-- @return Enum value instance -- @return Enum value instance
enum = luci.util.class(option) enum = util.class(option)
function enum.__init__(self, scheme, co, c, s, o, v) function enum.__init__(self, scheme, co, c, s, o, v)
self.cref = { c, s, o, v } self.cref = { c, s, o, v }
self.sref = { c, co and co[s] and co[s]['.type'] or s, o, v } self.sref = { c, co and co[s] and co[s]['.type'] or s, o, v }
self.c = self:_loadconf(co, c) self.c = self:_loadconf(co, c)
self.s = scheme self.s = scheme
self.t = luci.uvl.TYPE_ENUM self.t = TYPE_ENUM
end end

27
libs/uvl/luasrc/uvl/datatypes.lua
View file

@ -14,11 +14,14 @@ $Id$
]]-- ]]--
module( "luci.uvl.datatypes", package.seeall ) local fs = require "luci.fs"
local ip = require "luci.ip"
local math = require "math"
local util = require "luci.util"
require("luci.fs") local tonumber = tonumber
require("luci.ip")
require("luci.util") module "luci.uvl.datatypes"
function boolean( val ) function boolean( val )
@ -26,6 +29,8 @@ function boolean( val )
return true return true
elseif val == "0" or val == "no" or val == "off" or val == "false" then elseif val == "0" or val == "no" or val == "off" or val == "false" then
return true return true
elseif val == "" or val == nil then
return true
end end
return false return false
@ -59,7 +64,7 @@ end
function ip4addr( val ) function ip4addr( val )
if val then if val then
return luci.ip.IPv4(val) and true or false return ip.IPv4(val) and true or false
end end
return false return false
@ -72,7 +77,7 @@ end
function ip6addr( val ) function ip6addr( val )
if val then if val then
return luci.ip.IPv6(val) and true or false return ip.IPv6(val) and true or false
end end
return false return false
@ -102,7 +107,7 @@ function macaddr( val )
"^[a-fA-F0-9]+:[a-fA-F0-9]+:[a-fA-F0-9]+:" .. "^[a-fA-F0-9]+:[a-fA-F0-9]+:[a-fA-F0-9]+:" ..
"[a-fA-F0-9]+:[a-fA-F0-9]+:[a-fA-F0-9]+$" "[a-fA-F0-9]+:[a-fA-F0-9]+:[a-fA-F0-9]+$"
) then ) then
local parts = luci.util.split( val, ":" ) local parts = util.split( val, ":" )
for i = 1,6 do for i = 1,6 do
parts[i] = tonumber( parts[i], 16 ) parts[i] = tonumber( parts[i], 16 )
@ -134,7 +139,7 @@ function string( val )
end end
function directory( val, seen ) function directory( val, seen )
local s = luci.fs.stat( val ) local s = fs.stat( val )
seen = seen or { } seen = seen or { }
if s and not seen[s.ino] then if s and not seen[s.ino] then
@ -142,7 +147,7 @@ function directory( val, seen )
if s.type == "directory" then if s.type == "directory" then
return true return true
elseif s.type == "link" then elseif s.type == "link" then
return directory( luci.fs.readlink(val), seen ) return directory( fs.readlink(val), seen )
end end
end end
@ -150,7 +155,7 @@ function directory( val, seen )
end end
function file( val, seen ) function file( val, seen )
local s = luci.fs.stat( val ) local s = fs.stat( val )
seen = seen or { } seen = seen or { }
if s and not seen[s.ino] then if s and not seen[s.ino] then
@ -158,7 +163,7 @@ function file( val, seen )
if s.type == "regular" then if s.type == "regular" then
return true return true
elseif s.type == "link" then elseif s.type == "link" then
return file( luci.fs.readlink(val), seen ) return file( fs.readlink(val), seen )
end end
end end

45
libs/uvl/luasrc/uvl/dependencies.lua
View file

@ -14,38 +14,35 @@ $Id$
]]-- ]]--
module( "luci.uvl.dependencies", package.seeall ) local uvl = require "luci.uvl"
local ERR = require "luci.uvl.errors"
local util = require "luci.util"
local table = require "table"
local type, unpack = type, unpack
local ipairs, pairs = ipairs, pairs
module "luci.uvl.dependencies"
local ERR = luci.uvl.errors
function _parse_reference( r, c, s, o ) function _parse_reference( r, c, s, o )
local ref = { } local ref = { }
local vars = { local vars = {
config = ( c or '$config' ), config = c,
section = ( s or '$section' ), section = s,
option = ( o or '$option' ) option = o
} }
for i, v in ipairs(luci.util.split(r,".")) do for v in r:gmatch("[^.]+") do
table.insert(ref, (v:gsub( "%$(.+)", function(n) return vars[n] end ))) ref[#ref+1] = (v:gsub( "%$(.+)", vars ))
end end
if c or s then if #ref < 2 then
if #ref == 1 and c and s then table.insert(ref, 1, s or '$section')
ref = { c, s, ref[1] }
elseif #ref == 2 and c then
ref = { c, unpack(ref) }
elseif #ref ~= 3 then
ref = nil
end
else
if #ref == 1 then
ref = { '$config', '$section', ref[1] }
elseif #ref == 2 then
ref = { '$config', unpack(ref) }
elseif #ref ~= 3 then
ref = nil
end end
if #ref < 3 then
table.insert(ref, 1, c or '$config')
end end
return ref return ref
@ -54,7 +51,7 @@ end
function _serialize_dependency( dep, v ) function _serialize_dependency( dep, v )
local str local str
for k, v in luci.util.spairs( dep, for k, v in util.spairs( dep,
function(a,b) function(a,b)
a = ( type(dep[a]) ~= "boolean" and "_" or "" ) .. a a = ( type(dep[a]) ~= "boolean" and "_" or "" ) .. a
b = ( type(dep[b]) ~= "boolean" and "_" or "" ) .. b b = ( type(dep[b]) ~= "boolean" and "_" or "" ) .. b
@ -92,7 +89,7 @@ function check( self, object, nodeps )
return false, derr:child(ERR.SME_BADDEP(object,k)) return false, derr:child(ERR.SME_BADDEP(object,k))
end end
local option = luci.uvl.option( self, object.c, unpack(ref) ) local option = uvl.option( self, object.c, unpack(ref) )
valid, err = self:_validate_option( option, true ) valid, err = self:_validate_option( option, true )
if valid then if valid then

24
libs/uvl/luasrc/uvl/errors.lua
View file

@ -14,11 +14,19 @@ $Id$
]]-- ]]--
module( "luci.uvl.errors", package.seeall ) local uci = require "luci.model.uci"
local uvl = require "luci.uvl"
local util = require "luci.util"
local string = require "string"
require("luci.util") local ipairs, error, type = ipairs, error, type
local tonumber, unpack = tonumber, unpack
local luci = luci
module "luci.uvl.errors"
ERRCODES = { ERRCODES = {
{ 'UCILOAD', 'Unable to load config "%p": %1' }, { 'UCILOAD', 'Unable to load config "%p": %1' },
@ -68,11 +76,11 @@ ERRCODES = {
-- build error constants and instance constructors -- build error constants and instance constructors
for i, v in ipairs(ERRCODES) do for i, v in ipairs(ERRCODES) do
luci.uvl.errors[v[1]] = function(...) _M[v[1]] = function(...)
return error(i, ...) return error(i, ...)
end end
luci.uvl.errors['ERR_'..v[1]] = i _M['ERR_'..v[1]] = i
end end
@ -85,14 +93,14 @@ function i18n(key, def)
end end
error = luci.util.class() error = util.class()
function error.__init__(self, code, pso, args) function error.__init__(self, code, pso, args)
self.code = code self.code = code
self.args = ( type(args) == "table" and args or { args } ) self.args = ( type(args) == "table" and args or { args } )
if luci.util.instanceof( pso, luci.uvl.uvlitem ) then if util.instanceof( pso, uvl.uvlitem ) then
self.stype = pso.sref[2] self.stype = pso.sref[2]
self.package, self.section, self.option, self.value = unpack(pso.cref) self.package, self.section, self.option, self.value = unpack(pso.cref)
self.object = pso self.object = pso
@ -101,7 +109,7 @@ function error.__init__(self, code, pso, args)
pso = ( type(pso) == "table" and pso or { pso } ) pso = ( type(pso) == "table" and pso or { pso } )
if pso[2] then if pso[2] then
local uci = luci.model.uci.cursor() local uci = uci.cursor()
self.stype = uci:get(pso[1], pso[2]) or pso[2] self.stype = uci:get(pso[1], pso[2]) or pso[2]
end end
@ -113,7 +121,7 @@ function error.child(self, err)
if not self.childs then if not self.childs then
self.childs = { err } self.childs = { err }
else else
table.insert( self.childs, err ) self.childs[#self.childs+1] = err
end end
return self return self
end end

20
libs/uvl/luasrc/uvl/validation.lua
View file

@ -14,26 +14,28 @@ $Id$
]]-- ]]--
module( "luci.uvl.validation", package.seeall ) local os = require "os"
local fs = require "luci.fs"
local sys = require "luci.sys"
local ERR = require "luci.uvl.errors"
require("luci.fs") local ipairs, unpack, type, tostring = ipairs, unpack, type, tostring
require("luci.sys")
local ERR = luci.uvl.errors module "luci.uvl.validation"
function _exec( bin, args ) function _exec( bin, args )
local cmd, output = "", nil local cmd, output = "", nil
for _, v in ipairs({ bin, unpack(args) }) do for _, v in ipairs({ bin, unpack(args) }) do
cmd = cmd .. string.format("%q ",v):gsub("([%$`])","\\%1") cmd = cmd .. ("%q " % v):gsub("([%$`])","\\%1")
end end
local tmpfile = "/tmp/uvl" .. luci.sys.uniqueid(8) local tmpfile = "/tmp/uvl" .. sys.uniqueid(8)
local retval = os.execute( cmd .. " 1>" .. tmpfile .. " 2>" .. tmpfile ) local retval = os.execute( cmd .. " 1>" .. tmpfile .. " 2>" .. tmpfile )
if luci.fs.access(tmpfile) then if fs.access(tmpfile) then
output = luci.fs.readfile(tmpfile) output = fs.readfile(tmpfile)
luci.fs.unlink(tmpfile) fs.unlink(tmpfile)
end end
return retval, output return retval, output