X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/535944df291077c5c4d267a589a4db5e93f6426f..73b0af6ed427ce7daa5313858de5038ff5a7fb6f:/abcde

diff --git a/abcde b/abcde
index ad23759..3fc4cc5 100755
--- a/abcde
+++ b/abcde
@@ -20,9 +20,10 @@ echo "Usage: abcde [options] [tracks]"
 echo "Options:"
 echo "-1     Encode the whole CD in a single file"
 echo "-a <action1[,action2]...>"
-echo "       Actions to perform (cddb,read,normalize,encode,tag,move,playlist,clean)"
+echo "       Actions to perform (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)"
 echo "-c <file>"
 echo "       Specify a configuration file (overrides system and user config files)"
 echo "-C <discid#>"
@@ -50,12 +51,13 @@ 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     Add replaygain values to the tag info (only for vorbis,flac)"
+#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)"
 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 "-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"
@@ -366,7 +368,6 @@ do_replaygain()
 	if checkstatus replaygain; then :; else
 		run_command "" echo "Adding replygain information..."
 		for OUTPUT in $( echo $OUTPUTTYPE | tr , \ )
-		# THE OUTPUT NEEDS TO BE CORRECTED WITH THE CONTAINER?
 		do
 			case $OUTPUT in
 				vorbis|ogg)
@@ -387,23 +388,26 @@ do_replaygain()
 				ALBUMFILE="$(mungefilename "$DALBUM")"
 				do_gettracknum
 				if [ "$VARIOUSARTISTS" = "y" ]; then
-					OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
+					OUTPUTFILE="$(eval echo $VAOUTPUTFORMAT)"
 				else
-					OUTPUTFILE=$(eval echo $OUTPUTFORMAT)
+					OUTPUTFILE="$(eval echo $OUTPUTFORMAT)"
 				fi
 				OUTPUTFILES="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT $OUTPUTFILES"
 			done
 			case "$OUTPUT" in
 				flac)
-					run_command replaygain-flac $METAFLAC --add-replay-gain $OUTPUTFILES
+					run_command replaygain-flac $METAFLAC --add-replay-gain "$OUTPUTFILES"
 					;;
 				vorbis|ogg)
-					run_command replaygain-vorbis $VORBISGAIN --album $OUTPUTFILES
+					run_command replaygain-vorbis $VORBISGAIN --album "$OUTPUTFILES"
+					;;
+				mp3)
+					run_command replaygain-mp3 $MP3GAIN -a "$OUTPUTFILES"
 					;;
 				*);;
 			esac
 		done
-		if checkerrors replaygain-.{3,6}; then :; else
+		if checkerrors "replaygain-.{3,6}"; then :; else
 			run_command replaygain true
 		fi
 	fi
@@ -851,6 +855,8 @@ do_encode ()
 			esac
 			if [ X"$USEPIPES" = "Xy" ]; then
 				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"
 			else
 				run_command '' echo "Encoding track $1 of $TRACKS: $TRACKNAME..."
 				RUN_COMMAND="run_command encodetrack-$OUTPUT-$1"
@@ -925,9 +931,9 @@ do_encode ()
 				;;
 			wav)
 				# In case of wav output we need nothing. Just keep the wavs.
-				run_command encodetrack-$OUTPUT-$1 true
 				;;
 			esac
+			$RUN_COMMAND_PIPES
 		done
 		# Only remove .wav if the encoding succeeded
 		if checkerrors "encodetrack-(.{3,6})-$1"; then :; else
@@ -2140,7 +2146,7 @@ do_cdread ()
 	fi
 	CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
 	if [ "$USEPIPES" = "y" ]; then
-		TEMPARG="PIPE_$CDROMREADERSYNTAX"
+		TEMPARG="PIPERIPPER_$CDROMREADERSYNTAX"
 		FILEARG="$( eval echo "\$$TEMPARG" )"
 		REDIR=""
 		PIPE_MESSAGE="and encoding "
@@ -2270,8 +2276,12 @@ fi
 decho ()
 {
 if [ x"$DEBUG" != "x" ]; then
-	DEBUGECHO=$(echo "$@" | tr -d '[]')
-	echo "[DEBUG] $DEBUGECHO: `eval echo \\$${DEBUGECHO}`"
+	if echo $1 | grep -q "^\[" ; then
+		DEBUGECHO=$(echo "$@" | tr -d '[]')
+		echo "[DEBUG] $DEBUGECHO: `eval echo \\$${DEBUGECHO}`"
+	else
+		echo "[DEBUG] $1"
+	fi
 fi
 }
 
@@ -2399,6 +2409,7 @@ METAFLAC=metaflac
 NORMALIZE=normalize-audio
 CDSPEED=eject
 VORBISGAIN=vorbisgain
+MP3GAIN=mp3gain
 MKCUE=mkcue
 MKTOC=cdrdao
 DIFF=diff
@@ -2439,6 +2450,7 @@ MKCUEOPTS=
 MKTOCOPTS=""
 VORBISCOMMENTOPTS="-R"
 METAFLACOPTS="--no-utf8-convert"
+DIFFOPTS=
 
 # Default to one process if -j isn't specified
 MAXPROCS=1
@@ -2528,12 +2540,13 @@ fi
 
 # Parse command line options
 #while getopts 1a:A:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
-while getopts 1a:bc:C:d:Defghj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do
+while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do
 	case "$opt" in
 		1) ONETRACK=y ;;
 		a) ACTIONS="$OPTARG" ;;
 		A) EXPACTIONS="$OPTARG" ;;
 		b) BATCHNORM=y ;;
+		B) NOBATCHREPLAYGAIN=y ;;
 		c) if [ -e "$OPTARG" ] ; then . "$OPTARG" ; else log error "config file \"$OPTARG\" cannot be found." ; exit 1 ; fi ;;
 		C) DISCID="${OPTARG#abcde.}" ;;
 		d) CDROM="$OPTARG" ;;
@@ -2557,14 +2570,12 @@ while getopts 1a:bc:C:d:Defghj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do
 		p) PADTRACKS=y ;;
 		P) USEPIPES=y ;;
 		r) REMOTEHOSTS="$OPTARG" ;;
-		R) REPLAYGAIN=y ;;
+		R) DOREPLAYGAIN=y ;;
 		s) SHOWCDDBFIELDS="$OPTARG" ;;
 		S) CDSPEEDVALUE="$OPTARG" ;;
-#		t) PREPROCESSFORMATS="$OPTARG"
-#		   PREPROCESS=y ;;
-#		T) POSTPROCESSFORMATS="$OPTARG" ;;
 		t) STARTTRACKNUMBER="$OPTARG" ;;
 		T) STARTTRACKNUMBER="$OPTARG" ; STARTTRACKNUMBERTAG="y" ;;
+		u) CDDBPROTO=6 ;;
 		v) 
 		   echo "This is abcde v$VERSION."
 		   echo "Usage: abcde [options] [tracks]"
@@ -2598,6 +2609,9 @@ if echo $CDROM | grep -i -q '.flac$'; then
 	fi
 fi
 
+# If the user provided a DISCID, disable eject
+if [ -n "$DISCID" ]; then EJECTCD=n ; fi
+
 # Decide if we can continue.
 if [ "$ONETRACK" = "y" ]; then 
 	# FIXME # remove check as soon as we find out about the other readers
@@ -2672,7 +2686,7 @@ done
 
 if [ "$DONORMALIZE" = "y" ] && [ "$DOREPLAYGAIN" = "y" ]; then
 	# FIXME # should we abort on error or just inform the user?
-	:
+	log warning "selected both normalize and replaygain actions"
 fi
 
 for SHOWCDDBFIELD in $(echo $SHOWCDDBFIELDS | tr , \ ); do
@@ -2838,17 +2852,18 @@ do
 		vorbis|ogg)
 			[ "$OGGENCODERSYNTAX" = "default" ] && OGGENCODERSYNTAX=oggenc
 			[ "$DOTAG" = "y" ] && NEEDCOMMENTER=y
-			[ "$REPLAYGAIN" = "y" ] && NEEDVORBISGAIN=y
+			[ "$DOREPLAYGAIN" = "y" ] && NEEDVORBISGAIN=y
 			OGGOUTPUTCONTAINER=ogg
 			;;
 		mp3)
 			[ "$MP3ENCODERSYNTAX" = "default" ] && MP3ENCODERSYNTAX=lame
 			[ "$DOTAG" = "y" ] && NEEDTAGGER=y
+			[ "$DOREPLAYGAIN" = "y" ] && NEEDMP3GAIN=y
 			;;
 		flac)
 			[ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
-			[ "$REPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
 			[ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
+			[ "$DOREPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
 			;;
 		spx)
 			[ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc
@@ -3009,21 +3024,25 @@ if [ X"$CDSPEEDVALUE" != "X" ]; then
 	esac
 fi
 
+###USEPIPESSUPPORT###
+
 # Rippers with USEPIPE support
 # FIXME # Include here all the rippers we can figure out support pipes
-PIPE_cdparanoia="-"
-PIPE_flac="-c "
+PIPERIPPER_cdparanoia="-"
+PIPERIPPER_debug="-"
+PIPERIPPER_flac="-c "
 
 # Encoders with USEPIPE support
 # FIXME # Include here all the encoders we can figure out support pipes
 PIPE_lame="-"
 PIPE_bladeenc="-"
 PIPE_oggenc="-"
+PIPE_flac="-"
 
 # Figure out if we can use pipes with the ripper/encoder combination
 # exit otherwise
 if [ "$USEPIPES" = "y" ]; then
-	PIPERIPPERSVARCHECK="PIPE_${CDROMREADER}"
+	PIPERIPPERSVARCHECK="PIPERIPPER_${CDROMREADERSYNTAX}"
 	case "$OUTPUT" in
 		mp3)
 			PIPEENCODERSVARCHECK="PIPE_$MP3ENCODERSYNTAX" ;;
@@ -3036,13 +3055,17 @@ if [ "$USEPIPES" = "y" ]; then
 		mpc)
 			PIPEENCODERSVARCHECK="PIPE_$MPPENCODER" ;;
 	esac
-	if [ ! -n "$( eval echo "\$$PIPERIPPERSVARCHECK" )" ] ; then
+	decho "PIPERIPPERSVARCHECK: $( eval echo "\$$PIPERIPPERSVARCHECK" )"
+	if [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "$" ] || \
+	   [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "" ] ; then
 		log error "no support for pipes with given ripper"
 		log error "read the USEPIPES file from the source tarball to get help."
 		log error "On a Debian system, it is under /usr/share/doc/abcde/USEPIPES.gz"
 		exit 1;
 	fi
-	if [ ! -n "$( eval echo "\$$PIPEENCODERSVARCHECK" )" ] ; then
+	decho "PIPEENCODERSVARCHECK: $( eval echo "\$$PIPEENCODERSVARCHECK" )"
+	if [ "$( eval echo "\$$PIPEENCODERSVARCHECK" )" = "$" ] || \
+	   [ "$( eval echo "\$$PIPEENCODERSVARCHECK" )" = "" ] ; then
 		log error "no support for pipes with given encoder"
 		log error "read the USEPIPES file from the source tarball to help"
 		log error "on a Debian system, read /usr/share/doc/abcde/USEPIPES.gz"
@@ -3057,8 +3080,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
 	${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
 	${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
 	${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
-	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDCUEREADER+$CUEREADER} \
-	${NEEDCUE2DISCID+$CUE2DISCID}
+	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMP3GAIN+$MP3GAIN} \
+	${NEEDCUEREADER+$CUEREADER} ${NEEDCUE2DISCID+$CUE2DISCID}
 do
 	# Cut off the command-line options we just added in
 	X=$(echo $X | cut -d' ' -f2)
@@ -3158,7 +3181,11 @@ fi
 if [ "$ONETRACK" = "y" ]; then 
 	TRACKS="$FIRSTTRACK"
 	if checkstatus readtrack-$FIRSTTRACK; then :; else
-		do_cdread onetrack $FIRSTTRACK $LASTTRACK
+		if [ "$USEPIPES" = "y" ]; then
+			do_cdread onetrack $FIRSTTRACK $LASTTRACK | do_encode $FIRSTTRACK %local0% > /dev/null 2>&1
+		else
+			do_cdread onetrack $FIRSTTRACK $LASTTRACK
+		fi
 	fi
 else
 	for UTRACKNUM in $TRACKQUEUE
@@ -3184,6 +3211,11 @@ else
 		if [ "$NOGAP" = "y" ] || [ "$BATCHNORM" = "y" ]; then
 		    :
 		else
+			# If we are not reading, set the encode output to loud already, so
+			# that we can see the output of the first track.
+			if [ "$MAXPROCS" = "1" ] && [ ! "$DOREAD" = "y" ]; then
+				echo "encode-output=loud" >> "$ABCDETEMPDIR/status"
+			fi
 			echo NEXTTRACK # Get the encoder machine churning again
 			if [ "$DOREAD" = "y" ]; then
 				if [ "$LOWDISK" = "y" ] && [ "$DOENCODE" = "y" ]; then
@@ -3434,9 +3466,14 @@ if [ "$DOENCODE" = "y" -a "$USEPIPES" != "y" ]; then
 fi
 # If the above didn't catch the stragglers, this will
 wait
-if [ "$REPLAYGAIN" = "y" ]; then
+if [ "$DOREPLAYGAIN" = "y" ]; then
 	do_replaygain
 fi
+
+# FIXME #
+# Check if all the encoded formats have been actually moved to the final destination
+# ...
+
 # Check to see if run_command logged any errors
 if [ -f "$ABCDETEMPDIR/errors" ]; then
 	log error "The following commands failed to run:"