X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/991009a4ed8602524a806e01396944e84abc5f15..df2e617f90b059c1844a04e79cc936f270f082e2:/abcde

diff --git a/abcde b/abcde
index 258b728..975bff3 100755
--- a/abcde
+++ b/abcde
@@ -1133,11 +1133,10 @@ do_encode ()
 						*=*) ;;
 						*)   COMMENT="COMMENT=$COMMENT" ;;
 					esac	
-					COMMENT="--comment \"$COMMENT\""
 				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 nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" --comment "$COMMENT" "$IN" "$OUT"
+				# Tag the file at encode time, as it can't be done after encoding.
+				if [ "$DOTAG" = "y" ]; then
+					RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT"
 				else
 					$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
 				fi
@@ -1152,8 +1151,8 @@ do_encode ()
 				$RUN_COMMAND nice $EFFECTIVE_NICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT"
 				;;
 			m4a)
-				# Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging
-				if [ ! "$DOTAG" = "y" ]; then
+				# Tag the file at encode time, as it can't be done after encoding.
+				if [ "$DOTAG" = "y" ]; then
 					$RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" -o "$OUT" "$IN"
 					
 				else
@@ -1742,7 +1741,7 @@ do_discid ()
 		vecho -n "Getting CD track info... "
 		# In OSX, unmount the disc before a query
 		if [ "$OSFLAVOUR" = "OSX" ]; then
-			disktool -u ${CDROM#/dev/}
+			diskutil unmount ${CDROM#/dev/}
 		fi
 		case "$CDROMREADERSYNTAX" in
 			flac)
@@ -1814,7 +1813,7 @@ do_discid ()
 		fi
 		# In OSX, remount the disc again
 		if [ "$OSFLAVOUR" = "OSX" ]; then
-			disktool -m ${CDROM#/dev/}
+			diskutil mount ${CDROM#/dev/}
 		fi
 		WEHAVEACD=y
 		DISCID=$(echo $TRACKINFO | cut -f1 -d' ')
@@ -1929,7 +1928,7 @@ do_discid ()
 		if [ ! -f "$ABCDETEMPDIR/discid" ]; then
 			# Wipe and start fresh
 			echo "abcde: $ABCDETEMPDIR/discid not found. Abcde must remove and recreate" >&2
-			echo -n "this directory to continue. Continue? [y/n] (n)" >&2
+			echo -n "this directory to continue. Continue [y/N]? " >&2
 			if [ "$INTERACTIVE" = "y" ]; then
 				read ANSWER
 			else
@@ -2194,9 +2193,9 @@ do_localcddb ()
 				# List out disc title/author and contents
 				do_cddbparse "${CDDBLOCALFILE}"
 				#if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
-				#	echo -n "Embedded cuesheet entry found, use it? [y/n] (y): " >&2
+				#	echo -n "Embedded cuesheet entry found, use it [Y/n]? " >&2
 				#else
-					echo -n "Locally cached CDDB entry found, use it? [y/n] (y): " >&2
+					echo -n "Locally cached CDDB entry found, use it [Y/n]? " >&2
 				#fi
 				if [ "$INTERACTIVE" = "y" ]; then
 					read USELOCALRESP
@@ -2692,7 +2691,7 @@ do_cddbedit ()
 		echo "Looks like a Multi-Artist CD" >&2
 		VARIOUSARTISTS=y
 	else
-		echo -n "Is the CD multi-artist? [y/n] (n): " >&2
+		echo -n "Is the CD multi-artist [y/N]? " >&2
 		if [ "$INTERACTIVE" = "y" ]; then
 			read VARIOUSARTISTS
 		else
@@ -2783,7 +2782,7 @@ do_cddbedit ()
 
 			# submit the modified file, if they want
 			if [ "$NOSUBMIT" != "y" ]; then
-				echo -n "Do you want to submit this entry to $CDDBSUBMIT? [y/n] (n): "
+				echo -n "Do you want to submit this entry to $CDDBSUBMIT [y/N]? "
 				read YESNO
 				while [ "$YESNO" != "y" ] && [ "$YESNO" != "n" ] && [ "$YESNO" != "Y" ] && \
 					[ "$YESNO" != "N" ] && [ "$YESNO" != "" ]
@@ -2888,7 +2887,7 @@ do_cdread ()
 		cdda2wav | icedax)
 			if [ "$OSFLAVOUR" = "OSX" ] ; then
 				# Hei, we have to unmount the device before running anything like cdda2wav/icedax in OSX
-				disktool -u ${CDROM#/dev/} 0
+				diskutil unmount ${CDROM#/dev/} 0
 				# Also, in OSX the cdrom device for cdda2wav/icedax changes...
 				CDDA2WAVCDROM="IODVDServices"
 			elif [ "$OSFLAVOUR" = "FBSD" ] ; then
@@ -3131,6 +3130,7 @@ EYED3=eyeD3
 VORBISCOMMENT=vorbiscomment
 METAFLAC=metaflac
 AACTAG=faac
+ATOMICPARSLEY=AtomicParsley
 
 CDPARANOIA=cdparanoia
 CDDA2WAV=icedax
@@ -3225,8 +3225,8 @@ if [ X$(uname) = "XFreeBSD" ] ; then
 elif [ X$(uname) = "XDarwin" ] ; then
 	HTTPGET=curl
 	OSFLAVOUR=OSX
-	# We should have disktool in OSX, but let's be sure...
-	NEEDDISKTOOL=y
+	# We should have diskutil in OSX, but let's be sure...
+	NEEDDISKUTIL=y
 	CDROMREADERSYNTAX=cddafs
 elif [ X$(uname) = "XOpenBSD" ] ; then
 	HTTPGET=wget
@@ -3294,12 +3294,16 @@ if [ "$CDROM" = "" ] ; then
 		CDROM=/dev/cdroms/cdrom0
 	elif [ -e /dev/cdrom ]; then
 		CDROM=/dev/cdrom
+	elif [ -e /dev/sr0 ]; then
+		CDROM=/dev/sr0
 	elif [ -e /dev/cd0c ]; then
 		CDROM=/dev/cd0c
 	elif [ -e /dev/acd0c ]; then
 		CDROM=/dev/acd0c
 	elif [ -e /dev/disk1 ]; then
 		CDROM=/dev/disk1
+	elif [ "$OSFLAVOUR" = "OSX" ] && [[ $(diskutil list) =~ CD_part.*(disk.)$'\n' ]]; then
+		CDROM=/dev/${BASH_REMATCH[1]}
 	fi
 fi
 
@@ -3913,7 +3917,7 @@ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
 	${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \
 	${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
 	${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
-	${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
+	${NEEDDISKUTIL+diskutil} ${NEEDCDSPEED+$CDSPEED} \
 	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMP3GAIN+$MP3GAIN} \
 	${NEEDMPPGAIN+$MPPGAIN} ${NEEDCUEREADER+$CUEREADER} \
 	${NEEDCUE2DISCID+$CUE2DISCID}
@@ -4134,7 +4138,7 @@ if [ "$EJECTCD" = "y" ] && [ -x $(which $EJECT) ]; then
 		cd="$(echo $CDROM | sed -e 's=.*/==;s=[a-h]$==;')"
 		$eject $EJECTOPTS $cd
 	elif [ X"$(uname)" = X"Darwin" ] ; then
-		disktool -e ${CDROM#/dev/} 0
+		diskutil eject ${CDROM#/dev/} 0
 	else
 		$EJECT $EJECTOPTS "$CDROM"
 	fi