mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Make wizard page faster to display

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2022-04-04 13:24:07 +02:00
parent af89e81dff
commit 2248e12100
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
View file

@ -7,9 +7,15 @@
local sys = require "luci.sys" local sys = require "luci.sys"
local ut = require "luci.util" local ut = require "luci.util"
local ifaces = sys.net:devices() local ifaces = sys.net:devices()
local ifttyu = nixio.fs.glob("/dev/ttyUSB*")
local ifttyc = nixio.fs.glob("/dev/cdc-wdm*")
menuentry = uci:get("openmptcprouter","settings","menu") or "openmptcprouter" menuentry = uci:get("openmptcprouter","settings","menu") or "openmptcprouter"
function device_notvirtual(dev) function device_notvirtual(dev)
for _, iface in ipairs(net:get_networks()) do if dev:match("^eth.*") or dev:match("^wwan.*") or dev:match("^tun.*") or dev:match("/") then
return true
end
networks = net:get_networks()
for _, iface in ipairs(networks) do
local ifacen = iface:name() local ifacen = iface:name()
local ifacename = uci:get("network",ifacen,"device") local ifacename = uci:get("network",ifacen,"device")
local ifacetype = uci:get("network",ifacen,"type") or "" local ifacetype = uci:get("network",ifacen,"type") or ""
@ -428,7 +434,7 @@
<% <%
for _, iface in ipairs(net:get_networks()) do for _, iface in ipairs(net:get_networks()) do
local ifname = iface:name() local ifname = iface:name()
local firewall_lan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_lan.network | grep \'" .. ifname .. "\'")) local firewall_lan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_lan.network | tr ' ' '\n' | grep \'^" .. ifname .. "$\'"))
if firewall_lan ~= "" then if firewall_lan ~= "" then
%> %>
<h3><%=ifname%></h3> <h3><%=ifname%></h3>
@ -531,7 +537,7 @@
<% <%
for _, iface in ipairs(net:get_networks()) do for _, iface in ipairs(net:get_networks()) do
local ifname = iface:name() local ifname = iface:name()
local firewall_wan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_wan.network | grep \'" .. ifname .. "\'")) local firewall_wan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_wan.network | tr ' ' '\n' | grep \'^" .. ifname .. "$\'"))
if firewall_wan ~= "" then if firewall_wan ~= "" then
-- local multipath = uci:get("network",ifname,"multipath") -- local multipath = uci:get("network",ifname,"multipath")
@ -743,14 +749,12 @@
<select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.device.ncm" name="cbid.network.<%=ifname%>.device.ncm" size="1"> <select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.device.ncm" name="cbid.network.<%=ifname%>.device.ncm" size="1">
<% <%
iffind=0 iffind=0
iftty = nixio.fs.glob("/dev/ttyUSB*") for tty in ifttyu do
for tty in iftty do
%> %>
<option value="<%=tty%>"<% if uci:get("network",ifname,"device") == tty then iffind = 1 %> selected="selected"<% end %>><%=tty%></option> <option value="<%=tty%>"<% if uci:get("network",ifname,"device") == tty then iffind = 1 %> selected="selected"<% end %>><%=tty%></option>
<% <%
end end
iftty = nixio.fs.glob("/dev/cdc-wdm*") for tty in ifttyc do
for tty in iftty do
%> %>
<option value="<%=tty%>"<% if uci:get("network",ifname,"device") == tty then iffind = 1 %> selected="selected"<% end %>><%=tty%></option> <option value="<%=tty%>"<% if uci:get("network",ifname,"device") == tty then iffind = 1 %> selected="selected"<% end %>><%=tty%></option>
<% <%
@ -770,8 +774,7 @@
<select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.device.qmi" name="cbid.network.<%=ifname%>.device.qmi" size="1"> <select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.device.qmi" name="cbid.network.<%=ifname%>.device.qmi" size="1">
<% <%
iffind=0 iffind=0
iftty = nixio.fs.glob("/dev/cdc-wdm*") for tty in ifttyc do
for tty in iftty do
%> %>
<option value="<%=tty%>"<% if uci:get("network",ifname,"device") == tty then iffind = 1 %> selected="selected"<% end %>><%=tty%></option> <option value="<%=tty%>"<% if uci:get("network",ifname,"device") == tty then iffind = 1 %> selected="selected"<% end %>><%=tty%></option>
<% <%