Fix bug with missing video for last group

[fgen.git] / fgen.sh

diff --git a/fgen.sh b/fgen.sh
index b6a45c2..9fbd121 100755 (executable)
--- a/fgen.sh
+++ b/fgen.sh
@@ -17,6 +17,8 @@ fps=8
 
 debug=0
 trames=1
+dry_run=0
+
 SED=sed
 FFMPEG_OPTS="-hide_banner -loglevel error -y"
 
@@ -77,6 +79,34 @@ function get_group_id()
     echo "${group}"
 }
 
+# Get duplicate from. Ex: "label:dup1-7 planXYZ,geometry..." will return 1
+# Arg1: line
+function get_dup_from()
+{
+    dup=$(echo "${1}" | grep -e "label:dup.*" | ${SED} "s/.*label:dup\([0-9]\+\)-.*,geometry.*/\1/g")
+    echo "${dup}"
+}
+
+# Get duplicate to. Ex: "label:dup1-7 planXYZ,geometry..." will return 7
+# Arg1: line
+function get_dup_to()
+{
+    dup=$(echo "${1}" | grep -e "label:dup.*" | ${SED} "s/.*label:dup[0-9]\+-\([0-9]\+\).*,geometry.*/\1/g")
+    echo "${dup}"
+}
+
+function generate_video()
+{
+    if which ffmpeg 1> /dev/null 2>&1; then
+        if [ -f ${dest}/${group}-f1.png ]; then
+            if [ ${dry_run} -eq 0 ]; then
+                # Conversion vidéo:
+                ffmpeg ${FFMPEG_OPTS} -r ${fps} -start_number 1 -i ${dest}/${group}-f%d.png ${dest}/${group}.mp4
+            fi
+        fi
+    fi
+}
+
 print_usage()
 {
     echo "${PROG_NAME} -- Générateur de séquence d'images PNG à partir d'un fichier Photoshop (PSD)."
@@ -85,11 +115,12 @@ print_usage()
     echo "Options:"
     echo "  -d   affiche les informations de debug"
     echo "  -f   ne regénère pas les trames, mais uniquement la séquence vidéo"
+    echo "  -n   mode de test (dry-run)"
     echo "  -r   nombre de trames par seconde (FPS)"
     echo "  -h   affiche ce message d'aide"
 }
 
-while getopts "dhfr:" flag ;do
+while getopts "dhfnr:" flag ;do
     case ${flag} in
         d)
             debug="1"
@@ -97,6 +128,9 @@ while getopts "dhfr:" flag ;do
         f)
             trames=0
             ;;
+        n)
+            dry_run=1
+            ;;
         r)
             fps="${OPTARG}"
             ;;
@@ -186,14 +220,17 @@ if [ ${trames} -eq 1 ]; then
         nf=$(get_frame_id "${l}")
         ng=$(get_group_id "${l}")
 
+        dup_from=$(get_dup_from "${l}")
+        dup_to=$(get_dup_to "${l}")
+
+        # Also indicate a new frame, but to be copied from..to:
+        if [ x"${dup_from}" != x"" ]; then
+            nf=${dup_from}
+        fi
+
         # Only change group if ng is set...
         if [ x"${ng}" != x"" ]; then
-            if which ffmpeg 1> /dev/null 2>&1; then
-                if [ -f ${dest}/${group}-f1.png ]; then
-                    # Conversion vidéo:
-                    ffmpeg ${FFMPEG_OPTS} -r ${fps} -start_number 1 -i ${dest}/${group}-f%d.png ${dest}/${group}.mp4
-                fi
-            fi
+            generate_video
 
             group="${ng}"
             log_dbg "New group: ${ng}"
@@ -227,9 +264,33 @@ if [ ${trames} -eq 1 ]; then
             fi
 
             log_dbg "New frame ID: ${nf}"
-            convert -colorspace sRGB -page +0+0 ${dest}/background.png ${files} -background none -layers merge ${dest}/${group}-f${nf}.png
+
+            if [ ${dry_run} -eq 1 ]; then
+                touch ${dest}/${group}-f${nf}.png
+            else
+                convert -colorspace sRGB -page +0+0 ${dest}/background.png \
+                        ${files} -background none -layers merge \
+                        ${dest}/${group}-f${nf}.png
+            fi
+
+            if [ x"${dup_from}" != x"" ]; then
+                log_dbg "  dup from: ${dup_from}"
+                log_dbg "  dup to:   ${dup_to}"
+
+                dup_start=$((${dup_from} + 1))
+                for w in $(seq ${dup_start} ${dup_to}); do
+                    log_dbg "New frame ID: ${w} (duplicate)"
+
+                    # Use symlink???
+                    cp ${dest}/${group}-f${nf}.png ${dest}/${group}-f${w}.png
+                done
+            fi
+
             files=""
             oldnf="${nf}"
         fi
     done <${layers}
 fi
+
+# Special case for last group...
+generate_video