X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;f=processor%2Fdefault.html.do;h=99d784df28884f9816f08305099b04cc3338211e;hb=dd07631feb38e91824fdb81c7571f32ad56ed214;hp=2a457a5ad2eda05c2f47e9953357da48af5de818;hpb=5a17d0898d72bc8574601f57f26af8d3e0da2288;p=redo-blog diff --git a/processor/default.html.do b/processor/default.html.do index 2a457a5..99d784d 100644 --- a/processor/default.html.do +++ b/processor/default.html.do @@ -2,27 +2,27 @@ # Pull in global dependencies. . ./helpers.sh -intermediate_file="${1%.html}.intermediate" -title_file=title.meta -redo-ifchange "$title_file" +metadata_dir=metadata +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) -# Write remaining entry head and body. -printf "