diff --git a/files/scripts/compress_image.sh b/files/scripts/compress_image.sh index 66d897c..af14362 100755 --- a/files/scripts/compress_image.sh +++ b/files/scripts/compress_image.sh @@ -60,7 +60,8 @@ while getopts ":s:l:rfFdcAhx" opt; do F) super_force="Y" ;; d) delete="Y" ;; c) clean="Y" ;; - A) recurse="Y" && search="find" && force="Y" && delete="Y" && clean="Y" ;; + e) expand="Y" ;; + A) recurse="Y" && search="find" && force="Y" && delete="Y" && expand="Y" ;; h) usage 0 ;; x) set -x ;; *) echo "ERROR: Option $OPTARG not recognized." >&2 && usage 1 ;; @@ -123,13 +124,31 @@ $search "$location" | sort | while read image; do new_image_clean="${new_image_clean//-/}" new_image_clean="${new_image_clean// /}" - # Add directory back to the full path. + ## Expanded Filename ## + # Add back in the dashes so that the year, month, date, and time are exposed. + TEMP="$new_image_clean" + # Date Data + new_image_exp="${TEMP:0:4}-${TEMP:4:2}-${TEMP:6:2}" + # Time Data + new_image_exp="${new_image_exp}_${TEMP:8:2}-${TEMP:10:2}-${TEMP:12:2}" + # Remainder Data + if [[ "${TEMP:14:1}" == "." ]]; then + SEP="" + else + SEP="_" + fi + new_image_exp="${new_image_exp}${SEP}${TEMP:14}" + unset TEMP SEP + + # Add directory back to the full paths. new_image_clean="$image_dirname/$new_image_clean" + new_image_exp="$image_dirname/$new_image_exp" # Delete the existing shrunk image if we are forcing a new compression. - if [[ -n "$force" && (-e "$new_image" || -e $new_image_clean) ]]; then + if [[ -n "$force" && + (-e "$new_image" || -e $new_image_clean || -e $new_image_exp ) ]]; then echo -n " FORCE: " - rm -v "$new_image" "$new_image_clean" 2>/dev/null + rm -v "$new_image" "$new_image_clean" "$new_image_exp" 2>/dev/null fi # Skip if a compressed image was already created today. @@ -138,10 +157,14 @@ $search "$location" | sort | while read image; do continue fi - # Whether or not to use the cleaned version or the normal version. + # Whether or not to use the cleaned version. if [[ -n $clean ]]; then new_image="$new_image_clean" + # Whether or not to use the expanded version. + elif [[ -n $expand ]]; then + new_image="$new_image_exp" fi + # Otherwise uses the same name as before. ###### TBD Instead of this, only alter the file names, and set a dirname var? #### Create a new directory if the directory names were altered.