X-Git-Url: https://plomlompom.com/repos/?p=redo-blog;a=blobdiff_plain;f=processor%2Fdefault.html.do;h=f0d43a39dca9970f2a9838bff0ddda2f53d0d114;hp=ba163e2e29f32369cd2075f5d282cd6b46879326;hb=HEAD;hpb=0dddf8e27165915e413feaa4a6acf234e4ca5d17 diff --git a/processor/default.html.do b/processor/default.html.do index ba163e2..f0d43a3 100644 --- a/processor/default.html.do +++ b/processor/default.html.do @@ -10,7 +10,8 @@ prep_url() { # Pull in global dependencies. . ./helpers.sh metadata_dir=metadata -captchas_dir=captchas +captchas_dir=captchas/linkable +mkdir -p "$captchas_dir" meta_file="${metadata_dir}/${1%.html}.automatic_metadata" redo-ifchange "$meta_file" intermediate_file="${metadata_dir}/${1%.html}.intermediate" @@ -32,12 +33,14 @@ title_html=$(cat "$intermediate_file" | head -1) title_plaintext=`echo "$title_html" | html2text` title_html=$(printf "%s" "$title_html" | prep_sed) title_plaintext=$(escape_html "$title_plaintext" | prep_sed) +title_url=$(escape_html "${1%.html}" | prep_sed) body=$(cat "$intermediate_file" | sed 1d | prep_sed) 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}") 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") @@ -49,4 +52,6 @@ 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' | \ +sed 's/%TITLE_URL%/'"$title_url"'/g' | \ tr '\a' '%'