X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;ds=sidebyside;f=processor%2Ffeed.xml.do;h=eed86ed353a327063311d59b7eb5aebe01e09910;hb=b30ef996fa5865124811032655f80eba65ee8d0d;hp=14ead597b0f7d88f25d64a02af04683493483ef8;hpb=5a17d0898d72bc8574601f57f26af8d3e0da2288;p=redo-blog
diff --git a/processor/feed.xml.do b/processor/feed.xml.do
index 14ead59..eed86ed 100644
--- a/processor/feed.xml.do
+++ b/processor/feed.xml.do
@@ -2,25 +2,25 @@
# Pull in global dependencies.
. ./helpers.sh
-url_file=url.meta
-author_file=author.meta
-uuid_file=uuid.meta
-title_file=title.meta
+metadata_dir=metadata
+author_file="$metadata_dir"/author
+meta_file="$metadata_dir"/automatic_metadata
+title_file="$metadata_dir"/title
+url_file="$metadata_dir"/url
redo-ifchange "$url_file"
redo-ifchange "$author_file"
-redo-ifchange "$uuid_file"
+redo-ifchange "$meta_file"
redo-ifchange "$title_file"
# Build some variables. XML-escape even file contents that should not contain
# dangerous characters, just to avoid any XML trouble.
-base_url=`cat "$url_file" | head -1`
-url_protocol=`echo $base_url | cut -d ':' -f 1`
-url_basepath=`echo $base_url | cut -d '/' -f 3-`
-url_basepath_escaped=`escape_url "$url_basepath"`
-basepath="$url_protocol""://""$url_basepath_escaped"
-title=`read_and_escape_file "$title_file" | head -1`
-author=`read_and_escape_file "$author_file" | head -1`
-uuid=`read_and_escape_file "$uuid_file" | head -1`
+srcdir=$(pwd)
+tmp_snippets_dir=.tmp_feed_snippets
+basepath=$(get_basepath "${metadata_dir}/")
+title=$(read_and_escape_file "$title_file" | head -1)
+author=$(read_and_escape_file "$author_file" | head -1)
+uuid=$(get_uuid_from_meta_file "$meta_file")
+feed_gen_date=$(get_creation_date_from_meta_file_seconds "$meta_file")
# Write majority of feed head.
cat << EOF
@@ -33,42 +33,43 @@ 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.
-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 "$tmp_snippets_dir"
+for file in ./*.rst ./*.md; do
+ if [ -e "$file" ]; then
+ meta_file="${metadata_dir}/${file%.*}.automatic_metadata"
+ redo-ifchange "$meta_file"
+ published=$(get_creation_date_from_meta_file_nanoseconds "$meta_file")
+ snippet_file=./${metadata_dir}/"${file%.*}.feed_snippet"
+ redo-ifchange "$snippet_file"
+ ln -s "$srcdir/$snippet_file" "./${tmp_snippets_dir}/${published}"
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. Fallback to blog creation date.
+n_snippet_files=`ls -1 ./${metadata_dir}/*.feed_snippet 2>/dev/null | wc -l`
+if [ $n_snippet_files != 0 ]
+then
+ mod_dates=$(grep -hE "^" ./${metadata_dir}/*.feed_snippet | sed -E 's/<.?updated>//g')
+fi
+last_mod_unix=$feed_gen_date
+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
+last_mod_rfc3339=`date -u "+%Y-%m-%dT%TZ" -d "@${last_mod_unix}"`
+printf "%s\n\n" "$last_mod_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 ./${tmp_snippets_dir}/*; do
+ if [ -e "$file" ]; then
+ cat "${file}"
+ printf "\n"
+ fi
done
+rm -rf "$tmp_snippets_dir"
+# Write feed foot.
printf ""