X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/156f84a5214e88d8f66f388ac08b8deedc5b39d7..d68ebfffb7417f90492b113c50f517893aac878d:/abcde

diff --git a/abcde b/abcde
index 70726f4..c7f5642 100755
--- a/abcde
+++ b/abcde
@@ -1,12 +1,12 @@
 #!/bin/bash
 # Copyright (c) 1998-2001 Robert Woodcock <rcw@debian.org>
-# Copyright (c) 2003-2005 Jesus Climent <jesus.climent@hispalinux.es>
+# Copyright (c) 2003-2006 Jesus Climent <jesus.climent@hispalinux.es>
 # This code is hereby licensed for public consumption under either the
 # GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # Copyright for this work is to expire January 1, 2010, after which it
 # shall be public domain.
@@ -59,7 +59,8 @@ echo "       Show dielfs from the CDDB info (year,genre)"
 echo "-S <#> Set the CD speed"
 echo "-t <#> Start the track numbering at a given number"
 echo "-T <#> Same as -t but modifies tag numbering"
-echo "-u     Use UNICODE tags and comments"
+echo "-u     Use UNICODE (UTF8) tags and comments"
+echo "-U     Do NOT use UNICODE (UTF8) tags and comments"
 echo "-v     Show version number and exit"
 echo "-V     Be a bit more verbose about what is happening behind the scenes"
 echo "-x     Eject CD after all tracks are read"
@@ -168,7 +169,7 @@ checkstatus ()
 	fi
 }
 
-# chechwarnings [blurb]
+# checkwarnings [blurb]
 # Returns "0" if the blurb was found (meaning there was an warning),
 # returns 1 if it wasn't (yes this is a little backwards).
 # Does not print the blurb on stdout.
@@ -424,6 +425,60 @@ gettracknum()
 	fi
 }
 
+# makeids
+#
+# Calculate cddb disc ids without requiring specialized helper programs.
+# largely copied from cd-discid and musicbrainz examples.  some of the steps
+# don't make sense, but they're necessary to match the ids generated by other
+# programs.
+#
+## FIXME ## Right now, we get 2 frames more than with cue2discid ??
+# data@petit:~$ sh /tmp/cue2discid /home/data/tmp/flac/01.Roisin_Murphy--Ruby_Blue.flac
+# processing offsetimes 00:00:00 04:47:10 08:20:37 11:46:46 17:45:36 21:41:57 27:32:21 32:03:73 35:39:28 38:27:33 43:50:38 44:42:34
+# 980b4b0c 12 150 21685 37687 53146 80061 97782 124071 144448 160603 173208 197438 201334 2895
+# data@petit:~$ metaflac --export-cuesheet-to=- /home/data/tmp/flac/01.Roisin_Murphy--Ruby_Blue.flac| python /home/data/sources/abcde/trunk/examples/cue2discid
+# 980b4b0c 12 150 21685 37687 53146 80061 97782 124071 144448 160603 173208 197438 201334 2893
+#
+# Variables: OFFSETS, TRACKS, LEADOUT, [LEADIN]
+makeids ()
+{
+	if [ X"$LEADOUT" = "X" ]; then
+		log warning "Error trying to calculate disc ids without lead-out information."
+		exit 1
+	fi
+
+	# default to a two second lead-in
+	IDMAGICNUM=150
+	LEADIN=${LEADIN:=150}
+
+	# number of cdframes per second
+	CDFRAMES=75
+
+	# reset cddb checksum for cddb disc-id calululation
+	CDDBCKSUM=0
+
+	COOKEDOFFSETS=""
+	for OFFSET in $(echo $OFFSETS)
+	do
+		COOKEDOFFSETS="${COOKEDOFFSETS} $(($OFFSET + $LEADIN))"
+
+		OFFSETTIME=$(( ($OFFSET + $LEADIN) / $CDFRAMES  ))
+		while [ $OFFSETTIME -gt 0 ]; do
+			CDDBCKSUM=$(($CDDBCKSUM + $OFFSETTIME % 10))
+			OFFSETTIME=$(($OFFSETTIME / 10))
+		done
+
+	done
+
+	COOKEDOFFSETS="${COOKEDOFFSETS:1}"  # eat the leading space
+
+	PREGAP=$(($(echo $OFFSETS | cut -f1 -d' ')))
+	TOTALTIME=$(( (($LEADOUT + $LEADIN + $PREGAP) / $CDFRAMES) - (($LEADIN + $PREGAP) / $CDFRAMES)))
+
+	printf -v HEXSUM "%08lx" $(( ($CDDBCKSUM % 0xff) << 24 | $TOTALTIME << 8 | $TRACKS))
+	TRACKINFO="${HEXSUM} $((TRACKS)) ${COOKEDOFFSETS} $((($LEADOUT + $LEADIN + $IDMAGICNUM) / $CDFRAMES))"
+}
+
 do_replaygain()
 {
 	if checkstatus replaygain; then :; else
@@ -452,10 +507,18 @@ do_replaygain()
 				ARTISTFILE="$(mungefilename "$TRACKARTIST")"
 				ALBUMFILE="$(mungefilename "$DALBUM")"
 				gettracknum
-				if [ "$VARIOUSARTISTS" = "y" ]; then
-					OUTPUTFILE="$(eval echo "$VAOUTPUTFORMAT")"
-				else
-					OUTPUTFILE="$(eval echo "$OUTPUTFORMAT")"
+				if [ "$ONETRACK" = "y" ]; then 
+					if [ "$VARIOUSARTISTS" = "y" ]; then
+						OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\")"
+					else
+						OUTPUTFILE="$(eval echo \""$ONETRACKOUTPUTFORMAT"\")"
+					fi
+				else	
+					if [ "$VARIOUSARTISTS" = "y" ]; then
+						OUTPUTFILE="$(eval echo \""$VAOUTPUTFORMAT"\")"
+					else
+						OUTPUTFILE="$(eval echo \""$OUTPUTFORMAT"\")"
+					fi
 				fi
 				OUTPUTFILES[$REPLAYINDEX]="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
 				(( REPLAYINDEX = $REPLAYINDEX + 1 ))
@@ -926,18 +989,16 @@ do_encode ()
 		do
 			case "$TMPOUTPUT" in
 				vorbis|ogg)
-					OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
 					OUTPUT=$OGGOUTPUTCONTAINER
 					;;
 				flac)
-					OUT="$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
 					OUTPUT=$FLACOUTPUTCONTAINER
 					;;
 				*)
-					OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
 					OUTPUT=$TMPOUTPUT
 					;;
 			esac
+			OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
 			if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then 
 				continue
 			fi
@@ -1242,11 +1303,19 @@ do_move ()
 		gettracknum
 		# Supported variables for OUTPUTFORMAT are GENRE, YEAR, ALBUMFILE,
 		# ARTISTFILE, TRACKFILE, and TRACKNUM.
-		if [ "$VARIOUSARTISTS" = "y" ]; then
-			OUTPUTFILE="$(eval echo "$VAOUTPUTFORMAT")"
-		else
-			OUTPUTFILE="$(eval echo "$OUTPUTFORMAT")"
-		fi
+		if [ "$ONETRACK" = "y" ]; then 
+			if [ "$VARIOUSARTISTS" = "y" ]; then
+				OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\")"
+			else
+				OUTPUTFILE="$(eval echo \""$ONETRACKOUTPUTFORMAT"\")"
+		    	fi
+		else	
+			if [ "$VARIOUSARTISTS" = "y" ]; then
+				OUTPUTFILE="$(eval echo \""$VAOUTPUTFORMAT"\")"
+			else
+				OUTPUTFILE="$(eval echo \""$OUTPUTFORMAT"\")"
+			fi
+ 		fi
 		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
@@ -1391,9 +1460,9 @@ do_playlist ()
 				# TRACKNUM value before evaluation
 				gettracknum
 				if [ "$VARIOUSARTISTS" = "y" ]; then
-					OUTPUTFILE="$(eval echo "$VAOUTPUTFORMAT")"
+					OUTPUTFILE="$(eval echo \""$VAOUTPUTFORMAT\"")"
 				else
-					OUTPUTFILE="$(eval echo "$OUTPUTFORMAT")"
+					OUTPUTFILE="$(eval echo \""$OUTPUTFORMAT\"")"
 				fi
 				if [ "$VARIOUSARTISTS" = "y" ]; then
 					if [ "$VAPLAYLISTDATAPREFIX" ] ; then
@@ -1436,20 +1505,59 @@ do_discid ()
 		if [ "$OSFLAVOUR" = "OSX" ]; then
 			disktool -u ${CDROM#/dev/}
 		fi
-		if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
-			if $METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM > /dev/null 2>&1 ; then
-				TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM | $CUE2DISCID)
-			else
-				log error "the input flac file does not contain a cuesheet."
-				exit 1
-			fi
-		else
-			case "$CDDBMETHOD" in
-				cddb) TRACKINFO=$($CDDISCID $CDROM) ;;
-				# FIXME # musicbrainz needs a cleanup
-				musicbrainz) TRACKINFO=$($MUSICBRAINZ -c $CDROM ) ;;
-			esac
-		fi
+		case "$CDROMREADERSYNTAX" in
+			flac)
+				if $METAFLAC $METAFLACOPTS --export-cuesheet-to=- "$CDROM" > /dev/null 2>&1 ; then
+					case "$CUE2DISCID" in
+						builtin)
+							CUESHEET="$(metaflac $METAFLACOPTS --export-cuesheet-to=- "$CDROM")"
+
+							#TRACKS=$(echo $CUESHEET | egrep "TRACK \+[[:digit:]]\+ \+AUDIO" |wc -l)
+							#TRACKS=0
+							OFFSETTIMES=( $(echo "$CUESHEET" | sed -n -e's/\ *INDEX 01\ \+//p' ) )
+							TRACKS=${#OFFSETTIMES[@]}
+							unset OFFSETS
+							#echo "processing offsetimes ${OFFSETTIMES[@]}"
+							for OFFSETTIME in ${OFFSETTIMES[@]}; do
+								OFFSETS="$OFFSETS $(( 10#${OFFSETTIME:0:2} * 4500 + 10#${OFFSETTIME:3:2} * 75 + 10#${OFFSETTIME:6:2} ))"
+								#OFFSETS[${#OFFSETS[*]}]=$(( 10#${OFFSETTIME:0:2} * 4500 + 10#${OFFSETTIME:3:2} * 75 + 10#${OFFSETTIME:6:2} ))
+							done
+
+							LEADOUT=$(( $(echo "$CUESHEET" | grep lead-out | get_last) / 44100 * 75 ))
+							LEADIN=$(( $(echo "$CUESHEET" | grep lead-in | get_last) / 44100 * 75 ))
+							makeids
+						;;
+						*)
+							TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- "$CDROM" | $CUE2DISCID)
+						;;
+					esac
+				else
+					log error "the input flac file does not contain a cuesheet."
+					exit 1
+				fi
+				;;
+#			cdparanoia|debug)
+#				CDPARANOIAOUTPUT="$( $CDROMREADER -$CDPARANOIACDROMBUS $CDROM -Q --verbose 2>&1 )"
+#				RET=$?
+#				if [ ! "$RET" = "0" ];then
+#					log 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' ' ')"
+#				CDPARANOIAAUDIOTRACKS="$TRACKS"
+#
+#				LEADOUT="$(echo "$CDPARANOIAOUTPUT" | egrep -o '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)"
+#				OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')" 
+#				makeids
+#				;;
+			*)
+				case "$CDDBMETHOD" in
+					cddb) TRACKINFO=$($CDDISCID $CDROM) ;;
+					# FIXME # musicbrainz needs a cleanup
+					musicbrainz) TRACKINFO=$($MUSICBRAINZ -c $CDROM ) ;;
+				esac
+				;;
+		esac
 		# Make sure there's a CD in there by checking cd-discid's return code
 		if [ ! "$?" = "0" ]; then
 			if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
@@ -1485,7 +1593,7 @@ do_discid ()
 
 	ABCDETEMPDIR="$WAVOUTPUTDIR/abcde.$(echo $TRACKINFO | cut -f1 -d' ')"
 	if [ -z "$TRACKQUEUE" ]; then
-		if [ ! "$STRIPDATATRACKS" = "y" ]; then
+		if [ ! "$STRIPDATATRACKS" = "n" ]; then
 			case "$CDROMREADERSYNTAX" in
 				cdparanoia|debug)
 					if [ "$WEHAVEACD" = "y" ]; then
@@ -1635,7 +1743,7 @@ do_discid ()
 					if $CUEREADER $CUEREADEROPTS > "$ABCDETEMPDIR/$CUEFILE"; then
 						echo cuefile=$CUEFILE >> "$ABCDETEMPDIR/status"
 					else
-						log warning "reading the CUE sheet with mkcue is still considered experimental"
+						log warning "reading the CUE sheet is still considered experimental"
 						log warning "and there was a problem with the CD reading. abcde will continue,"
 						log warning "but consider reporting the problem to the abcde author"
 					fi
@@ -1673,7 +1781,7 @@ do_cleancue()
 			echo "TITLE \"$DALBUM\"" >> "$CUEFILE_OUT"
 			cat "$CUEFILE_IN" | while read line
 			do
-				if echo "$line" | grep "INDEX" > /dev/null 2>&1 ; then
+				if echo "$line" | grep "INDEX 01" > /dev/null 2>&1 ; then
 					eval track="\$TRACK$n"
 					n=$(expr $n + 1)
 					echo "TITLE \"$track\"" >> "$CUEFILE_OUT"
@@ -1760,9 +1868,11 @@ do_localcddb ()
 						echo -n "#$X: "
 						do_cddbparse "${CDDBLOCALREAD}" 
 						echo ""
+						##FIXME## QUICK HACK !!!!
+						if [ ! "$INTERACTIVE" = "y" ]; then break ; fi
 					} >> "$ABCDETEMPDIR/cddblocalchoices"
 				done
-				if [ $(cat "$ABCDETEMPDIR/cddblocalchoices" | wc -l) -ge 24 ]; then
+				if [ $(cat "$ABCDETEMPDIR/cddblocalchoices" | wc -l) -ge 24 ] && [ "$INTERACTIVE" = "y" ]; then
 					page "$ABCDETEMPDIR/cddblocalchoices"
 				else
 					# It's all going to fit in one page, cat it
@@ -1789,8 +1899,9 @@ do_localcddb ()
 					done
 				else
 					### FIXME ###
-					echo "Selected ..."
+					#echo "Selected ..."
 					CDDBLOCALRESP=y
+					CDDBLOCALCHOICENUM=1
 				fi
 				if [ ! "$CDDBLOCALCHOICENUM" = "0" ]; then
 					#echo "Using local copy of CDDB data"
@@ -1809,11 +1920,11 @@ do_localcddb ()
 			single)
 				# List out disc title/author and contents
 				do_cddbparse "${CDDBLOCALFILE}"
-				if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
-					echo -n "Embedded cuesheet entry found, use it? [y/n] (y): " >&2
-				else
+				#if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
+				#	echo -n "Embedded cuesheet entry found, use it? [y/n] (y): " >&2
+				#else
 					echo -n "Locally cached CDDB entry found, use it? [y/n] (y): " >&2
-				fi
+				#fi
 				if [ "$INTERACTIVE" = "y" ]; then
 					read USELOCALRESP
 					while [ "$USELOCALRESP" != "y" ] && [ "$USELOCALRESP" != "n" ] && [ "$USELOCALRESP" != "" ] ; do
@@ -1850,7 +1961,7 @@ do_musicbrainzstat ()
 	:
 }
 
-do_musizbrainz ()
+do_musicbrainz ()
 {
 	:
 }
@@ -2562,7 +2673,7 @@ post_read ()
 CDDBMETHOD=cddb
 CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi"
 CDDBSUBMIT=freedb-submit@freedb.org
-CDDBPROTO=5
+CDDBPROTO=6
 HELLOINFO="$(whoami)@$(hostname)"
 CDDBCOPYLOCAL="n"
 CDDBLOCALPOLICY="always"
@@ -2709,7 +2820,7 @@ ACTIONS=cddb,read,encode,tag,move,clean
 
 # This option is basicaly for Debian package dependencies: 
 # List of prefered outputs - by default, run with whatever we have in the path
-DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:lame,mp3:bladeenc,spx:speex
+DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:lame,mp3:bladeenc,spx:speex,m4a:faac
 
 # List of prefered cdromreaders - by default, run whichever we have in the path
 DEFAULT_CDROMREADERS="cdparanoia cdda2wav"
@@ -2737,7 +2848,7 @@ elif [ X$(uname) = "XNetBSD" ] ; then
 	HTTPGET=ftp
 	MD5SUM=md5
 	OSFLAVOUR=NBSD
-elif [ X$(uname) = "Solaris" ] ; then
+elif [ X$(uname) = "SunOS" ] ; then
 	HTTPGET=""
 	MD5SUM=md5
 	OSFLAVOUR=SunOS
@@ -2776,7 +2887,7 @@ if [ "$HTTPGETOPTS" = "" ] ; then
 		wget) HTTPGETOPTS="-q -O -";;
 		curl) HTTPGETOPTS="-f -s";;
 		fetch)HTTPGETOPTS="-q -o -";;
-		ftp)  HTTPGETOPTS="-q -o -";;
+		ftp)  HTTPGETOPTS="-a -V -o - ";;
 		*) log warning "HTTPGET in non-standard and HTTPGETOPTS are not defined." ;;
 	esac
 fi
@@ -2811,7 +2922,6 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do
 		C) DISCID="$( echo ${OPTARG#abcde.} | tr -d /)" ;;
 		d) CDROM="$OPTARG" ;;
 		D) set -x ;;
-		e) ERASEENCODEDSTATUS=y ;;
 		h) usage; exit ;;
 		e) ERASEENCODEDSTATUS=y ;;
 		E) ENCODING="$OPTARG" ;;
@@ -2836,6 +2946,7 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do
 		t) STARTTRACKNUMBER="$OPTARG" ;;
 		T) STARTTRACKNUMBER="$OPTARG" ; STARTTRACKNUMBERTAG="y" ;;
 		u) CDDBPROTO=6 ;;
+		U) CDDBPROTO=5 ;;
 		v) 
 		   echo "This is abcde v$VERSION."
 		   echo "Usage: abcde [options] [tracks]"
@@ -2853,6 +2964,7 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do
 		   fi
 		   ;;
 		z) DEBUG=y ; CDROMREADERSYNTAX=debug ; EJECTCD="n" ;;
+		Z) CUE2DISCID=builtin;;
 		?) usage; exit ;;
 	esac
 done
@@ -2871,8 +2983,11 @@ if echo "$CDROM" | grep -i '.flac$' > /dev/null 2>&1 ; then
 	fi
 	vecho warning "switching to flac CDROMREADERSYNTAX..."
 	CDROMREADERSYNTAX=flac
-	# Added a need on CUE2DISCID until we manage to convert the python script to bash.
-	NEEDCUE2DISCID=y
+	# We have a builtin version of cue2discid...
+	case "$CUE2DISCID" in
+		builtin);;
+		*) NEEDCUE2DISCID=y;;
+	esac
 	NEEDMETAFLAC=y
 	EJECTCD=n
 fi
@@ -3109,7 +3224,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 \  \|| tr , \ | tr \| \ )"; do
 		case "$OUTPUT" in
 			vorbis:*|ogg:*)	OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
 			mp3:*)	MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
@@ -3148,6 +3263,7 @@ do
 			[ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
 			[ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
 			[ "$DOREPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
+			[ "$ONETRACK" = "y" ] && [ "$MAKECUEFILE" = "y" ] && NEEDMETAFLAC=y 
 			;;
 		spx)
 			[ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc
@@ -3380,6 +3496,7 @@ fi
 # Make sure a buncha things exist
 for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
 	$OGGENCODER $FLACENCODER $SPEEXENCODER $MPPENCODER \
+	$AACENCODER \
 	${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \
 	${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
 	${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
@@ -3490,7 +3607,7 @@ fi
 if checkstatus onetrack ; then ONETRACK=y ; fi
 
 if [ "$ONETRACK" = "y" ]; then 
-	# Reuse the CUEFILE in case we created it in a previous run
+	# Reuse the CUEFILE in case we created it (now or in a previous run)
 	if CUEFILE=$(checkstatus cuefile); then
 		IMPORTCUESHEET=y
 	fi
@@ -3721,6 +3838,8 @@ do
 	fi
 	# Don't proceed with the rest of the loop if we can't encode
 	if [ "$ABORT" ]; then continue; fi
+	## FIXME ## Add here 
+	## run_command tagtrack-$OUTPUT-$1 $METAFLAC $METAFLACOPTS ${IMPORTCUESHEET:+--import-cuesheet-from="$ABCDETEMPDIR/$CUEFILE"} --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
 	# Set TRACKNUM, TRACKNAME
 	if [ -e "$CDDBDATA" ]; then
 		if [ "$ONETRACK" = "y" ]; then 
@@ -3777,8 +3896,9 @@ done
 
 # Go through it again and make sure there's no distmp3 stragglers, otherwise
 # we'll delete the files they're working on
+# Do NOT play ball if there is no ball to play (so ABORT if needed)
 ## FIXME ## Check also for files which are encoded using PIPEs.
-if [ "$DOENCODE" = "y" -a "$USEPIPES" != "y" ]; then
+if [ "$DOENCODE" = "y" ] && [ "$USEPIPES" != "y" ] && [ ! "$ABORT" ]; then
 	PROCEED=
 	until [ $PROCEED ]
 	do