X-Git-Url: https://plomlompom.com/repos/?p=redo-blog;a=blobdiff_plain;f=processor%2Ffeed.xml.do;h=513d538e08f416717b1a8b1c83bd94f52896f270;hp=16011f3d744331f3142030554660e6a5b02a7178;hb=298fdfd13e1918ad2bb316365595c510869d17ca;hpb=4373137de8ac6ad8731e6828a9876de9efe0a82e

diff --git a/processor/feed.xml.do b/processor/feed.xml.do
index 16011f3..513d538 100644
--- a/processor/feed.xml.do
+++ b/processor/feed.xml.do
@@ -2,9 +2,11 @@
 
 # Pull in global dependencies.
 . ./helpers.sh
-author_file=author.meta
-uuid_file=uuid.meta
-title_file=title.meta
+metadata_dir=metadata
+author_file="$metadata_dir"/author
+uuid_file="$metadata_dir"/uuid
+title_file="$metadata_dir"/title
+url_file="$metadata_dir"/url
 redo-ifchange "$url_file"
 redo-ifchange "$author_file"
 redo-ifchange "$uuid_file"
@@ -13,10 +15,12 @@ redo-ifchange "$title_file"
 # Build some variables. XML-escape even file contents that should not contain
 # dangerous characters, just to avoid any XML trouble.
 srcdir=`pwd`
-basepath=$(get_basepath)
+basepath=$(get_basepath "${metadata_dir}/")
 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`
+tmp_snippets_dir=.tmp_feed_snippets
+feed_gen_date=$(stat -c%Y "${uuid_file}")
 
 # Write majority of feed head.
 cat << EOF
@@ -30,37 +34,42 @@ printf "<author><name>%s</name></author>\n" "$author"
 printf "<id>urn:uuid:%s</id>\n" "$uuid"
 
 # Generate feed entry snippets.
-mkdir -p feed_snippets
+mkdir -p "$tmp_snippets_dir"
 for file in ./*.rst ./*.md; do
   if [ -e "$file" ]; then
-    uuid_file="${file%.*}.uuid"
+    uuid_file="${metadata_dir}/${file%.*}.uuid"
     redo-ifchange "$uuid_file"
-    published=`stat -c%y "${uuid_file}"`
-    published_unix=$(date -u "+%s%N" -d "${published}")
-    snippet_file="${file%.*}.feed_snippet"
+    published=$(stat -c%Y "${uuid_file}")
+    snippet_file=./${metadata_dir}/"${file%.*}.feed_snippet"
     redo-ifchange "$snippet_file"
-    ln -s "$srcdir/$snippet_file" "./feed_snippets/${published_unix}"
+    ln -s "$srcdir/$snippet_file" "./${tmp_snippets_dir}/${published}"
   fi
 done
 
-# Derive feed modification date from snippets.
-mod_dates=$(grep -hE "^<updated>" ./feed_snippets/* | sed -E 's/<.?updated>//g')
-last_mod_unix=0
+# Derive feed modification date from snippets. Fallback to uuid file mod 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 "^<updated>" ./${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
-lastmod_rfc3339=`date -u "+%Y-%m-%dT%TZ" -d "@${last_mod_unix}"`
-printf "<updated>%s</updated>\n\n" "$lastmod_rfc3339"
+last_mod_rfc3339=`date -u "+%Y-%m-%dT%TZ" -d "@${last_mod_unix}"`
+printf "<updated>%s</updated>\n\n" "$last_mod_rfc3339"
 
 # Write feed entries.
-for file in ./feed_snippets/*; do
-  cat "${file}"
-  printf "\n"
+for file in ./${tmp_snippets_dir}/*; do
+  if [ -e "$file" ]; then
+    cat "${file}"
+    printf "\n"
+  fi
 done
-rm -rf feed_snippets
+rm -rf "$tmp_snippets_dir"
 
 # Write feed foot.
 printf "</feed>"