projects
/
fgen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify PNG files detection
[fgen.git]
/
fgen.sh
diff --git
a/fgen.sh
b/fgen.sh
index
7dc2bb2
..
b1bd4e2
100755
(executable)
--- a/
fgen.sh
+++ b/
fgen.sh
@@
-37,12
+37,28
@@
case ${OSTYPE} in
;;
esac
;;
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_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()
{
# Arg1: layer
function get_size()
{
@@
-120,7
+136,7
@@
function get_frame_name()
local index
index=$(printf "${F_FMT}" ${1})
local index
index=$(printf "${F_FMT}" ${1})
- echo "${dest}/${group}-f${index}.png"
+ echo "${dest}/${
dest}-${
group}-f${index}.png"
}
# Arg1: start frame
}
# Arg1: start frame
@@
-149,16
+165,19
@@
function generate_video()
local png_files
if which ffmpeg 1> /dev/null 2>&1; then
local png_files
if which ffmpeg 1> /dev/null 2>&1; then
- set +e
- png_files=$(ls ${dest}/${group}-f*.png 2> /dev/null)
- set -e
+ png_files=$(ls ${dest}/${dest}-${group}-f*.png 2> /dev/null || echo "")
if [ x"${png_files}" != x"" ]; then
log_dbg "generate_video start"
if [ x"${png_files}" != x"" ]; then
log_dbg "generate_video start"
+
+ local outfile
+
+ outfile=${dest}/${dest}-${group}.mp4
+
if [ ${dry_run} -eq 1 ]; then
if [ ${dry_run} -eq 1 ]; then
- touch ${
dest}/${group}.mp4
+ touch ${
outfile}
else
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"
fi
log_dbg "generate_video: end"
@@
-168,8
+187,8
@@
function generate_video()
print_usage()
{
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-P
SD
"
+ 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-P
HOTOSHOP
"
echo
echo "Options:"
echo " -d affiche les informations de debug"
echo
echo "Options:"
echo " -d affiche les informations de debug"
@@
-214,20
+233,26
@@
if [ $# -eq 0 ]; then
exit 1
fi
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
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
layers=${dest}/layers.txt
if [ ! -d ${dest} ]; then
@@
-243,7
+268,7
@@
done
if [ ${trames} -eq 1 ]; then
# %s: scene number
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}
# Remove line(s) with empty label:
${SED} -i -e /label:,.*/d ${layers}
@@
-254,7
+279,7
@@
if [ ${trames} -eq 1 ]; then
log_dbg "Background size: ${size}"
if [ x"${size}" = x"" ]; 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
exit 1
fi
@@
-298,7
+323,7
@@
if [ ${trames} -eq 1 ]; then
fi
group="${ng}"
fi
group="${ng}"
- log_
dbg
"New group: ${ng}"
+ log_
info
"New group: ${ng}"
nf=""
oldnf=""
nf=""
oldnf=""
@@
-322,9
+347,9
@@
if [ ${trames} -eq 1 ]; then
expected_nf=$((${oldnf} + 1))
if [ ${expected_nf} -ne ${nf} ]; 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
insert_empty_frames ${expected_nf} $((${nf} -1))
fi
fi
@@
-338,7
+363,7
@@
if [ ${trames} -eq 1 ]; then
else
convert -colorspace sRGB -page +0+0 ${dest}/background.png \
${files} -background none -layers merge \
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
fi
if [ x"${dup_from}" != x"" ]; then
@@
-353,6
+378,8
@@
if [ ${trames} -eq 1 ]; then
# Use symlink???
cp ${fname} ${wfname}
# Use symlink???
cp ${fname} ${wfname}
+
+ nf=${w}
done
fi
done
fi