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

Merge pull request #4406 from lzto/code-cleanup

Browse source 
luci-app-nft-qos: code reindent
This commit is contained in:
Florian Eckert 2020-09-02 07:52:53 +02:00 committed by GitHub
commit 4befacfef5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 81 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

162
applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua
View file

@ -115,72 +115,72 @@ wa.cbi_add_networks(o)
-- --
if limit_enable == "1" and limit_type == "static" then if limit_enable == "1" and limit_type == "static" then
x = m:section(TypedSection, "download", translate("Static QoS-Download Rate")) x = m:section(TypedSection, "download", translate("Static QoS-Download Rate"))
x.anonymous = true x.anonymous = true
x.addremove = true x.addremove = true
x.template = "cbi/tblsection" x.template = "cbi/tblsection"
o = x:option(Value, "hostname", translate("Hostname")) o = x:option(Value, "hostname", translate("Hostname"))
o.datatype = "hostname" o.datatype = "hostname"
o.default = 'undefined' o.default = 'undefined'
if has_ipv6 then if has_ipv6 then
o = x:option(Value, "ipaddr", translate("IP Address (v4 / v6)")) o = x:option(Value, "ipaddr", translate("IP Address (v4 / v6)"))
else else
o = x:option(Value, "ipaddr", translate("IP Address (v4 Only)")) o = x:option(Value, "ipaddr", translate("IP Address (v4 Only)"))
end end
o.datatype = "ipaddr" o.datatype = "ipaddr"
if nixio.fs.access("/tmp/dhcp.leases") or nixio.fs.access("/var/dhcp6.leases") then if nixio.fs.access("/tmp/dhcp.leases") or nixio.fs.access("/var/dhcp6.leases") then
o.titleref = luci.dispatcher.build_url("admin", "status", "overview") o.titleref = luci.dispatcher.build_url("admin", "status", "overview")
end end
o = x:option(Value, "rate", translate("Rate")) o = x:option(Value, "rate", translate("Rate"))
o.default = def_rate_dl or '50' o.default = def_rate_dl or '50'
o.size = 4 o.size = 4
o.datatype = "uinteger" o.datatype = "uinteger"
o = x:option(ListValue, "unit", translate("Unit")) o = x:option(ListValue, "unit", translate("Unit"))
o.default = def_unit_dl or "kbytes" o.default = def_unit_dl or "kbytes"
o:value("bytes", "Bytes/s") o:value("bytes", "Bytes/s")
o:value("kbytes", "KBytes/s") o:value("kbytes", "KBytes/s")
o:value("mbytes", "MBytes/s") o:value("mbytes", "MBytes/s")
-- --
-- Static Limit Rate - Upload Rate -- Static Limit Rate - Upload Rate
-- --
y = m:section(TypedSection, "upload", translate("Static QoS-Upload Rate")) y = m:section(TypedSection, "upload", translate("Static QoS-Upload Rate"))
y.anonymous = true y.anonymous = true
y.addremove = true y.addremove = true
y.template = "cbi/tblsection" y.template = "cbi/tblsection"
o = y:option(Value, "hostname", translate("Hostname")) o = y:option(Value, "hostname", translate("Hostname"))
o.datatype = "hostname" o.datatype = "hostname"
o.default = 'undefined' o.default = 'undefined'
if has_ipv6 then if has_ipv6 then
o = y:option(Value, "ipaddr", translate("IP Address (v4 / v6)")) o = y:option(Value, "ipaddr", translate("IP Address (v4 / v6)"))
else else
o = y:option(Value, "ipaddr", translate("IP Address (v4 Only)")) o = y:option(Value, "ipaddr", translate("IP Address (v4 Only)"))
end end
o.datatype = "ipaddr" o.datatype = "ipaddr"
if nixio.fs.access("/tmp/dhcp.leases") or nixio.fs.access("/var/dhcp6.leases") then if nixio.fs.access("/tmp/dhcp.leases") or nixio.fs.access("/var/dhcp6.leases") then
o.titleref = luci.dispatcher.build_url("admin", "status", "overview") o.titleref = luci.dispatcher.build_url("admin", "status", "overview")
end end
o = y:option(Value, "macaddr", translate("MAC (optional)")) o = y:option(Value, "macaddr", translate("MAC (optional)"))
o.rmempty = true o.rmempty = true
o.datatype = "macaddr" o.datatype = "macaddr"
o = y:option(Value, "rate", translate("Rate")) o = y:option(Value, "rate", translate("Rate"))
o.default = def_rate_ul or '50' o.default = def_rate_ul or '50'
o.size = 4 o.size = 4
o.datatype = "uinteger" o.datatype = "uinteger"
o = y:option(ListValue, "unit", translate("Unit")) o = y:option(ListValue, "unit", translate("Unit"))
o.default = def_unit_ul or "kbytes" o.default = def_unit_ul or "kbytes"
o:value("bytes", "Bytes/s") o:value("bytes", "Bytes/s")
o:value("kbytes", "KBytes/s") o:value("kbytes", "KBytes/s")
o:value("mbytes", "MBytes/s") o:value("mbytes", "MBytes/s")
end end
@ -189,38 +189,38 @@ end
-- --
if enable_priority == "1" then if enable_priority == "1" then
s = m:section(TypedSection, "priority", translate("Traffic Priority Settings")) s = m:section(TypedSection, "priority", translate("Traffic Priority Settings"))
s.anonymous = true s.anonymous = true
s.addremove = true s.addremove = true
s.template = "cbi/tblsection" s.template = "cbi/tblsection"
o = s:option(ListValue, "protocol", translate("Protocol")) o = s:option(ListValue, "protocol", translate("Protocol"))
o.default = "tcp" o.default = "tcp"
o:value("tcp", "TCP") o:value("tcp", "TCP")
o:value("udp", "UDP") o:value("udp", "UDP")
o:value("udplite", "UDP-Lite") o:value("udplite", "UDP-Lite")
o:value("sctp", "SCTP") o:value("sctp", "SCTP")
o:value("dccp", "DCCP") o:value("dccp", "DCCP")
o = s:option(ListValue, "priority", translate("Priority")) o = s:option(ListValue, "priority", translate("Priority"))
o.default = "1" o.default = "1"
o:value("-400", "1") o:value("-400", "1")
o:value("-300", "2") o:value("-300", "2")
o:value("-225", "3") o:value("-225", "3")
o:value("-200", "4") o:value("-200", "4")
o:value("-150", "5") o:value("-150", "5")
o:value("-100", "6") o:value("-100", "6")
o:value("0", "7") o:value("0", "7")
o:value("50", "8") o:value("50", "8")
o:value("100", "9") o:value("100", "9")
o:value("225", "10") o:value("225", "10")
o:value("300", "11") o:value("300", "11")
o = s:option(Value, "service", translate("Service"), translate("e.g. https, 23, (separator is comma)")) o = s:option(Value, "service", translate("Service"), translate("e.g. https, 23, (separator is comma)"))
o.default = '?' o.default = '?'
o = s:option(Value, "comment", translate("Comment")) o = s:option(Value, "comment", translate("Comment"))
o.default = '?' o.default = '?'
end end