Bugfix ffmpeg-convert

Author: mboljen

Makefile

@@ -1,5 +1,5 @@
 NAME=ffmpeg-tools
-VERSION=0.1
+VERSION=0.2
 
 DIRS=bin etc share
 INSTALL_DIRS=`find $(DIRS) -type d 2>/dev/null`
@@ -11,7 +11,7 @@ PKG_NAME=$(NAME)-$(VERSION)
 PREFIX?=/usr/local
 DOC_DIR=$(PREFIX)/share/doc/$(PKG_NAME)
 
-BIN=$(notdir $(wildcard bin/*))
+BIN=$(filter-out ffmpeg-splitaudio-editor,$(notdir $(wildcard bin/*)))
 
 MAN_SECTION ?= 1
 MAN_DIR = share/man/man$(MAN_SECTION)

README.md

@@ -2,12 +2,12 @@
 
 This collection provides the following wrappers for **FFmpeg**:
 
-+ [ffmpeg-audioshift](share/doc/ffmpeg-audioshift.md)
 + [ffmpeg-concat](share/doc/ffmpeg-concat.md)
 + [ffmpeg-convert](share/doc/ffmpeg-convert.md)
 + [ffmpeg-cropdetect](share/doc/ffmpeg-cropdetect.md)
 + [ffmpeg-fadeinout](share/doc/ffmpeg-fadeinout.md)
 + [ffmpeg-gamma](share/doc/ffmpeg-gamma.md)
++ [ffmpeg-offset](share/doc/ffmpeg-offset.md)
 + [ffmpeg-splitaudio](share/doc/ffmpeg-splitaudio.md)
 + [ffmpeg-watermark](share/doc/ffmpeg-watermark.md)
 

bin/ffmpeg-convert

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
 # Created:         So 2023-08-06 01:34:08 CEST
-# Last Modified:   Sa 2024-06-22 18:40:53 CEST
+# Last Modified:   Mi 2025-01-15 19:54:10 CET
 #
 # ffmpeg-convert:
 #   Convert one or several video files
@@ -188,7 +188,7 @@ do
     fi
 
     # Replace file extension
-    OUTFILE="${INFILE%.*}.$EXT"
+    OUTFILE="${INFILE%.*}$NAME.$EXT"
 
     # Add output directory to output filename
     [ $(stat -c "%i" "$DIR") -ne $(stat -c "%i" $(pwd)) ] && OUTFILE="$DIR/$OUTFILE"

bin/ffmpeg-audioshift bin/ffmpeg-offset

@@ -1,19 +1,19 @@
 #!/usr/bin/env bash
 #
 # Created:         Mo 2019-08-26 11:18:48 CEST
-# Last Modified:   So 2024-06-16 18:04:41 CEST
+# Last Modified:   So 2024-12-15 09:15:08 CET
 #
-# ffmpeg-audioshift:
+# ffmpeg-offset:
 #   Delay the audio or video stream of one or several video files
 
 set -euo pipefail
 
 # Help text
 usage() {
 >&2 cat << EOF
-Delay the audio or video stream of one or several video files
+Offset audio stream of one or several video files
 
-Usage: ffmpeg-audioshift [OPTION]... INFILE...
+Usage: ffmpeg-offset [OPTION]... INFILE...
 
 Options:
   -o, --offset=VALUE     Offset audio track in seconds (default: 0).  Positive values delay the audio track.

bin/ffmpeg-splitaudio bin/ffmpeg-splitabook

@@ -1,9 +1,9 @@
 #!/bin/bash
 #
 # Created:         Do 2024-08-22 08:27:21 CEST
-# Last Modified:   Do 2024-08-22 21:31:41 CEST
+# Last Modified:   Sa 2025-01-04 11:52:03 CET
 #
-# ffmpeg-splitaudio:
+# ffmpeg-splitabook:
 #    Split an Audible audio book into chapter files
 #
 # see also:
@@ -16,11 +16,11 @@ usage() {
 >&2 cat << EOF
 Split monolithic audio book into chapter files
 
-Usage: ffmpeg-splitaudio [OPTION]... INFILE...
+Usage: ffmpeg-splitabook [OPTION]... INFILE...
 
 Options:
   -t, --to=FORMAT  Set output format
-  -r, --readonly   Extract chapter information only
+  -f, --fetchonly  Fetch chapter information only
   -y, --yes        Overwrite existing files
   -h, --help       Show this help and exit
 EOF
@@ -48,12 +48,12 @@ then
 fi
 
 # Defaults
-ro=0
+fetchonly=0
 to=
 yes=0
 
 # Parse command line options
-if ! args=$(getopt -a -o ct:yh --long chapteronly,to:,yes,help -- "$@")
+if ! args=$(getopt -a -o t:fyh --long to:,fetchonly,yes,help -- "$@")
 then
     echoerr "Error processing command line options"
     usage
@@ -65,10 +65,10 @@ eval set -- "$args"
 while :
 do
     case $1 in
-        -r | --readonly) ro=1  ; shift ;;
-        -t | --to)       to=$2 ; shift 2 ;;
-        -y | --yes)      yes=1 ; shift   ;;
-        -h | --help)     usage ; shift   ; exit 0;;
+        -t | --to)        to=$2; shift 2;;
+        -f | --fetchonly) fetchonly=1; shift;;
+        -y | --yes)       yes=1; shift;;
+        -h | --help)      usage; shift; exit 0;;
         # -- means end of the arguments; drop this, and break out of the while loop
         --) shift; break;;
          *) echoerr "Unsupported option: $1"; usage; shift; exit 1;;
@@ -109,30 +109,41 @@ do
     # Check target format
     if [[ "$ext" == "$to" ]]
     then
+
         # Source and target format are identical
         codec="copy"
+
     elif [[ $to == "mp3" ]]
     then
+
         # Convert to MP3
         codec="libmp3lame"
+
     else
+
         # Unsupported target format
         echoerr "Unsupported extension $to."
         exit 1
+
     fi
 
     # Create chapter file if it does not exist already
     if [ ! -e "$chapterdata" ]
     then
+
+        #
         "$FFPROBE" -i "$f" \
             -print_format json \
             -show_chapters \
             -loglevel error \
             -sexagesimal > "$chapterdata"
+
+        # Check output of FFPROBE, if empty invoke editor to set list manually
+
     fi
 
-    # Skip rest if chapteronly flag is enabled
-    [ "$ro" -eq 1 ] && continue
+    # Skip rest if fetchonly flag is active
+    [ "$fetchonly" -eq 1 ] && continue
 
     # Read chapterdata file
     readarray -t id    <<< $(jq -r '.chapters[].id'         "$chapterdata")