local ldebug = require "luci.debug"
local string = require "string"
local coroutine = require "coroutine"
+local cutil = require "luci.cutil"
local getmetatable, setmetatable = getmetatable, setmetatable
local rawget, rawset, unpack = rawget, rawset, unpack
--
-- Pythonic string formatting extension
--
+--[[
getmetatable("").__mod = function(a, b)
if not b then
return a
return a:format(b)
end
end
+]]--
--
--
-- Instantiates a class
+--[[
local function _instantiate(class, ...)
local inst = setmetatable({}, {__index = class})
return inst
end
+]]--
--- Create a Class object (Python-style object model).
-- The class object can be instantiated by calling itself.
-- @return A class object
-- @see instanceof
-- @see clone
+--[[
function class(base)
return setmetatable({}, {
__call = _instantiate,
__index = base
})
end
+]]--
+class = cutil.class
--- Test whether the given object is an instance of the given class.
-- @param object Object instance
-- @return Boolean indicating whether the object is an instance
-- @see class
-- @see clone
+--[[
function instanceof(object, class)
local meta = getmetatable(object)
while meta and meta.__index do
end
return false
end
+]]--
+instanceof = cutil.instanceof
--
--- Create valid XML PCDATA from given string.
-- @param value String value containing the data to escape
-- @return String value containing the escaped data
+--[[
function pcdata(value)
return value and tostring(value):gsub("[&\"'<>]", {
["&"] = "&",
[">"] = ">"
})
end
+]]--
+pcdata = cutil.pcdata
--- Strip HTML tags from given string.
-- @param value String containing the HTML text
--- Remove leading and trailing whitespace from given string value.
-- @param str String value containing whitespace padded data
-- @return String value with leading and trailing space removed
+--[[
function trim(str)
return (str:gsub("^%s*(.-)%s*$", "%1"))
end
+]]--
+trim = cutil.trim
+
+--- Count the occurences of given substring in given string.
+-- @param str String to search in
+-- @param pattern String containing pattern to find
+-- @return Number of found occurences
+function cmatch(str, pat)
+ local count = 0
+ for _ in str:gmatch(pat) do count = count + 1 end
+ return count
+end
--- Parse certain units from the given string and return the canonical integer
-- value or 0 if the unit is unknown. Upper- or lower case is irrelevant.
return val
end
---- Combines two or more numerically indexed tables and single objects into one table.
--- @param tbl1 Table value to combine
--- @param tbl2 Table value to combine
--- @param ... More tables to combine
--- @return Table value containing all values of given tables
-function combine(...)
- local result = {}
+-- also register functions above in the central string class for convenience
+string.escape = escape
+string.pcdata = pcdata
+string.striptags = striptags
+string.split = split
+string.trim = trim
+string.cmatch = cmatch
+string.parse_units = parse_units
+
+
+--- Appends numerically indexed tables or single objects to a given table.
+-- @param src Target table
+-- @param ... Objects to insert
+-- @return Target table
+function append(src, ...)
for i, a in ipairs({...}) do
if type(a) == "table" then
for j, v in ipairs(a) do
- result[#result+1] = v
+ src[#src+1] = v
end
else
- result[#result+1] = a
+ src[#src+1] = a
end
end
- return result
+ return src
+end
+
+--- Combines two or more numerically indexed tables and single objects into one table.
+-- @param tbl1 Table value to combine
+-- @param tbl2 Table value to combine
+-- @param ... More tables to combine
+-- @return Table value containing all values of given tables
+function combine(...)
+ return append({}, ...)
end
--- Checks whether the given table contains the given value.