X-Git-Url: https://plomlompom.com/repos/?p=redo-blog;a=blobdiff_plain;f=processor%2Fdefault.html.do;h=31fa9cd5e24259401c9ff0332eae1639f95c8648;hp=8937ce8ed1bbd9077472efbb535877160a645846;hb=72ae8fbf69b4a8de4cf31c5b9b9ee7bb760f2278;hpb=0759afe3db42ac3ca2c708a7f08fd37d5401bf7a diff --git a/processor/default.html.do b/processor/default.html.do index 8937ce8..31fa9cd 100644 --- a/processor/default.html.do +++ b/processor/default.html.do @@ -10,6 +10,8 @@ prep_url() { # Pull in global dependencies. . ./helpers.sh metadata_dir=metadata +captchas_dir=captchas/public +mkdir -p "$captchas_dir" meta_file="${metadata_dir}/${1%.html}.automatic_metadata" redo-ifchange "$meta_file" intermediate_file="${metadata_dir}/${1%.html}.intermediate" @@ -21,6 +23,9 @@ redo-ifchange "$article_tmpl_file" linkback_tmpl_file="${metadata_dir}"/linkback.tmpl redo-ifchange "$linkback_tmpl_file" replies_file="${1%.html}.links" +redo-ifchange "$replies_file" +captcha_file="$captchas_dir/${1%.html}" +redo-ifchange "$captcha_file" # Build entry data. blog_title=$(read_and_escape_file "$title_file" | head -1 | prep_sed) @@ -33,9 +38,8 @@ datetime_created_unix=$(get_creation_date_from_meta_file_seconds "$meta_file") date_created=$(date -u "+%Y-%m-%d" -d "@${datetime_created_unix}") datetime_lastmod_unix=$(get_lastmod_date_from_meta_file "$meta_file") date_updated=$(date -u "+%Y-%m-%d" -d "@${datetime_lastmod_unix}") -if test -f "$replies_file"; then - replies=$(while read line; do prep_url "$line"; done < "$replies_file") -fi +replies=$(while read line; do prep_url "$line"; done < "$replies_file") +captcha=$(escape_html "$(cat "$captcha_file" | sed -n 2p)" | prep_sed) # Put data into template. template=$(cat "$article_tmpl_file") @@ -47,4 +51,5 @@ sed 's/%DATE_CREATED%/'"$date_created"'/g' | \ sed 's/%DATE_UPDATED%/'"$date_updated"'/g' | \ sed 's/%BODY%/'"$body"'/g' | \ sed 's/%LINKBACKS%/'"$replies"'/g' | \ +sed 's/%CAPTCHA%/'"$captcha"'/g' | \ tr '\a' '%'