From: data <data@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Mon, 16 Jan 2006 21:26:41 +0000 (+0000)
Subject: Start the CDDB code with a sane "notfound" default.
X-Git-Url: https://git.hcoop.net/clinton/abcde.git/commitdiff_plain/65c4132dc24aec158a8098d9ed0c3c09982639fe?hp=98a4933cc10a453fabab236fec912a51ad9bcf5a;ds=sidebyside

Start the CDDB code with a sane "notfound" default.
Check that the flac file has a cuesheet before trying to extract it.

git-svn-id: http://abcde.googlecode.com/svn/trunk@187 a0fa61bc-5347-0410-a1a9-7f54aa4e1825
---

diff --git a/abcde b/abcde
index 281d9d3..05f4248 100755
--- a/abcde
+++ b/abcde
@@ -1364,13 +1364,11 @@ do_discid ()
 			disktool -u ${CDROM#/dev/}
 		fi
 		if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
-			if [ "$TRACKINFO" = "" ]; then
+			if $METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM > /dev/null 2>&1 ; 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
+				log error "the input flac file does not contain a cuesheet."
+				exit 1
 			fi
 		else
 			case "$CDDBMETHOD" in
@@ -3330,6 +3328,8 @@ case "$CDDBMETHOD" in
 esac
 
 if [ "$DOCDDB" = "y" ]; then
+	# start with a sane default:
+	CDDBLOCALSTATUS=notfound
 	if [ $CDDBUSELOCAL = "y" ]; then
 		do_localcddb
 	fi