X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/43559afbf6561a453bfe99a71673c24159ed6c87..e7530e7c17acbb94af451881b25c2fad3d7a2a2c:/abcde

diff --git a/abcde b/abcde
index 08640a4..047210b 100755
--- a/abcde
+++ b/abcde
@@ -54,7 +54,6 @@ 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)"
 echo "-S <#> Set the CD speed"
@@ -357,7 +356,7 @@ checkexec ()
 			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
 			exit 1
-		elif [ ! -x $(which $X) ]; then
+		elif [ ! -x "$(which $X)" ]; then
 			log error "$X is not executable." >&2
 			exit 1
 		fi
@@ -721,15 +720,25 @@ do_tag ()
 			case "$ID3SYNTAX" in
 				id3);;
 				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 --commen=::"$COMMENTOUTPUT" \
-						-A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
+					# FIXME # track numbers in mp3 come with 1/10, so we cannot
+					# happily substitute them with $TRACKNUM
+					run_command tagtrack-$OUTPUT-$1 $TAGGER $TAGGEROPTS \
+						--comment=::"$COMMENTOUTPUT" -A "$DALBUM" \
+						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
 						-G "$GENREID" -n "${TRACKNUM:-$1}" "${TRACKNUM:+-N $TRACKS}" \
-						"${ENCODING:+--set-encoding=$ENCODING}"
+						"${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}" \
 						"$ABCDETEMPDIR/track$1.$OUTPUT"
 					;;
 				*)
-					# FIXME # track numbers in mp3 come with 1/10, so we cannot happily substitute them with $TRACKNUM
+					# 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}" \
@@ -917,18 +926,16 @@ do_encode ()
 		do
 			case "$TMPOUTPUT" in
 				vorbis|ogg)
-					OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
 					OUTPUT=$OGGOUTPUTCONTAINER
 					;;
 				flac)
-					OUT="$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
 					OUTPUT=$FLACOUTPUTCONTAINER
 					;;
 				*)
-					OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
 					OUTPUT=$TMPOUTPUT
 					;;
 			esac
+			OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
 			if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then 
 				continue
 			fi
@@ -1428,8 +1435,8 @@ do_discid ()
 			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)
+			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
@@ -1751,9 +1758,11 @@ do_localcddb ()
 						echo -n "#$X: "
 						do_cddbparse "${CDDBLOCALREAD}" 
 						echo ""
+						##FIXME## QUICK HACK !!!!
+						if [ ! "$INTERACTIVE" = "y" ]; then break ; fi
 					} >> "$ABCDETEMPDIR/cddblocalchoices"
 				done
-				if [ $(cat "$ABCDETEMPDIR/cddblocalchoices" | wc -l) -ge 24 ]; then
+				if [ $(cat "$ABCDETEMPDIR/cddblocalchoices" | wc -l) -ge 24 ] && [ "$INTERACTIVE" = "y" ]; then
 					page "$ABCDETEMPDIR/cddblocalchoices"
 				else
 					# It's all going to fit in one page, cat it
@@ -1780,8 +1789,9 @@ do_localcddb ()
 					done
 				else
 					### FIXME ###
-					echo "Selected ..."
+					#echo "Selected ..."
 					CDDBLOCALRESP=y
+					CDDBLOCALCHOICENUM=1
 				fi
 				if [ ! "$CDDBLOCALCHOICENUM" = "0" ]; then
 					#echo "Using local copy of CDDB data"
@@ -2728,7 +2738,7 @@ elif [ X$(uname) = "XNetBSD" ] ; then
 	HTTPGET=ftp
 	MD5SUM=md5
 	OSFLAVOUR=NBSD
-elif [ X$(uname) = "Solaris" ] ; then
+elif [ X$(uname) = "SunOS" ] ; then
 	HTTPGET=""
 	MD5SUM=md5
 	OSFLAVOUR=SunOS
@@ -2850,13 +2860,17 @@ done
 
 shift $(($OPTIND - 1))
 
+# Here it comes the worse part of the whole thing. From here until we start
+# 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 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
+if echo "$CDROM" | grep -i '.flac$' > /dev/null 2>&1 ; then
+	if [ ! -f "$CDROM" ]; then
 		log error "the defined file for FLAC ripping cannot be found" >&2
 		exit 1
 	fi
-	vecho warning "abcde: switching to flac CDROMREADERSYNTAX..."
+	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
@@ -2940,6 +2954,7 @@ DOCLEAN=n
 for ACTION in $(echo $ACTIONS | tr , \ )
 do
 	case $ACTION in
+		default) DOCDDB=y; DOREAD=y; DOENCODE=y; DOTAG=y; DOMOVE=y; DOCLEAN=y;;
 		cddb) DOCDDB=y;;
 		read) DOREAD=y;;
 		normalize) DONORMALIZE=y; DOREAD=y;;
@@ -2967,8 +2982,6 @@ for SHOWCDDBFIELD in $(echo $SHOWCDDBFIELDS | tr , \ ); do
 	esac
 done
 
-# Sanity checks:
-
 # At this point a CDROM has to be defined, so we check it exists.
 if [ X"$CDROM" != "X" ] ; then 
 	if [ "$CDROMREADERSYNTAX" = "cdda2wav" ] && [ "$NEEDCDROMID" = "y" ] ; then
@@ -3097,7 +3110,7 @@ esac
 
 # Allow -o OUTPUT(1):OPTIONS(1),...,OUTPUT(N):OPTIONS(N) mode of operation
 if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then
-	for OUTPUT in "$(echo "$OUTPUTTYPE" | tr , \ )"; do
+	for OUTPUT in "$(echo "$OUTPUTTYPE" | tr \  \|| tr , \ | tr \| \ )"; do
 		case "$OUTPUT" in
 			vorbis:*|ogg:*)	OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
 			mp3:*)	MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
@@ -3150,7 +3163,7 @@ do
 			;;
 		wav)
 			if [ "$KEEPWAVS" = "y" ]; then
-				vecho "Unsetting the KEEPWAVS option, since the resulting wav files were requested..."
+				vecho "Setting the KEEPWAVS option, since the resulting wav files were requested..."
 			fi
 			KEEPWAVS=move
 			;;
@@ -3234,8 +3247,8 @@ case "$AACENCODERSYNTAX" in
 		AACENCODER="$AACENC"
 		;;
 esac
-# and which tagger
 
+# and which tagger
 if [ "$ID3TAGV" = "1" ]; then
 	TAGGER="$ID3"
 	TAGGEROPTS="$ID3OPTS"
@@ -3307,7 +3320,7 @@ if [ "$MAKECUEFILE" = "y" ]; then
 	NEEDCUEREADER=y
 fi
 
-if [ X"$CDSPEEDVALUE" != "X" ] && [ "$DOREAD" = "y"]; then
+if [ X"$CDSPEEDVALUE" != "X" ] && [ "$DOREAD" = "y" ]; then
 	case "$CDROMREADERSYNTAX" in
 		cdparanoia|debug) CDROMREADEROPTS="$CDPARANOIAOPTS -S $CDSPEEDVALUE" ;;
 		### FIXME ### translate "cue2discid" from python to bash
@@ -3379,7 +3392,8 @@ do
 	checkexec "$X"
 done
 
-# And last but not least, check if we can diff between files
+# And last but not least, check if we can diff between files. We do not abort,
+# since diffing is not critical...
 if [ -x $(which $DIFF) ]; then :; else
 	vecho warning "Disabling diff since we cannot find it in the \$PATH..."
 	DIFF=""