X-Git-Url: https://plomlompom.com/repos/?p=redo-blog;a=blobdiff_plain;f=processor%2Ffeed.xml.do;h=0bc7318b0dc881bd094b81a17254d1977a5d48a8;hp=001024020b2da6f777c767b3fa26b9dcd7fae740;hb=cc2d161a6ef0700f6d08fd5c63314834a7264c28;hpb=f7676bb9cabab8d408d220051e4857c054a55efd

diff --git a/processor/feed.xml.do b/processor/feed.xml.do
index 0010240..0bc7318 100644
--- a/processor/feed.xml.do
+++ b/processor/feed.xml.do
@@ -1,35 +1,12 @@
 #!/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 "<entry>\n"
-  printf "<title type=\"html\">%s</title>\n" "$title"
-  printf "<id>urn:uuid:%s</id>\n" "$uuid"
-  printf "<updated>%s</updated>\n" "$lastmod_rfc3339"
-  printf "<published>%s</published>\n" "$published_rfc3339"
-  printf "<link href=\"%s%s\" />\n" "$basepath" "${htmlfile#\./}"
-  printf "<content type=\"html\">\n%s\n</content>\n" "$body"
-  printf "</entry>"
-}
-
 # 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
+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"
@@ -37,14 +14,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.
-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"
+srcdir=`pwd`
+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
 
 # Write majority of feed head.
 cat << EOF
@@ -58,20 +33,25 @@ 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}")
-    entry=$(build_entry "${file}" "${uuid_file}" "${published}")
-    echo "${entry}" > ./feed_snippets/${published_unix}
+    snippet_file=./${metadata_dir}/"${file%.*}.feed_snippet"
+    redo-ifchange "$snippet_file"
+    ln -s "$srcdir/$snippet_file" "./${tmp_snippets_dir}/${published_unix}"
   fi
 done
 
 # Derive feed modification date from snippets.
-mod_dates=$(grep -hE "^<updated>" ./feed_snippets/* | sed -E 's/<.?updated>//g')
+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=0
 for date in $mod_dates; do
   date_unix=$(date -u "+%s" -d "${date}")
@@ -83,10 +63,13 @@ lastmod_rfc3339=`date -u "+%Y-%m-%dT%TZ" -d "@${last_mod_unix}"`
 printf "<updated>%s</updated>\n\n" "$lastmod_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>"