luci-app-dockerman: cbi/networks update coding style
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
parent
0f170c1118
commit
7c784349b9
1 changed files with 86 additions and 65 deletions
|
@ -6,35 +6,49 @@ Copyright 2019 lisaac <https://github.com/lisaac/luci-app-dockerman>
|
||||||
require "luci.util"
|
require "luci.util"
|
||||||
local uci = luci.model.uci.cursor()
|
local uci = luci.model.uci.cursor()
|
||||||
local docker = require "luci.model.docker"
|
local docker = require "luci.model.docker"
|
||||||
local dk = docker.new()
|
|
||||||
local networks
|
local m, s, o
|
||||||
local res = dk.networks:list()
|
local networks, dk, res
|
||||||
if res.code < 300 then networks = res.body else return end
|
|
||||||
|
dk = docker.new()
|
||||||
|
res = dk.networks:list()
|
||||||
|
if res.code < 300 then
|
||||||
|
networks = res.body
|
||||||
|
else
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local get_networks = function ()
|
local get_networks = function ()
|
||||||
local data = {}
|
local data = {}
|
||||||
|
|
||||||
if type(networks) ~= "table" then return nil end
|
if type(networks) ~= "table" then
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
for i, v in ipairs(networks) do
|
for i, v in ipairs(networks) do
|
||||||
local index = v.Created .. v.Id
|
local index = v.Created .. v.Id
|
||||||
|
|
||||||
data[index]={}
|
data[index]={}
|
||||||
data[index]["_selected"] = 0
|
data[index]["_selected"] = 0
|
||||||
data[index]["_id"] = v.Id:sub(1,12)
|
data[index]["_id"] = v.Id:sub(1,12)
|
||||||
data[index]["_name"] = v.Name
|
data[index]["_name"] = v.Name
|
||||||
data[index]["_driver"] = v.Driver
|
data[index]["_driver"] = v.Driver
|
||||||
|
|
||||||
if v.Driver == "bridge" then
|
if v.Driver == "bridge" then
|
||||||
data[index]["_interface"] = v.Options["com.docker.network.bridge.name"]
|
data[index]["_interface"] = v.Options["com.docker.network.bridge.name"]
|
||||||
elseif v.Driver == "macvlan" then
|
elseif v.Driver == "macvlan" then
|
||||||
data[index]["_interface"] = v.Options.parent
|
data[index]["_interface"] = v.Options.parent
|
||||||
end
|
end
|
||||||
|
|
||||||
data[index]["_subnet"] = v.IPAM and v.IPAM.Config[1] and v.IPAM.Config[1].Subnet or nil
|
data[index]["_subnet"] = v.IPAM and v.IPAM.Config[1] and v.IPAM.Config[1].Subnet or nil
|
||||||
data[index]["_gateway"] = v.IPAM and v.IPAM.Config[1] and v.IPAM.Config[1].Gateway or nil
|
data[index]["_gateway"] = v.IPAM and v.IPAM.Config[1] and v.IPAM.Config[1].Gateway or nil
|
||||||
end
|
end
|
||||||
|
|
||||||
return data
|
return data
|
||||||
end
|
end
|
||||||
|
|
||||||
local network_list = get_networks()
|
local network_list = get_networks()
|
||||||
-- m = Map("docker", translate("Docker"))
|
|
||||||
m = SimpleForm("docker", translate("Docker"))
|
m = SimpleForm("docker", translate("Docker"))
|
||||||
m.submit=false
|
m.submit=false
|
||||||
m.reset=false
|
m.reset=false
|
||||||
|
@ -70,12 +84,15 @@ docker_status = m:section(SimpleSection)
|
||||||
docker_status.template = "dockerman/apply_widget"
|
docker_status.template = "dockerman/apply_widget"
|
||||||
docker_status.err=docker:read_status()
|
docker_status.err=docker:read_status()
|
||||||
docker_status.err=docker_status.err and docker_status.err:gsub("\n","<br>"):gsub(" "," ")
|
docker_status.err=docker_status.err and docker_status.err:gsub("\n","<br>"):gsub(" "," ")
|
||||||
if docker_status.err then docker:clear_status() end
|
if docker_status.err then
|
||||||
|
docker:clear_status()
|
||||||
|
end
|
||||||
|
|
||||||
action = m:section(Table,{{}})
|
action = m:section(Table,{{}})
|
||||||
action.notitle=true
|
action.notitle=true
|
||||||
action.rowcolors=false
|
action.rowcolors=false
|
||||||
action.template="cbi/nullsection"
|
action.template="cbi/nullsection"
|
||||||
|
|
||||||
btnnew=action:option(Button, "_new")
|
btnnew=action:option(Button, "_new")
|
||||||
btnnew.inputtitle= translate("New")
|
btnnew.inputtitle= translate("New")
|
||||||
btnnew.template = "dockerman/cbi/inlinebutton"
|
btnnew.template = "dockerman/cbi/inlinebutton"
|
||||||
|
@ -83,8 +100,9 @@ btnnew.notitle=true
|
||||||
btnnew.inputstyle = "add"
|
btnnew.inputstyle = "add"
|
||||||
btnnew.forcewrite = true
|
btnnew.forcewrite = true
|
||||||
btnnew.write = function(self, section)
|
btnnew.write = function(self, section)
|
||||||
luci.http.redirect(luci.dispatcher.build_url("admin/docker/newnetwork"))
|
uci.http.redirect(luci.dispatcher.build_url("admin/docker/newnetwork"))
|
||||||
end
|
end
|
||||||
|
|
||||||
btnremove = action:option(Button, "_remove")
|
btnremove = action:option(Button, "_remove")
|
||||||
btnremove.inputtitle= translate("Remove")
|
btnremove.inputtitle= translate("Remove")
|
||||||
btnremove.template = "dockerman/cbi/inlinebutton"
|
btnremove.template = "dockerman/cbi/inlinebutton"
|
||||||
|
@ -94,22 +112,24 @@ btnremove.write = function(self, section)
|
||||||
local network_selected = {}
|
local network_selected = {}
|
||||||
local network_name_selected = {}
|
local network_name_selected = {}
|
||||||
local network_driver_selected = {}
|
local network_driver_selected = {}
|
||||||
-- 遍历table中sectionid
|
|
||||||
local network_table_sids = network_table:cfgsections()
|
local network_table_sids = network_table:cfgsections()
|
||||||
for _, network_table_sid in ipairs(network_table_sids) do
|
for _, network_table_sid in ipairs(network_table_sids) do
|
||||||
-- 得到选中项的名字
|
|
||||||
if network_list[network_table_sid]._selected == 1 then
|
if network_list[network_table_sid]._selected == 1 then
|
||||||
network_selected[#network_selected+1] = network_list[network_table_sid]._id --network_name:cfgvalue(network_table_sid)
|
network_selected[#network_selected+1] = network_list[network_table_sid]._id
|
||||||
network_name_selected[#network_name_selected+1] = network_list[network_table_sid]._name
|
network_name_selected[#network_name_selected+1] = network_list[network_table_sid]._name
|
||||||
network_driver_selected[#network_driver_selected+1] = network_list[network_table_sid]._driver
|
network_driver_selected[#network_driver_selected+1] = network_list[network_table_sid]._driver
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if next(network_selected) ~= nil then
|
if next(network_selected) ~= nil then
|
||||||
local success = true
|
local success = true
|
||||||
docker:clear_status()
|
docker:clear_status()
|
||||||
|
|
||||||
for ii, net in ipairs(network_selected) do
|
for ii, net in ipairs(network_selected) do
|
||||||
docker:append_status("Networks: " .. "remove" .. " " .. net .. "...")
|
docker:append_status("Networks: " .. "remove" .. " " .. net .. "...")
|
||||||
local res = dk.networks["remove"](dk, {id = net})
|
local res = dk.networks["remove"](dk, {id = net})
|
||||||
|
|
||||||
if res and res.code >= 300 then
|
if res and res.code >= 300 then
|
||||||
docker:append_status("code:" .. res.code.." ".. (res.body.message and res.body.message or res.message).. "\n")
|
docker:append_status("code:" .. res.code.." ".. (res.body.message and res.body.message or res.message).. "\n")
|
||||||
success = false
|
success = false
|
||||||
|
@ -120,6 +140,7 @@ btnremove.write = function(self, section)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if success then
|
if success then
|
||||||
docker:clear_status()
|
docker:clear_status()
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue