From 30d0cdf4059439786699b77cf0d406947f727894 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Fri, 19 Aug 2022 16:12:35 -0500 Subject: Paginate --- .gitignore | 1 + Makefile | 20 +- fwendplanet.sh | 31 +- fwendplanet_html.awk | 61 +- index.html | 3300 +++++++++++++++++++++++++++----------------------- style.css | 168 +-- 6 files changed, 1938 insertions(+), 1643 deletions(-) diff --git a/.gitignore b/.gitignore index 0e07134..d2efdb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ feeds/ sfeedrc +p*.html diff --git a/Makefile b/Makefile index 1fa687a..28c668e 100644 --- a/Makefile +++ b/Makefile @@ -3,19 +3,29 @@ REPO = https://tildegit.org/casa/pages/raw/branch/main/opml/mug.of.opml OUTD = /var/www/acdw.casa/fwends/ RC = sfeedrc FEEDS = feeds -FILES = index.html style.css +FILES = index.html style.css p*.html AGGREGATOR = ./fwendplanet.sh -MAXAGE = 60 +PAGEN = 60 # 2 months .PHONY: publish publish: build mkdir -p $(OUTD) - cp $(FILES) $(OUTD) + rsync -avz --delete $(FILES) $(OUTD) .PHONY: build build: $(RC) - sfeed_update $(RC) || true - $(AGGREGATOR) $(FEEDS) $(MAXAGE) >index.html + -rm p*.html + #-sfeed_update $(RC) + NEXT=p2.html PREV=0 $(AGGREGATOR) $(FEEDS) 1 $(PAGEN) >index.html + NEXT=p3.html PREV=index.html $(AGGREGATOR) $(FEEDS) 2 $(PAGEN) >pn.html + N=2; while grep '

' pn.html >/dev/null 2>&1; do \ + mv pn.html p$$N.html; \ + N=$$((N+1)); \ + NEXT=p$$((N+1)).html PREV=p$$((N-1)).html\ + $(AGGREGATOR) $(FEEDS) $$N $(PAGEN) >pn.html; \ + done; \ + rm pn.html; \ + NEXT=0 PREV=p$$((N-2)).html $(AGGREGATOR) $(FEEDS) $$((N-1)) $(PAGEN) >p$$((N-1)).html $(RC): curl -L $(REPO) | sfeed_opml_import > $@ diff --git a/fwendplanet.sh b/fwendplanet.sh index 586f934..7ec7eb8 100755 --- a/fwendplanet.sh +++ b/fwendplanet.sh @@ -6,12 +6,31 @@ curd="$PWD" cd "$1" || return 1 if [ -n "$2" ]; then - old="$(($(date +%s) - ($2 * 24 * 3600)))" + page="$2" else - old=0 + page=1 fi -awk -v old="$old" \ - 'BEGIN{FS="\t";OFS="\t";} int($1)>=old{$2="["FILENAME"] "$2;print}' * | - sort -k1,1rn | - "$curd/fwendplanet_html.awk" +if [ -n "$3" ]; then + groupn="$(($3 * 24 * 3600))" +else + groupn=1 +fi + +# echo "$@" "$page" "$groupn" >&2 + +awk -v page="$page" -v groupn="$groupn" -v now="$(date +%s)" \ + 'BEGIN { FS = "\t"; OFS = "\t"; } + { + oldest = groupn*page + if (oldest) oldest=now-oldest; else oldest=0 + newest = groupn*(page-1) + if (newest) newest=now-newest; else newest=now + d=int($1) + if (d>oldest && d<=newest) { + # printf "%s\t%s\t%s\n", d, oldest, newest > "/dev/stderr" + $2 = "[" FILENAME "] " $2 + print + } + } +' * | sort -k1,1rn | "$curd/fwendplanet_html.awk" diff --git a/fwendplanet_html.awk b/fwendplanet_html.awk index c4ebe0e..84f29a6 100755 --- a/fwendplanet_html.awk +++ b/fwendplanet_html.awk @@ -4,6 +4,8 @@ BEGIN { TITLE = "fwend planet" FS = "\t" + NEXT = ENVIRON["NEXT"] + PREV = ENVIRON["PREV"] } BEGIN { @@ -18,7 +20,22 @@ BEGIN { print "" print "" print "" - print "

fwend planet

" + print "

fwend planet" + if (PREV) { + p = (PREV ~ /index/ ? 1 : PREV) + gsub(/[^0-9]/, "", p) + print "p. " (int(p) + 1) + } + print "

" + print "

" + if (PREV) { + print "prev" + } + if (NEXT) { + print "next" + } + print "

" } { @@ -32,30 +49,50 @@ BEGIN { author = $7 enclosure = $8 category = $9 + datecmd = "date -d@" timestamp " +%F" + datecmd | getline date + close(datecmd) print "

" - print "

" title "

" + print "

" (title ? title : "") " : " date "

" print "

" - print "read original" + if (link && title !~ /linkbudz/ && link != enclosure) { + print "read original" + } if (enclosure) { print "enclosure" } print "

" print "

" content "

" print "

item information

" - print "timestamp: " timestamp - print "title: " title - print "link: " link - print "content_type: " content_type - print "id: " id - print "author: " author - print "enclosure: " enclosure - print "category: " category + print "

timestamp: " timestamp "
title: " title "
link: " link "
content_type: " content_type "
id: " id "
author: " author "
enclosure: " enclosure "
category: " category "

" print "

" } END { - print "email acdw if you have issues." + print "

" + if (PREV) { + print "prev" + } + if (NEXT) { + print "next" + } + print "

" + print "" + print "

" print "" print "" } diff --git a/index.html b/index.html index 7e58612..62cef65 100644 --- a/index.html +++ b/index.html @@ -9,81 +9,90 @@ -

fwend planet

fwend planet +

+next +

[linkbudz rss feed] ed is the standard editor

[linkbudz rss feed] ed is the standard editor : 2022-08-18

fwend planet

fwend planet" + if (PREV) { + p = (PREV ~ /index/ ? 1 : PREV) + gsub(/[^0-9]/, "", p) + print "p. " (int(p) + 1) + } + print "

fwend planet

fwend planet +

Admin Note

Credits