X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=686fff918748b851e7c0b21377550dcc2c7391b1;hb=79f431e19ea88f28e23d5bd4b9f39a7e6d0b1471;hp=0003fcddcec0d2021f71984bd90f598f46095843;hpb=7ded6fdd9e59aee0a29beaa95bca4eca21ddab50;p=fgen.git

diff --git a/fgen.sh b/fgen.sh
index 0003fcd..686fff9 100755
--- a/fgen.sh
+++ b/fgen.sh
@@ -184,8 +184,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"
@@ -230,20 +230,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
-    log_err "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)}')
+
+case ${ext} in
+    psd|psb)
+        # Ok: PSD or PSB format detected
+        ;;
+    *)
+        log_err "Format non-supporté: ${ext}"
+        exit 1
+        ;;
+esac
 
-dest=$(basename -s .psd ${1})
+dest=$(basename -s .${ext} "${src}")
 layers=${dest}/layers.txt
 
 if [ ! -d ${dest} ]; then
@@ -259,7 +265,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}
@@ -314,7 +320,7 @@ if [ ${trames} -eq 1 ]; then
             fi
 
             group="${ng}"
-            log_dbg "New group: ${ng}"
+            log_info "New group: ${ng}"
 
             nf=""
             oldnf=""
@@ -354,7 +360,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