projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More luci.cutil
[project/luci.git]
/
libs
/
core
/
luasrc
/
util.lua
diff --git
a/libs/core/luasrc/util.lua
b/libs/core/luasrc/util.lua
index
ea1fccb
..
53e46a9
100644
(file)
--- a/
libs/core/luasrc/util.lua
+++ b/
libs/core/luasrc/util.lua
@@
-31,6
+31,7
@@
local debug = require "debug"
local ldebug = require "luci.debug"
local string = require "string"
local coroutine = require "coroutine"
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
local getmetatable, setmetatable = getmetatable, setmetatable
local rawget, rawset, unpack = rawget, rawset, unpack
@@
-44,6
+45,7
@@
module "luci.util"
--
-- Pythonic string formatting extension
--
--
-- Pythonic string formatting extension
--
+--[[
getmetatable("").__mod = function(a, b)
if not b then
return a
getmetatable("").__mod = function(a, b)
if not b then
return a
@@
-53,6
+55,7
@@
getmetatable("").__mod = function(a, b)
return a:format(b)
end
end
return a:format(b)
end
end
+]]--
--
--
@@
-60,6
+63,7
@@
end
--
-- Instantiates a class
--
-- Instantiates a class
+--[[
local function _instantiate(class, ...)
local inst = setmetatable({}, {__index = class})
local function _instantiate(class, ...)
local inst = setmetatable({}, {__index = class})
@@
-69,6
+73,7
@@
local function _instantiate(class, ...)
return inst
end
return inst
end
+]]--
--- Create a Class object (Python-style object model).
-- The class object can be instantiated by calling itself.
--- Create a Class object (Python-style object model).
-- The class object can be instantiated by calling itself.
@@
-84,12
+89,15
@@
end
-- @return A class object
-- @see instanceof
-- @see clone
-- @return A class object
-- @see instanceof
-- @see clone
+--[[
function class(base)
return setmetatable({}, {
__call = _instantiate,
__index = base
})
end
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
--- Test whether the given object is an instance of the given class.
-- @param object Object instance
@@
-97,6
+105,7
@@
end
-- @return Boolean indicating whether the object is an instance
-- @see class
-- @see clone
-- @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
function instanceof(object, class)
local meta = getmetatable(object)
while meta and meta.__index do
@@
-107,6
+116,8
@@
function instanceof(object, class)
end
return false
end
end
return false
end
+]]--
+instanceof = cutil.instanceof
--
--
@@
-193,6
+204,7
@@
end
--- Create valid XML PCDATA from given string.
-- @param value String value containing the data to escape
-- @return String value containing the escaped data
--- 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("[&\"'<>]", {
["&"] = "&",
function pcdata(value)
return value and tostring(value):gsub("[&\"'<>]", {
["&"] = "&",
@@
-202,6
+214,8
@@
function pcdata(value)
[">"] = ">"
})
end
[">"] = ">"
})
end
+]]--
+pcdata = cutil.pcdata
--- Strip HTML tags from given string.
-- @param value String containing the HTML text
--- Strip HTML tags from given string.
-- @param value String containing the HTML text
@@
-257,9
+271,12
@@
end
--- 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
--- 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
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
--- Count the occurences of given substring in given string.
-- @param str String to search in