X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=1546f8aa7994a270df976e711ae805336cd85d53;hb=86d3c7b5e79cef08b254192ae674b9d8324094a2;hp=c7065c8d2edeeb7e3d94893509d7bfaec2246f5e;hpb=82d3c92276a2a97dc50911dcf829a1c71d035079;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index c7065c8..1546f8a 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -136,7 +136,7 @@ function get_frame_name()
     local index
 
     index=$(printf "${F_FMT}" ${1})
-    echo "${dest}/${group}-f${index}.png"
+    echo "${dest}/${dest}-${group}-f${index}.png"
 }
 
 # Arg1: start frame
@@ -166,15 +166,20 @@ function generate_video()
 
     if which ffmpeg 1> /dev/null 2>&1; then
         set +e
-        png_files=$(ls ${dest}/${group}-f*.png 2> /dev/null)
+        png_files=$(ls ${dest}/${dest}-${group}-f*.png 2> /dev/null)
         set -e
 
         if [ x"${png_files}" != x"" ]; then
             log_dbg "generate_video start"
+
+            local outfile
+
+            outfile=${dest}/${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"
@@ -184,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"
@@ -233,11 +238,23 @@ fi
 src="${*}"
 
 if [ ! -f "${src}" ]; then
-    log_err "Error: PSD source file not found"
+    log_err "Erreur: fichier source non trouvé"
     exit 1
 fi
 
-dest=$(basename -s .psd "${src}")
+ext=$(echo "${src##*.}" | awk '{print tolower($0)}')
+
+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