luci-app-travelmate: enhancements & fixes

[project/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 085d413..aa508f5 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
@@ -2,37 +2,96 @@
 -- This is free software, licensed under the Apache License, Version 2.0
 
 local fs = require("nixio.fs")
-local uci = require("uci")
-local sys = require("luci.sys")
+local uci = require("luci.model.uci").cursor()
 local json = require("luci.jsonc")
+local nw  = require("luci.model.network").init()
+local fw  = require("luci.model.firewall").init()
+local trmiface = uci.get("travelmate", "global", "trm_iface") or "trm_wwan"
 local trminput = uci.get("travelmate", "global", "trm_rtfile") or "/tmp/trm_runtime.json"
+local uplink = uci.get("network", trmiface) or ""
 local parse = json.parse(fs.readfile(trminput) or "")
 
 m = Map("travelmate", translate("Travelmate"),
        translate("Configuration of the travelmate package to to enable travel router functionality. ")
-       .. translate("For further information ")
-       .. [[<a href="https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md" target="_blank">]]
-       .. translate("see online documentation")
-       .. [[</a>]]
-       .. translate("."))
+       .. translatef("For further information "
+       .. "<a href=\"%s\" target=\"_blank\">"
+       .. "see online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md"))
 
--- Main travelmate options
+function m.on_after_commit(self)
+       luci.sys.call("/etc/init.d/travelmate restart >/dev/null 2>&1")
+       luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate"))
+end
 
 s = m:section(NamedSection, "global", "travelmate")
 
+-- Interface Wizard
+
+if uplink == "" then
+       dv = s:option(DummyValue, "nil", translate("Interface Wizard"))
+       dv.template = "cbi/nullsection"
+
+       o = s:option(Value, "trm_iface", translate("Uplink interface"))
+       o.datatype = "and(uciname,rangelength(3,15))"
+       o.default = "trm_wwan"
+       o.rmempty = false
+
+       function o.write(self, section, value)
+               iface = o:formvalue(section)
+               uci:set("travelmate", section, "trm_iface", iface)
+               uci:save("travelmate")
+               uci:commit("travelmate")
+       end
+
+       btn = s:option(Button, "", translate("Create Uplink Interface"),
+               translate("Create a new wireless wan uplink interface, configure it to use dhcp and ")
+               .. translate("add it to the wan zone of the firewall. This step has only to be done once."))
+       btn.inputtitle = translate("Add Interface")
+       btn.inputstyle = "apply"
+       btn.disabled = false
+       function btn.write()
+               local net = nw:add_network(iface, { proto = "dhcp" })
+               if net then
+                       nw:save("network")
+                       nw:commit("network")
+                       local zone = fw:get_zone_by_network("wan")
+                       if zone then
+                               zone:add_network(iface)
+                               fw:save("firewall")
+                               fw:commit("firewall")
+                               luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>&1")
+                       end
+               end
+               luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate"))
+       end
+       return m
+end
+
+-- Main travelmate options
+
 o1 = s:option(Flag, "trm_enabled", translate("Enable travelmate"))
 o1.default = o1.disabled
 o1.rmempty = false
 
 o2 = s:option(Flag, "trm_automatic", translate("Enable 'automatic' mode"),
-       translate("Keep travelmate in an active state."))
+       translate("Keep travelmate in an active state. Check every n seconds the connection status, i.e. the uplink availability."))
 o2.default = o2.enabled
 o2.rmempty = false
 
-o3 = s:option(Value, "trm_iface", translate("Restrict interface trigger to certain interface(s)"),
-       translate("Space separated list of interfaces that trigger travelmate processing. "..
-       "To disable event driven (re-)starts remove all entries."))
-o3.rmempty = true
+btn = s:option(Button, "", translate("Manual Rescan"))
+btn:depends("trm_automatic", "")
+btn.inputtitle = translate("Rescan")
+btn.inputstyle = "find"
+btn.disabled = false
+function btn.write()
+       luci.sys.call("/etc/init.d/travelmate start >/dev/null 2>&1")
+       luci.http.redirect(luci.dispatcher.build_url("admin", "services", "travelmate"))
+end
+
+o3 = s:option(Value, "trm_iface", translate("Uplink / Trigger interface"),
+       translate("Name of the uplink interface that triggers travelmate processing in 'manual' mode."))
+o3.datatype = "and(uciname,rangelength(3,15))"
+o3.default = "trm_wwan"
+o3.rmempty = false
 
 o4 = s:option(Value, "trm_triggerdelay", translate("Trigger delay"),
        translate("Additional trigger delay in seconds before travelmate processing begins."))