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

Merge pull request #400 from chris5560/master

Browse source 
luci-app-radicale: fixed function ipkg_ver_compare
This commit is contained in:
Christian Schoenebeck 2015-06-04 20:51:30 +02:00
commit 57c5143b23
3 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-radicale/Makefile
View file

@ -10,7 +10,7 @@ PKG_NAME:=luci-app-radicale
# Version == major.minor.patch
# increase "minor" on new functionality and "patch" on patches/optimization
PKG_VERSION:=1.0.0
PKG_VERSION:=1.0.1
# Release == build
# increase on changes of translation files

39
applications/luci-app-radicale/luasrc/controller/radicale.lua Executable file → Normal file
View file

@ -122,8 +122,7 @@ end
-- compare versions using "<=" "<" ">" ">=" "=" "<<" ">>"
function ipkg_ver_compare(ver1, comp, ver2)
if not ver1 or not (#ver1 > 0)
or not ver2 or not (#ver2 > 0)
if not ver1 or not ver2
or not comp or not (#comp > 0) then return nil end
-- correct compare string
if comp == "<>" or comp == "><" or comp == "!=" or comp == "~=" then comp = "~="
@ -140,33 +139,19 @@ function ipkg_ver_compare(ver1, comp, ver2)
for i = 1, math.max(table.getn(av1),table.getn(av2)), 1 do
local s1 = av1[i] or ""
local s2 = av2[i] or ""
local n1 = tonumber(s1)
local n2 = tonumber(s2)
-- one numeric and other empty string then set other to 0
if n1 and not n2 and (not s2 or #s2 == 0) then n2 = 0 end
if n2 and not n1 and (not s1 or #s1 == 0) then n1 = 0 end
local nc = (n1 and n2) -- numeric compare
if nc then
-- first "not equal" found return true
if comp == "~=" and (n1 ~= n2) then return true end
-- first "lower" found return true
if (comp == "<" or comp == "<=") and (n1 < n2) then return true end
-- first "greater" found return true
if (comp == ">" or comp == ">=") and (n1 > n2) then return true end
-- not equal then return false
if (n1 ~= n2) then return false end
else
if comp == "~=" and (s1 ~= s2) then return true end
if (comp == "<" or comp == "<=") and (s1 < s2) then return true end
if (comp == ">" or comp == ">=") and (s1 > s2) then return true end
if (s1 ~= s2) then return false end
end
-- first "not equal" found return true
if comp == "~=" and (s1 ~= s2) then return true end
-- first "lower" found return true
if (comp == "<" or comp == "<=") and (s1 < s2) then return true end
-- first "greater" found return true
if (comp == ">" or comp == ">=") and (s1 > s2) then return true end
-- not equal then return false
if (s1 ~= s2) then return false end
end
-- all equal then true
return true
-- all equal and not compare greater or lower then true
return not (comp == "<" or comp == ">")
end
-- read version information for given package if installed

0
applications/luci-app-radicale/luasrc/model/cbi/radicale.lua Executable file → Normal file
View file