1 files changed, 71 insertions, 52 deletions
diff --git a/sfeed_html.awk b/sfeed_html.awk
index 9af5b2e..70226a7 100755
--- a/sfeed_html.awk
+++ b/sfeed_html.awk

@@ -70,53 +70,8 @@ BEGIN {
        STDERR = "/dev/stderr"
 }
-## Print HTML header
 BEGIN {
-        fortunecmd = "fortune"
+        html_top()
-        fortunecmd | getline LOGO_TITLE
-        close(fortunecmd)
-        sub(/"/, "", LOGO_TITLE)
-        datecmd = "date -u +'" DATEFMT "'"
-        datecmd | getline UPDATE_TIME
-        close(datecmd)
-        print "<!DOCTYPE html>"
-        print "<html>"
-        # <head>
-        print "<head>"
-        print "<meta charset=\"utf-8\">"
-        print "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">"
-        print "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\">"
-        print "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">"
-        print "<title>" TITLE "</title>"
-        print "<link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\">"
-        print "<link rel=\"shortcut icon\" type=\"image/png\" href=\"mars-eyes.png\">"
-        print "<link rel=\"alternate\" type=\"application/atom+xml\" title=\"rss (full)\" href=\"feeds.xml\">"
-        print "<link rel=\"alternate\" type=\"application/atom+xml\" title=\"rss (short)\" href=\"feeds-short.xml\">"
-        print "<link rel=\"alternate\" type=\"application/xml\" title=\"opml\" href=\"feeds.opml\">"
-        print "<link rel=\"alternate\" type=\"text/plain\" title=\"twtxt\" href=\"feeds.txt\">"
-        print "</head>"
-        print "<body>"
-        # <header>
-        print "<header id=\"page-header\">"
-        print "<h1>"
-        printf "<a id=\"logo\" href=\"index.html\"><img src=\"mars-eyes.png\""
-        printf " title=\"%s\" ", LOGO_TITLE
-        printf "width=\"40\" height=\"39\""
-        print "alt=\"mars, but with eyes\" /></a>"
-        print TITLE "</h1>"
-        print "<p id=\"last-updated\">last updated at <time>" UPDATE_TIME "</time></p>"
-        print "</header>"
-        # <nav>
-        print "<nav id=\"page-nav\">"
-        print "<a href=\"#\" id=\"stalebutton\">hide stale</a>", SEPARATOR
-        print "<a href=\"feeds-short.xml\">rss</a>", SEPARATOR
-        print "<a href=\"feeds.html\">all</a>", "(<a href=\"feeds.xml\">rss</a>)", SEPARATOR
-        print "<a href=\"feeds.txt\">twtxt</a>", SEPARATOR
-        print "<a href=\"feeds.opml\">opml</a>"
-        print "</nav>"
-        # first part of <main>
-        print "<main>"
-        print "<section id=\"list\">"
 }
 FNR == 1 {
@@ -142,8 +97,11 @@ FNR == 1 {
        stamp = "."
        buf = ""
        ni = 0
+        stale_total += stale_count
        stale_count = 0
+        fresh_total += fresh_count
        fresh_count = 0
+        item_total += item_count
        item_count = 0
        file_count++
        siloed = 0
@@ -206,7 +164,7 @@ FNR == 1 {
        if ((silo != id) && (id != enclosure) && (id ~ /^https?:/)) {
                # alternate links (comments, etc.)
                stamp = ALT_LINK_STAMP
-                print_link(id, "alternate link", stamp)
+                print_link(silo_link(id), "alternate link", stamp)
        }
        bufprint("</td>")
        # Title
@@ -262,13 +220,16 @@ function end_file()
        getline feed_url < URLS
        getline site_url < URLS
        if (site_url) {
-                printf "<a class=\"site-url\" href=\"%s\">%s</a>\n", site_url, (yt ? "chan" : "site")
+                print_link(site_url, "", (yt ? "chan" : "site"), "site-url")
+                # printf "<a class=\"site-url\" href=\"%s\">%s</a>\n", site_url, (yt ? "chan" : "site")
        }
        if (feed_url) {
-                printf "<a class=\"feed-url\" href=\"%s\">feed</a>\n", feed_url
+                print_link(feed_url, "", "feed", "feed-url")
+                # printf "<a class=\"feed-url\" href=\"%s\">feed</a>\n", feed_url
        }
        # Top link
-        printf "<a class=\"top\" href=\"#\">top</a>"
+        print_link("#", "back to top", "top", "top")
+        # printf "<a class=\"top\" href=\"#\">top</a>"
        printf "</nav>"
        printf "</header>\n"
        # Feed entries
@@ -297,9 +258,67 @@ function html_escape(t)
        return t
 }
-function print_link(href, title, text)
+function html_top()
+{
+        # Print HTML header
+        fortunecmd = "fortune"
+        fortunecmd | getline LOGO_TITLE
+        close(fortunecmd)
+        sub(/"/, "", LOGO_TITLE)
+        datecmd = "date -u +'" DATEFMT "'"
+        datecmd | getline UPDATE_TIME
+        close(datecmd)
+        print "<!DOCTYPE html>"
+        print "<html>"
+        # <head>
+        print "<head>"
+        print "<meta charset=\"utf-8\">"
+        print "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">"
+        print "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\">"
+        print "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">"
+        print "<title>" TITLE "</title>"
+        print "<link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\">"
+        print "<link rel=\"shortcut icon\" type=\"image/png\" href=\"mars-eyes.png\">"
+        print "<link rel=\"alternate\" type=\"application/atom+xml\" title=\"rss (full)\" href=\"feeds.xml\">"
+        print "<link rel=\"alternate\" type=\"application/atom+xml\" title=\"rss (short)\" href=\"feeds-short.xml\">"
+        print "<link rel=\"alternate\" type=\"application/xml\" title=\"opml\" href=\"feeds.opml\">"
+        print "<link rel=\"alternate\" type=\"text/plain\" title=\"twtxt\" href=\"feeds.txt\">"
+        print "</head>"
+        print "<body>"
+        # <header>
+        print "<header id=\"page-header\">"
+        print "<h1>"
+        printf "<a id=\"logo\" href=\"index.html\"><img src=\"mars-eyes.png\""
+        printf " title=\"%s\" ", LOGO_TITLE
+        printf "width=\"40\" height=\"39\""
+        print "alt=\"mars, but with eyes\" /></a>"
+        print TITLE "</h1>"
+        print "<p id=\"last-updated\">last updated at <time>" UPDATE_TIME "</time></p>"
+        print "</header>"
+        # <nav>
+        print "<nav id=\"page-nav\">"
+        print "<a href=\"#\" id=\"stalebutton\">hide stale</a>", SEPARATOR
+        print "<a href=\"feeds-short.xml\">rss</a>", SEPARATOR
+        print "<a href=\"feeds.html\">all</a>", "(<a href=\"feeds.xml\">rss</a>)", SEPARATOR
+        print "<a href=\"feeds.txt\">twtxt</a>", SEPARATOR
+        print "<a href=\"feeds.opml\">opml</a>"
+        print "</nav>"
+        # first part of <main>
+        print "<main>"
+        print "<section id=\"list\">"
+}
+function print_link(href, title, text, class)
 {
-        bufprint("<a href=\"" href "\" title=\"" title "\" target=\"_blank\">" text "</a>", 0)
+        link = "<a href=\"" href "\""
+        if (class) {
+                link = link " class=\"" class "\""
+        }
+        link = link " title=\"" title "\""
+        link = link "rel=\"nofollow\" target=\"_blank\">"
+        link = link text
+        link = link "</a>"
+        bufprint(link, 0)
 }
 function silo_class(link)