sub-directories are not flatten anymore

1 files changed, 15 insertions, 27 deletions

diff --git a/src/photoalbum.sh b/src/photoalbum.sh
index e467aeb..fda18e1 100755
--- a/src/photoalbum.sh
+++ b/src/photoalbum.sh
@@ -3,12 +3,12 @@
 # photoalbum (c) 2011 - 2014 by Paul C. Buetow
 # http://photoalbum.buetow.org
 
-declare -r ARG1="${1}"; shift
-declare RC="${1}"     ; shift
-
 declare -r VERSION='PHOTOALBUMVERSION'
 declare -r DEFAULTRC=/etc/default/photoalbum
 
+declare -r ARG1="${1}" ; shift
+declare    RC="${1}"   ; shift
+
 if [ -z "${RC}" ]; then
   RC="${DEFAULTRC}"
 fi
@@ -84,34 +84,20 @@ function template() {
 function scale() {
   cd "${INCOMING_DIR}" && find ./ -type f | sort | while read photo; do
     photo=$(sed 's#^\./##' <<< "${photo}")
+    destphoto="${DIST_DIR}/photos/${photo}"
+    destphoto_nospace=${destphoto// /_}
 
-    if [ ! -f "${DIST_DIR}/photos/${photo}" ]; then
-      # Flatten directories / to __
-      if [[ "${photo}" =~ / ]]; then
-        destphoto="${photo//\//__}"
-      else
-        destphoto="${photo}"
-      fi
-
-      destphoto_nospace=${destphoto// /_}
-
-      if [[ ! -f "${DIST_DIR}/photos/${destphoto}"
-         && ! -f "${DIST_DIR}/photos/${destphoto_nospace}" ]]; then
+    dirname=$(dirname "${destphoto}")
+    [ ! -d "${dirname}" ] && mkdir -p "${dirname}"
 
-        echo "Scaling ${photo} to ${DIST_DIR}/photos/${destphoto}"
-
-        convert -auto-orient \
-          -geometry ${GEOMETRY} "${photo}" "${DIST_DIR}/photos/${destphoto}"
-      else
-        echo "Not scaling ${photo}, destination already exists"
-      fi
+    if [ ! -f "${destphoto_nospace}" ]; then
+      echo "Scaling ${photo} to ${destphoto_nospace}"
+      convert -auto-orient \
+        -geometry ${GEOMETRY} "${photo}" "${destphoto_nospace}"
+    else
+      echo "Not scaling ${photo} to ${destphoto_nospace}, already exists"
     fi
   done
-
-  echo 'Removing spaces from file names'
-  find "${DIST_DIR}/photos" -type f -name '* *' | while read file; do
-    rename 's/ /_/g' "${file}" 
-  done
 }
 
 function makedist() {
@@ -150,6 +136,8 @@ function makedist() {
 
     if [ ! -f "${DIST_DIR}/thumbs/${photo}" ]; then 
       echo "Creating thumb for ${photo}";
+      dirname=$(dirname "${DIST_DIR}/thumbs/${photo}")
+      [ ! -d "${dirname}" ] && mkdir -p "${dirname}"
       convert -geometry x${THUMBGEOMETRY} "${photo}" \
         "${DIST_DIR}/thumbs/${photo}"
     fi