* luci/libs: uvl: rename validate() to validate_config() and reimplement validate() as "catch all" variant
This commit is contained in:
parent
385c63d4fb
commit
5e606c8fe2
1 changed files with 17 additions and 1 deletions
|
@ -75,11 +75,27 @@ function UVL.__init__( self, schemedir )
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
--- Validate given configuration, section or option.
|
||||||
|
-- @param config Name of the configuration to validate
|
||||||
|
-- @param section Name of the section to validate (optional)
|
||||||
|
-- @param option Name of the option to validate (optional)
|
||||||
|
-- @return Boolean indicating whether the given config validates
|
||||||
|
-- @return String containing the reason for errors (if any)
|
||||||
|
function UVL.validate( self, config, section, option )
|
||||||
|
if config and section and option then
|
||||||
|
return self:validate_option( config, section, option )
|
||||||
|
elseif config and section then
|
||||||
|
return self:validate_section( config, section )
|
||||||
|
elseif config then
|
||||||
|
return self:validate_config( config )
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
--- Validate given configuration.
|
--- Validate given configuration.
|
||||||
-- @param config Name of the configuration to validate
|
-- @param config 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( self, config )
|
function UVL.validate_config( self, config )
|
||||||
|
|
||||||
if not self.packages[config] then
|
if not self.packages[config] then
|
||||||
local ok, err = pcall( self.read_scheme, self, config )
|
local ok, err = pcall( self.read_scheme, self, config )
|
||||||
|
|
Loading…
Reference in a new issue