X-Git-Url: https://plomlompom.com/repos/?p=redo-blog;a=blobdiff_plain;f=processor%2Fdefault.html.do;h=c44d00b40655b9eeaedc24d742baf9ffe9ca6156;hp=2a457a5ad2eda05c2f47e9953357da48af5de818;hb=ff5b37d8bc4cfba8f1db69a279da887accaa0296;hpb=5a17d0898d72bc8574601f57f26af8d3e0da2288
diff --git a/processor/default.html.do b/processor/default.html.do
index 2a457a5..c44d00b 100644
--- a/processor/default.html.do
+++ b/processor/default.html.do
@@ -2,27 +2,34 @@
# Pull in global dependencies.
. ./helpers.sh
-intermediate_file="${1%.html}.intermediate"
-title_file=title.meta
-redo-ifchange "$title_file"
+metadata_dir=metadata
+meta_file="${metadata_dir}/${1%.html}.automatic_metadata"
+redo-ifchange "$meta_file"
+intermediate_file="${metadata_dir}/${1%.html}.intermediate"
redo-ifchange "$intermediate_file"
+title_file="${metadata_dir}"/title
+redo-ifchange "$title_file"
+template_file="${metadata_dir}"/article.tmpl
+redo-ifchange "$template_file"
# Build entry data.
-blog_title=`read_and_escape_file "$title_file" | head -1`
-title_html=`cat "$intermediate_file" | head -1`
+blog_title=$(read_and_escape_file "$title_file" | head -1 | prep_sed)
+title_html=$(cat "$intermediate_file" | head -1)
title_plaintext=`echo "$title_html" | html2text`
-title_plaintext_escaped=`escape_html "$title_plaintext"`
-body=`cat "$intermediate_file" | sed 1d`
-
-# Write first part of entry head.
-cat << EOF
-
-
-
-EOF
+title_html=$(printf "%s" "$title_html" | prep_sed)
+title_plaintext=$(escape_html "$title_plaintext" | prep_sed)
+body=$(cat "$intermediate_file" | sed 1d | prep_sed)
+datetime_created_unix=$(get_creation_date_from_meta_file_seconds "$meta_file")
+datetime_created_rfc3339=$(date -u "+%Y-%m-%dT%TZ" -d "@${datetime_created_unix}")
+datetime_created_friendly=$(date -u "+%Y-%m-%d %T (UTC)" -d "@${datetime_created_unix}")
-# Write remaining entry head and body.
-printf "%s â %s\n\n\n" "$blog_title" "$title_plaintext_escaped"
-#printf "%s â %s\n\n\n" "$blog_title" "$entry_title"
-printf "%s
\n" "$title_html"
-printf "\n\n" "$body"
+# Put data into template.
+template=$(cat "$template_file")
+printf "%s" "$template" | \
+sed 's/%BLOG_TITLE%/'"$blog_title"'/g' | \
+sed 's/%ARTICLE_TITLE_ESCAPED%/'"$title_plaintext"'/g' | \
+sed 's/%ARTICLE_TITLE_HTML%/'"$title_html"'/g' | \
+sed 's/%DATETIME_CREATED_RFC3339%/'"$datetime_created_rfc3339"'/g' | \
+sed 's/%DATETIME_CREATED_FRIENDLY%/'"$datetime_created_friendly"'/g' | \
+sed 's/%BODY%/'"$body"'/g' | \
+tr '\a' '%'