X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/5b9629b00e0d20fac9463e476db9f4bc42495e9c..b8d3298b2658dd405fc8fbdda7128622211bc97e:/abcde

diff --git a/abcde b/abcde
index c4d19d3..af8c2e5 100755
--- a/abcde
+++ b/abcde
@@ -46,11 +46,14 @@ echo "-L     Use local CDDB storage directory"
 echo "-n     No lookup. Don't query CDDB, just create and use template"
 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 "       WARNING: Deprecated. Use \"cue\" action"
+#echo "-M     Create a CUE file"
 echo "-o <type1[,type2]...>"
 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 "-q <level>"
+echo "       Set quality level (high,medium,low)"
 echo "-r <host1[,host2]...>"
 echo "       Also encode on these remote hosts"
 echo "-R     Use local CDDB in recursive mode"
@@ -59,7 +62,6 @@ 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 (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"
@@ -169,7 +171,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.
@@ -353,9 +355,18 @@ checkexec ()
 	if [ ! "$@" = "" ]; then
 		# Cut off any command-line option we added in
 		X=$(echo $@ | cut -d' ' -f2)
+		# Test for built-in abcde.function
+		[ "$X" != "${X#abcde.}" ] && type $X >/dev/null 2>&1 && return
 		if [ "$(which $X)" = "" ]; then
 			log error "$X is not in your path." >&2
 			log info  "Define the full path to the executable if it exists on your system." >&2
+			if [ -e /etc/debian_release ] ; then
+				case $X in
+					oggenc) MISSING_PACKAGE=vorbis-tools ;;
+					lame)   MISSING_PACKAGE=lame ;;
+					flac)   MISSING_PACKAGE=flac ;;
+				esac
+				log info "Hint: apt-get install $MISSING_PACKAGE" >&2
 			exit 1
 		elif [ ! -x "$(which $X)" ]; then
 			log error "$X is not executable." >&2
@@ -425,6 +436,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
@@ -471,16 +536,16 @@ do_replaygain()
 			done
 			case "$OUTPUT" in
 				flac)
-					run_command replaygain-flac $METAFLAC --add-replay-gain "${OUTPUTFILES[@]}"
+					run_command replaygain-flac nice $ENCNICE $METAFLAC --add-replay-gain "${OUTPUTFILES[@]}"
 					;;
 				vorbis|ogg)
-					run_command replaygain-vorbis $VORBISGAIN --album "${OUTPUTFILES[@]}"
+					run_command replaygain-vorbis nice $ENCNICE $VORBISGAIN --album "${OUTPUTFILES[@]}"
 					;;
 				mp3)
-					run_command replaygain-mp3 $MP3GAIN -a "${OUTPUTFILES[@]}"
+					run_command replaygain-mp3 nice $ENCNICE $MP3GAIN -a "${OUTPUTFILES[@]}"
 					;;
 				mpc)
-					run_command replaygain-mpc $MPPGAIN --auto "${OUTPUTFILES[@]}"
+					run_command replaygain-mpc nice $ENCNICE $MPPGAIN --auto "${OUTPUTFILES[@]}"
 					;;
 				*);;
 			esac
@@ -731,26 +796,30 @@ do_tag ()
 				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 \
+					run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \
 						--comment=::"$COMMENTOUTPUT" -A "$DALBUM" \
 						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
-						-G "$GENREID" -n "${TRACKNUM:-$1}" "${TRACKNUM:+-N $TRACKS}" \
+						-G "$GENREID" -n "${TRACKNUM:-$1}" \
+						"${TRACKNUM:+-N $TRACKS}" \
 						"${ENCODING:+--set-encoding=$ENCODING}" \
 						"$ABCDETEMPDIR/track$1.$OUTPUT"
 					;;
 				# FIXME # Still not activated...
 				id3ed)
-					run_command tagtrack-$OUTPUT-$1 $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
-						-a "$DALBUM" -n "$TRACKARTIST" -s "$TRACKNAME" -y "$CDYEAR" \
-						-g "$GENREID" -k "${TRACKNUM:-$1}" \
+					run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
+						$TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
+						-a "$DALBUM" -n "$TRACKARTIST" -s "$TRACKNAME" \
+						-y "$CDYEAR" -g "$GENREID" -k "${TRACKNUM:-$1}" \
 						"$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}" \
+					run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
+						$TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
+						-A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
+						-y "$CDYEAR" -g "$GENREID" \
+						-T "${TRACKNUM:-$1/$TRACKS}" \
 						"$ABCDETEMPDIR/track$1.$OUTPUT"
 					;;
 			esac
@@ -763,7 +832,9 @@ do_tag ()
 						mv "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER"
 					fi
 					(
-					# These are from http://www.xiph.org/ogg/vorbis/doc/v-comment.html
+					# These are from
+					# http://www.xiph.org/ogg/vorbis/doc/v-comment.html
+
 					echo ARTIST="$TRACKARTIST"
 					echo ALBUM="$DALBUM"
 					echo TITLE="$TRACKNAME"
@@ -781,9 +852,11 @@ do_tag ()
 							*)   echo COMMENT="$COMMENTOUTPUT";;
 						esac	
 					fi
-					) | run_command tagtrack-$OUTPUT-$1 $VORBISCOMMENT $VORBISCOMMENTOPTS -w \
+					) | run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
+						$VORBISCOMMENT $VORBISCOMMENTOPTS -w \
 						"$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
-					# Doublecheck that the commented file was created successfully before wiping the original
+					# 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
@@ -811,7 +884,7 @@ do_tag ()
 					*)   echo COMMENT="$COMMENTOUTPUT";;
 				esac	
 			fi
-			) | run_command tagtrack-$OUTPUT-$1 $METAFLAC $METAFLACOPTS ${IMPORTCUESHEET:+--import-cuesheet-from="$ABCDETEMPDIR/$CUEFILE"} --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
+			) | run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $METAFLAC $METAFLACOPTS ${IMPORTCUESHEET:+--import-cuesheet-from="$ABCDETEMPDIR/$CUEFILE"} --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
 			;;
 		spx)
 			run_command tagtrack-$OUTPUT-$1 true
@@ -838,14 +911,15 @@ do_tag ()
 # OUTPUTTYPE, {FOO}ENCODERSYNTAX, ENCNICE, ENCODER, ENCODEROPTS
 do_nogap_encode ()
 {
-	# The commands here don't go through run_command because they're never supposed to be silenced
+	# The commands here don't go through run_command because they're never
+	# supposed to be silenced
 	echo "Encoding gapless MP3 tracks: $TRACKQUEUE"
 	for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
 	do
 		case "$OUTPUT" in
 		mp3)
 			case "$MP3ENCODERSYNTAX" in
-			lame)
+			lame|toolame)
 				(
 				cd "$ABCDETEMPDIR"
 				TRACKFILES=
@@ -877,8 +951,8 @@ do_nogap_encode ()
 			fi
 		fi
 	fi
-	# Other encoders fall through to normal encoding as the tracks
-	# have not been entered in the status file.
+	# Other encoders fall through to normal encoding as the tracks have not
+	# been entered in the status file.
 }
 
 # do_encode [tracknumber] [hostname]
@@ -952,20 +1026,26 @@ do_encode ()
 				RUN_COMMAND=""
 				# We need a way to store the creation of the files when using PIPES
 				RUN_COMMAND_PIPES="run_command encodetrack-$OUTPUT-$1 true"
+				# When pipping it does not make sense to have a higher nice for
+				# reading than for encoding, since it will be hold by the
+				# encoding process. Setting an effective nice, to calm down a
+				# bit the reading process.
+				EFFECTIVE_NICE=$READNICE
 			else
 				run_command '' echo "Encoding track $1 of $TRACKS: $TRACKNAME..."
 				RUN_COMMAND="run_command encodetrack-$OUTPUT-$1"
+				EFFECTIVE_NICE=$ENCNICE
 			fi
 			case "$OUTPUT" in
 			mp3)
 				case "$2" in
 				%local*%)
 					case "$MP3ENCODERSYNTAX" in
-					lame|gogo) $RUN_COMMAND nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS "$IN" "$OUT" ;;
-					bladeenc) $RUN_COMMAND nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS -quit "$IN" ;;
-					l3enc|xingmp3enc) $RUN_COMMAND nice $ENCNICE $MP3ENCODER "$IN" "$OUT" $MP3ENCODEROPTS ;;
+					lame|toolame|gogo) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER $MP3ENCODEROPTS "$IN" "$OUT" ;;
+					bladeenc) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER $MP3ENCODEROPTS -quit "$IN" ;;
+					l3enc|xingmp3enc) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER "$IN" "$OUT" $MP3ENCODEROPTS ;;
 					# FIXME # Relates to the previous FIXME since it might need the "-if" removed.
-					mp3enc) $RUN_COMMAND nice $ENCNICE $MP3ENCODER -if "$IN" -of "$OUT" $MP3ENCODEROPTS ;;
+					mp3enc) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER -if "$IN" -of "$OUT" $MP3ENCODEROPTS ;;
 					esac
 					;;
 				*)
@@ -977,8 +1057,8 @@ do_encode ()
 				case "$2" in
 				%local*%)
 					case "$OGGENCODERSYNTAX" in
-					vorbize) $RUN_COMMAND nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -w "$OUT" "$IN" ;;
-					oggenc) $RUN_COMMAND nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -o "$OUT" "$IN" ;;
+					vorbize) $RUN_COMMAND nice $EFFECTIVE_NICE $OGGENCODER $OGGENCODEROPTS -w "$OUT" "$IN" ;;
+					oggenc) $RUN_COMMAND nice $EFFECTIVE_NICE $OGGENCODER $OGGENCODEROPTS -o "$OUT" "$IN" ;;
 					esac
 					;;
 				*)
@@ -990,7 +1070,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 $EFFECTIVE_NICE $FLACENCODER -f $FLACENCODEROPTS -o "$OUT" "$IN" ;; 
 				        esac
 						;;
 					*)
@@ -1010,9 +1090,9 @@ do_encode ()
 				fi
 				# 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 $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" "$COMMENT" "$IN" "$OUT"
+					$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" "$COMMENT" "$IN" "$OUT"
 				else
-					$RUN_COMMAND nice $ENCNICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
+					$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
 				fi
 				;;
 			mpc)	
@@ -1022,12 +1102,12 @@ do_encode ()
 				# errors, so I have not tried it myself.
 				## FIXME ## Needs some cleanup to determine if an empty tag sent
 				## 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"
+				$RUN_COMMAND nice $EFFECTIVE_NICE $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"
+					$RUN_COMMAND nice $EFFECTIVE_NICE $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"
@@ -1378,6 +1458,7 @@ do_playlist ()
 					read ERASEPLAYLIST
 					case $ERASEPLAYLIST in
 						e|E|a|A|k|K) DONE=y ;;
+						"") ERASEPLAYLIST=e ; DONE=y ;;
 						*) ;;
 					esac
 				done
@@ -1436,6 +1517,156 @@ do_playlist ()
 	done
 }
 
+# abcde.cue2discid
+# This function reads a cuefile on stdin and writes an extended
+# cddb query on stdout.  Any PREGAP for track 1 is properly
+# handled, although cue files embedded in FLAC files do not
+# appear to properly store the PREGAP setting. :(
+abcde.cue2discid () {
+
+	cddb_sum () {
+		val=$1
+		ret=0
+		while [ $val -gt 0 ] ; do
+			ret=$(( $ret + ( $val % 10) ))
+			val=$(( $val / 10 ))
+		done
+		echo $ret
+	}
+
+	msf2lba () {
+		OIFS="$IFS"
+		IFS=":"
+		set -- $1
+		IFS="$OIFS"
+		local first second third
+		first=$(expr ${1} + 0 )
+		second=$(expr ${2} + 0 )
+		third=$(expr ${3} + 0 )
+
+		echo $(( ((($first * 60) + $second) * 75) + $third ))
+	}
+
+	OFFSET=150
+	PREGAP=0
+	LEADOUT=0
+	LEADIN=88200
+	i=0
+	N=0
+	
+	while read line ; do
+		set -- $line
+		case "$1" in
+		TRACK)	i=$(( i + 1 ))
+			;;
+		INDEX)	if [ "$2" -eq 1 ] ; then
+				LBA=$(msf2lba $3)
+				START=$(( $LBA + $PREGAP + $OFFSET ))
+				eval TRACK$i=$START
+				X=$(cddb_sum $(( $START / 75 )) )
+				N=$(( $N + $X ))
+			fi
+			;;
+		PREGAP)	PREGAP=$(msf2lba $2)
+			;;
+		REM)	case "$2" in 
+			FLAC__lead-out)
+				LEADOUT=$(( $4 / 588 ))
+				;;
+			FLAC__lead-in)
+				LEADIN=$(( $3 / 588 ))
+				;;
+			esac
+			;;
+		esac
+		
+	done
+	
+	TRACKS=$i
+	LEADOUT=$(( $LEADOUT + $LEADIN ))
+
+	LENGTH=$(( $LEADOUT/75 - $TRACK1/75 ))
+	DISCID=$(( ( $N % 255 ) * 2**24 | $LENGTH * 2**8 | $TRACKS ))
+	printf "%08x %i" $DISCID $TRACKS
+	
+	j=1
+	while [ $j -le $TRACKS ] ; do
+		eval echo -n "\" \$TRACK$j\""
+		j=$((j+1))
+	done
+	echo " $(( $LEADOUT / 75 ))"
+}
+
+# abcde.mkcue
+# abcde.mkcue [--wholedisk]
+# This creates a cuefile directly from the extended discid information
+# The --wholedisk option controls whether we're ripping data from the
+# start of track one or from the start of the disk (usually, but not
+# always the same thing!)
+#
+# Track one leadin/pregap (if any) handeling:
+# --wholedisk specified:
+#   TRACK 01 AUDIO
+#     INDEX 00 00:00:00
+#     INDEX 01 <pregap value>
+#   Remaining track index values unchanged from disc TOC
+#
+# --wholedisk not specified
+#   TRACK 01 AUDIO
+#     PREGAP <pregap value>
+#     INDEX 01 00:00:00
+#   Remaining track index values offset by <pregap value>
+#
+# Variables used:
+# TRACKINFO
+abcde.mkcue () {
+
+	echomsf () {
+		printf "$1%02i:%02i:%02i\n" $(($2/4500)) $((($2/75)%60)) $(($2%75))
+	} 
+
+	local MODE DISCID TRACKS
+	local i OFFSET LBA 
+
+
+    if [ "$1" = --wholedisc ] ; then
+        MODE=INDEX
+    else
+        MODE=PREGAP
+    fi
+
+    set -- $TRACKINFO
+
+    DISCID=$1
+    TRACKS=$2
+    shift 2
+
+    echo REM DISCID $DISCID
+    echo FILE \"dummy.wav\" WAVE
+
+    if [ $1 -ne 150 ] && [ $MODE = "PREGAP"] ; then
+        OFFSET=$1
+    else
+        OFFSET=150
+    fi
+
+    i=1
+    while [ $i -le "$TRACKS" ] ; do
+        LBA=$(( $1 - $OFFSET ))
+        printf "  TRACK %02i AUDIO\n" $i
+        if [ $i -eq 1 -a $1 -ne 150 ] ; then
+            if [ $MODE = PREGAP ] ; then
+                echomsf "    PREGAP " $(($OFFSET-150))
+            else
+                echo    "    INDEX 00 00:00:00"
+            fi
+		fi
+        echomsf "    INDEX 01 " $LBA
+		i=$(($i+1))
+        shift
+    done
+}
+
 # do_discid
 # This essentially the start of things
 do_discid ()
@@ -1451,20 +1682,64 @@ 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
+						# FIXME # right now we have 2 cue2discid internal
+						# implementations: builtin and abcde.cue2discid. Test
+						# both of them and decide which one we want to use.
+						builtin)
+							#vecho "Using builtin cue2discid implementation..."
+							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
+						;;
+						*)
+							#vecho "Using external python cue2discid implementation..."
+							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
@@ -1500,12 +1775,12 @@ 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
 						vecho "Querying the CD for audio tracks..."
-						CDPARANOIAOUTPUT="$( $CDROMREADER -$CDPARANOIACDROMBUS $CDROM -Q --verbose 2>&1 )"
+						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?"
@@ -1636,13 +1911,15 @@ do_discid ()
 		# Store the abcde version in the status file.
 		echo "abcde-version=$VERSION" >> "$ABCDETEMPDIR/status"
 	fi
-	if [ X"$MAKECUEFILE" = "Xy" -a X"$WEHAVEACD" = "Xy" ]; then
+	if [ X"$DOCUE" = "Xy" -a X"$WEHAVEACD" = "Xy" ]; then
 		if checkstatus cuefile > /dev/null 2>&1 ; then :; else
 			CUEFILE=cue-$(echo "$TRACKINFO" | cut -f1 -d' ').txt
 			vecho "Creating cue file..."
 			case $CDROMREADERSYNTAX in
 				flac)
-					if $METAFLAC --export-cuesheet-to=- $CDROM > "$ABCDETEMPDIR/$CUEFILE"; then :; else
+					if $METAFLAC --export-cuesheet-to=- "$CDROM" > "$ABCDETEMPDIR/$CUEFILE"; then 
+						echo cuefile=$CUEFILE >> "$ABCDETEMPDIR/status"
+					else
 						log warning "the input flac file does not contain a cuesheet."
 					fi
 					;;
@@ -1650,7 +1927,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
@@ -1686,15 +1963,24 @@ do_cleancue()
 			n=1
 			echo "PERFORMER \"$DARTIST\"" >> "$CUEFILE_OUT"
 			echo "TITLE \"$DALBUM\"" >> "$CUEFILE_OUT"
+			# Set IFS to <newline> to prevent read from swallowing spaces and tabs
+			OIFS="$IFS"
+			IFS='
+'
 			cat "$CUEFILE_IN" | while read line
 			do
 				if echo "$line" | grep "INDEX 01" > /dev/null 2>&1 ; then
+# FIXME # Possible patch: remove the line above, uncomment the 2 lines below.
+#				echo "$line" >> "$CUEFILE_OUT"
+#				if echo "$line" | grep "^[[:space:]]*TRACK" > /dev/null 2>&1 ; then
 					eval track="\$TRACK$n"
 					n=$(expr $n + 1)
-					echo "TITLE \"$track\"" >> "$CUEFILE_OUT"
+					echo "    TITLE \"$track\"" >> "$CUEFILE_OUT"
 				fi
+# FIXME # If the lines above are uncommented, remove the line below.
 				echo "$line" >> "$CUEFILE_OUT"
 			done
+			IFS="$OIFS"
 			mv "$CUEFILE_OUT" "$CUEFILE_IN"
 			echo "cleancuefile" >> "$ABCDETEMPDIR/status"
 		fi
@@ -1870,6 +2156,7 @@ do_musicbrainzstat ()
 
 do_musicbrainz ()
 {
+# Use MBE_TOCGetCDIndexId on a perl query
 	:
 }
 
@@ -2389,7 +2676,10 @@ do_cdread ()
 		UTRACKNUM=$FIRSTTRACK
 		case "$CDROMREADERSYNTAX" in
 			flac) READTRACKNUMS="$FIRSTTRACK.1-$(($LASTTRACK + 1)).0" ;;
-			cdparanoia) READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;;
+			cdparanoia) 
+				#XX FIXME XX
+				# Add a variable to check if tracks are provided in command line and if not, use "0-" to rip the tracks
+				READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;;
 			cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTTRACK" ;;
 			*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
 				exit 1 ;;
@@ -2437,7 +2727,7 @@ do_cdread ()
 			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 ;;
+			nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;
 		cdda2wav)
 			if [ "$OSFLAVOUR" = "OSX" ] ; then
 				# Hei, we have to unmount the device before running anything like cdda2wav in OSX
@@ -2457,7 +2747,7 @@ do_cdread ()
 			;;
 		## FIXME ## We have an exception for dagrab, since it uses -f
 		## FIXME ## Shall we just use -f $FILEARG ??
-		dagrab) nice $READNICE $CDROMREADER -d $CDROM -v $UTRACKNUM "$FILEARG" $REDIR
+		dagrab) nice $READNICE $CDROMREADER -d "$CDROM" -v $UTRACKNUM "$FILEARG" $REDIR
 			;;
 		cddafs)
 			# Find the track's mounted path
@@ -2470,7 +2760,7 @@ do_cdread ()
 			else
 				false
 			fi ;;
-		debug) nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM -w $UTRACKNUM-[:1] "$FILEARG" $REDIR
+		debug) nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" -w $UTRACKNUM-[:1] "$FILEARG" $REDIR
 			;;
 	esac
 	RETURN=$?
@@ -2626,6 +2916,7 @@ KEEPWAVS=n
 PADTRACKS=n
 NOGAP=n
 BATCHNORM=n
+NOCDDBQUERY=n
 
 # If using scsi devices, cdda2wav needs a CDROMID, instead of a device node
 # i.e. CDROMID="1,0,0"
@@ -2678,7 +2969,7 @@ MPPGAIN=replaygain
 MKCUE=mkcue
 MKTOC=cdrdao
 DIFF=diff
-CUE2DISCID=cue2discid
+CUE2DISCID=builtin
 
 # Options for programs called from abcde
 # mp3
@@ -2727,11 +3018,17 @@ 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,m4a:faac
+DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:toolame,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"
 
+# List of quality levels associated with the encoders:
+DEFAULT_QUALITY_XLO="oggenc:-q -1,lame:-q 9,speex:--quality 1,m4a:"
+DEFAULT_QUALITY_LO="oggenc:-q 1,lame:-q 7,speex:--quality 5,m4a:"
+DEFAULT_QUALITY_HI="oggenc:-q 7,lame:--preset standard,speex:--quality 9,m4a:"
+DEFAULT_QUALITY_XHI="oggenc:-q 10,lame:--preset extreme,speex:--quality 10,m4a:"
+
 # Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for
 # Linux/OpenBSD. ftp is user for NetBSD.
 # Let's use these checkings to determine the OS flavour, which will be used
@@ -2769,6 +3066,12 @@ CDDBAVAIL=y
 USEID3=y
 USEID3V2=y
 
+# There we go..
+# But before we get into business, let us chop off any GREP environmental
+# variables.
+GREP_OPTIONS=""
+GREP_COLOR=""
+
 if [ -z "$OUTPUTDIR" ]; then
 	OUTPUTDIR=$(pwd)
 fi
@@ -2791,7 +3094,7 @@ fi
 
 if [ "$HTTPGETOPTS" = "" ] ; then
 	case $HTTPGET in
-		wget) HTTPGETOPTS="-q -O -";;
+		wget) HTTPGETOPTS="-q -nv -O -";;
 		curl) HTTPGETOPTS="-f -s";;
 		fetch)HTTPGETOPTS="-q -o -";;
 		ftp)  HTTPGETOPTS="-a -V -o - ";;
@@ -2817,8 +3120,8 @@ if [ "$CDROM" = "" ] ; then
 fi
 
 # Parse command line options
-#while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
-while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do
+#while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPq:r:Rs:S:t:T:vVxw:W: opt ; do
+while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:UvVxX:w:W:z opt ; do
 	case "$opt" in
 		1) ONETRACK=y ;;
 		a) ACTIONS="$OPTARG" ;;
@@ -2829,7 +3132,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" ;;
@@ -2843,17 +3145,17 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do
 		n) CDDBAVAIL=n ;;
 		N) INTERACTIVE=n ;;
 		m) DOSPLAYLIST=y ;;
-		M) MAKECUEFILE=y ;;
+		M) DOCUE=y ;;
 		o) OUTPUTTYPE="$OPTARG" ;;
 		p) PADTRACKS=y ;;
 		P) USEPIPES=y ;;
+		q) QUALITYLEVEL="$OPTARG" ;;
 		r) REMOTEHOSTS="$OPTARG" ;;
 		R) CDDBLOCALRECURSIVE=y ;;
 		s) SHOWCDDBFIELDS="$OPTARG" ;;
 		S) CDSPEEDVALUE="$OPTARG" ;;
 		t) STARTTRACKNUMBER="$OPTARG" ;;
 		T) STARTTRACKNUMBER="$OPTARG" ; STARTTRACKNUMBERTAG="y" ;;
-		u) CDDBPROTO=6 ;;
 		U) CDDBPROTO=5 ;;
 		v) 
 		   echo "This is abcde v$VERSION."
@@ -2863,6 +3165,7 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do
 		   ;;
 		V) EXTRAVERBOSE="y" ;;
 		x) EJECTCD="y" ;;
+		X) CUE2DISCID="$OPTARG" ;;
 		w) COMMENT="$OPTARG" ;;
 		W) if echo $OPTARG | grep "[[:digit:]]" > /dev/null 2>&1 ; then 
 		     STARTTRACKNUMBER="${OPTARG}01" ; STARTTRACKNUMBERTAG="y" ; COMMENT="CD${OPTARG}"
@@ -2882,6 +3185,11 @@ shift $(($OPTIND - 1))
 # ripping, we have a mixture of sanity checks, verifications, default settigs
 # and other crazy stuff that interdepends, but hey, someone has to do it.
 
+# If NOCDDBQUERY is set, don't query the CDDB server.
+if [ "$NOCDDBQUERY" = "y" ]; then
+	CDDBAVAIL="n"
+fi
+
 # If the user specified a flac file, then switch to special flac mode
 if echo "$CDROM" | grep -i '.flac$' > /dev/null 2>&1 ; then
 	if [ ! -f "$CDROM" ]; then
@@ -2890,8 +3198,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
@@ -2968,11 +3279,14 @@ DOMOVE=n
 DOREPLAYGAIN=n
 DOPLAYLIST=n
 DOCLEAN=n
+## FIXME ## Lets keep compatibility with -M
+[ "$DOCUE" != "y" ] && DOCUE=n
 
 for ACTION in $(echo $ACTIONS | tr , \ )
 do
 	case $ACTION in
 		default) DOCDDB=y; DOREAD=y; DOENCODE=y; DOTAG=y; DOMOVE=y; DOCLEAN=y;;
+		cue) DOCUE=y ; MAKECUEFILE=y ;;
 		cddb) DOCDDB=y;;
 		read) DOREAD=y;;
 		normalize) DONORMALIZE=y; DOREAD=y;;
@@ -3076,7 +3390,7 @@ if [ "$BATCHNORM" = "y" ] && [ "$DONORMALIZE" = "n" ]; then
 	BATCHNORM=n
 fi
 
-# Check the encoding format from the ones available in the system, if nothing has been configured in the system.
+# Check the encoding format from the ones available in the system, if nothing has been configured.
 if [ X"$OUTPUTTYPE" = "X" ]; then
 	for DEFAULT_OUTPUT in $( echo "$DEFAULT_OUTPUT_BINARIES" | tr , \ ); do
 		DEFAULT_OUTPUT_FORMAT="$(echo $DEFAULT_OUTPUT | cut -d ":" -f 1)"
@@ -3167,7 +3481,7 @@ do
 			[ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
 			[ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
 			[ "$DOREPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
-			[ "$ONETRACK" = "y" ] && [ "$MAKECUEFILE" = "y" ] && NEEDMETAFLAC=y 
+			[ "$ONETRACK" = "y" ] && [ "$DOCUE" = "y" ] && NEEDMETAFLAC=y 
 			;;
 		spx)
 			[ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc
@@ -3335,7 +3649,7 @@ if [ ! "$CDDBAVAIL" = "n" ] && [ "$DOCDDB" = "y" ]; then
 		:
 	fi
 fi
-if [ "$MAKECUEFILE" = "y" ]; then
+if [ "$DOCUE" = "y" ]; then
 	NEEDCUEREADER=y
 fi
 
@@ -3435,7 +3749,7 @@ 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 3306 ;)
+# Well, right now we are at line 3737 ;)
 
 # Export needed things so they can be read in this subshell
 export CDDBTOOL ABCDETEMPDIR TRACKQUEUE LOWDISK EJECTCD EJECT EJECTOPTS
@@ -3624,7 +3938,7 @@ if [ "$EJECTCD" = "y" ] && [ -x $(which $EJECT) ]; then
 	elif [ X"$(uname)" = X"Darwin" ] ; then
 		disktool -e ${CDROM#/dev/} 0
 	else
-		$EJECT $EJECTOPTS $CDROM
+		$EJECT $EJECTOPTS "$CDROM"
 	fi
 	#fi
 fi