From e00760a753e9dafbf21bfa86543825539653bc0a Mon Sep 17 00:00:00 2001 From: Christian Schoenebeck Date: Sun, 14 Jun 2015 13:12:41 +0200 Subject: [PATCH] [for-15.05] luci-app-ddns: update to 2.2.4-1 (not copied from master) * fixed version checking in function ipkg_ver_compare() * Reported issue #387 and openwrt/packages issue 1285 changed in Version: 2.2.3-1 * reflect updated language file for zh-cn * change default for retry_count to 0 compatible to ddns-scripts 2.4.2-1 * addition to retry_count help description * modified dependency on ddns-scripts 2.4.2-1 Signed-off-by: Christian Schoenebeck --- applications/luci-app-ddns/Makefile | 2 +- .../luci-app-ddns/luasrc/controller/ddns.lua | 2 +- .../luasrc/model/cbi/ddns/detail.lua | 12 +++--- .../luci-app-ddns/luasrc/tools/ddns.lua | 39 ++++++------------- applications/luci-app-ddns/po/de/ddns.po | 11 ++++-- .../luci-app-ddns/po/templates/ddns.pot | 3 ++ 6 files changed, 31 insertions(+), 38 deletions(-) diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile index 1bffcaa4b..0e1e5df4c 100644 --- a/applications/luci-app-ddns/Makefile +++ b/applications/luci-app-ddns/Makefile @@ -10,7 +10,7 @@ PKG_NAME:=luci-app-ddns # Version == major.minor.patch # increase on new functionality (minor) or patches (patch) -PKG_VERSION:=2.2.2 +PKG_VERSION:=2.2.4 # Release == build # increase on changes of translation files diff --git a/applications/luci-app-ddns/luasrc/controller/ddns.lua b/applications/luci-app-ddns/luasrc/controller/ddns.lua index 0b82021e2..946dfefbc 100644 --- a/applications/luci-app-ddns/luasrc/controller/ddns.lua +++ b/applications/luci-app-ddns/luasrc/controller/ddns.lua @@ -15,7 +15,7 @@ local SYS = require "luci.sys" local DDNS = require "luci.tools.ddns" -- ddns multiused functions local UTIL = require "luci.util" -DDNS_MIN = "2.2.0-1" -- minimum version of service required +DDNS_MIN = "2.4.2-1" -- minimum version of service required function index() local nxfs = require "nixio.fs" -- global definitions not available diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua index 40a66ef15..27f9a9f26 100644 --- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua +++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua @@ -1156,11 +1156,13 @@ function fu.write(self, section, value) end -- retry_count (NEW) -- ######################################################## -rc = ns:taboption("timer", Value, "retry_count", - translate("Error Retry Counter"), - translate("On Error the script will stop execution after given number of retrys") ) -rc.default = 5 -rc.rmempty = false -- validate ourselves for translatable error messages +rc = ns:taboption("timer", Value, "retry_count") +rc.title = translate("Error Retry Counter") +rc.description = translate("On Error the script will stop execution after given number of retrys") + .. "
" + .. translate("The default setting of '0' will retry infinite.") +rc.default = 0 +rc.rmempty = false -- validate ourselves for translatable error messages function rc.validate(self, value) if not DTYP.uinteger(value) then return nil, err_tab_timer(self) .. translate("minimum value '0'") diff --git a/applications/luci-app-ddns/luasrc/tools/ddns.lua b/applications/luci-app-ddns/luasrc/tools/ddns.lua index 6d5393146..4466063cb 100644 --- a/applications/luci-app-ddns/luasrc/tools/ddns.lua +++ b/applications/luci-app-ddns/luasrc/tools/ddns.lua @@ -98,8 +98,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 = "~=" @@ -116,33 +115,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 diff --git a/applications/luci-app-ddns/po/de/ddns.po b/applications/luci-app-ddns/po/de/ddns.po index f6e0d5e39..6ffde5d54 100644 --- a/applications/luci-app-ddns/po/de/ddns.po +++ b/applications/luci-app-ddns/po/de/ddns.po @@ -1,15 +1,15 @@ msgid "" msgstr "" "Project-Id-Version: luci-app-ddns\n" -"POT-Creation-Date: 2015-02-08 18:30+0100\n" -"PO-Revision-Date: 2015-02-08 18:36+0100\n" +"POT-Creation-Date: 2015-05-08 21:29+0100\n" +"PO-Revision-Date: 2015-05-08 21:47+0100\n" "Last-Translator: Christian Schoenebeck \n" "Language-Team: \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.7.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: .\n" @@ -452,7 +452,7 @@ msgstr "" "wiederholen" msgid "On Error the script will stop execution after given number of retrys" -msgstr "Das Skript wird nach der gegebener Anzahlt von Fehlversuchen beendet" +msgstr "Das Skript wird nach der gegebenen Anzahl von Fehlversuchen beendet." msgid "Overview" msgstr "Übersicht" @@ -527,6 +527,9 @@ msgstr "" "Die installierte Software 'ddns-scripts' unterstützt nicht alle verfügbaren " "Optionen." +msgid "The default setting of '0' will retry infinite." +msgstr "Der Standard-Wert von '0' wird es endlosen erneut versuchen." + msgid "There is no service configured." msgstr "Kein Dienst konfiguriert" diff --git a/applications/luci-app-ddns/po/templates/ddns.pot b/applications/luci-app-ddns/po/templates/ddns.pot index 6e4f2fe08..35386802b 100644 --- a/applications/luci-app-ddns/po/templates/ddns.pot +++ b/applications/luci-app-ddns/po/templates/ddns.pot @@ -444,6 +444,9 @@ msgid "" "settings." msgstr "" +msgid "The default setting of '0' will retry infinite." +msgstr "" + msgid "There is no service configured." msgstr "" -- 2.25.1