X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/22b54460ba7338e88a50fdf1a5e77ca44616519a..b1d114943002289a4b4eb3d1e04f6b7a805df1c2:/abcde

diff --git a/abcde b/abcde
index b03d2b1..b848c9a 100755
--- a/abcde
+++ b/abcde
@@ -23,7 +23,7 @@ echo "Options:"
 echo "-1     Encode the whole CD in a single file"
 echo "-a <action1[,action2]...>"
 echo "       Actions to perform:"
-echo "       cddb,musicbrainz,read,normalize,encode,tag,move,replaygain,playlist,clean"
+echo "       cddb,read,normalize,encode,tag,move,replaygain,playlist,clean"
 #echo "-A     Experimental actions (retag, transcode)"
 echo "-b     Enable batch normalization"
 #echo "-B     Disable batch replaygain (do file by file)"
@@ -48,11 +48,12 @@ 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,wav). Defaults to vorbis"
+echo "       Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a). 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]...>"
 echo "       Also encode on these remote hosts"
+echo "-R     Use local CDDB in recursive mode"
 #echo "-R     Add replaygain values to the tag info (only for vorbis,flac,mp3)"
 echo "-s <field>"
 echo "       Show dielfs from the CDDB info (year,genre)"
@@ -107,7 +108,7 @@ f_seq_row ()
 f_seq_line ()
 {
 	i=$1
-	if echo i | grep -q "[[:digit:]]" ; then
+	if echo $i | grep -q "[[:digit:]]" ; then
 		while [ $i -ne `expr $2 + 1` ]
 		do
 			printf $i" "
@@ -333,6 +334,21 @@ relpath ()
 	echo $TO
 }
 
+checkexec ()
+{
+	if [ ! "$@" = "" ]; then
+		# Cut off the command-line options we just added in
+		X=$(echo $@ | cut -d' ' -f2)
+		if [ "$(which $X)" = "" ]; then
+			log error "$X is not in your path." >&2
+			exit 1
+		elif [ ! -x $(which $X) ]; then
+			log error "$X is not executable." >&2
+			exit 1
+		fi
+	fi
+}
+
 # do_getcddbinfo
 # Finds an specific field from cddbinfo
 do_getcddbinfo()
@@ -733,6 +749,9 @@ do_tag ()
 		mpc)
 			run_command tagtrack-$OUTPUT-$1 true
 			;;
+		m4a)
+			run_command tagtrack-$OUTPUT-$1 true
+			;;
 		wav)
 			run_command tagtrack-$OUTPUT-$1 true
 			;;
@@ -815,6 +834,9 @@ do_encode ()
 			mpc)
 				TEMPARG="PIPE_$MPPENCODER"
 				;;
+			m4a)
+				TEMPARG="PIPE_$MPPENCODER"
+				;;
 		esac
 		IN="$( eval echo "\$$TEMPARG" )"
 	else
@@ -899,7 +921,7 @@ do_encode ()
 				case "$2" in
 				%local*%)
 					case "$FLACENCODERSYNTAX" in
-					flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER -f $FLACENCODEROPTS -o "$OUT" "$IN" ;; 
+					flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER -f ${IMPORTCUESHEET:+--cuesheet="$ABCDETEMPDIR/$CUEFILE"} $FLACENCODEROPTS -o "$OUT" "$IN" ;; 
 				        esac
 						;;
 					*)
@@ -933,6 +955,15 @@ 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"
 				;;
+			m4a)
+				# Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging
+				if [ ! "$DOTAG" = "y" ]; then
+					$RUN_COMMAND nice $ENCNICE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" -o "$OUT" "$IN"
+					
+				else
+					$RUN_COMMAND nice $ENCNICE $AACENCODER $AACENCODEROPTS -o "$OUT" "$IN"
+				fi
+				;;
 			wav)
 				# In case of wav output we need nothing. Just keep the wavs.
 				;;
@@ -1333,9 +1364,20 @@ do_discid ()
 			disktool -u ${CDROM#/dev/}
 		fi
 		if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
-			TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM | $CUE2DISCID)
+			if [ "$TRACKINFO" = "" ]; then
+				TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM | $CUE2DISCID)
+			else
+				if $METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM > /dev/null 2>&1 ; then :; else
+					log error "the input flac file does not contain a cuesheet."
+					exit 1
+				fi
+			fi
 		else
-			TRACKINFO=$($CDDISCID $CDROM)
+			case "$CDDBMETHOD" in
+				cddb) TRACKINFO=$($CDDISCID $CDROM) ;;
+				# FIXME # musicbrainz needs a cleanup
+				musicbrainz) TRACKINFO=$($MUSICBRAINZ -c $CDROM ) ;;
+			esac
 		fi
 		# Make sure there's a CD in there by checking cd-discid's return code
 		if [ ! "$?" = "0" ]; then
@@ -1476,7 +1518,7 @@ do_discid ()
 				exit 1
 			fi
 			rm -rf "$ABCDETEMPDIR" || exit 1
-			mkdir "$ABCDETEMPDIR"
+			mkdir -p "$ABCDETEMPDIR"
 			if [ "$?" -gt "0" ]; then
 				# Directory already exists or could not be created
 				echo "abcde: Temp directory $ABCDETEMPDIR could not be created." >&2
@@ -1498,7 +1540,7 @@ do_discid ()
 		fi
 	else
 		# We are starting from scratch
-		mkdir "$ABCDETEMPDIR"
+		mkdir -p "$ABCDETEMPDIR"
 		if [ "$?" -gt "0" ]; then
 			# Directory already exists or could not be created
 			echo "abcde: Temp directory $ABCDETEMPDIR could not be created." >&2
@@ -1530,6 +1572,9 @@ do_discid ()
 	
 	# Create the discid file
 	echo "$TRACKINFO" > "$ABCDETEMPDIR/discid"
+	if checkstatus cddbmethod > /dev/null 2>&1 ; then :; else
+		echo "cddbmethod=$CDDBMETHOD" >> "$ABCDETEMPDIR/status"
+	fi
 }
 
 # do_cleancue
@@ -1599,45 +1644,124 @@ do_localcddb ()
 {
 	if checkstatus cddb-readcomplete && checkstatus cddb-choice >/dev/null; then :; else
 	
-		CDDBLOCALSUCCESS="n"
+		CDDBLOCALSTATUS="notfound"
 		CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
-		CDDBLOCALFILE="${CDDBLOCALDIR}/${CDDBDISCID}"
 		USELOCALRESP="y"
-		
-		# If the user has selected to check a local CDDB repo, we proceed with it
-		if [ -r "${CDDBLOCALFILE}" ]; then
-			# List out disc title/author and contents
-			do_cddbparse "${CDDBLOCALFILE}"
-			echo -n "Locally cached CDDB entry found, use it? [y/n] (y): "
-			if [ "$INTERACTIVE" = "y" ]; then
-				read USELOCALRESP
-				while [ "$USELOCALRESP" != "y" ] && [ "$USELOCALRESP" != "n" ] && [ "$USELOCALRESP" != "" ] ; do
-					echo -n 'Invalid selection. Please answer "y" or "n": '
-					read USELOCALRESP
-				done
-				[ x"$USELOCALRESP" = "x" ] && USELOCALRESP="y"
-			else
-				echo "y" >&2
-			fi
-			if [ "$USELOCALRESP" = "y" ]; then
-				#echo "Using local copy of CDDB data"
-				echo "# DO NOT ERASE THIS LINE! Added by abcde to imitate cddb output" > "$ABCDETEMPDIR/cddbread.1"
-				cat "${CDDBLOCALFILE}" >> "$ABCDETEMPDIR/cddbread.1"
-				echo 999 > "$ABCDETEMPDIR/cddbquery" # Assuming 999 isn't used by CDDB
-				echo cddb-readcomplete >> "$ABCDETEMPDIR/status"
-				do_cddbparse "${CDDBLOCALFILE}" > "$ABCDETEMPDIR/cddbchoices"
-				echo cddb-choice=1 >> "$ABCDETEMPDIR/status"
-				CDDBLOCALSUCCESS="y"
+
+		if [ "$CDDBLOCALRECURSIVE" = "y" ]; then
+			CDDBLOCALRESULTS="$(find ${CDDBLOCALDIR} -name "${CDDBDISCID}" -type f 2> /dev/null)"
+			if [ ! "${CDDBLOCALRESULTS}" = "" ]; then
+				if   (( $(echo "${CDDBLOCALRESULTS}" | wc -l) == 1 )); then
+					CDDBLOCALFILE="${CDDBLOCALRESULTS}"
+					CDDBLOCALMATCH=single
+					echo "${CDDBLOCALRESULTS}" : $(echo "${CDDBLOCALRESULTS}" | wc -l )
+					echo CDDBLOCALMATCH=single
+				elif (( $(echo "${CDDBLOCALRESULTS}" | wc -l) > 1 )); then
+					CDDBLOCALMATCH=multiple
+				fi
 			else
-				#echo "Not using local copy of CDDB data"
-				CDDBLOCALSUCCESS="n"
+				CDDBLOCALMATCH=none
 			fi
+		elif [ "$CDDBLOCALMATCH" = "none" ] && [ -r "${CDDBLOCALDIR}/${CDDBDISCID}" ]; then
+			CDDBLOCALFILE="${CDDBLOCALDIR}/${CDDBDISCID}"
+			CDDBLOCALMATCH=single
 		else
-			CDDBLOCALSUCCESS="n"
+			CDDBLOCALMATCH=none
 		fi
+		
+		# If the user has selected to check a local CDDB repo, we proceed with it
+		case $CDDBLOCALMATCH in
+			multiple)
+				echo "Processing multiple matching CDDB entries..." >> "$ABCDETEMPDIR/cddblocalchoices"
+				X=0
+				echo "$CDDBLOCALRESULTS" | while read RESULT ; do
+					X=$(expr $X + 1)
+					# List out disc title/author and contents
+					CDDBLOCALREAD="$ABCDETEMPDIR/cddblocalread.$X"
+					cat "$RESULT" >> "${CDDBLOCALREAD}"
+					{	
+						echo -n "#$X: "
+						do_cddbparse "${CDDBLOCALREAD}" 
+						echo ""
+					} >> "$ABCDETEMPDIR/cddblocalchoices"
+				done
+				CDDBLOCALCHOICES=$( echo "$CDDBLOCALRESULTS" | wc -l )
+				cat "$ABCDETEMPDIR/cddblocalchoices"
+				CDDBLOCALCHOICENUM=-1
+				if [ "$INTERACTIVE" = "y" ]; then
+					while [ $CDDBLOCALCHOICENUM -lt 0 ] || [ $CDDBLOCALCHOICENUM -gt $CDDBLOCALCHOICES ]; do
+						echo -n "Locally cached CDDB entries found. Which one would you like to use (0 for none)? [0-$CDDBLOCALCHOICES]: " >&2
+						read CDDBLOCALCHOICENUM
+						[ x"$CDDBLOCALCHOICENUM" = "x" ] && CDDBLOCALCHOICENUM="1"
+					done
+				else
+					### FIXME ###
+					echo "Selected ..."
+					CDDBLOCALRESP=y
+				fi
+				if [ ! "$CDDBLOCALCHOICENUM" = "0" ]; then
+					#echo "Using local copy of CDDB data"
+					echo "# DO NOT ERASE THIS LINE! Added by abcde to imitate cddb output" > "$ABCDETEMPDIR/cddbread.1"
+					cat "$ABCDETEMPDIR/cddblocalread.$CDDBLOCALCHOICENUM" >> "$ABCDETEMPDIR/cddbread.1"
+					echo 999 > "$ABCDETEMPDIR/cddbquery" # Assuming 999 isn't used by CDDB
+					echo cddb-readcomplete >> "$ABCDETEMPDIR/status"
+					do_cddbparse "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbchoices"
+					echo cddb-choice=1 >> "$ABCDETEMPDIR/status"
+					CDDBLOCALSTATUS="found"
+				else
+					#echo "Not using local copy of CDDB data"
+					CDDBLOCALSTATUS="notfound"
+				fi
+				;;
+			single)
+				# List out disc title/author and contents
+				do_cddbparse "${CDDBLOCALFILE}"
+				if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
+					echo -n "Embedded cuesheet entry found, use ut? [y/n] (y): " >&2
+				else
+					echo -n "Locally cached CDDB entry found, use it? [y/n] (y): " >&2
+				fi
+				if [ "$INTERACTIVE" = "y" ]; then
+					read USELOCALRESP
+					while [ "$USELOCALRESP" != "y" ] && [ "$USELOCALRESP" != "n" ] && [ "$USELOCALRESP" != "" ] ; do
+						echo -n 'Invalid selection. Please answer "y" or "n": ' >&2
+						read USELOCALRESP
+					done
+					[ x"$USELOCALRESP" = "x" ] && USELOCALRESP="y"
+				else
+					echo "y" >&2
+				fi
+				if [ "$USELOCALRESP" = "y" ]; then
+					#echo "Using local copy of CDDB data"
+					echo "# DO NOT ERASE THIS LINE! Added by abcde to imitate cddb output" > "$ABCDETEMPDIR/cddbread.1"
+					cat "${CDDBLOCALFILE}" >> "$ABCDETEMPDIR/cddbread.1"
+					echo 999 > "$ABCDETEMPDIR/cddbquery" # Assuming 999 isn't used by CDDB
+					echo cddb-readcomplete >> "$ABCDETEMPDIR/status"
+					do_cddbparse "${CDDBLOCALFILE}" > "$ABCDETEMPDIR/cddbchoices"
+					echo cddb-choice=1 >> "$ABCDETEMPDIR/status"
+					CDDBLOCALSTATUS="single"
+				else
+					#echo "Not using local copy of CDDB data"
+					CDDBLOCALSTATUS="notfound"
+				fi
+				;;
+			none)
+				CDDBLOCALSTATUS="notfound"
+				;;
+		esac
 	fi
 }
 
+do_musicbrainzstat ()
+{
+	:
+}
+
+do_musizbrainz ()
+{
+	:
+}
+
 # do_cddbstat
 do_cddbstat ()
 {
@@ -1683,7 +1807,7 @@ do_cddbquery ()
 		if [ "$CDDBAVAIL" = "n" ]; then
 			ERRORCODE=no_query
 			echo 503 > "$ABCDETEMPDIR/cddbquery"
-		# The default CDDBLOCALSUCCESS is "n"
+		# The default CDDBLOCALSTATUS is "notfound"
 		# This part will be triggered if the user CDDB repo does not 
 		# contain the entry, or if we are not trying to use the repo.
 		else
@@ -1822,7 +1946,7 @@ do_cddbedit ()
 	if [ "$INTERACTIVE" = "y" ]; then
 		# We should show the CDDB results both when we are not using the local CDDB repo
 		# or when we are using it but we could not find a proper match
-		if [ "$CDDBUSELOCAL" = "y" ] && [ ! "$CDDBLOCALSUCCESS" = "y" ] || [ ! "$CDDBUSELOCAL" = "y" ]; then
+		if [ "$CDDBUSELOCAL" = "y" ] && [ "$CDDBLOCALSTATUS" = "notfound" ] || [ ! "$CDDBUSELOCAL" = "y" ]; then
 			# Display the $ABCDETEMPDIR/cddbchoices file created above
 			# Pick a pager so that if the tracks overflow the screen the user can still view everything
 			if [ -r "$ABCDETEMPDIR/cddbchoices" ]; then
@@ -1830,6 +1954,13 @@ do_cddbedit ()
 				CHOICE=$(checkstatus cddb-choice)
 				if [ -n "$CHOICE" ] ; then
 					case $CDDBCHOICES in
+						-1) if head -1 "$ABCDETEMPDIR/cddbquery" | grep -q "^$" ; then
+								log error "CDDB query failed!" 
+								exit 1
+							else
+								cat "$ABCDETEMPDIR/cddbchoices"
+							fi
+							;;
 						1) cat "$ABCDETEMPDIR/cddbchoices" ;;
 						*)
 						echo "Selected: #$CHOICE"
@@ -1928,7 +2059,7 @@ do_cddbedit ()
 			# Show the choice if we are not using the locally stored one
 			# or when the local search failed to find a match.
 			PREVIOUSCHOICE=$(checkstatus cddb-choice)
-			if [ "$CDDBUSELOCAL" = "y" ] && [ "$CDDBLOCALSUCCESS" = "n" ] || [ ! "$CDDBUSELOCAL" = "y" ]; then
+			if [ "$CDDBUSELOCAL" = "y" ] && [ "$CDDBLOCALSTATUS" = "notfound" ] || [ ! "$CDDBUSELOCAL" = "y" ]; then
 				#if [ "$PREVIOUSCHOICE" ]; then
 					cat "$ABCDETEMPDIR/cddbchoices"
 				#fi
@@ -2118,10 +2249,12 @@ do_cddbedit ()
 			fi
 		fi
 	fi
-	# Make sure the cache directory exists
-	mkdir -p $CDDBLOCALDIR
+	### FIXME ###
+	# User CDDBLOCALPOLICY to find out if we store the file or not...
 	# Cache edited CDDB entry in the user's cddb dir
-	if [ "$CDDBCOPYLOCAL" = "y" ] || [ "$COPYCDDBLOCAL" = "Y" ]; then
+	if [ "$CDDBCOPYLOCAL" = "y" ]; then
+		# Make sure the cache directory exists
+		mkdir -p $CDDBLOCALDIR
 		cat "$CDDBDATA" | tail -n $(expr $(cat "$CDDBDATA" | wc -l ) - 1 ) > ${CDDBLOCALDIR}/$(echo "$TRACKINFO" | cut -d' ' -f1)
 	fi
 
@@ -2143,6 +2276,13 @@ do_cdread ()
 		FIRSTTRACK=$2
 		LASTTRACK=$3
 		UTRACKNUM=$FIRSTTRACK
+		case "$CDROMREADERSYNTAX" in
+			flac) READTRACKNUMS="$FIRSTTRACK.1-$(($LASTTRACK + 1)).0" ;;
+			cdparanoia) READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;;
+			cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTRACK" ;;
+			*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
+				exit 1 ;;
+		esac
 	else
 		UTRACKNUM=$1
 	fi
@@ -2182,7 +2322,9 @@ do_cdread ()
 		### 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" ;;
+			# Avoid problems wit math expressions by unpadding the given UTRACKNUM
+			STRIPTRACKNUM=$(expr $UTRACKNUM + 0)
+			nice $READNICE $FLAC -d -f --cue=${READTRACKNUMS:-$STRIPTRACKNUM.1-$(($STRIPTRACKNUM + 1)).0} "$FILEARG" "$CDROM" ;;
 		cdparanoia) 
 			nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;
 		cdda2wav)
@@ -2265,7 +2407,7 @@ vecho ()
 {
 if [ x"$EXTRAVERBOSE" != "x" ]; then
 	case $1 in
-		warning) log warning "$@" ;;
+		warning) shift ; log warning "$@" ;;
 		*) echo "$@" ;;
 	esac
 fi
@@ -2321,11 +2463,17 @@ post_read ()
 ###############################################################################
 
 # Builtin defaults
+
+# CDDB
+# Defaults to FreeDB, but a python musicbrainz can be used
+CDDBMETHOD=cddb
 CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi"
 CDDBSUBMIT=freedb-submit@freedb.org
 CDDBPROTO=5
 HELLOINFO="$(whoami)@$(hostname)"
 CDDBCOPYLOCAL="n"
+CDDBLOCALPOLICY="always"
+CDDBLOCALRECURSIVE="y"
 CDDBLOCALDIR="$HOME/.cddb"
 CDDBUSELOCAL="n"
 
@@ -2333,7 +2481,7 @@ CDDBUSELOCAL="n"
 SHOWCDDBFIELDS="year,genre"
 
 INTERACTIVE=y
-CDROMREADERSYNTAX=cdparanoia
+#CDROMREADERSYNTAX=cdparanoia
 ENCODERSYNTAX=default
 
 MP3ENCODERSYNTAX=default
@@ -2341,6 +2489,7 @@ OGGENCODERSYNTAX=default
 FLACENCODERSYNTAX=default
 SPEEXENCODERSYNTAX=default
 MPPENCODERSYNTAX=default
+AACENCODERSYNTAX=default
 NORMALIZERSYNTAX=default
 CUEREADERSYNTAX=default
 
@@ -2392,6 +2541,8 @@ FLAC=flac
 SPEEXENC=speexenc
 # mpp (Musepack)
 MPPENC=mppenc
+# m4a
+AACENC=faac
 
 ID3=id3
 ID3V2=id3v2
@@ -2402,6 +2553,7 @@ DAGRAB=dagrab
 CDDAFS=cp
 CDDISCID=cd-discid
 CDDBTOOL=cddb-tool
+MUSICBRAINZ=musicbrainz-get-tracks
 EJECT=eject
 MD5SUM=md5sum
 DISTMP3=distmp3
@@ -2435,6 +2587,8 @@ FLACOPTS=
 SPEEXENCOPTS=
 # mpc
 MPPENCOPTS=
+# m4a
+AACENCOPTS=
 
 ID3OPTS=
 ID3V2OPTS=
@@ -2460,10 +2614,13 @@ MAXPROCS=1
 # List of actions to perform - by default, run to completion
 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
-# This option is basicaly for Debian package dependencies
 DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:lame,mp3:bladeenc,spx:speex
 
+# List of prefered cdromreaders - by default, run whichever we have in the path
+DEFAULT_CDROMREADERS="cdparanoia cdda2wav"
+
 # Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for Linux/OpenBSD/NetBSD.
 # Let's use these checkings to determine the OS flavour, which will be used later
 if [ X$(uname) = "XFreeBSD" ] ; then
@@ -2603,16 +2760,31 @@ 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..."
+	vecho warning "abcde: switching to flac CDROMREADERSYNTAX..."
 	CDROMREADERSYNTAX=flac
-	if [ "$EJECTCD" = "y" ];then
-		vecho "abcde: CDROM flac mode, deactivating EJECTCD..."
-		EJECTCD=n
-	fi
+	# Added a need on CUE2DISCID until we manage to convert the python script to bash.
+	NEEDCUE2DISCID=y
+	NEEDMETAFLAC=y
+	EJECTCD=n
 fi
 
 # If the user provided a DISCID, disable eject
-if [ -n "$DISCID" ]; then EJECTCD=n ; fi
+if [ -n "$DISCID" ] || [ "$CDROMREADERSYNTAX" = "flac" ]; then EJECTCD=n ; fi
+
+# Check the available cd rippers in the system, from the ones we know.
+if [ "$CDROMREADERSYNTAX" = "" ]; then
+	for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do
+		if [ -x $( which $DEFAULT_CDROMREADER ) ]; then
+			CDROMREADERSYNTAX=$DEFAULT_CDROMREADER
+			break
+		fi
+	done
+	if [ "$CDROMREADERSYNTAX" = "" ]; then
+		log error "no cdreader found in your PATH"
+		log error "hints: are all dependencies installed? has the \$PATH been modified?"
+		exit 1
+	fi
+fi
 
 # Decide if we can continue.
 if [ "$ONETRACK" = "y" ]; then 
@@ -2658,7 +2830,6 @@ fi
 # Determine what actions are to be done from $ACTIONS and set the
 # following environment variables for them:
 DOCDDB=n
-DOMUSICBRAINZ=n
 DOREAD=n
 DONORMALIZE=n
 DOPREPROCESS=n
@@ -2674,7 +2845,6 @@ for ACTION in $(echo $ACTIONS | tr , \ )
 do
 	case $ACTION in
 		cddb) DOCDDB=y;;
-		musicbrainz) DOMUSICBRAINZ=y;;
 		read) DOREAD=y;;
 		normalize) DONORMALIZE=y; DOREAD=y;;
 #		preprocess) DOPREPROCESS=y; DOREAD=y;;
@@ -2838,6 +3008,7 @@ if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then
 			flac:*)	FLACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
 			spx:*)	SPEEXENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
 			mpc:*)	MPPENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+			m4a:*)  AACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
 		esac
 	done
 	for OUTPUT in "$(echo "$OUTPUTTYPE" | tr , \ )"; do
@@ -2847,7 +3018,8 @@ if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then
 	OUTPUTTYPE="$TEMPOUTPUTTYPE"
 fi
 
-# If nothing has been specified, use oggenc for oggs and lame for mp3s and flac for flacs and speexenc for speex and mppenc for mpps
+# If nothing has been specified, use oggenc for oggs and lame for mp3s and flac
+# for flacs and speexenc for speex and mppenc for mpps and faac for m4as
 
 # Getting ready for multiple output changes
 for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
@@ -2868,6 +3040,9 @@ do
 			[ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
 			[ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
 			[ "$DOREPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
+			if [ "$ONETRACK" = "y" ]; then
+				[ "$MAKECUEFILE" = "y" ] && IMPORTCUESHEET=y
+			fi
 			;;
 		spx)
 			[ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc
@@ -2877,6 +3052,9 @@ do
 			[ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc
 			[ "$DOREPLAYGAIN" = "y" ] && NEEDMPPGAIN=y
 			;;
+		m4a)
+			[ "$AACENCODERSYNTAX" = "default" ] && AACENCODERSYNTAX=faac
+			;;
 		wav)
 			if [ "$KEEPWAVS" = "y" ]; then
 				vecho "Unsetting the KEEPWAVS option, since the resulting wav files were requested..."
@@ -2957,7 +3135,12 @@ case "$MPPENCODERSYNTAX" in
 		MPPENCODER="$MPPENC"
 		;;
 esac
-		
+case "$AACENCODERSYNTAX" in
+	faac)
+		AACENCODEROPTS="${AACENCODEROPTSCLI:-$AACENCOPTS}"
+		AACENCODER="$AACENC"
+		;;
+esac
 # and which tagger
 
 if [ "$ID3TAGV" = "1" ]; then
@@ -2982,6 +3165,12 @@ case "$CUEREADERSYNTAX" in
 		;;
 esac
 
+# which information retrieval tool are we using?
+case "$CDDBTOOL" in
+	cddb) ;;
+	musicbrainz) ;;
+esac
+
 # Check if both OGGEOUTPUTCONTAINER and FLACOUTPUTCONTAINER are the same, and differentiante them
 if [ X"$OGGOUTPUTCONTAINER" = "Xogg" ] && [ X"$FLACOUTPUTCONTAINER" = "Xogg" ]; then
 	log error "FLAC on an Ogg container is not yet supported"
@@ -3015,17 +3204,21 @@ if [ "$EJECTCD" = "y" ]; then
 	NEEDEJECT=y
 fi
 if [ ! "$CDDBAVAIL" = "n" ] && [ "$DOCDDB" = "y" ]; then
-	NEEDHTTPGET=y
+	if [ "$CDDBMETHOD" = "cddb" ]; then
+		NEEDHTTPGET=y
+	elif [ "$CDDBMETHOD" = "musicbrainz" ]; then
+		:
+	fi
 fi
 if [ "$MAKECUEFILE" = "y" ]; then
 	NEEDCUEREADER=y
 fi
 
-if [ X"$CDSPEEDVALUE" != "X" ]; then
+if [ X"$CDSPEEDVALUE" != "X" ] && [ "$DOREAD" = "y"]; then
 	case "$CDROMREADERSYNTAX" in
 		cdparanoia|debug) CDROMREADEROPTS="$CDPARANOIAOPTS -S $CDSPEEDVALUE" ;;
 		### FIXME ### translate "cue2discid" from python to bash
-		flac) NEEDMETAFLAC=y ; NEEDCUE2DISCID=y ;;
+		flac) NEEDMETAFLAC=y ; NEEDCUE2DISCID=y ; CDSPEEDVALUE="" ;;
 		*) NEEDCDSPEED=y ;;
 	esac
 fi
@@ -3088,47 +3281,58 @@ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
 	${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
 	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMP3GAIN+$MP3GAIN} \
 	${NEEDMPPGAIN+$MPPGAIN} \
-	${NEEDCUEREADER+$CUEREADER} ${NEEDCUE2DISCID+$CUE2DISCID}
+	${NEEDCUEREADER+$CUEREADER}
 do
-	# Cut off the command-line options we just added in
-	X=$(echo $X | cut -d' ' -f2)
-	if [ "$(which $X)" = "" ]; then
-		log error "$X is not in your path." >&2
-		exit 1
-	elif [ ! -x $(which $X) ]; then
-		log error "$X is not executable." >&2
-		exit 1
-	fi
+	checkexec "$X"
 done
 
-CDROMREADER="$CDROMREADER $CDROMREADEROPTS"
-CDDBTOOL="$CDDBTOOL $CDDBTOOLOPTS"
-HTTPGET="$HTTPGET $HTTPGETOPTS"
-
 # And last but not least, check if we can diff between files
 if [ -x $(which $DIFF) ]; then :; else
 	vecho warning "Disabling diff since we cannot find it in the \$PATH..."
 	DIFF=""
 fi
 
+# Now that we have metaflac, check if we need cue2discid
+case $CDROMREADERSYNTAX in
+	flac)
+		TRACKINFO=$($METAFLAC --show-tag=CDDB $CDROM | cut -d"=" -f2 | egrep "[a-f0-9]{8}")
+		if [ "$TRACKINFO" = "" ]; then 
+			checkexec ${NEEDCUE2DISCID+$CUE2DISCID}
+		fi
+		;;
+esac
+
+CDROMREADER="$CDROMREADER $CDROMREADEROPTS"
+CDDBTOOL="$CDDBTOOL $CDDBTOOLOPTS"
+HTTPGET="$HTTPGET $HTTPGETOPTS"
+
 # Here it used to say:
 # One thousand lines in, we can start doing stuff with things
-# Well, right now we are at line 2736 ;)
+# Well, right now we are at line 3306 ;)
 
 # Export needed things so they can be read in this subshell
 export CDDBTOOL ABCDETEMPDIR TRACKQUEUE LOWDISK EJECTCD EJECT EJECTOPTS
 export CDROM CDDBDATA REMOTEHOSTS MAXPROCS HTTPGET MD5SUM
 
-# User-definable function to set some things. Use it for
-#  - closing the CD tray with eject -t
-#  - set the CD speed value with eject -x
-vecho -n "Executing customizable pre-read function... "
+if [ "$DOREAD" = "y" ]; then
+	# User-definable function to set some things. Use it for
+	#  - closing the CD tray with eject -t
+	#  - set the CD speed value with eject -x
+	vecho -n "Executing customizable pre-read function... "
 
-pre_read # Execute the user-defined pre-read funtion. Close the CD with it.
+	pre_read # Execute the user-defined pre-read funtion. Close the CD with it.
 
-vecho "done."
+	vecho "done."
+fi
 
-do_discid # Get ABCDETEMPDIR created and status file initialized
+case "$CDDBMETHOD" in
+	cddb)
+		do_discid # Get ABCDETEMPDIR created and status file initialized
+		;;
+	musicbrainz)
+		do_musicbrainz
+		;;
+esac
 
 if [ "$DOCDDB" = "y" ]; then
 	if [ $CDDBUSELOCAL = "y" ]; then
@@ -3137,10 +3341,17 @@ if [ "$DOCDDB" = "y" ]; then
 	if checkstatus cddb-choice > /dev/null; then
 		:
 	else 
-		if [ ! "$CDDBLOCALSUCCESS" = "y" ] ; then
-			do_cddbstat
-			do_cddbquery
-			do_cddbread
+		if [ "$CDDBLOCALSTATUS" = "notfound" ] ; then
+			case "$CDDBMETHOD" in
+				cddb)
+					do_cddbstat
+					do_cddbquery
+					do_cddbread
+					;;
+				musicbrainz)
+					do_musicbrainz
+					;;
+			esac
 		fi
 	fi
 	do_cddbedit
@@ -3186,6 +3397,10 @@ if [ "$LOWDISK" = "y" ] || [ "$ONETRACK" = "y" ]; then
 fi
 
 if [ "$ONETRACK" = "y" ]; then 
+	# Reuse the CUEFILE in case we created it in a previous run
+	if CUEFILE=$(checkstatus cuefile) >/dev/null ; then
+		IMPORTCUESHEET=y
+	fi
 	TRACKS="$FIRSTTRACK"
 	if checkstatus readtrack-$FIRSTTRACK; then :; else
 		if [ "$USEPIPES" = "y" ]; then