From: Christian Heller Date: Sat, 10 Dec 2016 22:55:21 +0000 (+0100) Subject: Stabilize feed.xml generation, reduce bad shell scripting. X-Git-Url: https://plomlompom.com/repos/?a=commitdiff_plain;h=f7676bb9cabab8d408d220051e4857c054a55efd;p=redo-blog Stabilize feed.xml generation, reduce bad shell scripting. --- diff --git a/README.md b/README.md index 92047da..e3ced3c 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,8 @@ customize the blog: ./url, ./author, ./uuid, ./title.) bugs ---- -Due to bad shell scripting in ./processor/index.html.do and -./processor/feed.xml.do (see the FIXME notes there), source files whose names -contain "$" break the redo processing. +Due to bad shell scripting in ./processor/index.html.do (see the FIXME notes +there), source files whose names contain "$" break the redo processing. Oh, and don't create a index.rst or index.md in the redo-managed directory, that will also break things. diff --git a/processor/feed.xml.do b/processor/feed.xml.do index 1e492eb..0010240 100644 --- a/processor/feed.xml.do +++ b/processor/feed.xml.do @@ -1,5 +1,29 @@ #!/bin/sh +build_entry () { + file="${1}" + uuidfile="${2}" + published="${3}" + intermediate_file="${file%.*}.intermediate" + htmlfile=`escape_url "${file%.*}.html"` + redo-ifchange "$uuid_file" + redo-ifchange "$intermediate_file" + lastmod=`stat -c%y "$file"` + lastmod_rfc3339=`date -u "+%Y-%m-%dT%TZ" -d "$lastmod"` + title=`read_and_escape_file "$intermediate_file" | head -1` + uuid=`read_and_escape_file "$uuid_file" | head -1` + body=`read_and_escape_file "$intermediate_file" | sed 1d` + published_rfc3339=`date -u "+%Y-%m-%dT%TZ" -d "${published}"` + printf "\n" + printf "%s\n" "$title" + printf "urn:uuid:%s\n" "$uuid" + printf "%s\n" "$lastmod_rfc3339" + printf "%s\n" "$published_rfc3339" + printf "\n" "$basepath" "${htmlfile#\./}" + printf "\n%s\n\n" "$body" + printf "" +} + # Pull in global dependencies. . ./helpers.sh url_file=url.meta @@ -33,44 +57,36 @@ printf "%s\n" "$title" printf "%s\n" "$author" printf "urn:uuid:%s\n" "$uuid" -# Iterate through most recent entries (go by lastmod date of source files) to -# build feed head "updated" element, and individual entries. -# FIXME: This ls parsing is a bad way to loop through the sorted files. Besides, -# $'\0' is a bashism. -first_run=0 -files=`ls -1t *.rst *.md | head -10 | tr '\n' $'\0'` -oldIFS="$IFS" -IFS=$'\0' -for file in $files; do - lastmod=`stat -c%y "$file"` - lastmod_rfc3339=`date -u "+%Y-%m-%dT%TZ" -d "$lastmod"` - if [ "$first_run" -lt "1" ]; then - IFS="$oldIFS" - printf "%s\n\n" "$lastmod_rfc3339" - first_run=1 +# Generate feed entry snippets. +mkdir -p feed_snippets +for file in ./*.rst ./*.md; do + if [ -e "$file" ]; then + uuid_file="${file%.*}.uuid" + redo-ifchange "$uuid_file" + published=`stat -c%y "${uuid_file}"` + published_unix=$(date -u "+%s%N" -d "${published}") + entry=$(build_entry "${file}" "${uuid_file}" "${published}") + echo "${entry}" > ./feed_snippets/${published_unix} fi +done - # Build some variables and dependencies. - intermediate_file="${file%.*}.intermediate" - htmlfile=`escape_url "${file%.*}.html"` - uuid_file="${file%.*}.uuid" - redo-ifchange "$intermediate_file" - redo-ifchange "$uuid_file" - title=`read_and_escape_file "$intermediate_file" | head -1` - uuid=`read_and_escape_file "$uuid_file" | head -1` - body=`read_and_escape_file "$intermediate_file" | sed 1d` - published=`stat -c%y "$uuid_file"` - published_rfc3339=`date -u "+%Y-%m-%dT%TZ" -d "$published"` +# Derive feed modification date from snippets. +mod_dates=$(grep -hE "^" ./feed_snippets/* | sed -E 's/<.?updated>//g') +last_mod_unix=0 +for date in $mod_dates; do + date_unix=$(date -u "+%s" -d "${date}") + if [ "$date_unix" -gt "$last_mod_unix" ]; then + last_mod_unix=$date_unix + fi +done +lastmod_rfc3339=`date -u "+%Y-%m-%dT%TZ" -d "@${last_mod_unix}"` +printf "%s\n\n" "$lastmod_rfc3339" - # Write entry. - printf "\n" - printf "%s\n" "$title" - printf "urn:uuid:%s\n" "$uuid" - printf "%s\n" "$lastmod_rfc3339" - printf "%s\n" "$published_rfc3339" - printf "\n" "$basepath" "$htmlfile" - printf "\n%s\n\n" "$body" - printf "\n\n" +# Write feed entries. +for file in ./feed_snippets/*; do + cat "${file}" + printf "\n" done +rm -rf feed_snippets printf "" diff --git a/test.sh b/test.sh index e333c40..d930e66 100755 --- a/test.sh +++ b/test.sh @@ -32,12 +32,14 @@ generated_files_dir_escaped="test\\/test_dir" rm -rf "$generated_files_dir" ./add_dir.sh "$generated_files_dir" working_dir=$(pwd) -cp "$expected_files_dir"/test.md "$generated_files_dir"/ -cp "$expected_files_dir"/foo.rst "$generated_files_dir"/ -cp "$expected_files_dir"/bar\ baz.md "$generated_files_dir"/ cd "$generated_files_dir" +cp "$working_dir/$expected_files_dir"/test.md . redo -cd "$working_dir" +cp "$working_dir/$expected_files_dir"/bar\ baz.md . +redo +cp "$working_dir/$expected_files_dir"/foo.rst . +redo +cd "$working_dir" # Simple file comparison tests and UUID tests. uuid_test "$generated_files_dir""/uuid.meta" diff --git a/test/test_files/feed.xml.ignoring b/test/test_files/feed.xml.ignoring index 039a116..0d6ea0d 100644 --- a/test/test_files/feed.xml.ignoring +++ b/test/test_files/feed.xml.ignoring @@ -8,36 +8,36 @@ IGNORE -foo +foo <em>bar</em> <strong>baz</strong> urn:uuid:IGNORE IGNORE IGNORE - + -<p>bar</p> +<p>foo</p> -a title with some nasty characters: &amp;&lt;&gt;&quot;' +foo urn:uuid:IGNORE IGNORE IGNORE - + -<p>this text contains some special characters: '&quot;&gt;&lt;&amp;</p> -<p>and more than one paragraph</p> +<p>bar</p> -foo <em>bar</em> <strong>baz</strong> +a title with some nasty characters: &amp;&lt;&gt;&quot;' urn:uuid:IGNORE IGNORE IGNORE - + -<p>bar</p> +<p>this text contains some special characters: '&quot;&gt;&lt;&amp;</p> +<p>and more than one paragraph</p> diff --git a/test/test_files/index.html b/test/test_files/index.html index f5b755c..3210fef 100644 --- a/test/test_files/index.html +++ b/test/test_files/index.html @@ -6,8 +6,8 @@

Yet another blog

diff --git a/test/test_files/test.html b/test/test_files/test.html index 787bf0e..565355d 100644 --- a/test/test_files/test.html +++ b/test/test_files/test.html @@ -6,7 +6,7 @@

foo bar baz

-

bar

+

foo

\ No newline at end of file diff --git a/test/test_files/test.md b/test/test_files/test.md index 3dd09f7..4416db1 100644 --- a/test/test_files/test.md +++ b/test/test_files/test.md @@ -1,2 +1,2 @@ % foo *bar* **baz** -bar +foo