X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/0c3e4d5a8b3d5b9912d6d44312b7306fd00e40ab..b69a8bb49108e275091c7115444f6ad4fc1db2c5:/abcde

diff --git a/abcde b/abcde
index 20a8b9a..bd230a5 100755
--- a/abcde
+++ b/abcde
@@ -11,7 +11,7 @@
 # Copyright for this work is to expire January 1, 2010, after which it
 # shall be public domain.
 
-VERSION="2.3.99-$Id$"
+VERSION="2.3.99-$Id $"
 
 usage ()
 {
@@ -28,7 +28,7 @@ echo "       Specify a configuration file (overrides system and user config file
 echo "-C <discid#>"
 echo "       Specify discid to resume from (only needed if you no longer have the cd)"
 echo "-d <device>"
-echo "       Specify CDROM device to grab"
+echo "       Specify CDROM device to grab (flac uses a single-track flac file)"
 echo "-D     Debugging mode (equivalent to sh -x abcde)"
 echo "-e     Erase encoded track information from status file"
 #echo "-E     Set the encoding information for the tags"
@@ -43,7 +43,7 @@ echo "-N     Noninteractive. Never prompt for anything"
 echo "-m     Modify playlist to include CRLF endings, to comply with some players"
 echo "-M     Create a CUE file"
 echo "-o <type1[,type2]...>"
-echo "       Output file type(s) (vorbis,mp3,flac,spx,mpc). Defaults to vorbis"
+echo "       Output file type(s) (vorbis,mp3,flac,spx,mpc,wav). Defaults to vorbis"
 echo "-p     Pad track numbers with 0's (if less than 10 tracks)"
 echo "-P     Use UNIX pipes to read+encode without wav files"
 echo "-r <host1[,host2]...>"
@@ -83,12 +83,17 @@ f_seq_row ()
 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}
@@ -209,7 +214,7 @@ run_command ()
 		fi
 	fi
 	case "$1" in
-	normalize)
+	normalize|normalize-audio)
 		if [ "$RETURN" = "2" ]; then
 			# File was already normalized.
 			RETURN=0
@@ -288,7 +293,7 @@ relpath ()
 #	TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
 #	TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
 
-do_getcddbinfo ()
+do_getcddbinfo()
 {
 	case $1 in
 	TRACKNAME1)
@@ -302,7 +307,7 @@ do_getcddbinfo ()
 
 # do_gettracknum
 # Get the track number we are going to use for different actions
-do_gettracknum
+do_gettracknum()
 {
 	if [ -n "$STARTTRACKNUMBER" ] ; then
 		# Get the trackpadding from the current track
@@ -313,36 +318,52 @@ do_gettracknum
 	fi
 }
 
-do_replaygain
+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 replygain 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)
-			else
-				OUTPUTFILE=$(eval echo $OUTPUTFORMAT)
-			fi
-			OUTPUTFILES="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT $OUTPUTFILES"
+			case $OUTPUT in
+				vorbis|ogg)
+					OUTPUT=$OGGOUTPUTCONTAINER
+					;;
+				flac)
+					OUTPUT=$FLACOUTPUTCONTAINER
+					;;
+			esac
+			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)
+					run_command replaygain-flac $METAFLAC --add-replay-gain $OUTPUTFILES
+					;;
+				vorbis|ogg)
+					run_command replaygain-vorbis $VORBISGAIN --album $OUTPUTFILES
+					;;
+				*);;
+			esac
 		done
-		case "$OUTPUT" in
-			flac);;
-			ogg);;
-			*);;
-		esac
-		echo vorbisgain-$OUTPUT >> "$ABCDETEMPDIR/status"
-	done
-	echo vorbisgain >> "$ABCDETEMPDIR/status"
+		if checkerrors replaygain-.{3,6}; then :; else
+			run_command replaygain true
+		fi
+	fi
 }
 
 # This code splits the a Various Artist track name from one of the following
@@ -362,34 +383,34 @@ splitvarious ()
 	if [ "$VARIOUSARTISTS" = "y" ] && [ ! "$ONETRACK" = "y" ]; then
 		case "$VARIOUSARTISTSTYLE" in
 		forward)
-			DTITLEARTIST=$(echo "$TRACKNAME" | sed 's- / -~-g')
-			TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f1 -d~)
-			TRACKNAME=$(echo "$DTITLEARTIST" | cut -f2 -d~)
+			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's- / -~-g')"
+			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
+			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
 			;;
 		forward-dash)
-			DTITLEARTIST=$(echo "$TRACKNAME" | sed 's, - ,~,g')
-			TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f1 -d~)
-			TRACKNAME=$(echo "$DTITLEARTIST" | cut -f2 -d~)
+			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's, - ,~,g')"
+			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
+			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
 			;;
 		reverse)
-			DTITLEARTIST=$(echo "$TRACKNAME" | sed 's- / -~-g')
-			TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f2 -d~)
-			TRACKNAME=$(echo "$DTITLEARTIST" | cut -f1 -d~)
+			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's- / -~-g')"
+			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
+			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
 			;;
 		reverse-dash)
-			DTITLEARTIST=$(echo "$TRACKNAME" | sed 's, - ,~,g')
-			TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f2 -d~)
-			TRACKNAME=$(echo "$DTITLEARTIST" | cut -f1 -d~)
+			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's, - ,~,g')"
+			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
+			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
 			;;
 		colon)
-			DTITLEARTIST=$(echo "$TRACKNAME" | sed 's-: -~-g')
-			TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f1 -d~)
-			TRACKNAME=$(echo "$DTITLEARTIST" | cut -f2 -d~)
+			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's-: -~-g')"
+			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
+			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
 			;;
 		trailing-paren)
-			DTITLEARTIST=$(echo "$TRACKNAME" | sed 's,^\(.*\) (\(.*\)),\1~\2,')
-			TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f2 -d~)
-			TRACKNAME=$(echo "$DTITLEARTIST" | cut -f1 -d~)
+			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's,^\(.*\) (\(.*\)),\1~\2,')"
+			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
+			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
 			;;
 		esac
 	elif [ "$VARIOUSARTISTS" = "y" ] && [ "$ONETRACK" = "y" ]; then
@@ -569,106 +590,108 @@ do_tag ()
 	run_command '' echo "Tagging track $1 of $TRACKS: $TRACKNAME..."
 	# If we want to start the tracks with a given number, we need to modify the
 	# TRACKNUM value before evaluation
-#	if [ -n "$STARTTRACKNUMBER" -a -n "$STARTTRACKNUMBERTAG" ] ; then
-#		# Get the trackpadding from the current track
-#		CURRENTTRACKPADDING=$(echo -n $UTRACKNUM | wc -c)
-#		TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
-#	fi
 	if [ -n "$STARTTRACKNUMBERTAG" ] ; then
 		do_gettracknum
 	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
+			;;
+		wav)
+			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,6})-$1"; then :; else
+		run_command tagtrack-$1 true
+	fi
+
 }
 
 # do_batch_encode
@@ -697,7 +720,7 @@ do_batch_encode ()
 			else
 				for UTRACKNUM in $TRACKQUEUE
 				do
-					echo encodetrack-$UTRACKNUM >> status
+					run_command encodetrack-$UTRACKNUM true
 				done
 			fi
 			)
@@ -843,22 +866,24 @@ do_encode ()
 				## FIXME ## to the encoder ends up empty.
 				$RUN_COMMAND nice $ENCNICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT"
 				;;
+			wav)
+				# In case of wav output we need nothing. Just keep the wavs.
+				run_command encodetrack-$OUTPUT-$1 true
+				;;
 			esac
 		done
 		# Only remove .wav if the encoding succeeded
-		if checkerrors "encodetrack-(.{3,4})-$1"; then 
-			run_command encodetrack-$1 false
-		else
+		if checkerrors "encodetrack-(.{3,6})-$1"; then :; else
 			run_command encodetrack-$1 true
 			if [ ! "$KEEPWAVS" = "y" ] ; then
-				rm -f "$IN"
+				if [ ! "$KEEPWAVS" = "move" ] ; then
+					rm -f "$IN"
+				fi
 			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
 }
@@ -1036,14 +1061,6 @@ do_move ()
 {
 	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:
 		# ' ' -> '_'
@@ -1051,56 +1068,58 @@ do_move ()
 		# ''' -> ''
 		# '?' -> ''
 		# Eat control characters
-		ALBUMFILE=$(mungefilename "$DALBUM")
-		ARTISTFILE=$(mungefilename "$TRACKARTIST")
-		TRACKFILE=$(mungefilename "$TRACKNAME")
-		GENRE=$(mungegenre "$GENRE")
-		YEAR=$(echo $CDYEAR)
+		ALBUMFILE="$(mungefilename "$DALBUM")"
+		ARTISTFILE="$(mungefilename "$TRACKARTIST")"
+		TRACKFILE="$(mungefilename "$TRACKNAME")"
+		GENRE="$(mungegenre "$GENRE")"
+		YEAR="$(echo $CDYEAR)"
 		# If we want to start the tracks with a given number, we need to modify the
 		# TRACKNUM value before evaluation
-	#	if [ -n "$STARTTRACKNUMBER" ] ; then
-	#		# Get the trackpadding from the current track
-	#		CURRENTTRACKPADDING=$(echo -n $UTRACKNUM | wc -c)
-	#		TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
-	#	else
-	#		TRACKNUM=${UTRACKNUM}
-	#	fi
 		do_gettracknum
 		# Supported variables for OUTPUTFORMAT are GENRE, ALBUMFILE, ARTISTFILE,
 		# TRACKFILE, and TRACKNUM.
 		if [ "$VARIOUSARTISTS" = "y" ]; then
-			OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
-			else
-			OUTPUTFILE=$(eval echo $OUTPUTFORMAT)
+			OUTPUTFILE="$(eval echo "$VAOUTPUTFORMAT")"
+		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
@@ -1116,11 +1135,19 @@ do_playlist ()
 {
 	for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
 	do
+		case $OUTPUT in
+			vorbis|ogg)
+				OUTPUT=$OGGOUTPUTCONTAINER
+				;;
+			flac)
+				OUTPUT=$FLACOUTPUTCONTAINER
+				;;
+		esac
 		# Create a playlist file for the playlist data to go into.
 		# We used to wipe it out if it existed. Now we request permision if interactive.
 		for LASTTRACK in $TRACKQUEUE; do :; done
-		ALBUMFILE=$(mungefilename "$DALBUM")
-		ARTISTFILE=$(mungefilename "$DARTIST")
+		ALBUMFILE="$(mungefilename "$DALBUM")"
+		ARTISTFILE="$(mungefilename "$DARTIST")"
 		GENRE=$(mungegenre "$GENRE")
 		YEAR=${CDYEAR:-$CDYEAR}
 		if [ "$VARIOUSARTISTS" = "y" ] ; then
@@ -1159,19 +1186,12 @@ do_playlist ()
 				#TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2 -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')
 				do_getcddbinfo TRACKNAME
 				splitvarious
-				TRACKFILE=$(mungefilename "$TRACKNAME")
-				ARTISTFILE=$(mungefilename "$TRACKARTIST")
-				ALBUMFILE=$(mungefilename "$DALBUM")
+				TRACKFILE="$(mungefilename "$TRACKNAME")"
+				ARTISTFILE="$(mungefilename "$TRACKARTIST")"
+				ALBUMFILE="$(mungefilename "$DALBUM")"
 				# If we want to start the tracks with a given number, we need to modify the
 				# TRACKNUM value before evaluation
-			#	if [ -n "$STARTTRACKNUMBER" ] ; then
-			#		# Get the trackpadding from the current track
-			#		CURRENTTRACKPADDING=$(echo -n $UTRACKNUM | wc -c)
-			#		TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
-			#	else
-			#		TRACKNUM=${UTRACKNUM}
-			#	fi
-				do_gettrucknum
+				do_gettracknum
 				if [ "$VARIOUSARTISTS" = "y" ]; then
 					OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
 				else
@@ -1218,11 +1238,21 @@ do_discid ()
 		if [ "$OSFLAVOUR" = "OSX" ]; then
 			disktool -u ${CDROM#/dev/}
 		fi
-		TRACKINFO=$($CDDISCID $CDROM)
+		if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
+			TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM | $CUE2DISCID)
+		else
+			TRACKINFO=$($CDDISCID $CDROM)
+		fi
 		# Make sure there's a CD in there by checking cd-discid's return code
-		if [ "$?" = "1" ]; then
-			echo "abcde error: CD could not be read. Perhaps there's no CD in the drive?" >&2
-			exit 1
+		if [ ! "$?" = "0" ]; then
+			if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
+				echo "abcde error: cuesheet information from the flac file could not be read." >&2
+				echo "abcde error: Perhaps the flac file does not contain a cuesheet?." >&2
+				exit 1
+			else
+				echo "abcde error: CD could not be read. Perhaps there's no CD in the drive?" >&2
+				exit 1
+			fi
 		fi
 		# In OSX, remount the disc again
 		if [ "$OSFLAVOUR" = "OSX" ]; then
@@ -1257,12 +1287,10 @@ do_discid ()
 						if [ ! "$RET" = "0" ];then
 							echo "Warning: Something went wrong while querying the CD... Maybe a DATA CD?"
 						fi
-						TRACKS="$( echo "$CDPARANOIAOUTPUT" | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ' )"
+						TRACKS="$(echo "$CDPARANOIAOUTPUT" | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
 						CDPARANOIAAUDIOTRACKS="$TRACKS"
 					else
-						if [ -f "$ABCDETEMPDIR/status" ] && checkstatus cdparanoia-audio-tracks ; then
-							TRACKS=$( cat "$ABCDETEMPDIR/cdparanoia-audio-tracks" )
-						else
+						if [ -f "$ABCDETEMPDIR/status" ] && TRACKS=$(checkstatus cdparanoia-audio-tracks); then :; else
 							TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
 						fi
 					fi
@@ -1393,10 +1421,8 @@ do_discid ()
 	fi
 	# If we got the CDPARANOIA status and it is not recorded, save it now
 	if [ -n "$CDPARANOIAAUDIOTRACKS" ]; then
-		if checkstatus cdparanoia-audio-tracks; then :; else
-			if echo "$CDPARANOIAAUDIOTRACKS" >> "$ABCDETEMPDIR/cdparanoia-audio-tracks"; then
-				echo "cdparanoia-audio-tracks" >> "$ABCDETEMPDIR/status"
-			fi
+		if checkstatus cdparanoia-audio-tracks > /dev/null 2>&1; then :; else
+			echo cdparanoia-audio-tracks=$CDPARANOIAAUDIOTRACKS >> "$ABCDETEMPDIR/status"
 		fi
 	fi
 	
@@ -2017,6 +2043,8 @@ do_cdread ()
 		LASTTRACK=$3
 		UTRACKNUM=$FIRSTTRACK
 		case "$CDROMREADERSYNTAX" in
+			### FIXME ### How are we calculating the tracks in flac mode?
+			flac) READTRACKNUMS="$FIRSTTRACK.1-$(($LASTTRACK + 1)).0" ;;
 			cdparanoia) READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;;
 			cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTRACK" ;;
 			*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
@@ -2034,7 +2062,10 @@ do_cdread ()
 	else
 		WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav"
 		case "$CDROMREADERSYNTAX" in
-		## FIXME ## Find the case for dagrab, to avoid exceptions
+		## FIXME ## Find the cases for dagrab and flac, to avoid exceptions
+			flac)
+				FILEARG="--output-name=$WAVDATA"
+				;;
 			dagrab)
 				FILEARG="-f $WAVDATA"
 				;;
@@ -2056,6 +2087,10 @@ do_cdread ()
 		fi
 	fi
 	case "$CDROMREADERSYNTAX" in
+		### FIXME ### use an exception for flac, since it uses -o
+		### FIXME ### Shall we just use -o $FILEARG ??
+		flac)
+			nice $READNICE $FLAC -d --cue=${READTRACKNUMS:-$UTRACKNUM.1-$(($UTRACKNUM + 1)).0} "$FILEARG" "$CDROM" ;;
 		cdparanoia) 
 			nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;
 		cdda2wav)
@@ -2265,6 +2300,7 @@ VORBISGAIN=vorbisgain
 MKCUE=mkcue
 MKTOC=cdrdao
 DIFF=diff
+CUE2DISCID=cue2discid
 
 # Options for programs called from abcde
 # mp3
@@ -2389,7 +2425,7 @@ fi
 
 # Parse command line options
 #while getopts 1a:A:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
-while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
+while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do
 	case "$opt" in
 		1) ONETRACK=y ;;
 		a) ACTIONS="$OPTARG" ;;
@@ -2441,16 +2477,28 @@ while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
 			 exit 1
 		   fi
 		   ;;
+		z) echo "Placeholder for a future autodebug option" ;;
 		?) usage; exit ;;
 	esac
 done
 
 shift $(($OPTIND - 1))
 
+# If the user specified a flac file, then switch to special flac mode
+if echo $CDROM | grep -i -q '.flac$'; then
+	vecho "abcde: switching to flac CDROMREADERSYNTAX..."
+	CDROMREADERSYNTAX=flac
+	if [ "$EJECTCD" = "y" ];then
+		vecho "abcde: CDROM flac mode, deactivating EJECTCD..."
+		EJECTCD=n
+	fi
+fi
+
 # Decide if we can continue.
 if [ "$ONETRACK" = "y" ]; then 
 	# FIXME # remove check as soon as we find out about the other readers
 	case "$CDROMREADERSYNTAX" in
+		flac) ;;
 		cdparanoia) ;;
 		cdda2wav) ;;
 		*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
@@ -2493,6 +2541,7 @@ DOENCODE=n
 DOPOSTPROCESS=n
 DOTAG=n
 DOMOVE=n
+DOREPLAYGAIN=n
 DOPLAYLIST=n
 DOCLEAN=n
 
@@ -2507,11 +2556,17 @@ do
 #		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";;
@@ -2604,6 +2659,10 @@ case "$CDROMREADERSYNTAX" in
 		CDROMREADER="$CDDAFS"
 		CDROMREADEROPTS="$CDDAFSOPTS"
 		;;
+	flac)
+		CDROMREADER="$FLAC"
+		CDROMREADEROPTS="$FLACOPTS"
+		;;
 esac
 
 # There's only one normalize...
@@ -2616,7 +2675,7 @@ esac
 
 # 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- )" ;;
@@ -2625,7 +2684,7 @@ if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then
 			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
@@ -2650,6 +2709,7 @@ do
 			;;
 		flac)
 			[ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
+			[ "$REPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
 			[ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
 			;;
 		spx)
@@ -2658,6 +2718,10 @@ do
 		mpc)
 			[ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc
 			;;
+		wav)
+			vecho "Unsetting the KEEPWAVS option, since the resulting wav files were requested..."
+			KEEPWAVS=move
+			;;
 		*)	echo "abcde error: Invalid OUTPUTTYPE defined" >&2
 			exit 1
 			;;
@@ -2789,6 +2853,8 @@ fi
 if [ X"$CDSPEEDVALUE" != "X" ]; then
 	case "$CDROMREADERSYNTAX" in
 		cdparanoia|debug) CDROMREADEROPTS="$CDPARANOIAOPTS -S $CDSPEEDVALUE" ;;
+		### FIXME ### translate "cue2discid" from python to bash
+		flac) NEEDMETAFLAC=y ; NEEDCUE2DISCID=y ;;
 		*) NEEDCDSPEED=y ;;
 	esac
 fi
@@ -2796,6 +2862,7 @@ fi
 # Rippers with USEPIPE support
 # FIXME # Include here all the rippers we can figure out support pipes
 PIPE_cdparanoia="-"
+PIPE_flac="-c "
 
 # Encoders with USEPIPE support
 # FIXME # Include here all the encoders we can figure out support pipes
@@ -2821,8 +2888,8 @@ if [ "$USEPIPES" = "y" ]; then
 	esac
 	if [ ! -n "$( eval echo "\$$PIPERIPPERSVARCHECK" )" ] ; then
 		echo "abcde error: no support for pipes with given ripper" >&2
-		echo "read the USEPIPES file from the source tarball to help" >&2
-		echo "on a Debian system, read /usr/share/doc/abcde/USEPIPES.gz" >&2
+		echo "read the USEPIPES file from the source tarball to get help." >&2
+		echo "On a Debian system, it is under /usr/share/doc/abcde/USEPIPES.gz" >&2
 		exit 1;
 	fi
 	if [ ! -n "$( eval echo "\$$PIPEENCODERSVARCHECK" )" ] ; then
@@ -2840,7 +2907,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
 	${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
 	${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
 	${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
-	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDCUEREADER+$CUEREADER}
+	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDCUEREADER+$CUEREADER} \
+	${NEEDCUE2DISCID+$CUE2DISCID}
 do
 	# Cut off the command-line options we just added in
 	X=$(echo $X | cut -d' ' -f2)
@@ -2897,14 +2965,15 @@ if [ "$DOCDDB" = "y" ]; then
 	fi
 	do_cddbedit
 
-	eval $($CDDBTOOL parse "$CDDBDATA")
+	eval "$($CDDBTOOL parse "$CDDBDATA")"
 fi
 
 # Before reading tracks, we set the speed of the device
 
 if [ X"$CDSPEEDVALUE" != "X" ]; then
 	case "$CDROMREADERSYNTAX" in
-		cdparanoia|debug) : ;;
+		cdparanoia|debug) ;;
+		flac) ;;
 		*) do_cdspeed ;;
 	esac
 fi
@@ -3206,7 +3275,7 @@ if [ "$DOENCODE" = "y" -a "$USEPIPES" != "y" ]; then
 fi
 # If the above didn't catch the stragglers, this will
 wait
-if checkstatus replaygain; then :; else
+if [ "$REPLAYGAIN" = "y" ]; then
 	do_replaygain
 fi
 # Check to see if run_command logged any errors