Use variable for video output file

[fgen.git] / fgen.sh

diff --git a/fgen.sh b/fgen.sh
index 7dc2bb2..f303f1a 100755 (executable)
--- a/fgen.sh
+++ b/fgen.sh
@@ -37,12 +37,28 @@ case ${OSTYPE} in
         ;;
 esac
 
+COLOR_ERR="\033[0;31m"
+COLOR_WARN="\033[0;33m"
+COLOR_NONE="\033[0m"
+
+function log_info() {
+    echo -e "${COLOR_NONE}${*}"
+}
+
 function log_dbg() {
     if [ x"${debug}" = x"1" ]; then
         echo "${*}"
     fi
 }
 
+function log_warn() {
+    echo -e "${COLOR_WARN}${*}${COLOR_NONE}"
+}
+
+function log_err() {
+    echo -e "${COLOR_ERR}${*}${COLOR_NONE}"
+}
+
 # Arg1: layer
 function get_size()
 {
@@ -155,10 +171,15 @@ function generate_video()
 
         if [ x"${png_files}" != x"" ]; then
             log_dbg "generate_video start"
+
+            local outfile
+
+            outfile=${dest}/${group}.mp4
+
             if [ ${dry_run} -eq 1 ]; then
-                touch ${dest}/${group}.mp4
+                touch ${outfile}
             else
-                ffmpeg ${FFMPEG_OPTS} -r ${fps} -pattern_type glob -i "${dest}/${group}-f*.png" ${dest}/${group}.mp4
+                ffmpeg ${FFMPEG_OPTS} -r ${fps} -pattern_type glob -i "${dest}/${dest}-${group}-f*.png" ${outfile}
             fi
 
             log_dbg "generate_video: end"
@@ -168,8 +189,8 @@ function generate_video()
 
 print_usage()
 {
-    echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD)."
-    echo "Usage: ${PROG_NAME} [OPTIONS...] FICHIER-PSD"
+    echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD/PSB)."
+    echo "Usage: ${PROG_NAME} [OPTIONS...] FICHIER-PHOTOSHOP"
     echo
     echo "Options:"
     echo "  -d   affiche les informations de debug"
@@ -214,20 +235,26 @@ if [ $# -eq 0 ]; then
     exit 1
 fi
 
-if [ $# -gt 1 ]; then
-    echo "${PROG_NAME}: Trop d'arguments."
-    echo "Essayez \`${PROG_NAME} -h' pour plus d'informations."
-    exit 1
-fi
+src="${*}"
 
-if [ ! -f "${1}" ]; then
-    echo "Error: PSD source file not found"
+if [ ! -f "${src}" ]; then
+    log_err "Erreur: fichier source non trouvé"
     exit 1
 fi
 
-src=${1}
+ext=$(echo "${src##*.}" | awk '{print tolower($0)}')
 
-dest=$(basename -s .psd ${1})
+case ${ext} in
+    psd|psb)
+        # Ok: PSD or PSB format detected
+        ;;
+    *)
+        log_err "Format non-supporté: ${ext}"
+        exit 1
+        ;;
+esac
+
+dest=$(basename -s .${ext} "${src}")
 layers=${dest}/layers.txt
 
 if [ ! -d ${dest} ]; then
@@ -243,7 +270,7 @@ done
 
 if [ ${trames} -eq 1 ]; then
     # %s: scene number
-    identify ${IM_OPS} -verbose -format "scene:%s,label:%l,geometry:%g,\n" ${src} > ${layers}
+    identify ${IM_OPS} -verbose -format "scene:%s,label:%l,geometry:%g,\n" "${src}" > ${layers}
 
     # Remove line(s) with empty label:
     ${SED} -i -e /label:,.*/d ${layers}
@@ -254,7 +281,7 @@ if [ ${trames} -eq 1 ]; then
     log_dbg "Background size: ${size}"
 
     if [ x"${size}" = x"" ]; then
-        echo "Error: background layer not found"
+        log_err "Error: background layer not found"
         exit 1
     fi
 
@@ -298,7 +325,7 @@ if [ ${trames} -eq 1 ]; then
             fi
 
             group="${ng}"
-            log_dbg "New group: ${ng}"
+            log_info "New group: ${ng}"
 
             nf=""
             oldnf=""
@@ -322,9 +349,9 @@ if [ ${trames} -eq 1 ]; then
                 expected_nf=$((${oldnf} + 1))
 
                 if [ ${expected_nf} -ne ${nf} ]; then
-                    echo "Warning: non-sequential frame sequence: ${nf}"
-                    echo "  previous: ${oldnf}"
-                    echo "  expected: ${expected_nf}"
+                    log_warn "Warning: non-sequential frame sequence: ${nf}"
+                    log_warn "  previous: ${oldnf}"
+                    log_warn "  expected: ${expected_nf}"
                     insert_empty_frames ${expected_nf} $((${nf} -1))
                 fi
             fi
@@ -338,7 +365,7 @@ if [ ${trames} -eq 1 ]; then
             else
                 convert -colorspace sRGB -page +0+0 ${dest}/background.png \
                         ${files} -background none -layers merge \
-                        ${fname}
+                        PNG32:${fname}
             fi
 
             if [ x"${dup_from}" != x"" ]; then
@@ -353,6 +380,8 @@ if [ ${trames} -eq 1 ]; then
 
                     # Use symlink???
                     cp ${fname} ${wfname}
+
+                    nf=${w}
                 done
             fi