Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / applications / luci-app-travelmate / luasrc / model / cbi / travelmate / overview_tab.lua

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
index e98cde719c317bdb3036bbdd42ebe85d0f83e84a..cc38bd97e19d0373886eca97623f469593c8135a 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
@@ -1,4 +1,4 @@
--- Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
+-- Copyright 2017-2019 Dirk Brenken (dev@brenken.org)
 -- This is free software, licensed under the Apache License, Version 2.0
 
 local fs       = require("nixio.fs")
@@ -17,11 +17,6 @@ m = Map("travelmate", translate("Travelmate"),
        .. "see online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md"))
 m:chain("network")
 m:chain("firewall")
-m.apply_on_parse = true
-
-function m.on_apply(self)
-       luci.sys.call("/etc/init.d/travelmate restart >/dev/null 2>&1")
-end
 
 -- Interface Wizard
 
@@ -65,23 +60,35 @@ o2 = s:option(Flag, "trm_captive", translate("Captive Portal Detection"),
 o2.default = o2.enabled
 o2.rmempty = false
 
-o3 = s:option(Flag, "trm_proactive", translate("ProActive Uplink Switch"),
-       translate("Proactively scan and switch to a higher prioritized uplink, despite of an already existing connection."))
-o3.default = o3.enabled
+o3 = s:option(Flag, "trm_netcheck", translate("Net Error Check"),
+       translate("Treat missing internet availability as an error."))
+o3:depends("trm_captive", 1)
+o3.default = o3.disabled
 o3.rmempty = false
 
-o4 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"),
+o4 = s:option(Flag, "trm_proactive", translate("ProActive Uplink Switch"),
+       translate("Proactively scan and switch to a higher prioritized uplink, despite of an already existing connection."))
+o4.default = o4.enabled
+o4.rmempty = false
+
+o5 = s:option(Flag, "trm_autoadd", translate("Add Open Uplinks"),
+       translate("Automatically add open uplinks like hotel captive portals to your wireless config."))
+o5.default = o5.disabled
+o5.rmempty = false
+
+o6 = s:option(ListValue, "trm_iface", translate("Uplink / Trigger interface"),
        translate("Name of the used uplink interface."))
 if dump then
        local i, v
        for i, v in ipairs(dump.interface) do
                if v.interface ~= "loopback" and v.interface ~= "lan" then
-                       o4:value(v.interface)
+                       local device = v.l3_device or v.device or "-"
+                       o6:value(v.interface, v.interface.. " (" ..device.. ")")
                end
        end
 end
-o4.default = trmiface
-o4.rmempty = false
+o6.default = trmiface
+o6.rmempty = false
 
 -- Runtime information
 
@@ -101,34 +108,46 @@ e2 = e:option(Value, "trm_radio", translate("Radio Selection / Order"),
        translate("Restrict travelmate to a single radio (e.g. 'radio1') or change the overall scanning order (e.g. 'radio1 radio2 radio0')."))
 e2.rmempty = true
 
-e3 = e:option(Value, "trm_triggerdelay", translate("Trigger Delay"),
-       translate("Additional trigger delay in seconds before travelmate processing begins."))
-e3.datatype = "range(1,60)"
-e3.default = 2
+e3 = e:option(Value, "trm_listexpiry", translate("List Auto Expiry"),
+       translate("Automatically resets the 'Faulty Stations' list after n minutes. Default is '0' which means no expiry."))
+e3.datatype = "range(0,300)"
+e3.default = 0
 e3.rmempty = false
 
-e4 = e:option(Value, "trm_maxretry", translate("Connection Limit"),
-       translate("Retry limit to connect to an uplink."))
-e4.default = 3
-e4.datatype = "range(1,10)"
+e4 = e:option(Value, "trm_triggerdelay", translate("Trigger Delay"),
+       translate("Additional trigger delay in seconds before travelmate processing begins."))
+e4.datatype = "range(1,60)"
+e4.default = 2
 e4.rmempty = false
 
-e5 = e:option(Value, "trm_minquality", translate("Signal Quality Threshold"),
-       translate("Minimum signal quality threshold as percent for conditional uplink (dis-) connections."))
-e5.default = 35
-e5.datatype = "range(20,80)"
+e5 = e:option(Value, "trm_maxretry", translate("Connection Limit"),
+       translate("Retry limit to connect to an uplink."))
+e5.default = 5
+e5.datatype = "range(1,10)"
 e5.rmempty = false
 
-e6 = e:option(Value, "trm_maxwait", translate("Interface Timeout"),
-       translate("How long should travelmate wait for a successful wlan uplink connection."))
-e6.default = 30
-e6.datatype = "range(20,40)"
+e6 = e:option(Value, "trm_minquality", translate("Signal Quality Threshold"),
+       translate("Minimum signal quality threshold as percent for conditional uplink (dis-) connections."))
+e6.default = 35
+e6.datatype = "range(20,80)"
 e6.rmempty = false
 
-e7 = e:option(Value, "trm_timeout", translate("Overall Timeout"),
-       translate("Overall retry timeout in seconds."))
-e7.default = 60
-e7.datatype = "range(30,300)"
+e7 = e:option(Value, "trm_maxwait", translate("Interface Timeout"),
+       translate("How long should travelmate wait for a successful wlan uplink connection."))
+e7.default = 30
+e7.datatype = "range(20,40)"
 e7.rmempty = false
 
+e8 = e:option(Value, "trm_timeout", translate("Overall Timeout"),
+       translate("Overall retry timeout in seconds."))
+e8.default = 60
+e8.datatype = "range(30,300)"
+e8.rmempty = false
+
+e10 = e:option(Value, "trm_scanbuffer", translate("Scan Buffer Size"),
+  translate("Buffer size in bytes to prepare nearby scan results."))
+e10.default = 1024
+e10.datatype = "range(512,4096)"
+e10.optional = true
+
 return m