X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/1362d8f6aa50cb31fc29c1ff58cd230697037b86..f7d70f9cc043a976d63e909cf375f3b6ea70cbe5:/abcde

diff --git a/abcde b/abcde
index a9950dc..4fd137c 100755
--- a/abcde
+++ b/abcde
@@ -334,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()
@@ -726,7 +741,7 @@ do_tag ()
 					*)   echo COMMENT="$COMMENTOUTPUT";;
 				esac	
 			fi
-			) | run_command tagtrack-$OUTPUT-$1 $METAFLAC $METAFLACOPTS --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
+			) | run_command tagtrack-$OUTPUT-$1 $METAFLAC $METAFLACOPTS ${IMPORTCUESHEET:+--import-cuesheet-from="$ABCDETEMPDIR/$CUEFILE"} --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
 			;;
 		spx)
 			run_command tagtrack-$OUTPUT-$1 true
@@ -1349,7 +1364,14 @@ 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
 			case "$CDDBMETHOD" in
 				cddb) TRACKINFO=$($CDDISCID $CDROM) ;;
@@ -1628,15 +1650,19 @@ do_localcddb ()
 
 		if [ "$CDDBLOCALRECURSIVE" = "y" ]; then
 			CDDBLOCALRESULTS="$(find ${CDDBLOCALDIR} -name "${CDDBDISCID}" -type f 2> /dev/null)"
-			if   (( $(echo "${CDDBLOCALRESULTS}" | wc -l) == 1 )); then
-				CDDBLOCALFILE="${CDDBLOCALDIR}/${CDDBLOCALRESULTS}"
-				CDDBLOCALMATCH=single
-			elif (( $(echo "${CDDBLOCALRESULTS}" | wc -l) > 1 )); then
-				CDDBLOCALMATCH=multiple
+			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
 				CDDBLOCALMATCH=none
 			fi
-		elif [ -r "${CDDBLOCALDIR}/${CDDBDISCID}" ]; then
+		elif [ "$CDDBLOCALMATCH" = "none" ] && [ -r "${CDDBLOCALDIR}/${CDDBDISCID}" ]; then
 			CDDBLOCALFILE="${CDDBLOCALDIR}/${CDDBDISCID}"
 			CDDBLOCALMATCH=single
 		else
@@ -1646,6 +1672,7 @@ do_localcddb ()
 		# 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)
@@ -1655,6 +1682,7 @@ do_localcddb ()
 					{	
 						echo -n "#$X: "
 						do_cddbparse "${CDDBLOCALREAD}" 
+						echo ""
 					} >> "$ABCDETEMPDIR/cddblocalchoices"
 				done
 				CDDBLOCALCHOICES=$( echo "$CDDBLOCALRESULTS" | wc -l )
@@ -1688,7 +1716,11 @@ do_localcddb ()
 			single)
 				# List out disc title/author and contents
 				do_cddbparse "${CDDBLOCALFILE}"
-				echo -n "Locally cached CDDB entry found, use it? [y/n] (y): " >&2
+				if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
+					echo -n "Embedded cuesheet entry found, use it? [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
@@ -2290,9 +2322,10 @@ 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) 
-			echo "nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;" > /tmp/log
 			nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;
 		cdda2wav)
 			if [ "$OSFLAVOUR" = "OSX" ] ; then
@@ -2349,9 +2382,9 @@ do_cdread ()
 			echo readencodetrack-$UTRACKNUM >> "$ABCDETEMPDIR/status"
 		else
 			echo readtrack-$UTRACKNUM >> "$ABCDETEMPDIR/status"
-			if [ "$1" = "onetrack" ]; then
-				echo onetrack >> "$ABCDETEMPDIR/status"
-			fi
+		fi
+		if [ "$1" = "onetrack" ]; then
+			echo onetrack >> "$ABCDETEMPDIR/status"
 		fi
 	fi
 }
@@ -2374,7 +2407,7 @@ vecho ()
 {
 if [ x"$EXTRAVERBOSE" != "x" ]; then
 	case $1 in
-		warning) log warning "$@" ;;
+		warning) shift ; log warning "$@" ;;
 		*) echo "$@" ;;
 	esac
 fi
@@ -2727,16 +2760,16 @@ 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
@@ -3178,11 +3211,11 @@ 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
@@ -3244,33 +3277,35 @@ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
 	${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
 	${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
 	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMP3GAIN+$MP3GAIN} \
-	${NEEDMPPGAIN+$MPPGAIN} \
-	${NEEDCUEREADER+$CUEREADER} ${NEEDCUE2DISCID+$CUE2DISCID}
+	${NEEDMPPGAIN+$MPPGAIN} ${NEEDCUEREADER+$CUEREADER} \
+	${NEEDCUE2DISCID+$CUE2DISCID}
 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
@@ -3341,11 +3376,20 @@ if [ -f "$ABCDETEMPDIR/status" ] && [ X"$ERASEENCODEDSTATUS" = "Xy" ]; then
 		| grep -v ^encode-output > "$ABCDETEMPDIR/status"
 fi
 
+if checkstatus onetrack ; then ONETRACK=y ; fi
+
+if [ "$ONETRACK" = "y" ]; then 
+	# Reuse the CUEFILE in case we created it in a previous run
+	if CUEFILE=$(checkstatus cuefile); then
+		IMPORTCUESHEET=y
+	fi
+fi
+
 # Create playlist if needed (backgroundable) and start reading in tracks
 
 (
 
-if [ ! "$ONETRACK" = "y" ]; then
+if [ "$ONETRACK" = "y" ]; then
 	if [ "$DOPLAYLIST" = "y" ]; then
 		echo Creating playlist... >&2
 		do_playlist
@@ -3360,10 +3404,12 @@ fi
 
 if [ "$ONETRACK" = "y" ]; then 
 	TRACKS="$FIRSTTRACK"
-	if checkstatus readtrack-$FIRSTTRACK; then :; else
-		if [ "$USEPIPES" = "y" ]; then
+	if [ "$USEPIPES" = "y" ]; then
+		if checkstatus readencodetrack-$FIRSTTRACK; then :; else
 			do_cdread onetrack $FIRSTTRACK $LASTTRACK | do_encode $FIRSTTRACK %local0% > /dev/null 2>&1
-		else
+		fi
+	else
+		if checkstatus readtrack-$FIRSTTRACK; then :; else
 			do_cdread onetrack $FIRSTTRACK $LASTTRACK
 		fi
 	fi