$template_tags_line_header/s|\\1|\\1|g" >> "$TMPFILE" - $EDITOR "$TMPFILE" + invoke_editor "$TMPFILE" filename=$1 fi rm "$filename" if [[ $2 == keep ]]; then + old_filename='' parse_file "$TMPFILE" "$edit_timestamp" "$filename" 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 [[ ${1##*.} == md ]] && mv "$1" "${filename%%.*}.md" 2>/dev/null fi rm "$TMPFILE" + touch -t "$touch_timestamp" "$filename" fi - touch -t "$touch_timestamp" "$filename" - touch -t "$touch_timestamp" "$1" chmod 644 "$filename" echo "Posted $filename" tags_after=$(tags_in_post "$filename") - relevant_tags=$(echo "$tags_before $tags_after" | tr ',' ' ' | tr ' ' '\n' | sort -u | tr '\n' ' ') - if [[ ! -z $relevant_tags ]]; then - relevant_posts="$(posts_with_tags $relevant_tags) $filename" - rebuild_tags "$relevant_posts" "$relevant_tags" + relevant_tags=$(sort -u <<< "$tags_before"$'\n'"$tags_after") + if [[ -n $relevant_tags ]]; then + relevant_posts=$(posts_with_tags $relevant_tags)$'\n'$filename + [[ -n $old_filename ]] && relevant_posts=$(grep -vFx "$old_filename" <<<"$relevant_posts") + rebuild_tags $relevant_posts --tags $relevant_tags fi } @@ -488,10 +512,11 @@ create_html_page() { parse_file() { # Read for the title and check that the filename is ok title="" - while IFS='' read -r line; do + while read -r line; do if [[ -z $title ]]; then # remove extra
and
added by markdown - title=$(echo "$line" | sed 's/<\/*p>//g') + title=${line#} + title=${title%
} if [[ -n $3 ]]; then filename=$3 else @@ -511,13 +536,14 @@ parse_file() { content=$filename.tmp # Parse possible tags elif [[ $line == "$template_tags_line_header"* ]]; then - 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" - echo -n "
$template_tags_line_header " >> "$content" - for item in "${array[@]}"; do - echo -n "$item, " - done | sed 's/, $/<\/p>/g' >> "$content" + sed "s%
%%g + s/^.*:[[:blank:]]*// + s/[[:blank:]]\$// + s/[[:blank:]]*,[[:blank:]]*/,/g + s%\([^,]*\),%\1, %g + s%, \([^,]*\)\$%, \1% + " <<< "$line" >> "$content" else echo "$line" >> "$content" fi @@ -578,7 +604,7 @@ EOF filename="" while [[ $post_status != "p" && $post_status != "P" ]]; do [[ -n $filename ]] && rm "$filename" # Delete the generated html file, if any - $EDITOR "$TMPFILE" + invoke_editor "$TMPFILE" if [[ $fmt == md ]]; then html_from_md=$(markdown "$TMPFILE") parse_file "$html_from_md" @@ -620,8 +646,8 @@ EOF echo "Posted $filename" relevant_tags=$(tags_in_post $filename) if [[ -n $relevant_tags ]]; then - relevant_posts="$(posts_with_tags $relevant_tags) $filename" - rebuild_tags "$relevant_posts" "$relevant_tags" + relevant_posts=$(posts_with_tags $relevant_tags)$'\n'$filename + rebuild_tags $relevant_posts --tags $relevant_tags fi } @@ -636,7 +662,7 @@ all_posts() { { echo "$template_tags_line_header/{s/^
$template_tags_line_header//;s/<[^>]*>//g;s/[ ,]\+/ /g;p;}" "$1" | tr ', ' ' ' + local newline=$'\n' + sed -n "/^
$template_tags_line_header/ { + s/^
$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. -# Arguments are tags -# Prints one line with space-separated tags to stdout +# Arguments are tags. +# Prints file names to stdout, one per line. posts_with_tags() { (($# < 1)) && return set -- "${@/#/$prefix_tags}" @@ -758,38 +793,40 @@ posts_with_tags() { # Rebuilds tag_*.html files # if no arguments given, rebuilds all of them # if arguments given, they should have this format: -# "FILE1 [FILE2 [...]]" "TAG1 [TAG2 [...]]" +# FILE1 [FILE2 [...]] --tags TAG1 [TAG2 [...]] # where FILEn are files with posts which should be used for rebuilding tags, # and TAGn are names of tags which should be rebuilt. # example: -# rebuild_tags "one_post.html another_article.html" "example-tag another-tag" -# mind the quotes! +# rebuild_tags one_post.html another_article.html --tags example-tag another-tag rebuild_tags() { - if (($# < 2)); then + if (($# < 1)); then # will process all files and tags - files=$(ls -t ./*.html) + files=( $(set +f; ls -t ./*.html) ) all_tags=yes else # will process only given files and tags - files=$(printf '%s\n' $1 | sort -u) - files=$(ls -t $files) - tags=$2 + for ((i=1; i<=$#; i++)); do + [[ ${!i} == --tags ]] && break + done + files=( $(ls -t $(sort -u <<< "${*:1:$((i-1))}")) ) + tags=( "${@:$((i+1)):$#}" ) + all_tags='' fi echo -n "Rebuilding tag pages " n=0 if [[ -n $all_tags ]]; then - rm ./"$prefix_tags"*.html &> /dev/null + ( set +f; rm -f ./"$prefix_tags"*.html ) else - for i in $tags; do - rm "./$prefix_tags$i.html" &> /dev/null + for i in "${tags[@]}"; do + rm -f "./$prefix_tags$i.html" done fi # First we will process all files and create temporal tag files # with just the content of the posts tmpfile=tmp.$RANDOM while [[ -f $tmpfile ]]; do tmpfile=tmp.$RANDOM; done - while IFS='' read -r i; do - is_boilerplate_file "$i" && continue; + for i in "${files[@]}"; do + is_boilerplate_file "$i" && continue echo -n "." if [[ -n $cut_do ]]; then get_html_file_content 'entry' 'entry' 'cut' <"$i" | awk "/$cut_line/ { print \"
\" ; next } 1" @@ -797,19 +834,20 @@ rebuild_tags() { get_html_file_content 'entry' 'entry' <"$i" fi >"$tmpfile" for tag in $(tags_in_post "$i"); do - if [[ -n $all_tags || " $tags " == *" $tag "* ]]; then + # if either all tags or array tags[] contains $tag... + if [[ -n $all_tags || $'\n'"${tags[*]}"$'\n' == *$'\n'"$tag"$'\n'* ]]; then cat "$tmpfile" >> "$prefix_tags$tag".tmp.html fi done - done <<< "$files" + done rm "$tmpfile" # Now generate the tag files with headers, footers, etc - while IFS='' read -r i; do + for i in $(set +f; ls -t ./"$prefix_tags"*.tmp.html 2>/dev/null); do tagname=${i#./"$prefix_tags"} tagname=${tagname%.tmp.html} create_html_page "$i" "$prefix_tags$tagname.html" yes "$global_title — $template_tag_title \"$tagname\"" "$global_author" rm "$i" - done < <(ls -t ./"$prefix_tags"*.tmp.html 2>/dev/null) + done echo } @@ -833,11 +871,12 @@ get_post_author() { list_tags() { if [[ $2 == -n ]]; then do_sort=1; else do_sort=0; fi - ls ./$prefix_tags*.html &> /dev/null - (($? != 0)) && echo "No posts yet. Use 'bb.sh post' to create one" && return + if ! (set +f; set -- $prefix_tags*.html; [[ -e $1 ]]); then + echo "No posts yet. Use 'bb.sh post' to create one" + return + fi - lines="" - for i in $prefix_tags*.html; do + for i in $(set +f; printf '%s\n' $prefix_tags*.html); do [[ -f "$i" ]] || break nposts=$(grep -c "<\!-- text begin -->" "$i") tagname=${i#"$prefix_tags"} @@ -856,17 +895,19 @@ list_tags() { # Displays a list of the posts list_posts() { - ls ./*.html &> /dev/null - (($? != 0)) && echo "No posts yet. Use 'bb.sh post' to create one" && return + if ! (set +f; set -- *.html; [[ -e $1 ]]); then + echo "No posts yet. Use 'bb.sh post' to create one" + return + fi lines="" n=1 - while IFS='' read -r i; do + for i in $(set +f; ls -t ./*.html); do is_boilerplate_file "$i" && continue line="$n # $(get_post_title "$i") # $(LC_ALL=$date_locale date -r "$i" +"$date_format")" lines+=$line\\n n=$(( n + 1 )) - done < <(ls -t ./*.html) + done echo -e "$lines" | column -t -s "#" } @@ -889,7 +930,7 @@ make_rss() { echo "