Merge email and web report scripts.

1 files changed, 156 insertions, 37 deletions

diff --git a/apt-panopticon-report-web.lua b/apt-panopticon-report-email-web.lua
index fb41341..60027d0 100755
--- a/apt-panopticon-report-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -4,6 +4,7 @@ local args = {...}
 
 verbosity = -1
 local logFile
+local html = false
 
 
 --[[ Ordered table iterator, allow to iterate on the natural order of the keys of a table.
@@ -77,17 +78,21 @@ end
 local plurals = function(e, w)
     local result = ""
     if 1 == e then
-        result = e .. " <font color='red'><b>error</b></font>"
+        result = e .. " error"
     elseif e ~= 0 then
-        result = e .. " <font color='red'><b>errors</b></font>"
+        result = e .. " errors"
     end
+    if ("" ~= result) and html then result = "<font color='red'><b>" .. result .. "</b></font>" end
+--    result = " " .. result
     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>"
+            result = result .. w .. " warning"
         else
-            result = result .. w .. " <font color='yellow'><b>warnings</b></font>"
+            result = result .. w .. " warnings"
         end
+        if ("" ~= result) and html then result = "<font color='yellow'><b>" .. result .. "</b></font>" end
+--      result = " " .. result
     end
     if "" ~= result then result = " (" .. result .. ")" end
     return result
@@ -127,7 +132,11 @@ local revDNS = function(dom, IP)
     if "deb.devuan.org" ~= dom then
         if nil ~= mirrors["deb.devuan.org"] then
             if nil ~= mirrors["deb.devuan.org"].IPs["deb.roundr.devuan.org"][IP] then
-                return "<font color='purple'><b>DNS-RR</b></font>"
+                if html then
+                    return "<font color='purple'><b>DNS-RR</b></font>"
+                else
+                    return "DNS-RR"
+                end
             end
         end
     else
@@ -184,26 +193,42 @@ local status = function(host, results, typ)
     end
 
     if to then
-        if s then
-            result = "[<font color='blue'><b>TIMEOUT</b></font>]"
-        else
-            result = "[<font color='darkblue'><b>TIMEOUT *</b></font>]"
+        result = "[TIMEOUT"
+        if not s then result = result .. "*" end
+        if html then
+            if s then
+                result = "[<font color='blue'><b>TIMEOUT</b></font>"
+            else
+                result = "[<font color='darkblue'><b>TIMEOUT*</b></font>"
+            end
         end
     elseif 0 < e then
-        if s then
-            result = "[<font color='red'><b>FAILED</b></font>]"
+        result = "[FAILED"
+        if not s then result = result .. "*" end
+        if html then
+            if s then
+                result = "[<font color='red'><b>FAILED</b></font>"
+            else
+                result = "[<font color='darkred'><b>FAILED*</b></font>"
+            end
+        end
+        if html then
+            faulty = faulty .. host .. " (" .. typ .. ")<br>\n"
         else
-            result = "[<font color='darkred'><b>FAILED *</b></font>]"
+            faulty = faulty .. host .. " (" .. typ .. ")\n"
         end
-        faulty = faulty .. host .. " (" .. typ .. ")<br>\n"
     else
-        if s then
-            result = "[<font color='lime'><b>OK</b></font>]"
-        else
-            result = "[<font color='darkgreen'><b>OK *</b></font>]"
+        result = "[OK"
+        if not s then result = result .. "*" end
+        if html then
+            if s then
+                result = "[<font color='lime'><b>OK</b></font>"
+            else
+                result = "[<font color='darkgreen'><b>OK*</b></font>"
+            end
         end
     end
-    return result .. plurals(e, w)
+    return result .. plurals(e, w) .. "]"
 end
 
 local collate = function(host, ip, results)
@@ -254,19 +279,113 @@ local logCount = function(domain, ip)
             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>"
+        if html then
+            if nil == ip then
+                log = "<a href='" .. nm .. "'>" .. domain .. "</a>"
+            else
+                log = "<a href='" .. nm .. "'>" .. ip .. "</a>"
+            end
         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" ..
+
+html = false
+local email, e = io.open("results/Report-email.txt", "w+")
+if nil == email then C("opening mirrors file - " .. e) else
+    email:write( "Dear Mirror Admins,\n\n" ..
+                "This is the status of the mirror servers in the Devuan package mirror network.\n\n" ..
+                "The full list of Devuan package mirrors is available at the URL:\n\n" ..
+                " https://pkgmaster.devuan.org/mirror_list.txt\n\n" ..
+                'Please contact "mirrors@devuan.org" if any of the information \nin the file above needs to be amended. \n\n' ..
+                "The full results of the mirror checking is available at the URL:\n\n" ..
+                " https://sledjhamr.org/apt-panopticon/results/Report-web.html\n\n" ..
+                "Due to the nature of the tests, some errors or warnings will be \ncounted several times.  " ..
+                "Refer to the logs on the web page for details.\n\n" ..
+                "Please see below the current status of the Devuan Package Mirror \nnetwork:\n\n" ..
+                "==== package mirror status " .. os.date("!%Y-%m-%d %H:%M") .. " GMT ====\n" ..
+                "[skip] means that the test hasn't been written yet.\n\n")
+    for k, v in orderedPairs(mirrors) do
+        local results = loadfile("results/" .. k .. ".lua")()
+        email:write(k .. "....\n")
+        local IPs = v.IPs
+        for i, u in pairs(IPs) do
+            if "table" == type(u) then
+                for h, t in pairs(u) do
+                    results = collate(k, h, results)
+                end
+            else
+                results = collate(k, i, results)
+            end
+        end
+        local ftp       = "[skip]"
+        local http      = status(k, results, "http")
+        local https     = status(k, results, "https")
+        local rsync     = "[skip]"
+        local dns       = ""
+        local protocol  = status(k, results, "Protocol")
+        local sanity    = "[skip]"
+        local integrity = status(k, results, "Integrity")
+        local updated   = status(k, results, "Updated")
+
+        -- DNS-RR test.
+        if ("deb.devuan.org" ~= k) and (nil ~= mirrors["deb.devuan.org"]) then
+            for l, w in pairs(mirrors[k].IPs) do
+                if type(w) == "table" then
+                    for i, u in pairs(w) do
+                        if nil ~= mirrors["deb.devuan.org"].IPs["deb.roundr.devuan.org"][i] then
+                            local log = logCount("deb.devuan.org", i)
+                            if "" ~= log then
+                                if "" == dns then dns = " " else dns = dns .. "  " end
+                                dns = dns .. logCount("deb.devuan.org", i)
+                            else
+                                if "" == dns then dns = " " else dns = dns .. "  " end
+                                dns = dns .. i
+                            end
+                        end
+                    end
+                else
+                    if nil ~= mirrors["deb.devuan.org"].IPs["deb.roundr.devuan.org"][l] then
+                        local log = logCount("deb.devuan.org", l)
+                        if "" ~= log then
+                            if "" == dns then dns = " " else dns = dns .. "  " end
+                            dns = dns .. log
+                        else
+                            if "" == dns then dns = " " else dns = dns .. "  " end
+                            dns = dns .. l
+                        end
+                    end
+                end
+            end
+            if "" == dns then dns = "[no]" end
+            dns = " DNS-RR: " .. dns
+        end
+
+        email:write(    "      ftp: " .. ftp .. " http: " .. http .. " https: " .. https .." rsync: " .. rsync .. "\n" ..
+                        "     " .. dns .. "\n" ..
+                        "      Protocol: " .. protocol .. " URL-sanity: " .. sanity .. " Integrity: " .. integrity .. "\n" ..
+                        "      Updated: " .. updated .. "\n")
+    end
+    email:write( "\n==== faulty mirrors: ====\n" .. faulty)
+    email:write( "\n-------------------------\n\n" ..
+                "* This means that this protocol isn't actually supported, but the test was run ayway.\n\n" ..
+                "Thanks for your precious help in ensuring that Devuan GNU+Linux \nremains a universal, stable, dependable, free operating system.\n\n" ..
+                "You can get the source code from https://sledjhamr.org/cgit/apt-panopticon/about/ .\n\n" ..
+                "Love\n\n" ..
+                "The Dev1Devs\n\n")
+    email:close()
+end
+
+
+results = {}
+m = {}
+faulty = ""
+html = true
+local web, e = io.open("results/Report-web.html", "w+")
+if nil == web then C("opening mirrors file - " .. e) else
+    web:write( "<html><head><title>apt-panopticon results</title>\n" ..
                 '</head><body bgcolor="black" text="white">' ..
                 "<h1>Welcome to the apt-panopticon results page.</h1>\n" ..
                 "<p>This is the status of the mirror servers in the Devuan package mirror network.</p>\n" ..
@@ -274,11 +393,11 @@ if nil == file then C("opening mirrors file - " .. e) else
                 "<a href='https://pkgmaster.devuan.org/mirror_list.txt'>https://pkgmaster.devuan.org/mirror_list.txt</a></p>\n" ..
                 "<p>Due to the nature of the tests, some errors or warnings will be counted several times. &nbsp; " ..
                 "The links in the table and DNS list go to the detailed testing logs.</p>\n\n" ..
-                "<hr>\n<h2>==== package mirror status " .. os.date("!%Y-%m-%d %H:%M") .. " GMT: ====</h2>\n<table>\n" ..
+                "<hr>\n<h2>==== package mirror status " .. os.date("!%Y-%m-%d %H:%M") .. " GMT ====</h2>\n<table>\n" ..
 
                 "<p>[<font color='red'><b>FAILED</b></font>] or [<font color='lime'><b>OK</b></font>]" ..
                 " means the tested thing is supported for that mirror.</p>\n" ..
-                "<p>[<font color='darkred'><b>FAILED *</b></font>] or [<font color='darkgreen'><b>OK *</b></font>]" ..
+                "<p>[<font color='darkred'><b>FAILED*</b></font>] or [<font color='darkgreen'><b>OK*</b></font>]" ..
                 " means the tested thing is unsupported for that mirror, but might have been tested anyway.</p>\n" ..
                 "<p>[<font color='blue'><b>TIMEOUT</b></font>] or [<font color='darkblue'><b>TIMEOUT</b></font>]" ..
                 " means the server had too many timeouts, and tests where aborted, so there is no result for this test.</p>" ..
@@ -294,10 +413,10 @@ if nil == file then C("opening mirrors file - " .. e) else
         local results = loadfile("results/" .. k .. ".lua")()
         local active = ""
         if "yes" == v.Active then
-            file:write("     <tr><th>" .. k .. "</th> ")
+            web:write("     <tr><th>" .. k .. "</th> ")
         else
             if nil == v.Active then active = 'nil' else active = v.Active end
-            file:write("     <tr style='background-color:dimgrey'><th>" .. k .. "</th> ")
+            web:write("     <tr style='background-color:dimgrey'><th>" .. k .. "</th> ")
         end
         local IPs = v.IPs
         for i, u in pairs(IPs) do
@@ -353,15 +472,15 @@ if nil == file then C("opening mirrors file - " .. e) else
             if "" == dns then dns = "[<font color='grey'><b>no</b></font>]" end
         end
 
-        file:write("<td>" .. ftp .. "&nbsp;</td><td>" .. http .. "&nbsp;</td><td>" .. https .. "&nbsp;</td><td>" .. rsync .. "&nbsp;</td><td>" .. dns ..
+        web:write("<td>" .. ftp .. "&nbsp;</td><td>" .. http .. "&nbsp;</td><td>" .. https .. "&nbsp;</td><td>" .. rsync .. "&nbsp;</td><td>" .. dns ..
                     "&nbsp;</td><td>" .. protocol .. "&nbsp;</td><td>" .. sanity ..
                     "&nbsp;</td><td>" .. integrity .. "&nbsp;</td><td>" .. updated .. "</td></tr>\n")
         if "" ~= v.Active then
-            file:write("<tr><td style='background-color:dimgrey'>" .. active .. "</td></tr>\n")
+            web:write("<tr><td style='background-color:dimgrey'>" .. active .. "</td></tr>\n")
         end
     end
-    file:write( "</table>\n<br>\n<h2>==== faulty mirrors: ====</h2>\n" .. faulty)
-    file:write( "<br>\n<br>\n<h2>==== DNS and logs: ====</h2>\n")
+    web:write( "</table>\n<br>\n<h2>==== faulty mirrors: ====</h2>\n" .. faulty)
+    web:write( "<br>\n<br>\n<h2>==== DNS and logs: ====</h2>\n")
 
     for k, v in pairs(mirrors) do
         local log = k
@@ -388,7 +507,7 @@ if nil == file then C("opening mirrors file - " .. e) else
         end
         m[log .. " DNS entries -"] = n
     end
-    file:write( "<p>This lists each mirror, and the DNS entries for that mirror. &nbsp; " ..
+    web:write(  "<p>This lists each mirror, and the DNS entries for that mirror. &nbsp; " ..
                 "The links point to the testing log files for " .. logCount("apt-panopticon") .. " for each domain name / IP combination that was tested. &nbsp; " ..
                 "If a mirror has a CNAME, that CNAME is listed along with that CNAMEs DNS entries. &nbsp; " ..
                 "deb.devuan.org is the DNS round robin, which points to the mirrors that are part of the DNS-RR. &nbsp; " ..
@@ -396,11 +515,11 @@ if nil == file then C("opening mirrors file - " .. e) else
                 "pkgmaster.devuan.org is the master mirror, all the others sync to it. &nbsp; " ..
                 "</p>\n"
                 )
-    file:write(dumpTableHTML(m, "", ""))
-    file:write( "\n<br>\n<hr>\n\n" ..
+    web:write(dumpTableHTML(m, "", ""))
+    web:write( "\n<br>\n<hr>\n\n" ..
                 "<p>The <a href='Report-email.txt'>email report</a>. &nbsp; " ..
                 "All <a href='../results'>the logs and other output</a>. &nbsp; " ..
                 "You can get the <a href='https://sledjhamr.org/cgit/apt-panopticon/about/'>source code here</a>.</p>" ..
                 "</body></html>\n")
-    file:close()
+    web:close()
 end