]]--
-module( "luci.uvl.errors", package.seeall )
-require("luci.util")
+local uci = require "luci.model.uci"
+local uvl = require "luci.uvl"
+local util = require "luci.util"
+local string = require "string"
+
+local ipairs, error, type = ipairs, error, type
+local tonumber, unpack = tonumber, unpack
+
+
+local luci = luci
+
+module "luci.uvl.errors"
ERRCODES = {
- { 'UCILOAD', 'Unable to load config "%p"' },
+ { 'UCILOAD', 'Unable to load config "%p": %1' },
{ 'SCHEME', 'Error in scheme "%p":\n%c' },
{ 'CONFIG', 'Error in config "%p":\n%c' },
- { 'SECTION', 'Error in section "%p.%s":\n%c' },
- { 'OPTION', 'Error in option "%p.%s.%o":\n%c' },
- { 'REFERENCE', 'Option "%p.%s.%o" has invalid reference specification "%1":\n%c' },
+ { 'SECTION', 'Error in section "%i" (%I):\n%c' },
+ { 'OPTION', 'Error in option "%i" (%I):\n%c' },
+ { 'REFERENCE', 'Option "%i" has invalid reference specification %1:\n%c' },
{ 'DEPENDENCY', 'In dependency check for %t "%i":\n%c' },
{ 'SME_FIND', 'Can not find scheme "%p" in "%1"' },
{ 'SME_EBADPACK', 'Enum "%v" in scheme "%p" references unknown package "%1"' },
{ 'SME_EBADSECT', 'Enum "%v" in scheme "%p" references unknown section "%1"' },
{ 'SME_EBADOPT', 'Enum "%v" in scheme "%p" references unknown option "%1"' },
- { 'SME_EBADTYPE', 'Enum "%v" in scheme "%p" references non-enum option "%p.%s.%o"' },
- { 'SME_EBADDEF', 'Enum "%v" in scheme "%p" redeclares the default value of "%p.%s.%o"' },
+ { 'SME_EBADTYPE', 'Enum "%v" in scheme "%p" references non-enum option "%I"' },
+ { 'SME_EBADDEF', 'Enum "%v" in scheme "%p" redeclares the default value of "%I"' },
- { 'SECT_UNKNOWN', 'Section "%p.%s" not found in scheme' },
+ { 'SECT_UNKNOWN', 'Section "%i" (%I) not found in scheme' },
{ 'SECT_REQUIRED', 'Required section "%p.%S" not found in config' },
{ 'SECT_UNIQUE', 'Unique section "%p.%S" occurs multiple times in config' },
{ 'SECT_NAMED', 'The section of type "%p.%S" is stored anonymously in config but must be named' },
{ 'SECT_NOTFOUND', 'Section "%p.%s" not found in config' },
- { 'OPT_UNKNOWN', 'Option "%1" not found in scheme' },
+ { 'OPT_UNKNOWN', 'Option "%i" (%I) not found in scheme' },
{ 'OPT_REQUIRED', 'Required option "%i" has no value' },
- { 'OPT_BADVALUE', 'Value "%1" of option "%i" is not defined in %t { %2 }' },
- { 'OPT_INVVALUE', 'Value "%1" of given option "%i" does not validate as datatype "%2"' },
+ { 'OPT_BADVALUE', 'Value "%1" of option "%i" is not defined in enum %2' },
+ { 'OPT_INVVALUE', 'Value "%1" of option "%i" does not validate as datatype "%2"' },
{ 'OPT_NOTLIST', 'Option "%i" is defined as list but stored as plain value' },
{ 'OPT_DATATYPE', 'Option "%i" has unknown datatype "%1"' },
{ 'OPT_NOTFOUND', 'Option "%p.%s.%o" not found in config' },
+ { 'OPT_RANGE', 'Option "%p.%s.%o" is not within the specified range' },
{ 'DEP_NOTEQUAL', 'Dependency (%1) failed:\nOption "%i" is not eqal "%2"' },
{ 'DEP_NOVALUE', 'Dependency (%1) failed:\nOption "%i" has no value' },
{ 'DEP_BADENUM', 'In dependency check for enum value "%i":\n%c' }
}
--- build error constants
+-- build error constants and instance constructors
for i, v in ipairs(ERRCODES) do
- luci.uvl.errors[v[1]] = function(...)
+ _M[v[1]] = function(...)
return error(i, ...)
end
+
+ _M['ERR_'..v[1]] = i
+end
+
+
+function i18n(key, def)
+ if luci.i18n then
+ return luci.i18n.translate(key,def)
+ else
+ return def
+ end
end
-error = luci.util.class()
+error = util.class()
function error.__init__(self, code, pso, args)
self.code = code
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.package, self.section, self.option, self.value = unpack(pso.cref)
self.object = pso
+ self.value = self.value or ( pso.value and pso:value() )
else
pso = ( type(pso) == "table" and pso or { pso } )
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]
end
if not self.childs then
self.childs = { err }
else
- table.insert( self.childs, err )
+ self.childs[#self.childs+1] = err
end
return self
end
function error.string(self,pad)
pad = pad or " "
- local str = ERRCODES[self.code][2]
+
+ local str = i18n(
+ 'uvl_err_%s' % string.lower(ERRCODES[self.code][1]),
+ ERRCODES[self.code][2]
+ )
:gsub("\n", "\n"..pad)
:gsub("%%i", self:cid())
:gsub("%%I", self:sid())
- :gsub("%%p", self.package or '<nil>')
- :gsub("%%s", self.section or '<nil>')
- :gsub("%%S", self.stype or '<nil>')
- :gsub("%%o", self.option or '<nil>')
- :gsub("%%v", self.value or '<nil>')
- :gsub("%%t", self.object and self.object:type() or '<nil>' )
- :gsub("%%T", self.object and self.object:title() or '<nil>' )
- :gsub("%%([1-9])", function(n) error(n) return self.args[tonumber(n)] or '<nil>' end)
+ :gsub("%%p", self.package or '(nil)')
+ :gsub("%%s", self.section or '(nil)')
+ :gsub("%%S", self.stype or '(nil)')
+ :gsub("%%o", self.option or '(nil)')
+ :gsub("%%v", self.value or '(nil)')
+ :gsub("%%t", self.object and self.object:type() or '(nil)' )
+ :gsub("%%T", self.object and self.object:title() or '(nil)' )
+ :gsub("%%([1-9])", function(n) return self.args[tonumber(n)] or '(nil)' end)
:gsub("%%c",
function()
local s = ""
( self.option and '.' .. self.option or '' ) ..
( self.value and '.' .. self.value or '' )
end
+
+function error.is(self, code)
+ if self.code == code then
+ return true
+ elseif self.childs then
+ for _, c in ipairs(self.childs) do
+ if c:is(code) then
+ return true
+ end
+ end
+ end
+ return false
+end
projects / project / luci.git / blobdiff