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

diff --git a/processor/feed.xml.do b/processor/feed.xml.do
index 2b43969..513d538 100644
--- a/processor/feed.xml.do
+++ b/processor/feed.xml.do
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # Pull in global dependencies.
-metadata_dir=.meta
-. "$metadata_dir"/helpers.sh
+. ./helpers.sh
+metadata_dir=metadata
 author_file="$metadata_dir"/author
 uuid_file="$metadata_dir"/uuid
 title_file="$metadata_dir"/title
@@ -20,6 +20,7 @@ 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
@@ -38,30 +39,35 @@ for file in ./*.rst ./*.md; do
   if [ -e "$file" ]; then
     uuid_file="${metadata_dir}/${file%.*}.uuid"
     redo-ifchange "$uuid_file"
-    published=`stat -c%y "${uuid_file}"`
-    published_unix=$(date -u "+%s%N" -d "${published}")
+    published=$(stat -c%Y "${uuid_file}")
     snippet_file=./${metadata_dir}/"${file%.*}.feed_snippet"
     redo-ifchange "$snippet_file"
-    ln -s "$srcdir/$snippet_file" "./${tmp_snippets_dir}/${published_unix}"
+    ln -s "$srcdir/$snippet_file" "./${tmp_snippets_dir}/${published}"
   fi
 done
 
-# Derive feed modification date from snippets.
-mod_dates=$(grep -hE "^<updated>" ./${metadata_dir}/*.feed_snippet | 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 ./${tmp_snippets_dir}/*; do
-  cat "${file}"
-  printf "\n"
+  if [ -e "$file" ]; then
+    cat "${file}"
+    printf "\n"
+  fi
 done
 rm -rf "$tmp_snippets_dir"