f_seq_line ()
{
i=$1
- while [ $i -ne `expr $2 + 1` ]
- do
- printf $i" "
- i=`expr $i + 1`
- done
- echo
+ if echo i | grep -q "[[:digit:]]" ; then
+ while [ $i -ne `expr $2 + 1` ]
+ do
+ printf $i" "
+ i=`expr $i + 1`
+ done
+ echo
+ else
+ echo "abcde: syntax error while processing track numbers" >&2
+ exit 1
+ fi
}
# Functions to replace the need of awk {print $1} and {print $NF}
fi
fi
case "$1" in
- normalize)
+ normalize|normalize-audio)
if [ "$RETURN" = "2" ]; then
# File was already normalized.
RETURN=0
do_replaygain()
{
- run_command "" echo "Adding reply-gain information..."
- for OUTPUT in $( echo $OUTPUTTYPE | tr , \ )
- do
- OUTPUTFILES=""
- for UTRACKNUM in $TRACKQUEUE
+ if checkstatus replaygain; then :; else
+ run_command "" echo "Adding reply-gain information..."
+ for OUTPUT in $( echo $OUTPUTTYPE | tr , \ )
+ # THE OUTPUT NEEDS TO BE CORRECTED WITH THE CONTAINER?
do
- CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
- do_getcddbinfo TRACKNAME
- splitvarious
- TRACKFILE=$(mungefilename "$TRACKNAME")
- ARTISTFILE=$(mungefilename "$TRACKARTIST")
- ALBUMFILE=$(mungefilename "$DALBUM")
- do_gettrucknum
- if [ "$VARIOUSARTISTS" = "y" ]; then
- OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
+ OUTPUTFILES=""
+ for UTRACKNUM in $TRACKQUEUE
+ do
+ CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
+ do_getcddbinfo TRACKNAME
+ splitvarious
+ TRACKFILE=$(mungefilename "$TRACKNAME")
+ ARTISTFILE=$(mungefilename "$TRACKARTIST")
+ ALBUMFILE=$(mungefilename "$DALBUM")
+ do_gettracknum
+ if [ "$VARIOUSARTISTS" = "y" ]; then
+ OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
+ else
+ OUTPUTFILE=$(eval echo $OUTPUTFORMAT)
+ fi
+ OUTPUTFILES="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT $OUTPUTFILES"
+ done
+ case "$OUTPUT" in
+ flac);;
+ ogg);;
+ *);;
+ esac
+ if [ "$RETURN" = "0" ]; then
+ run_command replaygain-$OUTPUT true
else
- OUTPUTFILE=$(eval echo $OUTPUTFORMAT)
+ runcommand replaygain-$OUTPUT false
fi
- OUTPUTFILES="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT $OUTPUTFILES"
done
- case "$OUTPUT" in
- flac);;
- ogg);;
- *);;
- esac
- echo vorbisgain-$OUTPUT >> "$ABCDETEMPDIR/status"
- done
- echo vorbisgain >> "$ABCDETEMPDIR/status"
+ if checkerrors replaygain-.{3,4}; then
+ run_command replaygain false
+ else
+ run_command replaygain true
+ fi
+ fi
}
# This code splits the a Various Artist track name from one of the following
fi
for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
do
- case "$OUTPUT" in
- mp3)
- # id3v2 v0.1.9 claims to have solved the -c bug, so we merge both id3 and id3v2
- GENREID=$(do_getgenreid "${CDGENRE}")
-
- case "$ID3SYNTAX" in
- id3);;
- eyed3)
- # FIXME # track numbers in mp3 come with 1/10, so we cannot happily substitute them with $TRACKNUM
- run_command tagtrack-$1 $TAGGER $TAGGEROPTS --commen=::"$COMMENTOUTPUT" \
- -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
- -G "$GENREID" -n "${TRACKNUM:-$1}" "${TRACKNUM:+-N $TRACKS}" \
- "${ENCODING:+--set-encoding=$ENCODING}"
- "$ABCDETEMPDIR/track$1.$OUTPUT"
- ;;
- *)
- # FIXME # track numbers in mp3 come with 1/10, so we cannot happily substitute them with $TRACKNUM
- run_command tagtrack-$1 $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
- -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" -y "$CDYEAR" \
- -g "$GENREID" -T "${TRACKNUM:-$1/$TRACKS}" \
- "$ABCDETEMPDIR/track$1.$OUTPUT"
- ;;
- esac
- ;;
- vorbis|ogg)
- case "$OGGENCODERSYNTAX" in
- vorbize|oggenc)
- # vorbiscomment can't do in-place modification, mv the file first
- if [ -f "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" -a ! -f "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER" ]; then
- mv "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER"
- fi
- (
- # These are from http://www.xiph.org/ogg/vorbis/doc/v-comment.html
- echo ARTIST="$TRACKARTIST"
- echo ALBUM="$DALBUM"
- echo TITLE="$TRACKNAME"
- if [ -n "$CDYEAR" ]; then
- echo DATE="$CDYEAR"
- fi
- if [ -n "$CDGENRE" ]; then
- echo GENRE="$CDGENRE"
- fi
- echo TRACKNUMBER=${TRACKNUM:-$1}
- echo CDDB=$CDDBDISCID
- if [ "$(eval echo ${COMMENT})" != "" ]; then
- case "$COMMENTOUTPUT" in
- *=*) echo "$COMMENTOUTPUT";;
- *) echo COMMENT="$COMMENTOUTPUT";;
- esac
- fi
- ) | run_command tagtrack-$1 $VORBISCOMMENT $VORBISCOMMENTOPTS -w \
- "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
- # Doublecheck that the commented file was created successfully before wiping the original
- if [ -f "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" ]; then
- rm -f "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER"
- else
- mv "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
- fi
- ;;
+ case "$OUTPUT" in
+ mp3)
+ # id3v2 v0.1.9 claims to have solved the -c bug, so we merge both id3 and id3v2
+ GENREID=$(do_getgenreid "${CDGENRE}")
+
+ case "$ID3SYNTAX" in
+ id3);;
+ eyed3)
+ # FIXME # track numbers in mp3 come with 1/10, so we cannot happily substitute them with $TRACKNUM
+ run_command tagtrack-$OUTPUT-$1 $TAGGER $TAGGEROPTS --commen=::"$COMMENTOUTPUT" \
+ -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
+ -G "$GENREID" -n "${TRACKNUM:-$1}" "${TRACKNUM:+-N $TRACKS}" \
+ "${ENCODING:+--set-encoding=$ENCODING}"
+ "$ABCDETEMPDIR/track$1.$OUTPUT"
+ ;;
+ *)
+ # FIXME # track numbers in mp3 come with 1/10, so we cannot happily substitute them with $TRACKNUM
+ run_command tagtrack-$OUTPUT-$1 $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
+ -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" -y "$CDYEAR" \
+ -g "$GENREID" -T "${TRACKNUM:-$1/$TRACKS}" \
+ "$ABCDETEMPDIR/track$1.$OUTPUT"
+ ;;
+ esac
+ ;;
+ vorbis|ogg)
+ case "$OGGENCODERSYNTAX" in
+ vorbize|oggenc)
+ # vorbiscomment can't do in-place modification, mv the file first
+ if [ -f "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" -a ! -f "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER" ]; then
+ mv "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER"
+ fi
+ (
+ # These are from http://www.xiph.org/ogg/vorbis/doc/v-comment.html
+ echo ARTIST="$TRACKARTIST"
+ echo ALBUM="$DALBUM"
+ echo TITLE="$TRACKNAME"
+ if [ -n "$CDYEAR" ]; then
+ echo DATE="$CDYEAR"
+ fi
+ if [ -n "$CDGENRE" ]; then
+ echo GENRE="$CDGENRE"
+ fi
+ echo TRACKNUMBER=${TRACKNUM:-$1}
+ echo CDDB=$CDDBDISCID
+ if [ "$(eval echo ${COMMENT})" != "" ]; then
+ case "$COMMENTOUTPUT" in
+ *=*) echo "$COMMENTOUTPUT";;
+ *) echo COMMENT="$COMMENTOUTPUT";;
+ esac
+ fi
+ ) | run_command tagtrack-$OUTPUT-$1 $VORBISCOMMENT $VORBISCOMMENTOPTS -w \
+ "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
+ # Doublecheck that the commented file was created successfully before wiping the original
+ if [ -f "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" ]; then
+ rm -f "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER"
+ else
+ mv "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
+ fi
+ ;;
+ esac
+ ;;
+ flac)
+ (
+ echo ARTIST="$TRACKARTIST"
+ echo ALBUM="$DALBUM"
+ echo TITLE="$TRACKNAME"
+ if [ -n "$CDYEAR" ]; then
+ echo DATE="$CDYEAR"
+ fi
+ if [ -n "$CDGENRE" ]; then
+ echo GENRE="$CDGENRE"
+ fi
+ echo TRACKNUMBER="${TRACKNUM:-$1}"
+ echo CDDB="$CDDBDISCID"
+ if [ "$(eval echo ${COMMENT})" != "" ]; then
+ case "$COMMENTOUTPUT" in
+ *=*) echo "$COMMENTOUTPUT";;
+ *) echo COMMENT="$COMMENTOUTPUT";;
+ esac
+ fi
+ ) | run_command tagtrack-$OUTPUT-$1 $METAFLAC $METAFLACOPTS --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
+ ;;
+ spx)
+ run_command tagtrack-$OUTPUT-$1 true
+ ;;
+ mpc)
+ run_command tagtrack-$OUTPUT-$1 true
+ ;;
esac
- ;;
- flac)
- (
- echo ARTIST="$TRACKARTIST"
- echo ALBUM="$DALBUM"
- echo TITLE="$TRACKNAME"
- if [ -n "$CDYEAR" ]; then
- echo DATE="$CDYEAR"
- fi
- if [ -n "$CDGENRE" ]; then
- echo GENRE="$CDGENRE"
- fi
- echo TRACKNUMBER=${TRACKNUM:-$1}
- echo CDDB=$CDDBDISCID
- if [ "$(eval echo ${COMMENT})" != "" ]; then
- case "$COMMENTOUTPUT" in
- *=*) echo "$COMMENTOUTPUT";;
- *) echo COMMENT="$COMMENTOUTPUT";;
- esac
- fi
- ) | run_command tagtrack-$1 $METAFLAC $METAFLACOPTS --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
- ;;
- spx)
- run_command tagtrack-$1 true
- ;;
- mpc)
- run_command tagtrack-$1 true
- ;;
- esac
done
+ if checkerrors "tagtrack-(.{3,4})-$1"; then
+ run_command tagtrack-$1 false
+ else
+ run_command tagtrack-$1 true
+ fi
+
}
# do_batch_encode
fi
fi
else
- if [ "$(checkstatus encode-output)" = "loud" ]; then
- echo "HEH! The file we were about to encode disappeared:"
- echo ">> $IN"
- fi
+ run_command "" echo "HEH! The file we were about to encode disappeared:"
+ run_command "" echo ">> $IN"
run_command encodetrack-$1 false
fi
}
{
for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
do
- case $OUTPUT in
- vorbis|ogg)
- OUTPUT=$OGGOUTPUTCONTAINER
- ;;
- flac)
- OUTPUT=$FLACOUTPUTCONTAINER
- ;;
- esac
# Create ALBUMFILE, ARTISTFILE, TRACKFILE
# Munge filenames as follows:
# ' ' -> '_'
else
OUTPUTFILE=$(eval echo $OUTPUTFORMAT)
fi
- # Check that the directory for OUTPUTFILE exists, if it doesn't, create it
- OUTPUTFILEDIR=$(dirname "$OUTPUTDIR/$OUTPUTFILE")
- # mkdir -p shouldn't return an error if the directory already exists
- mkdir -p "$OUTPUTFILEDIR"
- # Silence the Moving output since it overlaps with encoding processes...
- #run_command '' vecho "Moving track$1.$OUTPUT to $OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
- run_command movetrack-$1 mv "$ABCDETEMPDIR/track$1.$OUTPUT" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
- # Lets move the cue file
- if CUEFILE=$(checkstatus cuefile) >/dev/null ; then
- if [ -r "$ABCDETEMPDIR/$CUEFILE" ]; then
- if checkstatus movecue-$OUTPUT; then :; else
- # Silence the Copying output since it overlaps with encoding processes...
- #run_command '' vecho "Copying cue file to its destination directory..."
- if checkstatus onetrack >/dev/null ; then
- case $OUTPUT in
- # NOTE: Creating a cue file with the 3-char-extension files is to comply with
- # http://brianvictor.tripod.com/mp3cue.htm#details
- [a-z0-9][a-z0-9][a-z0-9])
- run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.cue"
- ;;
- *)
- run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT.cue"
- ;;
- esac
- else
- run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTFILEDIR/$CUEFILE"
+ if checkerrors "tagtrack-$OUTPUT-$1"; then :; else
+ # Once we know the specific output was successful, we can change the OUTPUT to the value containing the container
+ case $OUTPUT in
+ vorbis|ogg)
+ OUTPUT=$OGGOUTPUTCONTAINER
+ ;;
+ flac)
+ OUTPUT=$FLACOUTPUTCONTAINER
+ ;;
+ esac
+ # Check that the directory for OUTPUTFILE exists, if it doesn't, create it
+ OUTPUTFILEDIR=$(dirname "$OUTPUTDIR/$OUTPUTFILE")
+ # mkdir -p shouldn't return an error if the directory already exists
+ mkdir -p "$OUTPUTFILEDIR"
+ run_command movetrack-$1 mv "$ABCDETEMPDIR/track$1.$OUTPUT" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
+ # Lets move the cue file
+ if CUEFILE=$(checkstatus cuefile) >/dev/null ; then
+ if [ -r "$ABCDETEMPDIR/$CUEFILE" ]; then
+ if checkstatus movecue-$OUTPUT; then :; else
+ # Silence the Copying output since it overlaps with encoding processes...
+ #run_command '' vecho "Copying cue file to its destination directory..."
+ if checkstatus onetrack >/dev/null ; then
+ case $OUTPUT in
+ # NOTE: Creating a cue file with the 3-char-extension files is to comply with
+ # http://brianvictor.tripod.com/mp3cue.htm#details
+ [a-z0-9][a-z0-9][a-z0-9])
+ run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.cue"
+ ;;
+ *)
+ run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT.cue"
+ ;;
+ esac
+ else
+ run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTFILEDIR/$CUEFILE"
+ fi
+ echo movecue-$OUTPUT >> "$ABCDETEMPDIR/status"
fi
- echo movecue-$OUTPUT >> "$ABCDETEMPDIR/status"
fi
fi
fi
# else
# TRACKNUM=${UTRACKNUM}
# fi
- do_gettrucknum
+ do_gettracknum
if [ "$VARIOUSARTISTS" = "y" ]; then
OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
else
DOPOSTPROCESS=n
DOTAG=n
DOMOVE=n
+DOREPLAYGAIN=n
DOPLAYLIST=n
DOCLEAN=n
# postprocess) DOPREPROCESS=y; DOENCODE=y; DOREAD=y;;
tag) DOTAG=y; DOREAD=y; DOENCODE=y; DOCDDB=y;;
move) DOMOVE=y; DOTAG=y; DOREAD=y; DOENCODE=y; DOCDDB=y;;
+ replaygain) DOCDDB=y; DOREAD=y; DOENCODE=y; DOTAG=y; DOMOVE=y; DOREPLAYGAIN=y;;
playlist) DOCDDB=y; DOPLAYLIST=y;;
clean) DOCLEAN=y;;
esac
done
+if [ "$DONORMALIZE" = "y" ] && [ "$DOREPLAYGAIN" = "y" ]; then
+ # FIXME # should we abort on error or just inform the user?
+ :
+fi
+
for SHOWCDDBFIELD in $(echo $SHOWCDDBFIELDS | tr , \ ); do
case $SHOWCDDBFIELD in
y*|Y*) SHOWCDDBYEAR="y";;
# Allow -o OUTPUT(1):OPTIONS(1),...,OUTPUT(N):OPTIONS(N) mode of operation
if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then
- for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ); do
+ for OUTPUT in "$(echo "$OUTPUTTYPE" | tr , \ )"; do
case "$OUTPUT" in
vorbis:*|ogg:*) OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
mp3:*) MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
mpc:*) MPPENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
esac
done
- for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ); do
+ for OUTPUT in "$(echo "$OUTPUTTYPE" | tr , \ )"; do
TEMPOUTPUT=$( echo "$OUTPUT" | cut -d: -f1 )
TEMPOUTPUTTYPE="${TEMPOUTPUTTYPE:+$TEMPOUTPUTTYPE,}$TEMPOUTPUT"
done
fi
# If the above didn't catch the stragglers, this will
wait
-if checkstatus replaygain; then :; else
+if [ "$DOREPLAYGAIN" = "y" ]; then
do_replaygain
fi
# Check to see if run_command logged any errors
HCoop / clinton / abcde.git / blobdiff