Avoid data races with codeIndex on feeds

Don't show .gz files: that's almost everything thanks to ect's
non-deterministic output

Makefile

@@ -22,8 +22,11 @@ ECT_LEVEL=6
 csv/webrings.csv:
 	sh scripts/populate-webrings.sh
 
+data/bookmarks.json:
+	sh scripts/get-bookmarks.sh
+
 .PHONY: hugo
-hugo: csv/webrings.csv $(SRCFILES)
+hugo: csv/webrings.csv data/bookmarks.json $(SRCFILES)
 	sh scripts/get-webmentions.sh
 	hugo -b $(HUGO_BASEURL) $(HUGO_FLAGS) -d $(OUTPUT_DIR)
 	mv $(OUTPUT_DIR)/about/_index.gmi $(OUTPUT_DIR)/about/index.gmi
@@ -38,7 +41,7 @@ hugo: csv/webrings.csv $(SRCFILES)
 
 .PHONY: clean
 clean:
-	rm -rf $(OUTPUT_DIR) .lighthouseci lighthouse-reports
+	rm -rf $(OUTPUT_DIR) .lighthouseci lighthouse-reports data/webmentions.json csv/webrings.csv data/bookmarks.json
 
 .PHONY: lint-css
 lint-css: $(CSS_DIR)/*.css
@@ -123,16 +126,16 @@ compress: gzip brotli
 .PHONY: gzip brotli compress
 
 .PHONY: xhtmlize
-xhtmlize:
+xhtmlize: hugo
 	sh scripts/xhtmlize.sh $(OUTPUT_DIR)
 
 .PHONY: copy-to-xhtml
-copy-to-xhtml:
+copy-to-xhtml: xhtmlize
 	find $(OUTPUT_DIR) -type f -name "*.html" | grep -v 'resume/index.html' | xargs -n1 sh scripts/copy-file-to-xhtml.sh
 
 .PHONY: deploy-html
 deploy-html:
-	rsync $(RSYNCFLAGS) $(RSYNCFLAGS_EXTRA) --exclude 'gemini' --exclude '*.gmi' --exclude-from .rsyncignore $(OUTPUT_DIR)/ $(WWW_RSYNC_DEST) --delete
+	rsync $(RSYNCFLAGS) $(RSYNCFLAGS_EXTRA) --exclude 'gemini' --exclude '*.gmi' --exclude-from .rsyncignore $(OUTPUT_DIR)/ $(WWW_RSYNC_DEST) --delete | grep -v 'l\.gz$$'
 
 .PHONY: deploy-gemini
 deploy-gemini:

layouts/_default/list.atom.xml

@@ -9,9 +9,9 @@
 {{- if eq .Section "notes" -}}
 	{{- $period = "hourly" -}}
 {{- end -}}
-{{- $icon := resources.Get "/favicon.svg" | resources.Fingerprint "md5" -}}
+{{- $faviconSvg := resources.Get "/favicon.svg" | resources.Fingerprint "md5" -}}
 {{- $image := resources.Get "/favicon192.png" | resources.Fingerprint "md5" -}}
-{{- $logo := resources.Get "/atom.svg" | resources.Fingerprint "md5" -}}
+{{- $atomLogo := resources.Get "/atom.svg" | resources.Fingerprint "md5" -}}
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <feed
 	xmlns="http://www.w3.org/2005/Atom"
@@ -22,6 +22,7 @@
 	xmlns:ostatus="http://ostatus.org/schema/1.0"
 	xmlns:poco="http://portablecontacts.net/spec/1.0"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
 	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
 	xmlns:thr="http://purl.org/syndication/thread/1.0"
 	xmlns:webfeeds="http://webfeeds.org/rss/1.0">
@@ -34,10 +35,10 @@
 		{{- end -}}
 	</subtitle>
 	<link rel="self" type="application/atom+xml" href="{{ .Permalink }}atom.xml" />
-	<icon>{{ $icon.Permalink }}</icon>
+	<icon>{{ $faviconSvg.Permalink }}</icon>
-	<webfeeds:icon>{{ $icon.Permalink }}</webfeeds:icon>
+	<webfeeds:icon>{{ $image.Permalink }}</webfeeds:icon>
-	<webfeeds:cover>{{ $logo.Permalink }}</webfeeds:cover>
+	<webfeeds:cover>{{ $atomLogo.Permalink }}</webfeeds:cover>
-	<logo>{{ $logo.Permalink }}</logo>
+	<logo>{{ $atomLogo.Permalink }}</logo>
 	<webfeeds:accentColor>191919</webfeeds:accentColor>
 	<sy:updatePeriod>{{ $period }}</sy:updatePeriod>
 	<sy:updateFrequency>2</sy:updateFrequency>
@@ -57,7 +58,6 @@
   {{ range $pages -}}
 	{{- if not .Params.Private -}}
   <entry>
-		{{- .Page.Scratch.Set "codeIndex" 1 -}}
 		<title>{{ .Title }}</title>
 		<link rel="alternate" type="text/html" href="{{ .Permalink }}" />
 		<id>{{ .Permalink }}</id>
@@ -90,6 +90,7 @@
 					{{ partial "processed-content.html" . | replaceRE `(?: )?(?:item(type|scope|prop|id|ref)="[^"]*"|class="language-figure")` "" | replaceRE `<meta content="true" ?/>` "" | safeHTML -}}
 			</div>
 		</content>
+		<slash:comments>{{ .Page.Scratch.Get "webmentionCount" }}</slash:comments>
 	</entry>
   {{ end -}}
 	{{- end }}

layouts/partials/webmentions/webmentions.html

@@ -25,6 +25,7 @@
 	{{- end -}}
 {{- /* Render webmentions if they exist */ -}}
 {{- $count := (len $webmentions) -}}
+{{- .Page.Scratch.Set "webmentionCount" $count -}}<!--For use in atom feed-->
 {{- if gt $count 0 -}}
 <details>
 	<summary>Toggle {{ $count }} Webmentions</summary>

layouts/posts/single.html

@@ -1,6 +1,8 @@
 {{- define "main" -}}
 {{- $canonicalRelPermalink := .RelPermalink | replaceRE "^/~seirdy/" "/" }}
 {{- .Scratch.Set "codeIndex" 1 -}}
+{{- .Scratch.Set "codeIndexAtom" 1 -}}
+{{- .Scratch.Set "codeIndexRss" 1 -}}
 <main
  itemprop="mainEntity" itemscope="" itemtype="https://schema.org/BlogPosting{{ with .Params.articleType }} https://schema.org/{{ . }}{{ end }}" itemid="{{ .Site.Params.CanonicalBaseURL }}{{ $canonicalRelPermalink }}">
 <link itemprop="isPartOf" href="{{ .Site.Params.CanonicalBaseURL }}/" />

layouts/shortcodes/codecaption.atom

@@ -0,0 +1,17 @@
+{{- $codeIndex := (.Page.Scratch.Get "codeIndexAtom") -}}
+{{- $id := (printf `code-%d` $codeIndex) -}}
+{{- with .Get "id" -}}
+	{{- $id = . -}}
+{{- end -}}
+{{ with .Parent }}
+	{{- with .Get "id" -}}
+		{{- $id = . -}}
+	{{- end -}}
+{{- end -}}
+<figcaption id="{{ $id }}-caption">
+	<span id="{{ $id }}" tabindex="-1">
+	<strong itemprop="name"> <span itemprop="codeSampleType">Code snippet</span> {{ $codeIndex }}</strong>{{with .Get "lang"}} (<span itemprop="programmingLanguage">{{ . }}</span>){{ end -}}
+	</span>:
+{{ .Inner | .Page.RenderString | safeHTML }}
+</figcaption>
+{{- .Page.Scratch.Set "codeIndexAtom" (add 1 $codeIndex) -}}

layouts/shortcodes/codecaption.rss

@@ -0,0 +1,17 @@
+{{- $codeIndex := (.Page.Scratch.Get "codeIndexRss") -}}
+{{- $id := (printf `code-%d` $codeIndex) -}}
+{{- with .Get "id" -}}
+	{{- $id = . -}}
+{{- end -}}
+{{ with .Parent }}
+	{{- with .Get "id" -}}
+		{{- $id = . -}}
+	{{- end -}}
+{{- end -}}
+<figcaption id="{{ $id }}-caption">
+	<span id="{{ $id }}" tabindex="-1">
+	<strong itemprop="name"> <span itemprop="codeSampleType">Code snippet</span> {{ $codeIndex }}</strong>{{with .Get "lang"}} (<span itemprop="programmingLanguage">{{ . }}</span>){{ end -}}
+	</span>:
+{{ .Inner | .Page.RenderString | safeHTML }}
+</figcaption>
+{{- .Page.Scratch.Set "codeIndexRss" (add 1 $codeIndex) -}}

scripts/get-bookmarks.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e -u
+#shellcheck disable=SC3040  # This only sets pipefail if it's available and otherwise does nothing
+set -o pipefail 2>/dev/null || true
+
+dirname="$(dirname "$0")"
+curl_wrapper="$dirname/curl-wrapper.sh"
+bookmarks_file="$dirname/../data/bookmarks.json"
+
+if command -v buku >/dev/null; then
+	buku -t public -j >"$bookmarks_file"
+elif [ ! -f "$bookmarks_file" ]; then
+	"$curl_wrapper" 'https://seirdy.one/data/bookmarks.json' >"$bookmarks_file"
+else
+	echo 'using cached bookmarks'
+fi