X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/6c124acfc26c160b3999b906d4a19cfc96700b77..8fc41c4f89c3b52235f03d921a28d290bef53218:/abcde

diff --git a/abcde b/abcde
index a3b653e..849c9a4 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.2.4"
+VERSION="2.3.0"
 
 usage ()
 {
@@ -30,6 +30,7 @@ echo "       Specify discid to resume from (only needed if you no longer have th
 echo "-d <device>"
 echo "       Specify CDROM device to grab"
 echo "-D     Debugging mode (equivalent to sh -x abcde)"
+echo "-e     Erase encoded track information from status file"
 echo "-h     This help information"
 #echo "-i    Tag files while encoding, when possible (local only) -NWY-"
 echo "-j <#> Number of encoder processes to run at once (localhost)"
@@ -61,6 +62,7 @@ echo "-W <#> Contatenate CDs: -T #01 -w \"CD #\""
 echo ""
 echo "Tracks is a space-delimited list of tracks to grab."
 echo "Ranges specified with hyphens are allowed."
+#echo "Double hyphens are used to concatenate tracks"
 }
 
 # Funtions to replace the need of seq, which is too distribution dependant.
@@ -85,6 +87,31 @@ f_seq_line ()
 	echo
 }
 
+# Functions to replace the need of awk {print $1} and {print $NF}
+get_first()
+{
+if [ X"$1" = "X" ]; then
+	for first in `cat`; do
+		break
+	done
+else
+	first=$1
+fi
+echo $first
+}
+
+get_last()
+{
+if [ X"$1" = "X" ]; then
+	for stdin in `cat`; do
+		last=$stdin
+	done
+else
+	for last in $@ ; do :; done
+fi
+echo $last
+}
+
 # checkstatus [blurb]
 # Returns "0" if the blurb was found, returns 1 if it wasn't
 # Puts the blurb content, if available, on stdout.
@@ -242,43 +269,201 @@ 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 [ "$ONETRACK" = "y" ]; then
 		TRACKARTIST="Various"
 	else
-		TRACKARTIST=$DARTIST
+		TRACKARTIST="$DARTIST"
 	fi
 }
 
+do_getgenreid () {
+local genre=$(echo "${@}" | tr '[A-Z]' '[a-z]')
+local id=""
+	case ${genre} in
+		"blues")                 id=0 ;;
+		"classic rock")          id=1 ;;
+		"country")               id=2 ;;
+		"dance")                 id=3 ;;
+		"disco")                 id=4 ;;
+		"funk")                  id=5 ;;
+		"grunge")                id=6 ;;
+		"hip-hop")               id=7 ;;
+		"jazz")                  id=8 ;;
+		"metal")                 id=9 ;;
+		"new age")               id=10 ;;
+		"oldies")                id=11 ;;
+		"other")                 id=12 ;;
+		"pop")                   id=13 ;;
+		"r&b")                   id=14 ;;
+		"rap")                   id=15 ;;
+		"reggae")                id=16 ;;
+		"rock")                  id=17 ;;
+		"techno")                id=18 ;;
+		"industrial")            id=19 ;;
+		"alternative")           id=20 ;;
+		"ska")                   id=21 ;;
+		"death metal")           id=22 ;;
+		"pranks")                id=23 ;;
+		"soundtrack")            id=24 ;;
+		"euro-techno")           id=25 ;;
+		"ambient")               id=26 ;;
+		"trip-hop")              id=27 ;;
+		"vocal")                 id=28 ;;
+		"jazz+funk")             id=29 ;;
+		"fusion")                id=30 ;;
+		"trance")                id=31 ;;
+		"classical")             id=32 ;;
+		"instrumental")          id=33 ;;
+		"acid")                  id=34 ;;
+		"house")                 id=35 ;;
+		"game")                  id=36 ;;
+		"sound clip")            id=37 ;;
+		"gospel")                id=38 ;;
+		"noise")                 id=39 ;;
+		"alt. rock")             id=40 ;;
+		"bass")                  id=41 ;;
+		"soul")                  id=42 ;;
+		"punk")                  id=43 ;;
+		"space")                 id=44 ;;
+		"meditative")            id=45 ;;
+		"instrum. pop")          id=46 ;;
+		"instrum. rock")         id=47 ;;
+		"ethnic")                id=48 ;;
+		"gothic")                id=49 ;;
+		"darkwave")              id=50 ;;
+		"techno-indust.")        id=51 ;;
+		"electronic")            id=52 ;;
+		"pop-folk")              id=53 ;;
+		"eurodance")             id=54 ;;
+		"dream")                 id=55 ;;
+		"southern rock")         id=56 ;;
+		"comedy")                id=57 ;;
+		"cult")                  id=58 ;;
+		"gangsta")               id=59 ;;
+		"top 40")                id=60 ;;
+		"christian rap")         id=61 ;;
+		"pop/funk")              id=62 ;;
+		"jungle")                id=63 ;;
+		"native american")       id=64 ;;
+		"cabaret")               id=65 ;;
+		"new wave")              id=66 ;;
+		"psychadelic")           id=67 ;;
+		"rave")                  id=68 ;;
+		"showtunes")             id=69 ;;
+		"trailer")               id=70 ;;
+		"lo-fi")                 id=71 ;;
+		"tribal")                id=72 ;;
+		"acid punk")             id=73 ;;
+		"acid jazz")             id=74 ;;
+		"polka")                 id=75 ;;
+		"retro")                 id=76 ;;
+		"musical")               id=77 ;;
+		"rock & roll")           id=78 ;;
+		"hard rock")             id=79 ;;
+		"folk")                  id=80 ;;
+		"folk/rock")             id=81 ;;
+		"national folk")         id=82 ;;
+		"swing")                 id=83 ;;
+		"fusion")                id=84 ;;
+		"bebob")                 id=85 ;;
+		"latin")                 id=86 ;;
+		"revival")               id=87 ;;
+		"celtic")                id=88 ;;
+		"bluegrass")             id=89 ;;
+		"avantgarde")            id=90 ;;
+		"gothic rock")           id=91 ;;
+		"progress. rock")        id=92 ;;
+		"psychadel. rock")       id=93 ;;
+		"symphonic rock")        id=94 ;;
+		"slow rock")             id=95 ;;
+		"big band")              id=96 ;;
+		"chorus")                id=97 ;;
+		"easy listening")        id=98 ;;
+		"acoustic")              id=99 ;;
+		"humour")                id=100 ;;
+		"speech")                id=101 ;;
+		"chanson")               id=102 ;;
+		"opera")                 id=103 ;;
+		"chamber music")         id=104 ;;
+		"sonata")                id=105 ;;
+		"symphony")              id=106 ;;
+		"booty bass")            id=107 ;;
+		"primus")                id=108 ;;
+		"porn groove")           id=109 ;;
+		"satire")                id=110 ;;
+		"slow jam")              id=111 ;;
+		"club")                  id=112 ;;
+		"tango")                 id=113 ;;
+		"samba")                 id=114 ;;
+		"folklore")              id=115 ;;
+		"ballad")                id=116 ;;
+		"power ballad")          id=117 ;;
+		"rhythmic soul")         id=118 ;;
+		"freestyle")             id=119 ;;
+		"duet")                  id=120 ;;
+		"punk rock")             id=121 ;;
+		"drum solo")             id=122 ;;
+		"a capella")             id=123 ;;
+		"euro-house")            id=124 ;;
+		"dance hall")            id=125 ;;
+		"goa")                   id=126 ;;
+		"drum & bass")           id=127 ;;
+		"club-house")            id=128 ;;
+		"hardcore")              id=129 ;;
+		"terror")                id=130 ;;
+		"indie")                 id=131 ;;
+		"britpop")               id=132 ;;
+		"negerpunk")             id=133 ;;
+		"polsk punk")            id=134 ;;
+		"beat")                  id=135 ;;
+		"christian gangsta rap") id=136 ;;
+		"heavy metal")           id=137 ;;
+		"black metal")           id=138 ;;
+		"crossover")             id=139 ;;
+		"contemporary christian")id=140 ;;
+		"christian rock")        id=141 ;;
+		"merengue")              id=142 ;;
+		"salsa")                 id=143 ;;
+		"thrash metal")          id=144 ;;
+		"anime")                 id=145 ;;
+		"jpop")                  id=146 ;;
+		"synthpop")              id=147 ;;
+		*)                       return 1 ;;
+	esac
+echo ${id}
+return 0
+}
+
 # do_tag [tracknumber]
 # id3 tags a filename
 # variables used:
@@ -293,17 +478,20 @@ do_tag ()
 	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} - 1 ))
+		TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
 	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}")
+
 		# 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 "$CDGENRE" -T "${TRACKNUM:-$1/$TRACKS}" "$ABCDETEMPDIR/track$1.$OUTPUT"
+			-g "$GENREID" -T "${TRACKNUM:-$1/$TRACKS}" \
+			"$ABCDETEMPDIR/track$1.$OUTPUT"
 		;;
 	ogg)
 		case "$OGGENCODERSYNTAX" in
@@ -314,9 +502,9 @@ do_tag ()
 				fi
 				(
 				# These are from http://www.xiph.org/ogg/vorbis/doc/v-comment.html
-				echo ARTIST=$TRACKARTIST
+				echo ARTIST="$TRACKARTIST"
 				echo ALBUM="$DALBUM"
-				echo TITLE=$TRACKNAME
+				echo TITLE="$TRACKNAME"
                			if [ -n "$CDYEAR" ]; then
 					echo DATE="$CDYEAR"
                			fi
@@ -331,7 +519,7 @@ do_tag ()
 						*)   echo COMMENT="$COMMENTOUTPUT";;
 					esac	
 				fi
-				) | run_command tagtrack-$1 $VORBISCOMMENT -w \
+				) | run_command tagtrack-$1 $VORBISCOMMENT $VORBISCOMMENTOPTS -w \
 					"$ABCDETEMPDIR/track$1.uncommented.$OUTPUT" "$ABCDETEMPDIR/track$1.$OUTPUT"
 				# Doublecheck that the commented file was created successfully before wiping the original
 				if [ -f "$ABCDETEMPDIR/track$1.$OUTPUT" ]; then
@@ -343,16 +531,17 @@ do_tag ()
 		esac
 		;;
 	flac)
-                (
+## FIXME ##		[ "$FLACONOGG" = "y" ] && OUTPUT=ogg
+		(
 		echo ARTIST="$TRACKARTIST"
 		echo ALBUM="$DALBUM"
 		echo TITLE="$TRACKNAME"
-               	if [ -n "$CDYEAR" ]; then
+		if [ -n "$CDYEAR" ]; then
 			echo DATE="$CDYEAR"
-               	fi
-               	if [ -n "$CDGENRE" ]; then
+		fi
+		if [ -n "$CDGENRE" ]; then
 			echo GENRE="$CDGENRE"
-                fi	
+		fi	
 		echo TRACKNUMBER=${TRACKNUM:-$1}
 		echo CDDB=$CDDBDISCID
 		if [ "$(eval echo ${COMMENT})" != "" ]; then
@@ -361,7 +550,7 @@ do_tag ()
 				*)   echo COMMENT="$COMMENTOUTPUT";;
 			esac	
 		fi
-                ) | run_command tagtrack-$1 $METAFLAC --import-tags-from=- --no-utf8-convert "$ABCDETEMPDIR/track$1.$OUTPUT"
+		) | run_command tagtrack-$1 $METAFLAC $METAFLACOPTS --import-tags-from=- "$ABCDETEMPDIR/track$1.$OUTPUT"
 		;;
 	spx)
 		run_command tagtrack-$1 true
@@ -417,26 +606,69 @@ do_batch_encode ()
 # TRACKS, TRACKNAME, TRACKARTIST, DISTMP3, DISTMP3OPTS, {FOO}ENCODERSYNTAX, OUTPUTTYPE, ENCODEROPTS, DALBUM, DARTIST, ENCNICE, CDYEAR, CDGENRE, COMMENT
 do_encode ()
 {
-	IN="$ABCDETEMPDIR/track$1.wav"
-	# We need IN to proceed.
-	if [ -s "$IN" ] ; then
+	if [ "$USEPIPES" = "y" ]; then
+		case "$OUTPUT" in
+			mp3)
+				TEMPARG="PIPE_$MP3ENCODERSYNTAX"
+				;;
+			ogg)
+				TEMPARG="PIPE_$OGGENCODERSYNTAX"
+				;;
+			flac)
+				TEMPARG="PIPE_$FLACENCODERSYNTAX"
+				;;
+			spx)
+				TEMPARG="PIPE_$SPEEXENCODER"
+				;;
+			mpc)
+				TEMPARG="PIPE_$MPPENCODER"
+				;;
+		esac
+		IN=${!TEMPARG}
+	else
+		IN="$ABCDETEMPDIR/track$1.wav"
+		case "$OUTPUT" in
+			mp3)
+				case "$MP3ENCODERSYNTAX" in
+					# FIXME # check if mp3enc needs -if for pipes
+					mp3enc)
+						FILEARG="-if $IN"
+						;;
+					*)
+						FILEARG=$IN
+						;;
+				esac
+				;;
+			*)
+				FILEARG=$IN
+				;;
+		esac
+	fi
+	# We need IN to proceed, if we are not using pipes.
+	if [ -s "$IN" -o X"$USEPIPES" = "Xy" ] ; then
 		for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
 		do
 			OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
-			run_command '' echo "Encoding track $1 of $TRACKS: $TRACKNAME..."
+			if [ X"$USEPIPES" = "Xy" ]; then
+				RUN_COMMAND=""
+			else
+				run_command '' echo "Encoding track $1 of $TRACKS: $TRACKNAME..."
+				RUN_COMMAND="run_command encodetrack-$OUTPUT-$1"
+			fi
 			case "$OUTPUT" in
 			mp3)
 				case "$2" in
 				%local*%)
 					case "$MP3ENCODERSYNTAX" in
-					lame|gogo) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS "$IN" "$OUT" ;;
-					bladeenc) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS -quit "$IN" ;;
-					l3enc|xingmp3enc) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $MP3ENCODER "$IN" "$OUT" $MP3ENCODEROPTS ;;
-					mp3enc) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $MP3ENCODER -if "$IN" -of "$OUT" $MP3ENCODEROPTS ;;
+					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 ;;
+					# FIXME # Relates to the previous FIXME since it might need the "-if" removed.
+					mp3enc) $RUN_COMMAND nice $ENCNICE $MP3ENCODER -if "$IN" -of "$OUT" $MP3ENCODEROPTS ;;
 					esac
 					;;
 				*)
-					run_command encodetrack-$OUTPUT-$1 nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" >/dev/null 2>&1
+					$RUN_COMMAND nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" >/dev/null 2>&1
 					;;
 				esac
 				;;
@@ -444,12 +676,12 @@ do_encode ()
 				case "$2" in
 				%local*%)
 					case "$OGGENCODERSYNTAX" in
-					vorbize) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -w "$OUT" "$IN" ;;
-					oggenc) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -o "$OUT" "$IN" ;;
+					vorbize) $RUN_COMMAND nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -w "$OUT" "$IN" ;;
+					oggenc) $RUN_COMMAND nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -o "$OUT" "$IN" ;;
 					esac
 					;;
 				*)
-					run_command encodetrack-$OUTPUT-$1 nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" >/dev/null 2>&1
+					$RUN_COMMAND nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" >/dev/null 2>&1
 					;;
 				esac
 				;;
@@ -457,14 +689,14 @@ do_encode ()
 				case "$2" in
 	                        %local*%)
 					case "$FLACENCODERSYNTAX" in
-					flac) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $FLACENCODER  $FLACENCODEROPTS -o "$OUT" "$IN" ;; 
+					flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER  $FLACENCODEROPTS -o "$OUT" "$IN" ;; 
 				        esac
 					;;
 	
 				*)
 					echo -n "DISTMP3:"
 					echo "$DISTMP3 $DISTMP3OPTS $2 $IN $OUT >/dev/null 2>&1"
-					run_command encodetrack-$OUTPUT-$1 nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" > /dev/null 2>&1
+					$RUN_COMMAND nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" > /dev/null 2>&1
 					;;
 				esac
 				;;
@@ -478,9 +710,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 encodetrack-$OUTPUT-$1 nice $ENCNICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" "$COMMENT" "$IN" "$OUT"
+					$RUN_COMMAND nice $ENCNICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" "$COMMENT" "$IN" "$OUT"
 				else
-					run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
+					$RUN_COMMAND nice $ENCNICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
 				fi
 				;;
 			mpc)	
@@ -490,7 +722,7 @@ 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 encodetrack-$OUTPUT-$1 nice $ENCNICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT"
+				$RUN_COMMAND nice $ENCNICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT"
 				;;
 			esac
 		done
@@ -693,7 +925,7 @@ do_move ()
 		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} - 1 ))
+			TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
 		else
 			TRACKNUM=${UTRACKNUM}
 		fi
@@ -769,7 +1001,7 @@ do_playlist ()
 				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} - 1 ))
+					TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
 				else
 					TRACKNUM=${UTRACKNUM}
 				fi
@@ -850,7 +1082,7 @@ 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 |  awk '{print $1}' | 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
@@ -865,7 +1097,7 @@ do_discid ()
 		else
 			TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
 		fi
-		if echo "$TRACKS" | grep [[:digit:]] > /dev/null 2>&1 ;then :;else
+		if echo "$TRACKS" | grep "[[:digit:]]" > /dev/null 2>&1 ;then :;else
 			echo "The disc does not contain any tracks. Giving up..."
 			exit 0
 		fi
@@ -900,8 +1132,6 @@ do_discid ()
 		echo Grabbing tracks: "$TRACKQUEUE"
 	fi
 
-#	for LASTTRACK in $TRACKQUEUE; do :; done
-
 	QUEUEDTRACKS=$(echo $TRACKQUEUE | wc -w | tr -d ' ')
 
 	# We have the discid, create a temp directory after it to store all the temp
@@ -1038,7 +1268,7 @@ do_localcddb ()
 				echo "y" >&2
 			fi
 			if [ "$USELOCALRESP" = "y" ]; then
-			#echo "Using local copy of CDDB data"
+				#echo "Using local copy of CDDB data"
 				cp "${CDDBLOCALFILE}" "$ABCDETEMPDIR/cddbread.1"
 				echo 999 > "$ABCDETEMPDIR/cddbquery" # Assuming 999 isn't used by CDDB
 				echo cddb-readcomplete >> "$ABCDETEMPDIR/status"
@@ -1049,7 +1279,6 @@ do_localcddb ()
 				#echo "Not using local copy of CDDB data"
 				CDDBLOCALSUCCESS="n"
 			fi
-			CDDBLOCALSUCCESS="y"
 		else
 			CDDBLOCALSUCCESS="n"
 		fi
@@ -1384,12 +1613,18 @@ do_cddbedit ()
 				eval $(echo "$EDITOR") "$CDDBDATA"
 			fi
 		# If that fails, check for a vi
+		elif which vi >/dev/null 2>&1; then
+			vi "$CDDBDATA"
 		elif [ -x /usr/bin/vi ]; then
 			/usr/bin/vi "$CDDBDATA"
 		# nano should be on all (modern, i.e., sarge) debian systems
+		elif which nano >/dev/null 2>&1 ; then
+			nano "$CDDBDATA"
 		elif [ -x /usr/bin/nano ]; then
 			/usr/bin/nano "$CDDBDATA"
 		# mg should be on all OpenBSD systems
+		elif which mg >/dev/null 2>&1 ; then
+			mg "$CDDBDATA"
 		elif [ -x /usr/bin/mg ]; then
 			/usr/bin/mg "$CDDBDATA"
 		# bomb out
@@ -1404,7 +1639,7 @@ do_cddbedit ()
 
 	# Some heuristics first. Look at Disc Title, and if it starts with
 	# "Various", then we'll assume Various Artists
-	if [ "$(grep ^DTITLE= "$CDDBDATA" | cut -f2 -d= | egrep -ci '^(various|soundtrack|varios|sonora|ost)')" != "0" ]; then
+	if [ "$(grep ^DTITLE= "$CDDBDATA" | cut -f2- -d= | egrep -ci '^(various|soundtrack|varios|sonora|ost)')" != "0" ]; then
 		echo "Looks like a Multi-Artist CD" >&2
 		VARIOUSARTISTS=y
 	else
@@ -1540,8 +1775,8 @@ do_cdread ()
 		FIRSTTRACK=$2
 		LASTTRACK=$3
 		case "$CDROMREADERSYNTAX" in
-			cdparanoia) UTRACKNUM="1-" ;;
-			cdda2wav) UTRACKNUM="1+$LASTRACK" ;;
+			cdparanoia) UTRACKNUM="$FIRSTTRACK-$LASTTRACK" ;;
+			cdda2wav) UTRACKNUM="$FIRSTTRACK+$LASTRACK" ;;
 			*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
 			   exit 1 ;;
 		esac
@@ -1549,18 +1784,13 @@ do_cdread ()
 		UTRACKNUM=$1
 	fi
 	CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
-	WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav"
-	if [ -r "$CDDBDATA" ]; then
-		TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
-		echo "Grabbing track $UTRACKNUM: $TRACKNAME..." >&2
-	else
-		echo "Grabbing track $UTRACKNUM..." >&2
-	fi
 	if [ "$USEPIPES" = "y" ]; then
 		TEMPARG="PIPE_$CDROMREADERSYNTAX"
 		FILEARG=${!TEMPARG}
 		REDIR=""
+		PIPE_MESSAGE="and encoding "
 	else
+		WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav"
 		case "$CDROMREADERSYNTAX" in
 		## FIXME ## Find the case for dagrab, to avoid exceptions
 			dagrab)
@@ -1572,6 +1802,16 @@ do_cdread ()
 		esac
 		REDIR=">&2"
 	fi
+	if [ "$1" = "onetrack" ]; then
+		echo "Grabbing ${PIPE_MESSAGE}tracks $UTRACKNUM..." >&2
+	else
+		if [ -r "$CDDBDATA" ]; then
+			TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
+			echo "Grabbing ${PIPE_MESSAGE}track $UTRACKNUM: $TRACKNAME..." >&2
+		else
+			echo "Grabbing ${PIPE_MESSAGE}track $UTRACKNUM..." >&2
+		fi
+	fi
 	case "$CDROMREADERSYNTAX" in
 		cdparanoia) nice $READNICE $CDROMREADER -d $CDROM $UTRACKNUM $FILEARG $REDIR ;;
 		cdda2wav)
@@ -1658,7 +1898,8 @@ fi
 # Custom filename munging:
 mungefilename ()
 {
-	echo "$@" | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
+	#echo "$@" | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
+	echo "$@" | sed s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
 }
 
 # Custom genre munging:
@@ -1792,6 +2033,8 @@ NORMALIZEOPTS=
 CDSPEEDOPTS="-x"
 CDSPEEDVALUE=
 MKCUEOPTS=
+VORBISCOMMENTOPTS="-R"
+METAFLACOPTS="--no-utf8-convert"
 
 # Default to one process if -j isn't specified
 MAXPROCS=1
@@ -1871,7 +2114,7 @@ fi
 
 # Parse command line options
 #while getopts 1a:bc:C:d:Dhj:klLnNo:pr:S:t:T:vVx opt ; do
-while getopts 1a:A:bc:C:d:Dhj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
+while getopts 1a:A:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
 	case "$opt" in
 		1) ONETRACK=y ;;
 		a) ACTIONS="$OPTARG" ;;
@@ -1881,7 +2124,9 @@ while getopts 1a:A:bc:C:d:Dhj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
 		C) DISCID="${OPTARG#abcde.}" ;;
 		d) CDROM="$OPTARG" ;;
 		D) set -x ;;
+		e) ERASEENCODEDSTATUS=y ;;
 		h) usage; exit ;;
+		e) ERASEENCODEDSTATUS=y ;;
 #		f) FORCECDDBUSELOCAL=y ;;
 		i) INLINETAG=y ;;
 		j) MAXPROCS="$OPTARG" ;;
@@ -1913,7 +2158,13 @@ while getopts 1a:A:bc:C:d:Dhj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
 		V) EXTRAVERBOSE="y" ;;
 		x) EJECTCD="y" ;;
 		w) COMMENT="$OPTARG" ;;
-		W) STARTTRACKNUMBER="${OPTARG}01" ; STARTTRACKNUMBERTAG="y" ; COMMENT="CD${OPTARG}" ;;
+		W) if echo $OPTARG | grep -q "[[:digit:]]" ; then 
+		     STARTTRACKNUMBER="${OPTARG}01" ; STARTTRACKNUMBERTAG="y" ; COMMENT="CD${OPTARG}"
+		   else
+		     echo "abcde error: argument of -W must be integer"
+			 exit 1
+		   fi
+		   ;;
 		?) usage; exit ;;
 	esac
 done
@@ -1924,7 +2175,7 @@ shift $(($OPTIND - 1))
 if [ "$ONETRACK" = "y" ]; then 
 	# FIXME # remove check as soon as we find out about the other readers
 	case "$CDROMREADERSYNTAX" in
-		dagrab|cddafs|debug) echo "abcde error: ONETRACK reading is not suported with "$CDROMREADERSYNTAX" yet"
+		dagrab|cddafs|debug) echo "abcde error: ONETRACK reading is not suported with $CDROMREADERSYNTAX yet"
 			                 exit 1 ;;
 	esac
 	if [ "$BATCH" = "y" ]; then
@@ -1995,12 +2246,12 @@ if [ X"$CDROM" != "X" ] ; then
 				exit 1
 			fi
 		fi
-	elif [ ! -e "$CDROM" -a X"$DOREAD" = "y" ]; then
+	elif [ ! -e "$CDROM" -a X"$DOREAD" = "Xy" ]; then
 		echo "abcde error: CDROM device cannot be found." >&2
 		exit 1
 	fi
 # avoid processing if we are not going to hit the CDROM.
-elif [ X"$DOREAD" = "y" ]; then
+elif [ X"$DOREAD" = "Xy" ]; then
 	echo "abcde error: CDROM has not been defined or cannot be found" >&2
 	exit 1
 fi
@@ -2146,7 +2397,11 @@ esac
 case "$FLACENCODERSYNTAX" in
 	flac)
 		FLACENCODEROPTS="${FLACENCODEROPTSCLI:-$FLACOPTS}"
-		FLACENCODER="$FLAC"
+		FLACENCODER="$FLAC"	
+		## FIXME ## FLAC streams can be encapsulated on a Ogg transport layer
+		if echo "$FLACENCODEROPTS" | egrep -q -- "(^| )--ogg($| )" ;then
+			FLACONOGG=y
+		fi
 		;;
 esac
 case "$SPEEXENCODERSYNTAX" in
@@ -2185,11 +2440,21 @@ if [ "$DISTMP3NICE" ]; then
 fi
 
 # Don't check for stuff if it's not needed
-if [ "$REMOTEHOSTS" ]; then NEEDDISTMP3=y; fi
-[ "$DONORMALIZE" = "y" ] && NEEDNORMALIZER=y
-[ "$EJECTCD" = "y" ] && NEEDEJECT=y
-[ ! "$CDDBAVAIL" = "n" ] && [ "$DOCDDB" = "y" ] && NEEDHTTPGET=y
-[ "$CUEFILE" = "y" ] && NEEDMKCUE=y
+if [ "$REMOTEHOSTS" ]; then 
+	NEEDDISTMP3=y
+fi
+if [ "$DONORMALIZE" = "y" ]; then
+	NEEDNORMALIZER=y
+fi
+if [ "$EJECTCD" = "y" ]; then
+	NEEDEJECT=y
+fi
+if [ ! "$CDDBAVAIL" = "n" ] && [ "$DOCDDB" = "y" ]; then
+	NEEDHTTPGET=y
+fi
+if [ "$CUEFILE" = "y" ]; then
+	NEEDMKCUE=y
+fi
 
 if [ X"$CDSPEEDVALUE" != "X" ]; then
 	case "$CDROMREADERSYNTAX" in
@@ -2205,6 +2470,7 @@ PIPE_cdparanoia="-"
 # Encoders with USEPIPE support
 # FIXME # Include here all the encoders we can figure out support pipes
 PIPE_lame="-"
+PIPE_bladeenc="-"
 PIPE_oggenc="-"
 
 # Figure out if we can use pipes with the ripper/encoder combination
@@ -2308,6 +2574,16 @@ if [ X"$CDSPEEDVALUE" != "X" ]; then
 	esac
 fi
 
+# Define the first and last track, since we might need them later in several places
+FIRSTTRACK=$( get_first $TRACKQUEUE )
+LASTTRACK=$( get_last $TRACKQUEUE )
+
+if [ -f "$ABCDETEMPDIR/status" ] && [ X"$ERASEENCODEDSTATUS" = "Xy" ]; then
+	mv "$ABCDETEMPDIR/status" "$ABCDETEMPDIR/status.old"
+	grep -v ^encodetracklocation- < "$ABCDETEMPDIR/status.old" \
+		| grep -v ^encode-output > "$ABCDETEMPDIR/status"
+fi
+
 # Create playlist if needed (backgroundable) and start reading in tracks
 
 (
@@ -2326,11 +2602,9 @@ if [ "$LOWDISK" = "y" ] || [ "$ONETRACK" = "y" ]; then
 fi
 
 if [ "$ONETRACK" = "y" ]; then 
-	FIRSTTRACK=$( echo $TRACKQUEUE | awk '{print $1}' )
 	TRACKS="$FIRSTTRACK"
-	for UTRACKNUM in $TRACKQUEUE; do :;done
 	if checkstatus readtrack-$FIRSTTRACK; then :; else
-		do_cdread onetrack $FIRSTTRACK $UTRACKNUM
+		do_cdread onetrack $FIRSTTRACK $LASTTRACK
 	fi
 else
 	for UTRACKNUM in $TRACKQUEUE
@@ -2338,7 +2612,8 @@ else
 		if [ "$DOREAD" = "y" ]; then
 			if [ "$USEPIPES" = "y" ]; then
 				if checkstatus readencodetrack-$UTRACKNUM; then :; else
-					do_cdread $UTRACKNUM | do_encode $UTRACKNUM %local0%
+					# Read, pipe, shut up!
+					do_cdread $UTRACKNUM | do_encode $UTRACKNUM %local0% > /dev/null 2>&1
 				fi
 			else
 				if checkstatus readtrack-$UTRACKNUM; then :; else
@@ -2451,8 +2726,7 @@ fi
 
 # If we are using ONETRACK, we can proceed with the normal encoding using just the $FIRSTTRACK as TRACKQUEUE
 if [ "$ONETRACK" = "y" ] ; then
-	FIRSTTRACK=$( echo $TRACKQUEUE | awk '{print $1}')
-	TRACKQUEUE=$FIRSTTRACK
+	TRACKQUEUE="$FIRSTTRACK"
 	TRACKS="$FIRSTTRACK"
 fi
 
@@ -2521,8 +2795,8 @@ do
 		else
 #			TRACKNUM=$(printf %0.${TRACKNUMPADDING}d $(expr ${UTRACKNUM} + 0))
 			TRACKNUM=$UTRACKNUM
-		        CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
-			TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2 -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')
+			CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
+			TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
 			splitvarious
 		fi
 	fi