#
# $Id$
-VERSION='2.5.1-UNRELEASED'
+VERSION='2.5.3-UNRELEASED'
usage ()
{
done
echo
else
- log error "syntax error while processing track numbers"
+ log error "syntax error while processing track numbers ($i)"
exit 1
fi
}
# Runs a command, silently if necessary, and updates the status file
run_command ()
{
+ vvecho "$@"
BLURB="$1"
shift
# See if this is supposed to be silent
fi
# 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"
+ $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
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)
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' ')
fi
}
+# do_cdtext
+# Try to read CD-Text from the drive using icedax / cdda2wav
+do_cdtext ()
+{
+ if new_checkexec icedax; then
+ CDTEXT_READER=icedax
+ elif new_checkexec cdda2wav; then
+ CDTEXT_READER=cdda2wav
+ else
+ # Didn't find either, bail
+ return 0
+ fi
+
+ if [ "$CDROMID" = "" ]; then
+ CDDA2WAVCDROM="$CDROM"
+ else
+ CDDA2WAVCDROM="$CDROMID"
+ fi
+
+ # Do we have CD-Text on the disc (and can the drive read it?)
+ ${CDTEXT_READER} -J -N -D ${CDDA2WAVCDROM} > $ABCDETEMPDIR/cd-text 2>&1
+ grep -q '^CD-Text: detected' $ABCDETEMPDIR/cd-text
+ ERRORCODE=$?
+ if [ $ERRORCODE -ne 0 ]; then
+ # No CD-Text found, bail
+ return 0
+ fi
+
+ rm -f "$ABCDETEMPDIR/cddbchoices"
+ CDDBCHOICES=1
+ # Make an empty template
+ $CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > "$ABCDETEMPDIR/cddbread.1"
+ echo -n "Retrieved 1 CD-Text match..." >> "$ABCDETEMPDIR/cddbchoices"
+ echo "done." >> "$ABCDETEMPDIR/cddbchoices"
+ echo cddb-read-1-complete >> "$ABCDETEMPDIR/status"
+ echo cddb-choice=1 >> "$ABCDETEMPDIR/status"
+ ATITLE=$(grep -e '^Album title:' ${ABCDETEMPDIR}/cd-text | cut -c14- )
+ echo "200 none ${ATITLE}" >> "$ABCDETEMPDIR/cddbquery"
+ # List out disc title/author and contents
+ echo ---- ${ATITLE} ---- >> "$ABCDETEMPDIR/cddbchoices"
+ for TRACK in $(f_seq_row 1 $TRACKS)
+ do
+ TRACKM1=$(($TRACK - 1))
+ TITLE="$(grep -E ^Track\ +$TRACK: "$ABCDETEMPDIR/cd-text" | tr -d \\r\\n | sed 's~^Track ..: .~~g;'"s~'$~~g")"
+ echo "$TRACK: $TITLE" >> "$ABCDETEMPDIR/cddbchoices"
+ sed -i "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" $ABCDETEMPDIR/cddbread.1
+ done
+ sed -i "s~^DTITLE=.*~DTITLE=${ATITLE}~" $ABCDETEMPDIR/cddbread.1
+ echo >> "$ABCDETEMPDIR/cddbchoices"
+ echo "cdtext-readcomplete" >> "$ABCDETEMPDIR/status"
+}
+
# do_musicbrainz
# Work with the musicbrainz WS API, then transform the results here so
# they look (very) like the results from CDDB. Maybe not the best way
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
# vecho [message]
#
-# vecho outputs a message if EXTRAVERBOSE is selected
+# vecho outputs a message if EXTRAVERBOSE is 1 or more
vecho ()
{
-if [ x"$EXTRAVERBOSE" != "x" ]; then
+if [ x"$EXTRAVERBOSE" != "x" ] && [ $EXTRAVERBOSE -gt 0 ] ; then
+ case $1 in
+ warning) shift ; log warning "$@" ;;
+ *) echo "$@" ;;
+ esac
+fi
+}
+
+# vvecho [message]
+#
+# vvecho outputs a message if EXTRAVERBOSE is 2 or more
+vvecho ()
+{
+if [ x"$EXTRAVERBOSE" != "x" ] && [ $EXTRAVERBOSE -gt 1 ] ; then
case $1 in
warning) shift ; log warning "$@" ;;
*) echo "$@" ;;
VORBISCOMMENT=vorbiscomment
METAFLAC=metaflac
AACTAG=faac
+ATOMICPARSLEY=AtomicParsley
CDPARANOIA=cdparanoia
CDDA2WAV=icedax
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
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
+# We used to use EXTRAVERBOSE=y to turn on more debug output. Now
+# that's changed to a number to allow for more control. If
+# EXTRAVERBOSE=y, set it to 1 for backwards compatibility.
+if [ "$EXTRAVERBOSE" = "y" ]; then
+ EXTRAVERBOSE=1
+fi
+if [ "$EXTRAVERBOSE" = "n" ]; then
+ EXTRAVERBOSE=0
+fi
+
# Parse command line options
#while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPq:r:Rs:S:t:T:vVxw:W: opt ; do
while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPq:r:s:S:t:T:UvVxX:w:W:z opt ; do
echo "abcde -h for extra help"
exit
;;
- V) EXTRAVERBOSE="y" ;;
+ V) EXTRAVERBOSE=$(($EXTRAVERBOSE + 1)) ;;
x) EJECTCD="y" ;;
X) CUE2DISCID="$OPTARG" ;;
w) COMMENT="$OPTARG" ;;
# Range parsing code courtesy of Vincent Ho
# Cleaned up to use shell built-ins by Charles Steinkuehler
if [ "${1#*[^0-9-]}" != "$1" ]; then
- log error "syntax error while processing track numbers"
+ log error "syntax error while processing track numbers ($1)"
+ exit 1
else
RSTART=${1%%-*}
REND=${1##*-}
# Make sure a buncha things exist
for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
$OGGENCODER $FLACENCODER $SPEEXENCODER $MPPENCODER \
- $AACENCODER \
+ $AACENCODER $CDDBTOOL \
${NEEDATOMICPARSLEY+$ATOMICPARSLEY} \
${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}
;;
esac
fi
+ CHOICE=$(checkstatus cddb-choice)
+ if [ $CHOICE = 0 ] ; then
+ # We don't have any information at all; try to fall back
+ # to CD-Text for basic information
+ vecho "No CDDB information found, trying cdtext from the CD"
+ do_cdtext
+ fi
fi
do_cddbedit
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
HCoop / clinton / abcde.git / blobdiff