caylakpenguen/bashblog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New filename filtering

Browse Source
This commit is contained in:
Carlos Fenollosa 2014-06-05 18:51:28 +02:00
parent c8027a6205
commit d0f7e8eebd
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bb.sh
View File

@ -65,6 +65,7 @@
# #
######################################################################################### #########################################################################################
# #
# 2.2 Flexible post title -> filename conversion
# 2.1 Support for tags/categories # 2.1 Support for tags/categories
# 'delete' command # 'delete' command
# 2.0.3 Support for other analytics code, via external file # 2.0.3 Support for other analytics code, via external file
@ -113,7 +114,7 @@ global_config=".config"
# by the 'global_config' file contents # by the 'global_config' file contents
global_variables() { global_variables() {
global_software_name="BashBlog" global_software_name="BashBlog"
global_software_version="2.1" global_software_version="2.2"
# Blog title # Blog title
global_title="My fancy blog" global_title="My fancy blog"
@ -173,14 +174,6 @@ global_variables() {
# prefix for tags/categories files # prefix for tags/categories files
# please make sure that no other html file starts with this prefix # please make sure that no other html file starts with this prefix
prefix_tags="tag_" prefix_tags="tag_"
# force characters to lowercase - works with latin characters only
filename_lowercase="yes"
# when making filenames, replace spaces with this symbol
filename_spaces="-"
# Regexp explaining forbidden characters in filenames.
# Usually it's something like [^allowed-characters]
# Example for Cyrillic characters: [^A-z0-9А-я-]
filename_forbidden_characters=""
# personalized header and footer (only if you know what you're doing) # personalized header and footer (only if you know what you're doing)
# DO NOT name them .header.html, .footer.html or they will be overwritten # DO NOT name them .header.html, .footer.html or they will be overwritten
# leave blank to generate them, recommended # leave blank to generate them, recommended
@ -224,6 +217,12 @@ global_variables() {
date_format="%B %d, %Y" date_format="%B %d, %Y"
date_locale="C" date_locale="C"
# Perform the post title -> filename conversion
# Experts only. You may need to tune the locales too
# Leave empty for no conversion, which is not recommended
# This default filter respects backwards compatibility
convert_filename="iconv -f utf-8 -t cp1251//translit | iconv -f cp1251 -t utf-8 | sed 's/^-*//' | tr [:upper:] [:lower:] | tr ' ' '-' | tr -dc '[:alnum:]-'"
# Markdown location. Trying to autodetect by default. # Markdown location. Trying to autodetect by default.
# The invocation must support the signature 'markdown_bin in.md > out.html' # The invocation must support the signature 'markdown_bin in.md > out.html'
markdown_bin="$(which Markdown.pl)" markdown_bin="$(which Markdown.pl)"
@ -535,22 +534,17 @@ parse_file() {
title="" title=""
while IFS='' read -r line; do while IFS='' read -r line; do
if [[ "$title" == "" ]]; then if [[ "$title" == "" ]]; then
# set title and
# remove extra <p> and </p> added by markdown # remove extra <p> and </p> added by markdown
title=$(echo "$line" | sed 's/<\/*p>//g') title=$(echo "$line" | sed 's/<\/*p>//g')
if [ "$3" ]; then if [ "$3" ]; then
filename=$3 filename=$3
else else
filename=$title filename=$title
[[ "$filename_lowercase" == "yes" ]] && filename="$(echo $filename | tr [:upper:] [:lower:])" [[ "$convert_filename" ]] &&
filename="$(echo $filename | sed "s/\\s/$filename_spaces/g")" filename="$(echo $title | eval $convert_filename)"
if [ "$filename_forbidden_characters" ]; then [[ "$filename" ]] ||
filename="$(echo $filename | LC_ALL=C.UTF-8 sed "s/$filename_forbidden_characters//g")" filename=$RANDOM # don't allow empty filenames
else
filename="$(echo $filename | tr -dc '[:alnum:]-')" # html likes alphanumeric
fi
filename="$(echo $filename | sed 's/^-*//')" # unix utilities are unhappy if filename starts with -
[ "$filename" ] || filename=$RANDOM # if filename gets empty, put something in it
filename="$filename.html" filename="$filename.html"
# Check for duplicate file names # Check for duplicate file names
@ -651,9 +645,9 @@ EOF
chmod 700 "drafts/" chmod 700 "drafts/"
title="$(head -n 1 $TMPFILE)" title="$(head -n 1 $TMPFILE)"
title="$(echo $title | tr [:upper:] [:lower:])" [[ "$convert_filename" ]] && title="$(echo $title | eval $convert_filename)"
title="$(echo $title | sed 's/\ /-/g')" [[ "$title" ]] || title=$RANDOM
title="$(echo $title | tr -dc '[:alnum:]-')"
draft="drafts/$title.$fmt" draft="drafts/$title.$fmt"
while [ -f "$draft" ]; do draft="drafts/$title-$RANDOM.$fmt"; done while [ -f "$draft" ]; do draft="drafts/$title-$RANDOM.$fmt"; done