From 7785c6127cfbc520f482cf89257d532d772f6a7e Mon Sep 17 00:00:00 2001 From: Nils K Date: Mon, 15 Mar 2021 22:27:52 +0100 Subject: better var names --- gallery.sh | 206 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/gallery.sh b/gallery.sh index 623b563..7e4606a 100755 --- a/gallery.sh +++ b/gallery.sh @@ -8,46 +8,46 @@ #### Configuration Section ######################################################################################### -height_small=187 -height_large=768 -quality=85 -thumbdir="__thumbs" -htmlfile="index.html" -title="Gallery" -footer='Created with gallery.sh' +MY_HEIGHT_SMALL=187 +MY_HEIGHT_LARGE=768 +MY_QUALITY=85 +MY_THUMBDIR="__thumbs" +MY_INDEX_HTML_FILE="index.html" +MY_TITLE="Gallery" +MY_FOOTER='Created with gallery.sh' # Use convert from ImageMagick -convert="convert" +MY_CONVERT_COMMAND="convert" # Use JHead for EXIF Information -exif="jhead" +MY_EXIF_COMMAND="jhead" -# Bootstrap (currently v3.4.1) -stylesheet="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.6.0/css/bootstrap.min.css" +# Bootstrap 4 +MY_CSS="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.6.0/css/bootstrap.min.css" # Debugging output # true=enable, false=disable -debug=true +MY_DEBUG=true ######################################################################################### #### End Configuration Section ######################################################################################### -me=$(basename "$0") -datetime=$(date -u "+%Y-%m-%d %H:%M:%S") -datetime+=" UTC" +MY_SCRIPT_NAME=$(basename "$0") +MY_DATETIME=$(date -u "+%Y-%m-%d %H:%M:%S") +MY_DATETIME+=" UTC" function usage { - returnCode="$1" - echo -e "Usage: $me [-t ] [-d <thumbdir>] [-h]: - [-t <title>]\\t sets the title (default: $title) - [-d <thumbdir>]\\t sets the thumbdir (default: $thumbdir) + MY_RETURN_CODE="$1" + echo -e "Usage: $MY_SCRIPT_NAME [-t <title>] [-d <thumbdir>] [-h]: + [-t <title>]\\t sets the title (default: $MY_TITLE) + [-d <thumbdir>]\\t sets the thumbdir (default: $MY_THUMBDIR) [-h]\\t\\t displays help (this message)" - exit "$returnCode" + exit "$MY_RETURN_CODE" } function debugOutput(){ - if [[ "$debug" == true ]]; then + if [[ "$MY_DEBUG" == true ]]; then echo "$1" # if debug variable is true, echo whatever's passed to the function fi } @@ -56,21 +56,21 @@ function getFileSize(){ # Be aware that BSD stat doesn't support --version and -c if stat --version &>/dev/null; then # GNU - myfilesize=$(stat -c %s "$1" | awk '{$1/=1000000;printf "%.2fMB\n",$1}') + MY_FILE_SIZE=$(stat -c %s "$1" | awk '{$1/=1000000;printf "%.2fMB\n",$1}') else # BSD - myfilesize=$(stat -f %z "$1" | awk '{$1/=1000000;printf "%.2fMB\n",$1}') + MY_FILE_SIZE=$(stat -f %z "$1" | awk '{$1/=1000000;printf "%.2fMB\n",$1}') fi - echo "$myfilesize" + echo "$MY_FILE_SIZE" } while getopts ":t:d:h" opt; do case $opt in t) - title="$OPTARG" + MY_TITLE="$OPTARG" ;; d) - thumbdir="$OPTARG" + MY_THUMBDIR="$OPTARG" ;; h) usage 0 @@ -82,39 +82,39 @@ while getopts ":t:d:h" opt; do esac done -debugOutput "- $me : $datetime" +debugOutput "- $MY_SCRIPT_NAME : $MY_DATETIME" ### Check Commands -command -v $convert >/dev/null 2>&1 || { echo >&2 "!!! $convert it's not installed. Aborting."; exit 1; } -command -v $exif >/dev/null 2>&1 || { echo >&2 "!!! $exif it's not installed. Aborting."; exit 1; } +command -v $MY_CONVERT_COMMAND >/dev/null 2>&1 || { echo >&2 "!!! $MY_CONVERT_COMMAND it's not installed. Aborting."; exit 1; } +command -v $MY_EXIF_COMMAND >/dev/null 2>&1 || { echo >&2 "!!! $MY_EXIF_COMMAND it's not installed. Aborting."; exit 1; } ### Create Folders -[[ -d "$thumbdir" ]] || mkdir "$thumbdir" || exit 2 +[[ -d "$MY_THUMBDIR" ]] || mkdir "$MY_THUMBDIR" || exit 2 -heights[0]=$height_small -heights[1]=$height_large -for res in ${heights[*]}; do - [[ -d "$thumbdir/$res" ]] || mkdir -p "$thumbdir/$res" || exit 3 +MY_HEIGHTS[0]=$MY_HEIGHT_SMALL +MY_HEIGHTS[1]=$MY_HEIGHT_LARGE +for MY_RES in ${MY_HEIGHTS[*]}; do + [[ -d "$MY_THUMBDIR/$MY_RES" ]] || mkdir -p "$MY_THUMBDIR/$MY_RES" || exit 3 done #### Create Startpage -debugOutput "$htmlfile" -cat > "$htmlfile" << EOF +debugOutput "$MY_INDEX_HTML_FILE" +cat > "$MY_INDEX_HTML_FILE" << EOF <!DOCTYPE HTML> <html lang="en"> <head> <meta charset="utf-8"> - <title>$title + $MY_TITLE - +
- $title + $MY_TITLE
@@ -125,56 +125,56 @@ EOF ### Photos (JPG) if [[ $(find . -maxdepth 1 -type f -iname \*.jpg | wc -l) -gt 0 ]]; then -echo '
' >> "$htmlfile" +echo '
' >> "$MY_INDEX_HTML_FILE" ## Generate Images -numfiles=0 -for filename in *.[jJ][pP][gG]; do - filelist[$numfiles]=$filename - (( numfiles++ )) - for res in ${heights[*]}; do - if [[ ! -s $thumbdir/$res/$filename ]]; then - debugOutput "$thumbdir/$res/$filename" - $convert -auto-orient -strip -quality $quality -resize x$res "$filename" "$thumbdir/$res/$filename" +MY_NUM_FILES=0 +for MY_FILENAME in *.[jJ][pP][gG]; do + MY_FILELIST[$MY_NUM_FILES]=$MY_FILENAME + (( MY_NUM_FILES++ )) + for MY_RES in ${MY_HEIGHTS[*]}; do + if [[ ! -s $MY_THUMBDIR/$MY_RES/$MY_FILENAME ]]; then + debugOutput "$MY_THUMBDIR/$MY_RES/$MY_FILENAME" + $MY_CONVERT_COMMAND -auto-orient -strip -quality $MY_QUALITY -resize x$MY_RES "$MY_FILENAME" "$MY_THUMBDIR/$MY_RES/$MY_FILENAME" fi done - cat >> "$htmlfile" << EOF + cat >> "$MY_INDEX_HTML_FILE" << EOF

- Thumbnail: $filename + Thumbnail: $MY_FILENAME

EOF done -echo '
' >> "$htmlfile" +echo '
' >> "$MY_INDEX_HTML_FILE" ## Generate the HTML Files for Images in thumbdir -file=0 -while [[ $file -lt $numfiles ]]; do - filename=${filelist[$file]} - prev="" - next="" - [[ $file -ne 0 ]] && prev=${filelist[$((file - 1))]} - [[ $file -ne $((numfiles - 1)) ]] && next=${filelist[$((file + 1))]} - imagehtmlfile="$thumbdir/$filename.html" - exifinfo=$($exif "$filename") - filesize=$(getFileSize "$filename") - debugOutput "$imagehtmlfile" - cat > "$imagehtmlfile" << EOF +MY_FILE=0 +while [[ $MY_FILE -lt $MY_NUM_FILES ]]; do + MY_FILENAME=${MY_FILELIST[$MY_FILE]} + MY_PREV="" + MY_NEXT="" + [[ $MY_FILE -ne 0 ]] && MY_PREV=${MY_FILELIST[$((MY_FILE - 1))]} + [[ $MY_FILE -ne $((MY_NUM_FILES - 1)) ]] && MY_NEXT=${MY_FILELIST[$((MY_FILE + 1))]} + MY_IMAGE_HTML_FILE="$MY_THUMBDIR/$MY_FILENAME.html" + MY_EXIF_INFO=$($MY_EXIF_COMMAND "$MY_FILENAME") + MY_FILESIZE=$(getFileSize "$MY_FILENAME") + debugOutput "$MY_IMAGE_HTML_FILE" + cat > "$MY_IMAGE_HTML_FILE" << EOF -$filename +$MY_FILENAME - +
- $title + $MY_TITLE
@@ -183,44 +183,44 @@ while [[ $file -lt $numfiles ]]; do EOF # Pager - echo '
' >> "$imagehtmlfile" - if [[ $prev ]]; then - echo '« Previous' >> "$imagehtmlfile" + echo '
' >> "$MY_IMAGE_HTML_FILE" + if [[ $MY_PREV ]]; then + echo '« Previous' >> "$MY_IMAGE_HTML_FILE" else - echo '« Previous' >> "$imagehtmlfile" + echo '« Previous' >> "$MY_IMAGE_HTML_FILE" fi - cat >> "$imagehtmlfile" << EOF + cat >> "$MY_IMAGE_HTML_FILE" << EOF
-

$filename

+

$MY_FILENAME

EOF - if [[ $next ]]; then - echo 'Next »' >> "$imagehtmlfile" + if [[ $MY_NEXT ]]; then + echo 'Next »' >> "$MY_IMAGE_HTML_FILE" else - echo 'Next »' >> "$imagehtmlfile" + echo 'Next »' >> "$MY_IMAGE_HTML_FILE" fi - echo '
' >> "$imagehtmlfile" + echo '
' >> "$MY_IMAGE_HTML_FILE" - cat >> "$imagehtmlfile" << EOF + cat >> "$MY_IMAGE_HTML_FILE" << EOF
-

Image: $filename

+

Image: $MY_FILENAME

-

Download Original ($filesize)

+

Download Original ($MY_FILESIZE)

EOF # EXIF - if [[ $exifinfo ]]; then - cat >> "$imagehtmlfile" << EOF + if [[ $MY_EXIF_INFO ]]; then + cat >> "$MY_IMAGE_HTML_FILE" << EOF 
-$exifinfo
+$MY_EXIF_INFO
@@ -228,25 +228,25 @@ EOF fi # Footer - cat >> "$imagehtmlfile" << EOF + cat >> "$MY_IMAGE_HTML_FILE" << EOF
- $footer - $datetime + $MY_FOOTER - $MY_DATETIME
EOF - (( file++ )) + (( MY_FILE++ )) done fi ### Movies (MOV or MP4) if [[ $(find . -maxdepth 1 -type f -iname \*.mov -o -iname '*.mp4' | wc -l) -gt 0 ]]; then - cat >> "$htmlfile" << EOF + cat >> "$MY_INDEX_HTML_FILE" << EOF

Movies

@@ -256,27 +256,27 @@ if [[ $(find . -maxdepth 1 -type f -iname \*.mov -o -iname '*.mp4' | wc -l) -gt
EOF if [[ $(find . -maxdepth 1 -type f -iname \*.mov | wc -l) -gt 0 ]]; then - for filename in *.[mM][oO][vV]; do - filesize=$(getFileSize "$filename") - cat >> "$htmlfile" << EOF -$filename ($filesize) + for MY_FILENAME in *.[mM][oO][vV]; do + MY_FILESIZE=$(getFileSize "$MY_FILENAME") + cat >> "$MY_INDEX_HTML_FILE" << EOF +$MY_FILENAME ($MY_FILESIZE) EOF done fi if [[ $(find . -maxdepth 1 -type f -iname \*.mp4 | wc -l) -gt 0 ]]; then - for filename in *.[mM][pP]4; do - filesize=$(getFileSize "$filename") - cat >> "$htmlfile" << EOF -$filename ($filesize) + for MY_FILENAME in *.[mM][pP]4; do + MY_FILESIZE=$(getFileSize "$MY_FILENAME") + cat >> "$MY_INDEX_HTML_FILE" << EOF +$MY_FILENAME ($MY_FILESIZE) EOF done fi - echo '
' >> "$htmlfile" + echo '
' >> "$MY_INDEX_HTML_FILE" fi ### Downloads (ZIP) if [[ $(find . -maxdepth 1 -type f -iname \*.zip | wc -l) -gt 0 ]]; then - cat >> "$htmlfile" << EOF + cat >> "$MY_INDEX_HTML_FILE" << EOF

Downloads

@@ -285,22 +285,22 @@ if [[ $(find . -maxdepth 1 -type f -iname \*.zip | wc -l) -gt 0 ]]; then
EOF - for filename in *.[zZ][iI][pP]; do - filesize=$(getFileSize "$filename") - cat >> "$htmlfile" << EOF -$filename ($filesize) + for MY_FILENAME in *.[zZ][iI][pP]; do + MY_FILESIZE=$(getFileSize "$MY_FILENAME") + cat >> "$MY_INDEX_HTML_FILE" << EOF +$MY_FILENAME ($MY_FILESIZE) EOF done - echo '
' >> "$htmlfile" + echo '
' >> "$MY_INDEX_HTML_FILE" fi ### Footer -cat >> "$htmlfile" << EOF +cat >> "$MY_INDEX_HTML_FILE" << EOF
-- cgit v1.2.3