From 895d07f3c35bbb82e24bbfb02589a79aa3aec883 Mon Sep 17 00:00:00 2001 From: riley Date: Thu, 16 Nov 2023 14:13:28 -0500 Subject: [PATCH] refactored radio hardware info --- luasrc/model/cbi/easymesh.lua | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/luasrc/model/cbi/easymesh.lua b/luasrc/model/cbi/easymesh.lua index 54a3a7e..933f4a8 100755 --- a/luasrc/model/cbi/easymesh.lua +++ b/luasrc/model/cbi/easymesh.lua @@ -31,39 +31,24 @@ function detect_Node() end -function get_verbose_hw_info(iface) +local function get_verbose_hw_info(iface) local type = iwinfo.type(iface) - if not type then - return "Generic" - end + if not type then return "Generic" end local driver = iwinfo[type] - if not driver then - return "Driver not supported" - end + if not driver then return "Driver not supported" end - local hw_name = driver.hardware_name and driver.hardware_name(iface) - if not hw_name or hw_name == "" then - hw_name = "Unknown hardware" - end - - local hw_modes = driver.hwmodelist and driver.hwmodelist(iface) + local hw_name = driver.hardware_name and driver.hardware_name(iface) or "Unknown hardware" + local hw_modes = driver.hwmodelist and driver.hwmodelist(iface) or {} local supported_modes = {} - if hw_modes then - for mode, supported in pairs(hw_modes) do - if supported then - table.insert(supported_modes, mode) - end + + for mode, supported in pairs(hw_modes) do + if supported then + supported_modes[#supported_modes + 1] = mode end end - if #supported_modes == 0 then - supported_modes_str = "No mode information" - else - supported_modes_str = table.concat(supported_modes, "/") - end - local verbose_info = hw_name .. " (" .. supported_modes_str .. ")" - return verbose_info + return hw_name .. " (" .. (#supported_modes > 0 and table.concat(supported_modes, "/") or "No mode information") .. ")" end local Nodes = luci.sys.exec("batctl n 2>/dev/null| tail +3 | wc -l")