From e00c72a094bd8ef422be8d6e6c89b9b3f656246a Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sat, 7 Oct 2023 16:35:34 -0400 Subject: [PATCH] Pad frame index with leading zeroes --- fgen.sh | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/fgen.sh b/fgen.sh index f2c961f..7dc2bb2 100755 --- a/fgen.sh +++ b/fgen.sh @@ -21,6 +21,8 @@ dry_run=0 SED=sed +F_FMT="%04d" + # When reading a file line by line, if a command inside the loop # also reads stdin, it can exhaust the input file. # -nostdin: disable ffmpeg interaction on standard input: @@ -111,6 +113,16 @@ function get_dup_to() echo "${token}" } +# Generate frame index name with leading zeroes: +# Arg1: frame number +function get_frame_name() +{ + local index + + index=$(printf "${F_FMT}" ${1}) + echo "${dest}/${group}-f${index}.png" +} + # Arg1: start frame # Arg1: end frame function insert_empty_frames() @@ -118,13 +130,17 @@ function insert_empty_frames() local w local start local end + local wfname start=${1} end=${2} for w in $(seq ${start} ${end}); do log_dbg "New frame ID: ${w} (empty)" - cp ${dest}/background.png ${dest}/${group}-f${w}.png + + wfname=$(get_frame_name ${w}) + + cp ${dest}/background.png ${wfname} done } @@ -315,12 +331,14 @@ if [ ${trames} -eq 1 ]; then log_dbg "New frame ID: ${nf}" + fname=$(get_frame_name ${nf}) + if [ ${dry_run} -eq 1 ]; then - touch ${dest}/${group}-f${nf}.png + touch ${fname} else convert -colorspace sRGB -page +0+0 ${dest}/background.png \ ${files} -background none -layers merge \ - ${dest}/${group}-f${nf}.png + ${fname} fi if [ x"${dup_from}" != x"" ]; then @@ -331,8 +349,10 @@ if [ ${trames} -eq 1 ]; then for w in $(seq ${dup_start} ${dup_to}); do log_dbg "New frame ID: ${w} (duplicate)" + wfname=$(get_frame_name ${w}) + # Use symlink??? - cp ${dest}/${group}-f${nf}.png ${dest}/${group}-f${w}.png + cp ${fname} ${wfname} done fi -- 2.20.1