beenull/bashblog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert changes in #116

Browse source
This commit is contained in:
Carlos Fenollosa 2016-10-24 15:49:52 +02:00
parent 5fc037f4b9
commit 5c8e0e56e1
1 changed files with 55 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
bb.sh
View file

@ -5,18 +5,6 @@
# https://github.com/carlesfe/bashblog/contributors # https://github.com/carlesfe/bashblog/contributors
# Check out README.md for more details # Check out README.md for more details
# Some shell settings for robustness by default. These help eliminate
# unexpected snags and security vulnerabilities in case someone forgets to
# quote a variable somewhere. They do require a few coding adaptations.
IFS=$'\n' # Globally, we do word splitting only on newline (which also
# makes "$*" expand with newline separator instead of space).
set -f # Disable globbing (pathname expansion). It can be re-enabled
# locally using 'set +f'; it's handy to do this in a subshell,
# for example in $(command substitution), as the globbing will
# be local to the subshell.
# Global variables # Global variables
# It is recommended to perform a 'rebuild' after changing any of this in the code # It is recommended to perform a 'rebuild' after changing any of this in the code
@ -269,14 +257,6 @@ get_html_file_content() {
}" }"
} }
# Invoke the editor specified by the $EDITOR environment variable. Use a
# function for this as we need to locally word-split $EDITOR on spaces
# (in case it contains arguments, like EDITOR='joe -nobackups).
invoke_editor() {
local IFS=$' \t\n'
$EDITOR "$1"
}
# Edit an existing, published .html file while keeping its original timestamp # Edit an existing, published .html file while keeping its original timestamp
# Please note that this function does not automatically republish anything, as # Please note that this function does not automatically republish anything, as
# it is usually called from 'main'. # it is usually called from 'main'.
@ -296,8 +276,7 @@ edit() {
touch_timestamp=$(LC_ALL=C date -r "${1%%.*}.html" +"$date_format_timestamp") touch_timestamp=$(LC_ALL=C date -r "${1%%.*}.html" +"$date_format_timestamp")
tags_before=$(tags_in_post "${1%%.*}.html") tags_before=$(tags_in_post "${1%%.*}.html")
if [[ $2 == full ]]; then if [[ $2 == full ]]; then
invoke_editor "$1" $EDITOR "$1"
touch -t "$touch_timestamp" "$1"
filename=$1 filename=$1
else else
if [[ ${1##*.} == md ]]; then if [[ ${1##*.} == md ]]; then
@ -307,8 +286,7 @@ edit() {
exit exit
fi fi
# editing markdown file # editing markdown file
invoke_editor "$1" $EDITOR "$1"
touch -t "$touch_timestamp" "$1"
TMPFILE=$(markdown "$1") TMPFILE=$(markdown "$1")
filename=${1%%.*}.html filename=${1%%.*}.html
else else
@ -318,29 +296,27 @@ edit() {
get_post_title "$1" > "$TMPFILE" get_post_title "$1" > "$TMPFILE"
# Post text with plaintext tags # Post text with plaintext tags
get_html_file_content 'text' 'text' <"$1" | sed "/^<p>$template_tags_line_header/s|<a href='$prefix_tags\([^']*\).html'>\\1</a>|\\1|g" >> "$TMPFILE" get_html_file_content 'text' 'text' <"$1" | sed "/^<p>$template_tags_line_header/s|<a href='$prefix_tags\([^']*\).html'>\\1</a>|\\1|g" >> "$TMPFILE"
invoke_editor "$TMPFILE" $EDITOR "$TMPFILE"
filename=$1 filename=$1
fi fi
rm "$filename" rm "$filename"
if [[ $2 == keep ]]; then if [[ $2 == keep ]]; then
old_filename=''
parse_file "$TMPFILE" "$edit_timestamp" "$filename" parse_file "$TMPFILE" "$edit_timestamp" "$filename"
else else
old_filename=$filename # save old filename to exclude it from $relevant_posts
parse_file "$TMPFILE" "$edit_timestamp" # this command sets $filename as the html processed file parse_file "$TMPFILE" "$edit_timestamp" # this command sets $filename as the html processed file
[[ ${1##*.} == md ]] && mv "$1" "${filename%%.*}.md" 2>/dev/null [[ ${1##*.} == md ]] && mv "$1" "${filename%%.*}.md" 2>/dev/null
fi fi
rm "$TMPFILE" rm "$TMPFILE"
touch -t "$touch_timestamp" "$filename"
fi fi
touch -t "$touch_timestamp" "$filename"
touch -t "$touch_timestamp" "$1"
chmod 644 "$filename" chmod 644 "$filename"
echo "Posted $filename" echo "Posted $filename"
tags_after=$(tags_in_post "$filename") tags_after=$(tags_in_post "$filename")
relevant_tags=$(sort -u <<< "$tags_before"$'\n'"$tags_after") relevant_tags=$(echo "$tags_before $tags_after" | tr ',' ' ' | tr ' ' '\n' | sort -u | tr '\n' ' ')
if [[ -n $relevant_tags ]]; then if [[ ! -z $relevant_tags ]]; then
relevant_posts=$(posts_with_tags $relevant_tags)$'\n'$filename relevant_posts="$(posts_with_tags $relevant_tags) $filename"
[[ -n $old_filename ]] && relevant_posts=$(grep -vFx "$old_filename" <<<"$relevant_posts") rebuild_tags "$relevant_posts" "$relevant_tags"
rebuild_tags $relevant_posts --tags $relevant_tags
fi fi
} }
@ -512,11 +488,10 @@ create_html_page() {
parse_file() { parse_file() {
# Read for the title and check that the filename is ok # Read for the title and check that the filename is ok
title="" title=""
while read -r line; do while IFS='' read -r line; do
if [[ -z $title ]]; then if [[ -z $title ]]; then
# remove extra <p> and </p> added by markdown # remove extra <p> and </p> added by markdown
title=${line#<p>} title=$(echo "$line" | sed 's/<\/*p>//g')
title=${title%</p>}
if [[ -n $3 ]]; then if [[ -n $3 ]]; then
filename=$3 filename=$3
else else
@ -538,6 +513,7 @@ parse_file() {
elif [[ $line == "<p>$template_tags_line_header"* ]]; then elif [[ $line == "<p>$template_tags_line_header"* ]]; then
tags=$(echo "$line" | cut -d ":" -f 2- | sed -e 's/<\/p>//g' -e 's/^ *//' -e 's/ *$//' -e 's/, /,/g') tags=$(echo "$line" | cut -d ":" -f 2- | sed -e 's/<\/p>//g' -e 's/^ *//' -e 's/ *$//' -e 's/, /,/g')
IFS=, read -r -a array <<< "$tags" IFS=, read -r -a array <<< "$tags"
echo -n "<p>$template_tags_line_header " >> "$content" echo -n "<p>$template_tags_line_header " >> "$content"
for item in "${array[@]}"; do for item in "${array[@]}"; do
echo -n "<a href='$prefix_tags$item.html'>$item</a>, " echo -n "<a href='$prefix_tags$item.html'>$item</a>, "
@ -602,7 +578,7 @@ EOF
filename="" filename=""
while [[ $post_status != "p" && $post_status != "P" ]]; do while [[ $post_status != "p" && $post_status != "P" ]]; do
[[ -n $filename ]] && rm "$filename" # Delete the generated html file, if any [[ -n $filename ]] && rm "$filename" # Delete the generated html file, if any
invoke_editor "$TMPFILE" $EDITOR "$TMPFILE"
if [[ $fmt == md ]]; then if [[ $fmt == md ]]; then
html_from_md=$(markdown "$TMPFILE") html_from_md=$(markdown "$TMPFILE")
parse_file "$html_from_md" parse_file "$html_from_md"
@ -644,8 +620,8 @@ EOF
echo "Posted $filename" echo "Posted $filename"
relevant_tags=$(tags_in_post $filename) relevant_tags=$(tags_in_post $filename)
if [[ -n $relevant_tags ]]; then if [[ -n $relevant_tags ]]; then
relevant_posts=$(posts_with_tags $relevant_tags)$'\n'$filename relevant_posts="$(posts_with_tags $relevant_tags) $filename"
rebuild_tags $relevant_posts --tags $relevant_tags rebuild_tags "$relevant_posts" "$relevant_tags"
fi fi
} }
@ -660,7 +636,7 @@ all_posts() {
{ {
echo "<h3>$template_archive_title</h3>" echo "<h3>$template_archive_title</h3>"
prev_month="" prev_month=""
for i in $(set +f; ls -t ./*.html); do while IFS='' read -r i; do
is_boilerplate_file "$i" && continue is_boilerplate_file "$i" && continue
echo -n "." 1>&3 echo -n "." 1>&3
# Month headers # Month headers
@ -677,7 +653,7 @@ all_posts() {
# Date # Date
date=$(LC_ALL=$date_locale date -r "$i" +"$date_format") date=$(LC_ALL=$date_locale date -r "$i" +"$date_format")
echo " $date</li>" echo " $date</li>"
done done < <(ls -t ./*.html)
echo "" 1>&3 echo "" 1>&3
echo "</ul>" echo "</ul>"
echo "<div id=\"all_posts\"><a href=\"./$index_file\">$template_archive_index_page</a></div>" echo "<div id=\"all_posts\"><a href=\"./$index_file\">$template_archive_index_page</a></div>"
@ -700,7 +676,7 @@ all_tags() {
{ {
echo "<h3>$template_tags_title</h3>" echo "<h3>$template_tags_title</h3>"
echo "<ul>" echo "<ul>"
for i in $(set +f; printf '%s\n' $prefix_tags*.html); do for i in $prefix_tags*.html; do
[[ -f "$i" ]] || break [[ -f "$i" ]] || break
echo -n "." 1>&3 echo -n "." 1>&3
nposts=$(grep -c "<\!-- text begin -->" "$i") nposts=$(grep -c "<\!-- text begin -->" "$i")
@ -737,8 +713,7 @@ rebuild_index() {
# Create the content file # Create the content file
{ {
n=0 n=0
for i in $(set +f; ls -t ./*.html) # sort by date, newest first while IFS='' read -r i; do
do
is_boilerplate_file "$i" && continue; is_boilerplate_file "$i" && continue;
if ((n >= number_of_index_articles)); then break; fi if ((n >= number_of_index_articles)); then break; fi
if [[ -n $cut_do ]]; then if [[ -n $cut_do ]]; then
@ -748,7 +723,7 @@ rebuild_index() {
fi fi
echo -n "." 1>&3 echo -n "." 1>&3
n=$(( n + 1 )) n=$(( n + 1 ))
done done < <(ls -t ./*.html) # sort by date, newest first
feed=$blog_feed feed=$blog_feed
if [[ -n $global_feedburner ]]; then feed=$global_feedburner; fi if [[ -n $global_feedburner ]]; then feed=$global_feedburner; fi
@ -765,22 +740,14 @@ rebuild_index() {
# Finds all tags referenced in one post. # Finds all tags referenced in one post.
# Accepts either filename as first argument, or post content at stdin # Accepts either filename as first argument, or post content at stdin
# Prints tags to stdout, one per line. # Prints one line with space-separated tags to stdout
# (Since we're doing global IFS word splitting on newline only,
# something like 'for tag in $(tags_in_post $i)' will work.)
tags_in_post() { tags_in_post() {
local newline=$'\n' sed -n "/^<p>$template_tags_line_header/{s/^<p>$template_tags_line_header//;s/<[^>]*>//g;s/[ ,]\+/ /g;p;}" "$1" | tr ', ' ' '
sed -n "/^<p>$template_tags_line_header/ {
s/^<p>$template_tags_line_header[[:blank:]]*//
s/[[:blank:]]*<[^>]*>[[:blank:]]*//g
s/[[:blank:]]*,[[:blank:]]*/\\$newline/g
p
}" "$1"
} }
# Finds all posts referenced in a number of tags. # Finds all posts referenced in a number of tags.
# Arguments are tags. # Arguments are tags
# Prints file names to stdout, one per line. # Prints one line with space-separated tags to stdout
posts_with_tags() { posts_with_tags() {
(($# < 1)) && return (($# < 1)) && return
set -- "${@/#/$prefix_tags}" set -- "${@/#/$prefix_tags}"
@ -791,40 +758,38 @@ posts_with_tags() {
# Rebuilds tag_*.html files # Rebuilds tag_*.html files
# if no arguments given, rebuilds all of them # if no arguments given, rebuilds all of them
# if arguments given, they should have this format: # if arguments given, they should have this format:
# FILE1 [FILE2 [...]] --tags TAG1 [TAG2 [...]] # "FILE1 [FILE2 [...]]" "TAG1 [TAG2 [...]]"
# where FILEn are files with posts which should be used for rebuilding tags, # where FILEn are files with posts which should be used for rebuilding tags,
# and TAGn are names of tags which should be rebuilt. # and TAGn are names of tags which should be rebuilt.
# example: # example:
# rebuild_tags one_post.html another_article.html --tags example-tag another-tag # rebuild_tags "one_post.html another_article.html" "example-tag another-tag"
# mind the quotes!
rebuild_tags() { rebuild_tags() {
if (($# < 1)); then if (($# < 2)); then
# will process all files and tags # will process all files and tags
files=( $(set +f; ls -t ./*.html) ) files=$(ls -t ./*.html)
all_tags=yes all_tags=yes
else else
# will process only given files and tags # will process only given files and tags
for ((i=1; i<=$#; i++)); do files=$(printf '%s\n' $1 | sort -u)
[[ ${!i} == --tags ]] && break files=$(ls -t $files)
done tags=$2
files=( $(ls -t $(sort -u <<< "${*:1:$((i-1))}")) )
tags=( "${@:$((i+1)):$#}" )
all_tags=''
fi fi
echo -n "Rebuilding tag pages " echo -n "Rebuilding tag pages "
n=0 n=0
if [[ -n $all_tags ]]; then if [[ -n $all_tags ]]; then
( set +f; rm -f ./"$prefix_tags"*.html ) rm ./"$prefix_tags"*.html &> /dev/null
else else
for i in "${tags[@]}"; do for i in $tags; do
rm -f "./$prefix_tags$i.html" rm "./$prefix_tags$i.html" &> /dev/null
done done
fi fi
# First we will process all files and create temporal tag files # First we will process all files and create temporal tag files
# with just the content of the posts # with just the content of the posts
tmpfile=tmp.$RANDOM tmpfile=tmp.$RANDOM
while [[ -f $tmpfile ]]; do tmpfile=tmp.$RANDOM; done while [[ -f $tmpfile ]]; do tmpfile=tmp.$RANDOM; done
for i in "${files[@]}"; do while IFS='' read -r i; do
is_boilerplate_file "$i" && continue is_boilerplate_file "$i" && continue;
echo -n "." echo -n "."
if [[ -n $cut_do ]]; then if [[ -n $cut_do ]]; then
get_html_file_content 'entry' 'entry' 'cut' <"$i" | awk "/$cut_line/ { print \"<p class=\\\"readmore\\\"><a href=\\\"$i\\\">$template_read_more</a></p>\" ; next } 1" get_html_file_content 'entry' 'entry' 'cut' <"$i" | awk "/$cut_line/ { print \"<p class=\\\"readmore\\\"><a href=\\\"$i\\\">$template_read_more</a></p>\" ; next } 1"
@ -832,20 +797,19 @@ rebuild_tags() {
get_html_file_content 'entry' 'entry' <"$i" get_html_file_content 'entry' 'entry' <"$i"
fi >"$tmpfile" fi >"$tmpfile"
for tag in $(tags_in_post "$i"); do for tag in $(tags_in_post "$i"); do
# if either all tags or array tags[] contains $tag... if [[ -n $all_tags || " $tags " == *" $tag "* ]]; then
if [[ -n $all_tags || $'\n'"${tags[*]}"$'\n' == *$'\n'"$tag"$'\n'* ]]; then
cat "$tmpfile" >> "$prefix_tags$tag".tmp.html cat "$tmpfile" >> "$prefix_tags$tag".tmp.html
fi fi
done done
done done <<< "$files"
rm "$tmpfile" rm "$tmpfile"
# Now generate the tag files with headers, footers, etc # Now generate the tag files with headers, footers, etc
for i in $(set +f; ls -t ./"$prefix_tags"*.tmp.html 2>/dev/null); do while IFS='' read -r i; do
tagname=${i#./"$prefix_tags"} tagname=${i#./"$prefix_tags"}
tagname=${tagname%.tmp.html} tagname=${tagname%.tmp.html}
create_html_page "$i" "$prefix_tags$tagname.html" yes "$global_title &mdash; $template_tag_title \"$tagname\"" "$global_author" create_html_page "$i" "$prefix_tags$tagname.html" yes "$global_title &mdash; $template_tag_title \"$tagname\"" "$global_author"
rm "$i" rm "$i"
done done < <(ls -t ./"$prefix_tags"*.tmp.html 2>/dev/null)
echo echo
} }
@ -869,12 +833,11 @@ get_post_author() {
list_tags() { list_tags() {
if [[ $2 == -n ]]; then do_sort=1; else do_sort=0; fi if [[ $2 == -n ]]; then do_sort=1; else do_sort=0; fi
if ! (set +f; set -- $prefix_tags*.html; [[ -e $1 ]]); then ls ./$prefix_tags*.html &> /dev/null
echo "No posts yet. Use 'bb.sh post' to create one" (($? != 0)) && echo "No posts yet. Use 'bb.sh post' to create one" && return
return
fi
for i in $(set +f; printf '%s\n' $prefix_tags*.html); do lines=""
for i in $prefix_tags*.html; do
[[ -f "$i" ]] || break [[ -f "$i" ]] || break
nposts=$(grep -c "<\!-- text begin -->" "$i") nposts=$(grep -c "<\!-- text begin -->" "$i")
tagname=${i#"$prefix_tags"} tagname=${i#"$prefix_tags"}
@ -893,19 +856,17 @@ list_tags() {
# Displays a list of the posts # Displays a list of the posts
list_posts() { list_posts() {
if ! (set +f; set -- *.html; [[ -e $1 ]]); then ls ./*.html &> /dev/null
echo "No posts yet. Use 'bb.sh post' to create one" (($? != 0)) && echo "No posts yet. Use 'bb.sh post' to create one" && return
return
fi
lines="" lines=""
n=1 n=1
for i in $(set +f; ls -t ./*.html); do while IFS='' read -r i; do
is_boilerplate_file "$i" && continue is_boilerplate_file "$i" && continue
line="$n # $(get_post_title "$i") # $(LC_ALL=$date_locale date -r "$i" +"$date_format")" line="$n # $(get_post_title "$i") # $(LC_ALL=$date_locale date -r "$i" +"$date_format")"
lines+=$line\\n lines+=$line\\n
n=$(( n + 1 )) n=$(( n + 1 ))
done done < <(ls -t ./*.html)
echo -e "$lines" | column -t -s "#" echo -e "$lines" | column -t -s "#"
} }
@ -928,7 +889,7 @@ make_rss() {
echo "<atom:link href=\"$global_url/$blog_feed\" rel=\"self\" type=\"application/rss+xml\" />" echo "<atom:link href=\"$global_url/$blog_feed\" rel=\"self\" type=\"application/rss+xml\" />"
n=0 n=0
for i in $(set +f; ls -t ./*.html); do while IFS='' read -r i; do
is_boilerplate_file "$i" && continue is_boilerplate_file "$i" && continue
((n >= number_of_feed_articles)) && break # max 10 items ((n >= number_of_feed_articles)) && break # max 10 items
echo -n "." 1>&3 echo -n "." 1>&3
@ -942,7 +903,7 @@ make_rss() {
echo "<pubDate>$(LC_ALL=C date -r "$i" +"$date_format_full")</pubDate></item>" echo "<pubDate>$(LC_ALL=C date -r "$i" +"$date_format_full")</pubDate></item>"
n=$(( n + 1 )) n=$(( n + 1 ))
done done < <(ls -t ./*.html)
echo '</channel></rss>' echo '</channel></rss>'
} 3>&1 >"$rssfile" } 3>&1 >"$rssfile"
@ -1041,7 +1002,7 @@ create_css() {
rebuild_all_entries() { rebuild_all_entries() {
echo -n "Rebuilding all entries " echo -n "Rebuilding all entries "
for i in $(set +f; printf '%s\n' *.html); do for i in ./*.html; do
is_boilerplate_file "$i" && continue; is_boilerplate_file "$i" && continue;
contentfile=.tmp.$RANDOM contentfile=.tmp.$RANDOM
while [[ -f $contentfile ]]; do contentfile=.tmp.$RANDOM; done while [[ -f $contentfile ]]; do contentfile=.tmp.$RANDOM; done
@ -1097,7 +1058,7 @@ reset() {
echo "Are you sure you want to delete all blog entries? Please write \"Yes, I am!\" " echo "Are you sure you want to delete all blog entries? Please write \"Yes, I am!\" "
read -r line read -r line
if [[ $line == "Yes, I am!" ]]; then if [[ $line == "Yes, I am!" ]]; then
(set +f; rm -f .*.html ./*.html ./*.css ./*.rss) rm .*.html ./*.html ./*.css ./*.rss &> /dev/null
echo echo
echo "Deleted all posts, stylesheets and feeds." echo "Deleted all posts, stylesheets and feeds."
echo "Kept your old '.backup.tar.gz' just in case, please delete it manually if needed." echo "Kept your old '.backup.tar.gz' just in case, please delete it manually if needed."
@ -1169,9 +1130,9 @@ do_main() {
fi fi
# Test for existing html files # Test for existing html files
if (set +f; set -- *.html; [[ -e $1 ]]); then if ls ./*.html &> /dev/null; then
# We're going to back up just in case # We're going to back up just in case
(set +f; tar -c -z -f ".backup.tar.gz" -- *.html) && tar -c -z -f ".backup.tar.gz" -- *.html &&
chmod 600 ".backup.tar.gz" chmod 600 ".backup.tar.gz"
elif [[ $1 == rebuild ]]; then elif [[ $1 == rebuild ]]; then
echo "Can't find any html files, nothing to rebuild" echo "Can't find any html files, nothing to rebuild"