1 files changed, 56 insertions, 43 deletions
diff --git a/apt-panopticon-report-web.lua b/apt-panopticon-report-web.lua
index 5968972..35c61dc 100755
--- a/apt-panopticon-report-web.lua
+++ b/apt-panopticon-report-web.lua
@@ -74,6 +74,25 @@ dumpTableHTMLSub = function (table, space)
    return r
 end
+local plurals = function(e, w)
+    local result = ""
+    if 1 == e then
+        result = e .. " <font color='red'><b>error</b></font>"
+    elseif e ~= 0 then
+        result = e .. " <font color='red'><b>errors</b></font>"
+    end
+    if 0 < w then
+        if 0 < e then result = result .. ", " end
+        if 1 == w then 
+            result = result .. w .. " <font color='yellow'><b>warning</b></font>"
+        else
+            result = result .. w .. " <font color='yellow'><b>warnings</b></font>"
+        end
+    end
+    if "" ~= result then result = " (" .. result .. ")" end
+    return result
+end
 local results = {}
 local log = function(v, t, s, prot, test, host)
@@ -131,27 +150,13 @@ local status = function(host, results, typ)
        end
    end
-    if 0 < e then result = e .. " <font color='red'><b>errors</b></font>" end
+    if 0 < e then
-    if 1 == e then result = e .. " <font color='red'><b>error</b></font>" end
+        result = "[<font color='red'><b>FAILED</b></font>]"
-    if 0 < w then
+        faulty = faulty .. host .. " (" .. typ .. ")<br>\n"
-        if 0 < e then result = result .. ", " end
+    else
-        if 1 == w then 
+        result = "[<font color='green'><b>OK</b></font>]"
-            result = result .. w .. " <font color='yellow'><b>warning</b></font>"
-        else
-            result = result .. w .. " <font color='yellow'><b>warnings</b></font>"
-        end
-    end
-    if "[OK]" ~= result then
-        if 0 < e then
-            result = "[<font color='red'><b>FAILED</b></font>] (" .. result .. ")"
-            faulty = faulty .. host .. " (" .. typ .. ")<br>\n"
-        elseif 0 < w then
-            result = "[<font color='green'><b>OK</b></font>] (" .. result .. ")"
-        else
-            result = "[<font color='green'><b>OK</b></font>]"
-        end
    end
-    return result
+    return result .. plurals(e, w)
 end
 local collate = function(host, ip, results)
@@ -188,6 +193,31 @@ end
 local mirrors = loadfile("results/mirrors.lua")()
 local m = {}
+local logCount = function(domain, ip)
+    local nm = "LOG_" .. domain
+    local log = ""
+    local extra = ""
+    if nil ~= ip then nm = nm .. "_" .. ip end
+    nm = nm .. ".html"
+    local rfile, e = io.open("results/" .. nm, "r")
+    if nil ~= rfile then
+        local errors = 0
+        local warnings = 0
+        for l in rfile:lines() do
+            if nil ~= l:match("><b>ERROR ") then errors = errors + 1 end
+            if nil ~= l:match("><b>WARNING ") then warnings = warnings + 1 end
+        end
+        rfile:close()
+        if nil == ip then
+            log = "<a href='" .. nm .. "'>" .. domain .. "</a>"
+        else
+            log = "<a href='" .. nm .. "'>" .. ip .. "</a>"
+        end
+        log = log .. plurals(errors, warnings)
+    end
+    return log
+end
 local file, e = io.open("results/Report-web.html", "w+")
 if nil == file then C("opening mirrors file - " .. e) else
    file:write( "<html><head><title>apt-panopticon results</title>\n" ..
@@ -229,12 +259,7 @@ if nil == file then C("opening mirrors file - " .. e) else
    for k, v in pairs(mirrors) do
        local log = k
        local n = {}
-        local nm = "LOG_" .. k .. ".html"
+        log = logCount(k)
-        local rfile, e = io.open("results/" .. nm, "r")
-        if nil ~= rfile then
-            rfile:close()
-            log = "<a href='" .. nm .. "'>" .. k .. "</a>"
-        end
        mirrors[k].Protocols = nil
        mirrors[k].FQDN = nil
        mirrors[k].Active = nil
@@ -246,30 +271,18 @@ if nil == file then C("opening mirrors file - " .. e) else
            if type(w) == "table" then
                n[l] = {}
                for i, u in pairs(w) do
-                    local nm = "LOG_" .. k .. "_" .. i .. ".html"
+                    local log = logCount(k, i)
-                    local rfile, e = io.open("results/" .. nm, "r")
+                    if "" == log then n[l] = u else n[log] = u end
-                    if nil ~= rfile then
-                        rfile:close()
-                        n[l]["<a href='" .. nm .. "'>" .. i .. "</a>"] = u
-                    else
-                        n[l][i] = u
-                    end
                end
            else
-                local nm = "LOG_" .. k .. "_" .. l .. ".html"
+                local log = logCount(k, l)
-                local rfile, e = io.open("results/" .. nm, "r")
+                if "" == log then n[l] = w else n[log] = w end
-                if nil ~= rfile then
-                    rfile:close()
-                    n["<a href='" .. nm .. "'>" .. l .. "</a>"] = w
-                else
-                    n[l] = w
-                end
            end
        end
        m[log .. " DNS entries -"] = n
    end
    file:write( "<p>This lists each mirror, and the DNS entries for that mirror.  " ..
-                "The links point to the log files for each FDQN / IP combination that was checked.  " ..
+                "The links point to the log files for " .. logCount("apt-panopticon") .. " for each FDQN / IP combination that was checked.  " ..
                "If a mirror has a CNAME, that CNAME is listed along with that CNAMEs DNS entries.  " ..
                "deb.devuan.org is the DNS round robin, which points to the mirrors that are part of the DNS-RR.  " ..
                "pkgmaster.devuan.org is the master mirror, all the others sync to it.  " ..