# Copyright (c) 2003-2006 Jesus Climent <jesus.climent@hispalinux.es>
# Copyright (c) 2009-2012 Colin Tuckley <colint@debian.org>
# Copyright (c) 2012- Steve McIntyre <93sam@@debian.org>
-# Copyright (c) 2015- Andrew Strong <andrew.david.strong@gmail.com>
+# Copyright (c) 2015-2016 Andrew Strong <andrew.david.strong@gmail.com>
# This code is hereby licensed for public consumption under either the
# GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice.
#
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-VERSION='2.7.3-UNRELEASED'
+VERSION='2.8.2-UNRELEASED'
usage ()
{
echo "-1 Encode the whole CD in a single file"
echo "-a <action1[,action2]...>"
echo " Actions to perform:"
-echo " cddb,read,getalbumart,normalize,encode,tag,move,replaygain,playlist,clean"
+echo " cddb,read,getalbumart,embedalbumart,normalize,encode,tag,move,replaygain,playlist,clean"
#echo "-A Experimental actions (retag, transcode)"
echo "-b Enable batch normalization"
+echo "-B Embed albumart (this also activates getalbumart)"
echo "-c <file>"
echo " Specify a configuration file (overrides system and user config files)"
echo "-C <discid#>"
echo "-n No lookup. Don't query CDDB, just create and use template"
echo "-N Noninteractive. Never prompt for anything"
echo "-o <type1[,type2]...>"
-echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a,opus,mka,wv,ape,mp2,tta). Defaults to vorbis"
+echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a,opus,mka,wv,ape,mp2,tta,aiff). Defaults to vorbis"
echo "-p Pad track numbers with 0's (if less than 10 tracks)"
echo "-P Use UNIX pipes to read+encode without wav files"
+echo "-Q Select CDDBMETHOD method(s) from the command line. Choose from any/all of musicbrainz,cddb,cdtext. Defaults to musicbrainz".
echo "-r <host1[,host2]...>"
echo " Also encode on these remote hosts"
echo "-s <field>"
{
case $1 in
TRACKNAME1)
- TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
+ TRACKNAME="$(grep -a ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
;;
TRACKNAME)
- TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
+ TRACKNAME="$(grep -a ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
;;
TRACK-INFO)
- grep ^EXTT$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\\n/\n/g'
+ grep -a ^EXTT$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\\n/\n/g'
;;
esac
}
PREGAP=$(($(echo $OFFSETS | cut -f1 -d' ')))
TOTALTIME=$(( (($LEADOUT + $LEADIN + $PREGAP) / $CDFRAMES) - (($LEADIN + $PREGAP) / $CDFRAMES)))
- case "$CDDBMETHOD" in
- cddb)
- printf -v DISCID "%08lx" $(( ($CDDBCKSUM % 0xff) * 16777216 | $TOTALTIME * 256 | $TRACKS))
- ;;
- musicbrainz)
+ # Calculate both the cddb discid *and* the musicbrainz discid
+ # now. We'll use the cddb discid for reference in most cases
+ # for consistency, but we also have the musicbrainz discid for
+ # when we need it
+ printf -v CDDBDISCID "%08lx" $(( ($CDDBCKSUM % 0xff) * 16777216 | $TOTALTIME * 256 | $TRACKS))
+ CDDBTRACKINFO="${CDDBDISCID} $((TRACKS)) ${COOKEDOFFSETS} $((($LEADOUT + $LEADIN + $IDMAGICNUM) / $CDFRAMES))"
+
+ case $CDDBMETHOD in
+ *musicbrainz*)
# FIXME: don't assume the first track is 1
- echo "dasd: 1 $TRACKS $LEADIN $LEADOUT $OFFSETS "
- DISCID=$($MUSICBRAINZ --command calcid --discinfo 1 $TRACKS $LEADIN $LEADOUT $OFFSETS)
+ MBDISCID=$($MUSICBRAINZ --command calcid --discinfo 1 $TRACKS $LEADIN $LEADOUT $OFFSETS)
+ MBTRACKINFO="${MBDISCID} $((TRACKS)) ${COOKEDOFFSETS} $((($LEADOUT + $LEADIN + $IDMAGICNUM) / $CDFRAMES))"
;;
esac
-
- TRACKINFO="${DISCID} $((TRACKS)) ${COOKEDOFFSETS} $((($LEADOUT + $LEADIN + $IDMAGICNUM) / $CDFRAMES))"
}
do_replaygain()
CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
getcddbinfo TRACKNAME
splitvarious
- TRACKFILE="$(mungefilename "$TRACKNAME")"
- ARTISTFILE="$(mungefilename "$TRACKARTIST")"
- ALBUMFILE="$(mungefilename "$DALBUM")"
+ TRACKFILE="$(mungetrackname "$TRACKNAME")"
+ ARTISTFILE="$(mungeartistname "$TRACKARTIST")"
+ ALBUMFILE="$(mungealbumname "$DALBUM")"
GENRE="$(mungegenre "$GENRE")"
YEAR=${CDYEAR:-$CDYEAR}
gettracknum
}
do_getgenreid () {
-local genre=$(echo "${@}" | tr '[A-Z]' '[a-z]')
-local id=""
+ local genre=$(echo "${@}" | tr '[A-Z]' '[a-z]')
+ local id=""
case ${genre} in
"blues") id=0 ;;
"classic rock") id=1 ;;
if [ -z "$COMMENTOUTPUT" ]; then
COMMENTOUTPUT="$(getcddbinfo TRACK-INFO)"
fi
- if [ "$CDDBMETHOD" = "cddb" ]; then
- CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
- fi
+ CDDBDISCID=$(echo $CDDBTRACKINFO | cut -d' ' -f1)
run_command '' echo "Tagging track $1 of $TRACKS: $TRACKNAME..."
# If we want to start the tracks with a given number, we need to modify the
# TRACKNUM value before evaluation
mka)
run_command tagtrack-$OUTPUT-$1 true
;;
+ aiff)
+ run_command tagtrack-$OUTPUT-$1 true
+ ;;
flac)
(
echo ARTIST="$TRACKARTIST"
mka)
TEMPARG="PIPE_$MKAENCODERSYNTAX"
;;
+ aiff)
+ TEMPARG="PIPE_$AIFFENCODERSYNTAX"
+ ;;
flac)
TEMPARG="PIPE_$FLACENCODERSYNTAX"
;;
mka)
OUTPUT=$MKAOUTPUTCONTAINER
;;
+ aiff)
+ OUTPUT=$AIFFOUTPUTCONTAINER
+ ;;
flac)
OUTPUT=$FLACOUTPUTCONTAINER
;;
;;
esac
;;
+ aiff)
+ case "$AIFFENCODERSYNTAX" in
+ ffmpeg)
+ if [ "$DOTAG" = "y" ]; then
+ $RUN_COMMAND nice $EFFECTIVE_NICE $AIFFENCODER -i "$IN" $AIFFENCODEROPTS -metadata artist="$TRACKARTIST" \
+ -metadata album="$DALBUM" -metadata title="$TRACKNAME" -metadata track=${TRACKNUM:-$1} -metadata date="$CDYEAR" \
+ -metadata genre="$CDGENRE" -metadata comment="$COMMENT" "$OUT"
+ else
+ $RUN_COMMAND nice $EFFECTIVE_NICE $AIFFENCODER -i "$IN" $AIFFENCODEROPTS "$OUT"
+ fi
+ ;;
+ esac
+ ;;
flac)
case "$2" in
%local*%)
OUTPUT="$TMPOUTPUT"
# Create ALBUMFILE, ARTISTFILE, TRACKFILE
- ALBUMFILE="$(mungefilename "$DALBUM")"
- ARTISTFILE="$(mungefilename "$TRACKARTIST")"
- TRACKFILE="$(mungefilename "$TRACKNAME")"
+ ALBUMFILE="$(mungealbumname "$DALBUM")"
+ ARTISTFILE="$(mungeartistname "$TRACKARTIST")"
+ TRACKFILE="$(mungetrackname "$TRACKNAME")"
GENRE="$(mungegenre "$GENRE")"
YEAR=${CDYEAR:-$CDYEAR}
# If we want to start the tracks with a given number, we need to modify
mka)
OUTPUT=$MKAOUTPUTCONTAINER
;;
+ aiff)
+ OUTPUT=$AIFFOUTPUTCONTAINER
+ ;;
flac)
OUTPUT=$FLACOUTPUTCONTAINER
;;
mka)
OUTPUT=$MKAOUTPUTCONTAINER
;;
+ aiff)
+ OUTPUT=$AIFFOUTPUTCONTAINER
+ ;;
flac)
OUTPUT=$FLACOUTPUTCONTAINER
;;
# Create a playlist file for the playlist data to go into.
# We used to wipe it out if it existed. Now we request permission if interactive.
for LASTTRACK in $TRACKQUEUE; do :; done
- ALBUMFILE="$(mungefilename "$DALBUM")"
- ARTISTFILE="$(mungefilename "$DARTIST")"
+ ALBUMFILE="$(mungealbumname "$DALBUM")"
+ ARTISTFILE="$(mungeartistname "$DARTIST")"
GENRE="$(mungegenre "$GENRE")"
YEAR=${CDYEAR:-$CDYEAR}
if [ "$VARIOUSARTISTS" = "y" ] ; then
CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
getcddbinfo TRACKNAME
splitvarious
- TRACKFILE="$(mungefilename "$TRACKNAME")"
- ARTISTFILE="$(mungefilename "$TRACKARTIST")"
- ALBUMFILE="$(mungefilename "$DALBUM")"
+ TRACKFILE="$(mungetrackname "$TRACKNAME")"
+ ARTISTFILE="$(mungeartistname "$TRACKARTIST")"
+ ALBUMFILE="$(mungealbumname "$DALBUM")"
# If we want to start the tracks with a given number, we need to modify the
# TRACKNUM value before evaluation
gettracknum
LEADOUT=$(( $LEADOUT + $LEADIN ))
LENGTH=$(( $LEADOUT/75 - $TRACK1/75 ))
- DISCID=$(( ( $N % 255 ) * 2**24 | $LENGTH * 2**8 | $TRACKS ))
- printf "%08x %i" $DISCID $TRACKS
+ CDDBDISCID=$(( ( $N % 255 ) * 2**24 | $LENGTH * 2**8 | $TRACKS ))
+ printf "%08x %i" $CDDBDISCID $TRACKS
j=1
while [ $j -le $TRACKS ] ; do
# Remaining track index values offset by <pregap value>
#
# Variables used:
-# TRACKINFO
+# CDDBTRACKINFO
abcde.mkcue () {
echomsf () {
fi
vecho "One track is $ONETRACK"
- TRACKFILE="$(mungefilename "$TRACKNAME")"
- ARTISTFILE="$(mungefilename "$TRACKARTIST")"
- ALBUMFILE="$(mungefilename "$DALBUM")"
+ TRACKFILE="$(mungetrackname "$TRACKNAME")"
+ ARTISTFILE="$(mungeartistname "$TRACKARTIST")"
+ ALBUMFILE="$(mungealbumname "$DALBUM")"
if [ "$ONETRACK" = "y" ]; then
if [ "$VARIOUSARTISTS" = "y" ]; then
CUEWAVFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\" | sed -e 's@^.*/@@').$OUTPUT"
CUEWAVFILE="dummy.wav"
fi
- set -- $TRACKINFO
+ set -- $CDDBTRACKINFO
DISCID=$1
TRACKS=$2
# This essentially the start of things
do_discid ()
{
- # Query the CD to get the track info, unless the user specified -C
- # or we are using some actions which do not need the CDDB data at all
- #if [ ! X"$EXPACTIONS" = "X" ]; then
- # :
- #elif [ -z "$DISCID" ]; then
- if [ -z "$DISCID" ]; then
+ if [ -z "$CDDBDISCID" ]; then
vecho -n "Getting CD track info... "
# In OSX, unmount the disc before a query
if [ "$OSFLAVOUR" = "OSX" ]; then
;;
*)
#vecho "Using external python cue2discid implementation..."
- TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- "$CDROM" | $CUE2DISCID)
+ CDDBTRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- "$CDROM" | $CUE2DISCID)
;;
esac
else
exit 1
fi
;;
-# cdparanoia|debug)
-# CDPARANOIAOUTPUT="$( $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" -Q --verbose 2>&1 )"
-# RET=$?
-# if [ ! "$RET" = "0" ];then
-# log warning "something went wrong while querying the CD... Maybe a DATA CD?"
-# fi
-#
-# TRACKS="$(echo "$CDPARANOIAOUTPUT" | grep -E '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
-# CDPARANOIAAUDIOTRACKS="$TRACKS"
-#
-# LEADOUT="$(echo "$CDPARANOIAOUTPUT" | grep -Eo '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)"
-# OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')"
-# makeids
-# ;;
+ cdparanoia|debug)
+ CDPARANOIAOUTPUT="$( $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" -Q --verbose 2>&1 )"
+ RET=$?
+ if [ ! "$RET" = "0" ];then
+ log warning "something went wrong while querying the CD... Maybe a DATA CD?"
+ fi
+
+ TRACKS="$(echo "$CDPARANOIAOUTPUT" | grep -E '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
+ CDPARANOIAAUDIOTRACKS="$TRACKS"
+
+ LEADOUT="$(echo "$CDPARANOIAOUTPUT" | grep -Eo '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)"
+ OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')"
+ makeids
+ ;;
*)
- case "$CDDBMETHOD" in
- cddb) TRACKINFO=$($CDDISCID "$CDROM") ;;
- musicbrainz) TRACKINFO=$($MUSICBRAINZ --command id --device "$CDROM") ;;
+ # Calculate the cddb discid in all
+ # cases now. We'll use the cddb discid
+ # for reference in most cases for
+ # consistency. Also calculate the
+ # musicbrainz discid if we need it.
+ CDDBTRACKINFO=$($CDDISCID "$CDROM")
+ CDDBDISCID=$(echo $CDDBTRACKINFO | cut -d' ' -f1)
+ case $CDDBMETHOD in
+ *musicbrainz*)
+ MBTRACKINFO=$($MUSICBRAINZ --command id --device "$CDROM")
+ MBDISCID=$(echo $MBTRACKINFO | cut -d' ' -f1)
+ ;;
esac
- ;;
esac
# Make sure there's a CD in there by checking cd-discid's return code
if [ ! "$?" = "0" ]; then
diskutil mount ${CDROM#/dev/}
fi
WEHAVEACD=y
- DISCID=$(echo $TRACKINFO | cut -f1 -d' ')
+ CDDBDISCID=$(echo $CDDBTRACKINFO | cut -f1 -d' ')
else
- TRACKINFO=$(cat "$WAVOUTPUTDIR/abcde.$DISCID/discid")
+ CDDBTRACKINFO=$(cat "$WAVOUTPUTDIR/abcde.$CDDBDISCID/cddbdiscid")
fi
# Get a full enumeration of tracks, sort it, and put it in the TRACKQUEUE.
TRACKNUMPADDING=2
fi
- ABCDETEMPDIR="$WAVOUTPUTDIR/abcde.$(echo $TRACKINFO | cut -f1 -d' ')"
+ ABCDETEMPDIR="$WAVOUTPUTDIR/abcde.$(echo $CDDBTRACKINFO | cut -f1 -d' ')"
if [ -z "$TRACKQUEUE" ]; then
if [ ! "$STRIPDATATRACKS" = "n" ]; then
case "$CDROMREADERSYNTAX" in
rm -f "$ABCDETEMPDIR/cdparanoia-audio-tracks"
fi
if [ -f "$ABCDETEMPDIR/status" ] && TRACKS=$(checkstatus cdparanoia-audio-tracks); then :; else
- TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
+ TRACKS=$(echo $CDDBTRACKINFO | cut -f2 -d' ')
fi
fi
;;
- *) TRACKS=$(echo $TRACKINFO | cut -f2 -d' ') ;;
+ *) TRACKS=$(echo $CDDBTRACKINFO | cut -f2 -d' ') ;;
esac
else
- TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
+ TRACKS=$(echo $CDDBTRACKINFO | cut -f2 -d' ')
fi
if echo "$TRACKS" | grep "[[:digit:]]" > /dev/null 2>&1 ;then :;else
log info "The disc does not contain any tracks. Giving up..."
done
echo $TRACKQUEUE
else
- TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
+ TRACKS=$(echo $CDDBTRACKINFO | cut -f2 -d' ')
# User-supplied track queue.
# Weed out non-numbers, whitespace, then sort and weed out duplicates
TRACKQUEUE=$(echo $TRACKQUEUE | sed 's-[^0-9 ]--g' | tr ' ' '\n' | grep -v ^$ | sort -n | uniq | tr '\n' ' ' | sed 's- $--g')
fi
echo .
# See if it's populated
- if [ ! -f "$ABCDETEMPDIR/discid" ]; then
+ if [ ! -f "$ABCDETEMPDIR/cddbdiscid" ]; then
# Wipe and start fresh
- echo "abcde: $ABCDETEMPDIR/discid not found. Abcde must remove and recreate" >&2
+ echo "abcde: $ABCDETEMPDIR/cddbdiscid not found. Abcde must remove and recreate" >&2
echo -n "this directory to continue. Continue [y/N]? " >&2
if [ "$INTERACTIVE" = "y" ]; then
read ANSWER
fi
if [ X"$DOCUE" = "Xy" -a X"$WEHAVEACD" = "Xy" ]; then
if checkstatus cuefile > /dev/null 2>&1 ; then :; else
- CUEFILE=cue-$(echo "$TRACKINFO" | cut -f1 -d' ').txt
+ CUEFILE=cue-$(echo "$CDDBTRACKINFO" | cut -f1 -d' ').txt
vecho "Creating cue file..."
case $CDROMREADERSYNTAX in
flac)
fi
fi
- # Create the discid file
- echo "$TRACKINFO" > "$ABCDETEMPDIR/discid"
- if checkstatus cddbmethod > /dev/null 2>&1 ; then :; else
- echo "cddbmethod=$CDDBMETHOD" >> "$ABCDETEMPDIR/status"
- fi
+ # Create the discid files
+ echo "$CDDBTRACKINFO" > "$ABCDETEMPDIR/cddbdiscid"
+ case $CDDBMETHOD in
+ *musicbrainz*)
+ echo "$MBTRACKINFO" > "$ABCDETEMPDIR/mbdiscid"
+ ;;
+ esac
}
# do_cleancue
elif [ "$ONETRACK" = "y" ] &&
echo "$line" | grep '^FILE "dummy.wav" WAVE' > /dev/null 2>&1 ; then
- TRACKFILE="$(mungefilename "$TRACKNAME")"
- ARTISTFILE="$(mungefilename "$TRACKARTIST")"
- ALBUMFILE="$(mungefilename "$DALBUM")"
+ TRACKFILE="$(mungetrackname "$TRACKNAME")"
+ ARTISTFILE="$(mungeartistname "$TRACKARTIST")"
+ ALBUMFILE="$(mungealbumname "$DALBUM")"
if [ "$VARIOUSARTISTS" = "y" ]; then
OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\" | sed -e 's@^.*/@@').$OUTPUT"
if [ "$ONETRACK" = "y" ]; then
vecho "ONETRACK mode selected: displaying only the title of the CD..."
fi
- echo "---- $(grep DTITLE "${CDDBPARSEFILE}" | cut '-d=' -f2- | tr -d \\r\\n ) ----"
+ echo "---- $(grep -a DTITLE "${CDDBPARSEFILE}" | cut '-d=' -f2- | tr -d \\r\\n ) ----"
if [ X"$SHOWCDDBYEAR" = "Xy" ]; then
PARSEDYEAR=$(grep -a DYEAR "${CDDBPARSEFILE}" | cut '-d=' -f2-)
if [ ! X"$PARSEDYEAR" = "X" ]; then
fi
}
-# do_localcddb
+# do_localcddb_read
# Check for a local CDDB file, and report success
-do_localcddb ()
+do_localcddb_read ()
{
if checkstatus cddb-readcomplete && checkstatus cddb-choice >/dev/null; then :; else
CDDBLOCALSTATUS="notfound"
- CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
+ CDDBDISCID=$(echo $CDDBTRACKINFO | cut -d' ' -f1)
USELOCALRESP="y"
if [ "$CDDBLOCALRECURSIVE" = "y" ]; then
#echo "Using local copy of CDDB data"
echo "# DO NOT ERASE THIS LINE! Added by abcde to imitate cddb output" > "$ABCDETEMPDIR/cddbread.1"
cat "$ABCDETEMPDIR/cddblocalread.$CDDBLOCALCHOICENUM" >> "$ABCDETEMPDIR/cddbread.1"
+ echo "local" > "$ABCDETEMPDIR/datasource.1"
echo 999 > "$ABCDETEMPDIR/cddbquery" # Assuming 999 isn't used by CDDB
echo cddb-readcomplete >> "$ABCDETEMPDIR/status"
do_cddbparse "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbchoices"
#echo "Using local copy of CDDB data"
echo "# DO NOT ERASE THIS LINE! Added by abcde to imitate cddb output" > "$ABCDETEMPDIR/cddbread.1"
cat "${CDDBLOCALFILE}" >> "$ABCDETEMPDIR/cddbread.1"
+ echo "local" > "$ABCDETEMPDIR/datasource.1"
echo 999 > "$ABCDETEMPDIR/cddbquery" # Assuming 999 isn't used by CDDB
echo cddb-readcomplete >> "$ABCDETEMPDIR/status"
do_cddbparse "${CDDBLOCALFILE}" > "$ABCDETEMPDIR/cddbchoices"
fi
}
-# do_cdtext
+# do_cdtext_read
# Try to read CD-Text from the drive using icedax / cdda2wav
-do_cdtext ()
+do_cdtext_read ()
{
if new_checkexec icedax; then
CDTEXT_READER=icedax
return 0
fi
+ vecho "Obtaining CD-Text results..."
+ CDTDISCID=$(echo $CDDBTRACKINFO | cut -d' ' -f1)
+ local SOURCE_WORKDIR="$ABCDETEMPDIR/data-cdtext"
+ mkdir -p "${SOURCE_WORKDIR}"
+
if [ "$OSFLAVOUR" = "OSX" ] ; then
# Hei, we have to unmount the device before running anything like cdda2wav/icedax in OSX
diskutil unmount ${CDROM#/dev/}
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"
+ (
+ cd "${SOURCE_WORKDIR}" && rm -f audio.* audio_*
+ ${CDTEXT_READER} -J -v titles -D ${CDDA2WAVCDROM} > "${SOURCE_WORKDIR}/cd-text" 2>&1
+ )
+ grep -a -q '^CD-Text: detected' "${SOURCE_WORKDIR}/cd-text"
ERRORCODE=$?
if [ $ERRORCODE -ne 0 ]; then
# No CD-Text found, bail
return 0
fi
- rm -f "$ABCDETEMPDIR/cddbchoices"
- CDDBCHOICES=1
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + 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 -ae '^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 -aE ^Track\ +$TRACK: "$ABCDETEMPDIR/cd-text" | tr -d \\r\\n | sed 's~^Track ..: .~~g;'"s~'$~~g")"
- echo "$TRACK: $TITLE" >> "$ABCDETEMPDIR/cddbchoices"
- sed "s~^TTITLE${TRACKM1}=.*~TTITLE${TRACKM1}=${TITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new" && \
- mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1"
- done
- sed "s~^DTITLE=.*~DTITLE=${ATITLE}~" "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbread.new" && \
- mv -f "$ABCDETEMPDIR/cddbread.new" "$ABCDETEMPDIR/cddbread.1"
- rm -f "$ABCDETEMPDIR/cddbread.new" # In case a sed error occurred
- echo >> "$ABCDETEMPDIR/cddbchoices"
+ $CDDBTOOL template $(cat "${ABCDETEMPDIR}/cddbdiscid") > "${SOURCE_WORKDIR}/cddbread.${NUM_CDDB_MATCHES}"
+ echo cddb-read-${NUM_CDDB_MATCHES}-complete >> "${ABCDETEMPDIR}/status"
+ rm -f "${SOURCE_WORKDIR}/cddbread.${NUM_CDDB_MATCHES}"
+
+ # XXX FIXME - this is a hack and should be replaced by proper
+ # character set tracking for the CDDB data we have.
+ if test "$CDDBPROTO" -ge 6 ; then
+ # convert to Unicode
+ iconv -f iso-8859-1 -t utf-8 <"${SOURCE_WORKDIR}/audio.cddb" >"${SOURCE_WORKDIR}/cddbread.${NUM_CDDB_MATCHES}"
+ else
+ # copy verbatim, assuming CD-TEXT is in ISO-8859-1 format
+ # apparently icedax/cdda2wav have no support for 16-bit
+ # characters yet, either
+ cp -p "${SOURCE_WORKDIR}/audio.cddb" "${SOURCE_WORKDIR}/cddbread.${NUM_CDDB_MATCHES}"
+ fi
+
+ CDDBDISCID=$(echo $CDDBTRACKINFO | cut -d' ' -f1)
+ ATITLE=$(grep -a -e '^DTITLE=' "${SOURCE_WORKDIR}/cddbread.${NUM_CDDB_MATCHES}" | cut -c8- | tr -d \\r\\n)
+ echo "CD-Text" > ${SOURCE_WORKDIR}/datasource.${NUM_CDDB_MATCHES}
+ echo "none $CDDBDISCID ${ATITLE}" >> "${SOURCE_WORKDIR}/cddbquery.${NUM_CDDB_MATCHES}"
+
+ ( cd "${SOURCE_WORKDIR}" && rm -f audio_* audio.* )
+ cp "${SOURCE_WORKDIR}/"*."${NUM_CDDB_MATCHES}" "$ABCDETEMPDIR"
echo "cdtext-readcomplete" >> "$ABCDETEMPDIR/status"
}
-# do_musicbrainz
+# do_musicbrainz_read
# 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
# to go, but it Works For Me (TM)
-
-do_musicbrainz ()
+#
+# List out all the matches individually into $SOURCE_WORKDIR/cddbread.X
+#
+do_musicbrainz_read ()
{
if checkstatus musicbrainz-readcomplete; then :; else
vecho "Obtaining Musicbrainz results..."
# If MB is to be used, interpret the query results and read all
# the available entries.
- rm -f "$ABCDETEMPDIR/cddbchoices"
- CDDBCHOICES=1 # Overridden by multiple matches
- MBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
- ${MUSICBRAINZ} --command data --discid "$MBDISCID" --workdir "$ABCDETEMPDIR"
+ CDDBDISCID=$(echo $CDDBTRACKINFO | cut -d' ' -f1)
+ MBDISCID=$(echo $MBTRACKINFO | cut -d' ' -f1)
+ local SOURCE_WORKDIR="${ABCDETEMPDIR}/data-musicbrainz"
+ mkdir -p "${SOURCE_WORKDIR}"
+ ${MUSICBRAINZ} --command data --discid "$MBDISCID" --workdir "${SOURCE_WORKDIR}" --start ${NUM_CDDB_MATCHES}
+ # Check for no matches.
# The helper script will write disc matches out to
# cddbread.*. Count how many we have
- if [ ! -f "${ABCDETEMPDIR}/cddbread.1" ] ; then
- # No matches. Use the normal cddb template for the user to
- # fill in
- echo "No Musicbrainz match." >> "$ABCDETEMPDIR/cddbchoices"
- $CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > "$ABCDETEMPDIR/cddbread.0"
- # List out disc title/author and contents of template
- echo ---- Unknown Artist / Unknown Album ---- >> "$ABCDETEMPDIR/cddbchoices"
- UNKNOWNDISK=y
- for TRACK in $(f_seq_row 1 $TRACKS)
- do
- echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.0" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
+ NUM_RESPONSES=$(echo "${SOURCE_WORKDIR}"/cddbread.* | wc -w)
+ if [ "$NUM_RESPONSES" -gt 0 ] ; then
+ # One or more exact matches
+ i=1
+ while [ $i -le $NUM_RESPONSES ]; do
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + 1))
+ i=$(($i + 1))
+ echo cddb-read-${NUM_CDDB_MATCHES}-complete >> "$ABCDETEMPDIR/status"
+ ATITLE=$(grep -a -e '^DTITLE=' "${SOURCE_WORKDIR}/cddbread.${NUM_CDDB_MATCHES}" | cut -c8- | tr -d \\r\\n)
+ echo "none $CDDBDISCID ${ATITLE}" >> "${SOURCE_WORKDIR}/cddbquery.${NUM_CDDB_MATCHES}"
+ echo "Musicbrainz" > "${SOURCE_WORKDIR}/datasource.${NUM_CDDB_MATCHES}"
+ cp -f "${SOURCE_WORKDIR}/"*."${NUM_CDDB_MATCHES}" "$ABCDETEMPDIR"
done
- echo >> "$ABCDETEMPDIR/cddbchoices"
- echo cddb-read-0-complete >> "$ABCDETEMPDIR/status"
- echo cddb-choice=0 >> "$ABCDETEMPDIR/status"
- echo 503 > "$ABCDETEMPDIR/cddbquery"
- else
- # We have some matches
- NUM_RESPONSES=$(echo "${ABCDETEMPDIR}"/cddbread.* | wc -w)
- if [ "$NUM_RESPONSES" -eq 1 ] ; then
- # One exact match
- echo -n "Retrieved 1 Musicbrainz match..." >> "$ABCDETEMPDIR/cddbchoices"
- echo "done." >> "$ABCDETEMPDIR/cddbchoices"
- echo cddb-read-1-complete >> "$ABCDETEMPDIR/status"
- echo cddb-choice=1 >> "$ABCDETEMPDIR/status"
- ATITLE=$(grep -e '^DTITLE=' "${ABCDETEMPDIR}/cddbread.1" | cut -c8- )
- 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
- echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
- done
- echo >> "$ABCDETEMPDIR/cddbchoices"
- else
- echo "210 Found exact matches, list follows (until terminating .)" > "$ABCDETEMPDIR/cddbquery"
- echo "Multiple Musicbrainz matches:" >> "$ABCDETEMPDIR/cddbchoices"
- for file in "$ABCDETEMPDIR"/cddbread.*
- do
- X=$(echo $file | sed 's/^.*cddbread\.//g')
- echo cddb-read-$X-complete >> "$ABCDETEMPDIR/status"
- ATITLE=$(grep -e '^DTITLE=' "${ABCDETEMPDIR}"/cddbread.$X | cut -c8- )
- echo "none ${ATITLE}" >> "$ABCDETEMPDIR/cddbquery"
- # List out disc title/author and contents
- echo "#$X: ---- ${ATITLE} ----" >> "$ABCDETEMPDIR/cddbchoices"
- for TRACK in $(f_seq_row 1 $TRACKS)
- do
- echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.$X" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
- done
- echo >> "$ABCDETEMPDIR/cddbchoices"
- done
- echo "." >> "$ABCDETEMPDIR/cddbquery"
- fi
fi
echo "musicbrainz-readcomplete" >> "$ABCDETEMPDIR/status"
fi
}
-# do_cddbstat
-do_cddbstat ()
+# do_cddb_read
+do_cddb_read ()
{
+ local SOURCE_WORKDIR="${ABCDETEMPDIR}/data-cddb"
+ mkdir -p "${SOURCE_WORKDIR}"
+
+ ###########
+ # cddbstat
+ ###########
+
# Perform CDDB protocol version check if it hasn't already been done
if checkstatus cddb-statcomplete; then :; else
if [ "$CDDBAVAIL" = "n" ]; then
ERRORCODE=no_query
- echo 503 > "$ABCDETEMPDIR/cddbstat"
+ echo 503 > "${SOURCE_WORKDIR}/cddbstat"
else
rc=1
CDDBUSER=$(echo $HELLOINFO | cut -f1 -d'@')
CDDBHOST=$(echo $HELLOINFO | cut -f2- -d'@')
while test $rc -eq 1 -a $CDDBPROTO -ge 3; do
vecho "Checking CDDB server status..."
- $CDDBTOOL stat $CDDBURL $CDDBUSER $CDDBHOST $CDDBPROTO > "$ABCDETEMPDIR/cddbstat"
- RESPONSECODE=$(head -n 1 "$ABCDETEMPDIR/cddbstat" | cut -f1 -d' ')
+ $CDDBTOOL stat $CDDBURL $CDDBUSER $CDDBHOST $CDDBPROTO > "${SOURCE_WORKDIR}/cddbstat"
+ RESPONSECODE=$(head -n 1 "${SOURCE_WORKDIR}/cddbstat" | cut -f1 -d' ')
case "$RESPONSECODE" in
210) # 210 OK, status information follows (until terminating `.')
rc=0
;;
*) # Try a cddb query, since freedb2.org doesn't support the stat or ver commands
# FreeDB TESTCD disc-id is used for query
- $CDDBTOOL query $CDDBURL $CDDBPROTO $CDDBUSER $CDDBHOST 03015501 1 296 344 > "$ABCDETEMPDIR/cddbstat"
- RESPONSECODE=$(head -n 1 "$ABCDETEMPDIR/cddbstat" | cut -f1 -d' ')
+ $CDDBTOOL query $CDDBURL $CDDBPROTO $CDDBUSER $CDDBHOST 03015501 1 296 344 > "${SOURCE_WORKDIR}/cddbstat"
+ RESPONSECODE=$(head -n 1 "${SOURCE_WORKDIR}/cddbstat" | cut -f1 -d' ')
case "$RESPONSECODE" in
2??) # Server responded, everything seems OK
rc=0
fi
echo cddb-statcomplete >> "$ABCDETEMPDIR/status"
fi
-}
+ ###########
+ # cddbquery
+ ###########
-# do_cddbquery
-do_cddbquery ()
-{
- CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
+ CDDBDISCID=$(echo $CDDBTRACKINFO | cut -d' ' -f1)
CDDBLOCALFILE="${CDDBLOCALDIR}/${CDDBDISCID}"
# Perform CDDB query if it hasn't already been done
if checkstatus cddb-querycomplete; then :; else
if [ "$CDDBAVAIL" = "n" ]; then
ERRORCODE=no_query
- echo 503 > "$ABCDETEMPDIR/cddbquery"
+ echo 503 > "${SOURCE_WORKDIR}/cddbquery"
# The default CDDBLOCALSTATUS is "notfound"
# This part will be triggered if the user CDDB repo does not
# contain the entry, or if we are not trying to use the repo.
vecho "Querying the CDDB server..."
CDDBUSER=$(echo $HELLOINFO | cut -f1 -d'@')
CDDBHOST=$(echo $HELLOINFO | cut -f2- -d'@')
- $CDDBTOOL query $CDDBURL $CDDBPROTO $CDDBUSER $CDDBHOST $TRACKINFO > "$ABCDETEMPDIR/cddbquery"
+ $CDDBTOOL query $CDDBURL $CDDBPROTO $CDDBUSER $CDDBHOST $CDDBTRACKINFO > "${SOURCE_WORKDIR}/cddbquery"
ERRORCODE=$?
case $ERRORCODE in
0) # success
;;
12|13|14)
- # no match found in database,
- # wget/fetch error, or user requested not to use CDDB
- # Make up an error code (503) that abcde
- # will recognize in do_cddbread
+ # no match found in database, wget/fetch error,
+ # or user requested not to use CDDB. Make up an
+ # error code (503) that abcde will recognize later
# and compensate by making a template
- echo 503 > "$ABCDETEMPDIR/cddbquery"
+ echo 503 > "${SOURCE_WORKDIR}/cddbquery"
;;
*) # strange and unknown error
echo ERRORCODE=$ERRORCODE
fi
echo cddb-querycomplete >> "$ABCDETEMPDIR/status"
fi
-}
-# do_cddbread
-do_cddbread ()
-{
+ ###########
+ # cddbread
+ ###########
+
# If it's not to be used, generate a template.
# Then, display it (or them) and let the user choose/edit it
if checkstatus cddb-readcomplete; then :; else
+ RESPONSECODE=$(head -n 1 "${SOURCE_WORKDIR}/cddbquery" | cut -f1 -d' ')
vecho "Obtaining CDDB results..."
- # If CDDB is to be used, interpret the query results and read all
- # the available entries.
- rm -f "$ABCDETEMPDIR/cddbchoices"
- CDDBCHOICES=1 # Overridden by multiple matches
- RESPONSECODE=$(head -n 1 "$ABCDETEMPDIR/cddbquery" | cut -f1 -d' ')
case "$RESPONSECODE" in
200)
# One exact match, retrieve it
# 200 [section] [discid] [artist] / [title]
- if checkstatus cddb-read-1-complete; then :; else
- echo -n "Retrieving 1 CDDB match..." >> "$ABCDETEMPDIR/cddbchoices"
- $CDDBTOOL read $CDDBURL $CDDBPROTO $CDDBUSER $CDDBHOST $(cut -f2,3 -d' ' "$ABCDETEMPDIR/cddbquery") > "$ABCDETEMPDIR/cddbread.1"
- echo "done." >> "$ABCDETEMPDIR/cddbchoices"
- echo cddb-read-1-complete >> "$ABCDETEMPDIR/status"
- echo cddb-choice=1 >> "$ABCDETEMPDIR/status"
- fi
- # List out disc title/author and contents
- echo ---- "$(cut '-d ' -f4- "$ABCDETEMPDIR/cddbquery")" ---- >> "$ABCDETEMPDIR/cddbchoices"
- for TRACK in $(f_seq_row 1 $TRACKS)
- do
- echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
- done
- echo >> "$ABCDETEMPDIR/cddbchoices"
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + 1))
+ $CDDBTOOL read $CDDBURL $CDDBPROTO $CDDBUSER $CDDBHOST $(cut -f2,3 -d' ' "${SOURCE_WORKDIR}/cddbquery") > "${SOURCE_WORKDIR}/cddbread.${NUM_CDDB_MATCHES}"
+ cat ${SOURCE_WORKDIR}/cddbquery | cut -f2- -d' ' > ${SOURCE_WORKDIR}/cddbquery.${NUM_CDDB_MATCHES}
+ echo "cddb" > ${SOURCE_WORKDIR}/datasource.${NUM_CDDB_MATCHES}
+ echo cddb-read-${NUM_CDDB_MATCHES}-complete >> "${ABCDETEMPDIR}/status"
;;
202|403|409|500|503)
# TODO: Explain these error codes a little more accurately:
# http://ftp.freedb.org/pub/freedb/misc/freedb_CDDB_protcoldoc.zip
# No match response:
- case "$RESPONSECODE" in
- 202) echo "No CDDB match." >> "$ABCDETEMPDIR/cddbchoices" ;;
- 403|409) echo "CDDB entry is corrupt, or the handshake failed." >> "$ABCDETEMPDIR/cddbchoices" ;;
- 500|503) echo "CDDB unavailable." >> "$ABCDETEMPDIR/cddbchoices" ;;
- esac
- $CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > "$ABCDETEMPDIR/cddbread.0"
- # List out disc title/author and contents of template
- echo ---- Unknown Artist / Unknown Album ---- >> "$ABCDETEMPDIR/cddbchoices"
- UNKNOWNDISK=y
- for TRACK in $(f_seq_row 1 $TRACKS)
- do
- echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.0" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
- done
- echo >> "$ABCDETEMPDIR/cddbchoices"
- echo cddb-read-0-complete >> "$ABCDETEMPDIR/status"
- echo cddb-choice=0 >> "$ABCDETEMPDIR/status"
;;
210|211)
# Multiple exact, (possibly multiple) inexact matches
- IN=
- if [ "$RESPONSECODE" = "211" ]; then IN=in; fi
- if [ "$(wc -l < "$ABCDETEMPDIR/cddbquery" | tr -d ' ')" -eq 3 ]; then
- echo "One ${IN}exact match:" >> "$ABCDETEMPDIR/cddbchoices"
- tail -n +2 "$ABCDETEMPDIR/cddbquery" | head -n 1 >> "$ABCDETEMPDIR/cddbchoices"
- echo cddb-choice=1 >> "$ABCDETEMPDIR/status"
- else
- echo "Multiple ${IN}exact matches:" >> "$ABCDETEMPDIR/cddbchoices"
- fi
vecho -n "Retrieving multiple matches... "
- grep -v ^[.]$ "$ABCDETEMPDIR/cddbquery" | ( X=0
- read DISCINFO # eat top line
- while read DISCINFO
- do
- X=$(expr $X + 1)
- if checkstatus cddb-read-$X-complete; then :; else
- $CDDBTOOL read $CDDBURL $CDDBPROTO $CDDBUSER $CDDBHOST $(echo $DISCINFO | cut -f1,2 -d' ') > "$ABCDETEMPDIR/cddbread.$X"
- echo cddb-read-$X-complete >> "$ABCDETEMPDIR/status"
- fi
- # List out disc title/author and contents
- echo \#$X: ---- "$DISCINFO" ---- >> "$ABCDETEMPDIR/cddbchoices"
- for TRACK in $(f_seq_row 1 $TRACKS)
+ grep -v ^[.]$ "${SOURCE_WORKDIR}/cddbquery" | (
+ read DISCINFO # eat top line
+ while read DISCINFO
do
- echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.$X" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
- done
- echo >> "$ABCDETEMPDIR/cddbchoices"
- done )
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + 1))
+ if checkstatus cddb-read-${NUM_CDDB_MATCHES}-complete; then :; else
+ $CDDBTOOL read $CDDBURL $CDDBPROTO $CDDBUSER $CDDBHOST $(echo $DISCINFO | cut -f1,2 -d' ') > "${SOURCE_WORKDIR}/cddbread.${NUM_CDDB_MATCHES}"
+ echo "$DISCINFO" > ${SOURCE_WORKDIR}/cddbquery.${NUM_CDDB_MATCHES}
+ echo "cddb/$CDDBHOST" > ${SOURCE_WORKDIR}/datasource.${NUM_CDDB_MATCHES}
+ echo cddb-read-${NUM_CDDB_MATCHES}-complete >> "$ABCDETEMPDIR/status"
+ fi
+ done )
vecho "done."
- CDDBCHOICES=$(expr $(cat "$ABCDETEMPDIR/cddbquery" | wc -l) - 2)
;;
999)
# Using local copy.
- for TRACK in $(f_seq_row 1 $TRACKS)
- do
- echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
- done
- echo >> "$ABCDETEMPDIR/cddbchoices"
- echo cddb-read-1-complete >> "$ABCDETEMPDIR/status"
- echo cddb-choice=1 >> "$ABCDETEMPDIR/status"
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + 1))
+ echo cddb-read-${NUM_CDDB_MATCHES}-complete >> "$ABCDETEMPDIR/status"
;;
esac
echo "cddb-readcomplete" >> "$ABCDETEMPDIR/status"
+ cp -f "${SOURCE_WORKDIR}/"*.* "$ABCDETEMPDIR"
fi
}
# Display the $ABCDETEMPDIR/cddbchoices file created above
# Pick a pager so that if the tracks overflow the screen the user can still view everything
if [ -r "$ABCDETEMPDIR/cddbchoices" ]; then
- CDDBCHOICES=$(expr $(cat "$ABCDETEMPDIR/cddbquery" | wc -l) - 2)
CHOICE=$(checkstatus cddb-choice)
if [ -n "$CHOICE" ] ; then
- case $CDDBCHOICES in
- -1) if head -1 "$ABCDETEMPDIR/cddbquery" | grep "^$" > /dev/null 2>&1 ; then
- log error "CDDB query failed!"
- exit 1
- else
- cat "$ABCDETEMPDIR/cddbchoices"
- fi
- ;;
+ case $NUM_CDDB_MATCHES in
1) cat "$ABCDETEMPDIR/cddbchoices" ;;
*)
- echo "Selected: #$CHOICE"
+ ATITLE=$(grep -a ^DTITLE= "$ABCDETEMPDIR/cddbread.$CHOICE" | cut -f2- -d= | tr -d \\r\\n)
+ SOURCE=$(cat "${ABCDETEMPDIR}/datasource.$CHOICE")
+ echo "Selected: #$CDCHOICENUM ($SOURCE) ($ATITLE)"
do_cddbparse "$ABCDETEMPDIR/cddbread.$CHOICE"
;;
esac
# Setting the choice to an impossible integer to avoid errors in the numeric comparisons
CDCHOICENUM=-1
# I'll take CDDB read #3 for $400, Alex
- while [ $CDCHOICENUM -lt 0 ] || [ $CDCHOICENUM -gt $CDDBCHOICES ]; do
- echo -n "Which entry would you like abcde to use (0 for none)? [0-$CDDBCHOICES]: " >&2
+ while [ $CDCHOICENUM -lt 0 ] || [ $CDCHOICENUM -gt $NUM_CDDB_MATCHES ]; do
+ echo -n "Which entry would you like abcde to use (0 for none)? [0-$NUM_CDDB_MATCHES]: " >&2
read CDDBCHOICE
[ X"$CDDBCHOICE" = "X" ] && CDDBCHOICE=1
if echo $CDDBCHOICE | grep -E "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then
if [ ! X"$DIFF" = "X" ]; then
PARSECHOICE1=$(echo $CDDBCHOICE | cut -d"," -f1 | xargs printf %d 2>/dev/null)
PARSECHOICE2=$(echo $CDDBCHOICE | cut -d"," -f2 | xargs printf %d 2>/dev/null)
- if [ $PARSECHOICE1 -lt 1 ] || [ $PARSECHOICE1 -gt $CDDBCHOICES ] || \
- [ $PARSECHOICE2 -lt 1 ] || [ $PARSECHOICE2 -gt $CDDBCHOICES ] || \
+ if [ $PARSECHOICE1 -lt 1 ] || [ $PARSECHOICE1 -gt $NUM_CDDB_MATCHES ] || \
+ [ $PARSECHOICE2 -lt 1 ] || [ $PARSECHOICE2 -gt $NUM_CDDB_MATCHES ] || \
[ $PARSECHOICE1 -eq $PARSECHOICE2 ]; then
- echo "Invalid diff range. Please select two comma-separated numbers between 1 and $CDDBCHOICES" >&2
+ echo "Invalid diff range. Please select two comma-separated numbers between 1 and $NUM_CDDB_MATCHES" >&2
else
# We parse the 2 choices to diff, store them in temporary files and diff them.
for PARSECHOICE in $(echo $CDDBCHOICE | tr , \ ); do
fi
fi
else
- echo "The diff program was not found in your path. Please choose a number between 0 and $CDDBCHOICES." >&2
+ echo "The diff program was not found in your path. Please choose a number between 0 and $NUM_CDDB_MATCHES." >&2
fi
elif echo $CDDBCHOICE | grep -E "[[:space:]]*[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then
# Make sure we get a valid choice
CDCHOICENUM=$(echo $CDDBCHOICE | xargs printf %d 2>/dev/null)
- if [ $CDCHOICENUM -lt 0 ] || [ $CDCHOICENUM -gt $CDDBCHOICES ]; then
- echo "Invalid selection. Please choose a number between 0 and $CDDBCHOICES." >&2
+ if [ $CDCHOICENUM -lt 0 ] || [ $CDCHOICENUM -gt $NUM_CDDB_MATCHES ]; then
+ echo "Invalid selection. Please choose a number between 0 and $NUM_CDDB_MATCHES." >&2
fi
fi
done
if [ "$CDCHOICENUM" = "0" ]; then
vecho "Creating empty CDDB template..."
UNKNOWNDISK=y
- $CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > "$ABCDETEMPDIR/cddbread.0"
+ $CDDBTOOL template $(cat "$ABCDETEMPDIR/cddbdiscid") > "$ABCDETEMPDIR/cddbread.0"
else
- echo "Selected: #$CDCHOICENUM ($(grep ^DTITLE= "$ABCDETEMPDIR/cddbread.$CDCHOICENUM" | cut -f2- -d= | tr -d \\r\\n))" >&2
+ ATITLE=$(grep -a ^DTITLE= "$ABCDETEMPDIR/cddbread.$CDCHOICENUM" | cut -f2- -d= | tr -d \\r\\n)
+ SOURCE=$(cat "${ABCDETEMPDIR}/datasource.$CDCHOICENUM")
+ echo "Selected: #$CDCHOICENUM ($SOURCE) ($ATITLE)" >&2
do_cddbparse "$ABCDETEMPDIR/cddbread.$CDCHOICENUM"
fi
echo "cddb-choice=$CDCHOICENUM" >> "$ABCDETEMPDIR/status"
# Display the $ABCDETEMPDIR/cddbchoices file created above
# Pick a pager so that if the tracks overflow the screen the user can still view everything
if [ -r "$ABCDETEMPDIR/cddbchoices" ]; then
- CDDBCHOICES=$(expr $(cat "$ABCDETEMPDIR/cddbquery" | wc -l) - 2)
CHOICE=$(checkstatus cddb-choice)
if [ "$USELOCALRESP" = "y" ]; then :; else
if [ -n "$CHOICE" ] ; then
- case $CDDBCHOICES in
+ case $NUM_CDDB_MATCHES in
0)
UNKNOWNDISK=y
echo "Selected template."
CDCHOICENUM=1
echo "cddb-choice=$CDCHOICENUM" >> "$ABCDETEMPDIR/status"
fi
- echo "Selected: #$CDCHOICENUM ($(grep ^DTITLE= "$ABCDETEMPDIR/cddbread.$CDCHOICENUM" | cut -f2- -d= | tr -d \\r\\n))" >&2
+ echo "Selected: #$CDCHOICENUM ($(grep -a ^DTITLE= "$ABCDETEMPDIR/cddbread.$CDCHOICENUM" | cut -f2- -d= | tr -d \\r\\n))" >&2
fi
fi
exit 1
fi
CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
+ CDDBSOURCE=$(cat "$ABCDETEMPDIR/datasource.$(checkstatus cddb-choice)")
echo -n "Edit selected CDDB data " >&2
if [ "$INTERACTIVE" = "y" ]; then
if [ "$UNKNOWNDISK" = "y" ]; then
# Some heuristics first. Look at Disc Title, and if it starts with
# "Various", then we'll assume Various Artists
- if [ "$(grep ^DTITLE= "$CDDBDATA" | cut -f2- -d= | grep -Eci '^(various|soundtrack|varios|sonora|ost)')" != "0" ]; then
+ if [ "$(grep -a ^DTITLE= "$CDDBDATA" | cut -f2- -d= | grep -aEci '^(various|soundtrack|varios|sonora|ost)')" != "0" ]; then
echo "Looks like a Multi-Artist CD" >&2
VARIOUSARTISTS=y
else
# Set a default
DEFAULTSTYLE=1
# Need NUMTRACKS before cddb-tool will return it:
- NUMTRACKS=$(grep -E '^TTITLE[0-9]+=' "$CDDBDATA" | wc -l)
- if [ "$(grep -c "^TTITLE.*\/" "$CDDBDATA")" -gt "$(expr $NUMTRACKS / 2 )" ]; then
+ NUMTRACKS=$(grep -a -E '^TTITLE[0-9]+=' "$CDDBDATA" | wc -l)
+ if [ "$(grep -ac "^TTITLE.*\/" "$CDDBDATA")" -gt "$(expr $NUMTRACKS / 2 )" ]; then
# More than 1/2 tracks contain a "/", so guess forward
DEFAULTSTYLE=1
- elif [ "$(grep -c "^TTITLE.*\-" "$CDDBDATA")" -gt "$(expr $NUMTRACKS / 2 )" ]; then
+ elif [ "$(grep -ac "^TTITLE.*\-" "$CDDBDATA")" -gt "$(expr $NUMTRACKS / 2 )" ]; then
# More than 1/2 contain a "-", so guess forward-dash
DEFAULTSTYLE=2
- elif [ "$(grep -c "^TTITLE.*(.*)" "$CDDBDATA")" -gt "$(expr $NUMTRACKS / 2 )" ]; then
+ elif [ "$(grep -ac "^TTITLE.*(.*)" "$CDDBDATA")" -gt "$(expr $NUMTRACKS / 2 )" ]; then
# More than 1/2 contain something in parens, so guess trailing-paren
DEFAULTSTYLE=6
fi
echo "variousartists=$VARIOUSARTISTS" >> "$ABCDETEMPDIR/status"
echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
- if [ "$EDITCDDB" = "y" ] && [ "$CDDBMETHOD" = "cddb" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
+ if [ "$EDITCDDB" = "y" ] && [ "$CDDBSOURCE" = "cddb" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
if [ "$CDDBDATAMD5SUM" != "" ] && [ "$CDDBDATAMD5SUM" != "$($MD5SUM "$CDDBDATA" | cut -d " " -f 1)" ]; then
# This works but does not have the necessary error checking
# yet. If you are familiar with the CDDB spec
if [ "$CDDBCOPYLOCAL" = "y" ]; then
# Make sure the cache directory exists
mkdir -p $CDDBLOCALDIR
- cat "$CDDBDATA" | tail -n $(expr $(cat "$CDDBDATA" | wc -l ) - 1 ) > ${CDDBLOCALDIR}/$(echo "$TRACKINFO" | cut -d' ' -f1)
+ cat "$CDDBDATA" | tail -n $(expr $(cat "$CDDBDATA" | wc -l ) - 1 ) > ${CDDBLOCALDIR}/$(echo "$CDDBTRACKINFO" | cut -d' ' -f1)
fi
echo "cddb-edit" >> "$ABCDETEMPDIR/status"
do_getalbumart()
{
# set variables
- ALBUMFILE="$(mungefilename "$DALBUM")"
- ARTISTFILE="$(mungefilename "$DARTIST")"
+ ALBUMFILE="$(mungealbumname "$DALBUM")"
+ ARTISTFILE="$(mungeartistname "$DARTIST")"
GENRE="$(mungegenre "$GENRE")"
YEAR=${CDYEAR:-$CDYEAR}
# have we got a musicbrainz mbid or amazon asin?
case "$CDDBMETHOD" in
- musicbrainz)
+ *musicbrainz*)
# try musicbrainz mbid
if [ -s "$ABCDETEMPDIR/mbid.$(checkstatus cddb-choice)" ]; then
MBID=$(cat "$ABCDETEMPDIR/mbid.$(checkstatus cddb-choice)")
fi
}
+# Optionally embed the albumart downloaded by the getalbumart fuction.
+# FIXME: It would be nice to have this also selectable from within the
+# FIXME: getalbumart function itself. Andrew
+do_embedalbumart()
+{
+ # Set variables:
+ ALBUMFILE="$(mungealbumname "$DALBUM")"
+ ARTISTFILE="$(mungeartistname "$DARTIST")"
+ GENRE="$(mungegenre "$GENRE")"
+ YEAR=${CDYEAR:-$CDYEAR}
+
+ # Allow for multiple output formats:
+ for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
+ do
+ # Find the output directory for multi track encodes:
+ if [ "$ONETRACK" != "y" ] ; then
+ if [ "$VARIOUSARTISTS" = "y" ] ; then
+ FINDPATH="$(eval echo "$VAOUTPUTFORMAT")"
+ else
+ FINDPATH="$(eval echo "$OUTPUTFORMAT")"
+ fi
+ fi
+ # Find the output directory for single track encodes:
+ if [ "$ONETRACK" = "y" ] ; then
+ if [ "$VARIOUSARTISTS" = "y" ] ; then
+ FINDPATH="$(eval echo "$VAONETRACKOUTPUTFORMAT")"
+ else
+ FINDPATH="$(eval echo "$ONETRACKOUTPUTFORMAT")"
+ fi
+ fi
+
+ FINALDIR="$(dirname "$OUTPUTDIR/$FINDPATH")"
+ cd "$FINALDIR"
+
+# Instructions for each format, feel free to add more. It would be nice to
+# make the backup directory selectable and perhaps also have an option for
+# the bold to simply have the image deleted. Work for another day... Andrew.
+ if [ -e "$ALBUMARTFILE" ] ; then
+ case "$OUTPUT" in
+ mp3)
+ for i in *.mp3
+ do
+ "$EYED3" --add-image "$ALBUMARTFILE":FRONT_COVER "$i"
+ done
+ mkdir "$FINALDIR"/albumart_backup
+ mv "$ALBUMARTFILE" "$FINALDIR"/albumart_backup
+ vecho "Successfully embedded the album art into your $OUTPUT tracks" >&2
+ ;;
+ flac)
+ for i in *.flac
+ do
+ "$METAFLAC" --import-picture-from="$ALBUMARTFILE" "$i"
+ done
+ mkdir "$FINALDIR"/albumart_backup
+ mv "$ALBUMARTFILE" "$FINALDIR"/albumart_backup
+ vecho "Successfully embedded the album art into your $OUTPUT tracks" >&2
+ ;;
+ m4a)
+ for i in *.m4a
+ do
+ "$ATOMICPARSLEY" "$i" --artwork "$ALBUMARTFILE" --overWrite
+ done
+ mkdir "$FINALDIR"/albumart_backup
+ mv "$ALBUMARTFILE" "$FINALDIR"/albumart_backup
+ vecho "Successfully embedded the album art into your $OUTPUT tracks" >&2
+ ;;
+ wv)
+ for i in *.wv
+ do
+ "$WVTAG" --write-binary-tag "Cover Art (Front)=@"$ALBUMARTFILE"" "$i"
+ done
+ mkdir "$FINALDIR"/albumart_backup
+ mv "$ALBUMARTFILE" "$FINALDIR"/albumart_backup
+ vecho "Successfully embedded the album art into your $OUTPUT tracks" >&2
+ ;;
+ ogg)
+ # ----------------
+ # This technique is drawn from 2 sources (the first link being the primary source):
+ # 1. https://github.com/biapy/howto.biapy.com/blob/master/various/mussync-tools
+ # 2. https://github.com/acabal/scripts/blob/master/ogg-cover-art
+ # In abcde a few steps are used in this sequence:
+ #
+ # 1. Create a 'legal' header for the cover art image
+ # 2. Makes a copy of the existing tags
+ # 3. base64 the cover art image
+ # 4. Copy the original tags + the base64 image back to the original ogg file
+ #
+ # Might need some fine tuning but it is a start for abcde 2.8.2 Andrew.
+ # FIXME: I am not sure if there is a maximum size for images converted in this
+ # way, but this could be perhaps handled by CONVERTOPTS called from do_getalbumart.
+ # ----------------
+ # First some variables we can reuse:
+ # Use MIMETYPECOVER to allow use of either png or the more common jpeg:
+ MIMETYPECOVER=$(file -b --mime-type "$ALBUMARTFILE")
+ EXPORTTAGS="$ABCDETEMPDIR/export_ogg_tags"
+ BUILDHEADER="$ABCDETEMPDIR/build_header"
+ # Now build the header, gory details are here:
+ # https://xiph.org/flac/format.html#metadata_block_picture
+ # Picture Type:
+ printf "0: %.8x" 3 | xxd -r -g0 > "$BUILDHEADER"
+ # Mime type length
+ printf "0: %.8x" $(echo -n "$MIMETYPECOVER" | wc -c) | xxd -r -g0 >> "$BUILDHEADER"
+ # Mime type:
+ echo -n "$MIMETYPECOVER" >> "$BUILDHEADER"
+ # Description length. FIXME: I have used 'Cover Image' but I am not sure
+ # if this is better left as an empty field. Andrew
+ printf "0: %.8x" $(echo -n "Cover Image" | wc -c) | xxd -r -g0 >> "$BUILDHEADER"
+ # Description:
+ echo -n "Cover Image" >> "$BUILDHEADER"
+ # Picture width:
+ printf "0: %.8x" 0 | xxd -r -g0 >> "$BUILDHEADER"
+ # Picture height:
+ printf "0: %.8x" 0 | xxd -r -g0 >> "$BUILDHEADER"
+ # Picture color depth:
+ printf "0: %.8x" 0 | xxd -r -g0 >> "$BUILDHEADER"
+ # Picture color count:
+ printf "0: %.8x" 0 | xxd -r -g0 >> "$BUILDHEADER"
+ # Image file size:
+ printf "0: %.8x" $(wc -c "$ALBUMARTFILE" | cut --delimiter=' ' --fields=1) | xxd -r -g0 >> "$BUILDHEADER"
+ # cat the image file:
+ cat "$ALBUMARTFILE" >> "$BUILDHEADER"
+ # Now process each ogg file by first exporting the original tags then
+ # appending the cover image and finally copying the whole thing back
+ # to the original image:
+ for i in *.ogg
+ do
+ # Make a backup of the existing tags:
+ "$VORBISCOMMENT" --list --raw "$i" > "EXPORTTAGS"
+ # base64 the file and then mix it all together with the exported tags:
+ echo "metadata_block_picture=$(base64 --wrap=0 < "$BUILDHEADER")" >> "EXPORTTAGS"
+ # Update the original ogg file with exported tags and the appended base64'd image:
+ "$VORBISCOMMENT" --write --raw --commentfile "EXPORTTAGS" "$i"
+ # Delete the EXPORTTAGS file ready to be recreated for the next file in the loop,
+ # note that the header file BUILDHEADER will be reused for each file in the loop:
+ rm "EXPORTTAGS"
+ done
+ mkdir "$FINALDIR"/albumart_backup
+ mv "$ALBUMARTFILE" "$FINALDIR"/albumart_backup
+ vecho "Successfully embedded the album art into your $OUTPUT tracks" >&2
+ ;;
+ *) vecho "Sorry, abcde does not embed album art for the $OUTPUT container..." >&2
+ esac
+ else
+ vecho "Suitable cover image not found, no embedding done..." >&2
+ fi
+done
+}
+
# do_cdread [tracknumber]
# do_cdread onetrack [firsttrack] [lasttrack]
#
LASTTRACK=$(expr $3 + 0)
UTRACKNUM=$FIRSTTRACK
case "$CDROMREADERSYNTAX" in
- flac) READTRACKNUMS="$FIRSTTRACK.1-$(($LASTTRACK + 1)).0" ;;
+ flac) READTRACKNUMS="-" ;;
cdparanoia|libcdio)
#XX FIXME XX
- # Add a variable to check if tracks are provided in command line and if not, use "0-" to rip the tracks
- READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;;
+ # Add a variable to check if tracks are provided in command line and if not, rip the whole CD
+ # We must make sure to rip from sector 0, both lines below work
+ # READTRACKNUMS="-- -$LASTTRACK" ;;
+ READTRACKNUMS="[.0]-" ;;
cdda2wav | icedax) READTRACKNUMS="$FIRSTTRACK+$LASTTRACK" ;;
pird) READTRACKNUMS="$FIRSTTRACK..$LASTTRACK" ;;
*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
echo "$@" | sed -e 's/^\.*//' -e 's/ /_/g' | tr -d ":><|*/\"'?[:cntrl:]"
}
+# Custom filename munging specific to track names:
+mungetrackname ()
+{
+ mungefilename $@
+}
+
+# Custom filename munging specific to artist names:
+mungeartistname ()
+{
+ mungefilename $@
+}
+
+# Custom filename munging specific to album names:
+mungealbumname ()
+{
+ mungefilename $@
+}
+
# Custom genre munging:
mungegenre ()
{
# Builtin defaults
# CDDB
-# Defaults to FreeDB, but musicbrainz can be used too, via the abcde-musicbrainz-tool script
-CDDBMETHOD=cddb
+# Currently three supported options ("musicbrainz", "cddb" for freedb.org and "cdtext")
+CDDBMETHOD=musicbrainz
CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi"
CDDBSUBMIT=freedb-submit@freedb.org
CDDBPROTO=6
OGGENCODERSYNTAX=default
OPUSENCODERSYNTAX=default
MKAENCODERSYNTAX=default
+AIFFENCODERSYNTAX=default
FLACENCODERSYNTAX=default
SPEEXENCODERSYNTAX=default
MPCENCODERSYNTAX=default
METAFLAC=metaflac
NEROAACTAG=neroAacTag
ATOMICPARSLEY=AtomicParsley
+WVTAG=wvtag
WINE=wine
CDPARANOIA=cdparanoia
CONVERT=convert
DISPLAYCMD=display
-# Options for programs called from abcde
+# Options for programs called from abcde:
+#
+# aiff
+# These options needed by FFmpeg for tagging and selection of id3v2 version:
+# 1. '-write_id3v2 1' allows id3v2 tagging while '-write_id3v2 0' disables tagging
+# 2. '-id3v2_version 4' gives version id3v2.4 while '3' gives id3v2.3
+AIFFENCOPTS="-write_id3v2 1 -id3v2_version 4"
# mp3
LAMEOPTS=
GOGOOPTS=
# This option is basically for Debian package dependencies:
# List of preferred outputs - by default, run with whatever we have in the path
-DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:lame,mp3:bladeenc,spx:speex,m4a:faac:opus
+DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:lame,mp3:bladeenc,spx:speex,m4a:fdkaac:opus
# List of preferred cdromreaders - by default, run whichever we have in the path
DEFAULT_CDROMREADERS="cdparanoia icedax cdda2wav libcdio pird"
OSFLAVOUR=FBSD
elif [ X$(uname) = "XDarwin" ] ; then
HTTPGET=curl
+# By default md5sum is not installed, use md5 instead:
+ MD5SUM=md5
OSFLAVOUR=OSX
# We should have diskutil in OSX, but let's be sure...
NEEDDISKUTIL=y
if [ "$HTTPGETOPTS" = "" ] ; then
case $HTTPGET in
wget) HTTPGETOPTS="-q -nv -e timestamping=off -O -";;
- curl) HTTPGETOPTS="-f -s";;
+ curl) HTTPGETOPTS="-f -s -L";;
fetch)HTTPGETOPTS="-q -o -";;
ftp) HTTPGETOPTS="-a -V -o - ";;
*) log warning "HTTPGET in non-standard and HTTPGETOPTS are not defined." ;;
esac
# Parse command line options
-while getopts 1a:bc:C:d:DefgGhj:klLmMnNo:pPr:s:S:t:T:UvVxX:w:W:z opt ; do
+while getopts 1a:bBc:C:d:DefgGhj:klLmMnNo:pP:Q:r:s:S:t:T:UvVxX:w:W:z opt ; do
case "$opt" in
1) ONETRACK=y ;;
a) ACTIONS="$OPTARG" ;;
A) EXPACTIONS="$OPTARG" ;;
b) BATCHNORM=y ;;
+ B) GETALBUMART=y ; EMBEDALBUMART=y ;;
c) if [ -e "$OPTARG" ] ; then . "$OPTARG" ; else log error "config file \"$OPTARG\" cannot be found." ; exit 1 ; fi ;;
- C) DISCID="$( echo ${OPTARG#abcde.} | tr -d /)" ;;
+ C) CDDBDISCID="$( echo ${OPTARG#abcde.} | tr -d /)" ;;
d) CDROM="$OPTARG" ;;
D) set -x ;;
h) usage; exit ;;
o) OUTPUTTYPE="$OPTARG" ;;
p) PADTRACKS=y ;;
P) USEPIPES=y ;;
+ Q) CDDBMETHOD="$OPTARG" ;;
r) REMOTEHOSTS="$OPTARG" ;;
R) CDDBLOCALRECURSIVE=y ;;
s) SHOWCDDBFIELDS="$OPTARG" ;;
EJECTCD=n
fi
-# If the user provided a DISCID, disable eject
-if [ -n "$DISCID" ] || [ "$CDROMREADERSYNTAX" = "flac" ]; then EJECTCD=n ; fi
+# If the user provided a CDDBDISCID, disable eject
+if [ -n "$CDDBDISCID" ] || [ "$CDROMREADERSYNTAX" = "flac" ]; then EJECTCD=n ; fi
# Check the available cd rippers in the system, from the ones we know.
if [ "$CDROMREADERSYNTAX" = "" ]; then
playlist) DOCDDB=y; DOPLAYLIST=y;;
clean) DOCLEAN=y;;
getalbumart) GETALBUMART=y;;
+ embedalbumart) GETALBUMART=y; EMBEDALBUMART=y;;
esac
done
vorbis:*|ogg:*) OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
opus:*) OPUSENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
mka:*) MKAENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+ aiff:*) AIFFENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
mp3:*) MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
flac:*) FLACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
spx:*) SPEEXENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
esac
# If nothing has been specified, use oggenc for oggs and lame for mp3s and flac
-# for flacs and speexenc for speex and mpcenc for mpcs and faac for m4as and
+# for flacs and speexenc for speex and mpcenc for mpcs and fdkaac for m4as and
# wavpack for wvs...
# Getting ready for multiple output changes
[ "$MKAENCODERSYNTAX" = "default" ] && MKAENCODERSYNTAX=ffmpeg
MKAOUTPUTCONTAINER=mka
;;
+ aiff)
+ [ "$AIFFENCODERSYNTAX" = "default" ] && AIFFENCODERSYNTAX=ffmpeg
+ AIFFOUTPUTCONTAINER=aiff
+ ;;
mp3)
[ "$MP3ENCODERSYNTAX" = "default" ] && MP3ENCODERSYNTAX=lame
[ "$DOTAG" = "y" ] && NEEDTAGGER=y
[ "$DOREPLAYGAIN" = "y" ] && NEEDMP3GAIN=y
+ [ "$EMBEDALBUMART" = "y" ] && NEEDEYED3=y
;;
flac)
[ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
[ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
[ "$DOREPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
[ "$ONETRACK" = "y" ] && [ "$DOCUE" = "y" ] && NEEDMETAFLAC=y
+ [ "$EMBEDALBUMART" = "y" ] && NEEDMETAFLAC=y
;;
spx)
[ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc
[ "$DOTAG" = "y" ]
[ "$DOREPLAYGAIN" = "y" ] && NEEDWVGAIN=y
[ "$WVENCODERSYNTAX" = "ffmpeg" ] && DOREPLAYGAIN=n
+ [ "$EMBEDALBUMART" = "y" ] && NEEDWVTAG=y
;;
ape)
[ "$APENCODERSYNTAX" = "default" ] && APENCODERSYNTAX=mac
# compiled without libmp4v2... Andrew.
;;
m4a)
- [ "$AACENCODERSYNTAX" = "default" ] && AACENCODERSYNTAX=faac
- [ "$DOTAG" = "y" ] && CHECKFAACBUILD=y
+ [ "$AACENCODERSYNTAX" = "default" ] && AACENCODERSYNTAX=fdkaac
+ [ "$AACENCODERSYNTAX" = "faac" ] && [ "$DOTAG" = "y" ] && CHECKFAACBUILD=y
[ "$AACENCODERSYNTAX" = "neroAacEnc" ] && NEEDNEROAACTAG=y
[ "$AACENCODERSYNTAX" = "qaac" ] && NEEDWINE=y
[ "$AACENCODERSYNTAX" = "fhgaacenc" ] && NEEDWINE=y && NEEDATOMICPARSLEY=y
[ "$AACENCODERSYNTAX" = "ffmpeg" ] && [ "$DOTAG" = "y" ]
+ [ "$EMBEDALBUMART" = "y" ] && NEEDATOMICPARSLEY=y
;;
wav)
if [ "$KEEPWAVS" = "y" ]; then
MKAENCODER="$FFMPEG"
;;
esac
+case "$AIFFENCODERSYNTAX" in
+ ffmpeg)
+ AIFFENCODEROPTS="${AIFFENCODEROPTSCLI:-$AIFFENCOPTS}"
+ AIFFENCODER="$FFMPEG"
+ ;;
+esac
case "$FLACENCODERSYNTAX" in
flac)
FLACENCODEROPTS="${FLACENCODEROPTSCLI:-$FLACOPTS}"
NEEDEJECT=y
fi
if [ ! "$CDDBAVAIL" = "n" ] && [ "$DOCDDB" = "y" ]; then
- if [ "$CDDBMETHOD" = "cddb" ]; then
- NEEDHTTPGET=y
- elif [ "$CDDBMETHOD" = "musicbrainz" ]; then
- :
- fi
+ # Need an http tool to be able to do CDDB
+ case $CDDBMETHOD in
+ *cddb*)
+ NEEDHTTPGET=y;;
+ esac
fi
if [ "$DOCUE" = "y" ]; then
NEEDCUEREADER=y
PIPEENCODERSVARCHECK="PIPE_$OPUSENCODERSYNTAX" ;;
mka)
PIPEENCODERSVARCHECK="PIPE_$MKAENCODERSYNTAX" ;;
+ aiff)
+ PIPEENCODERSVARCHECK="PIPE_$AIFFENCODERSYNTAX" ;;
flac)
PIPEENCODERSVARCHECK="PIPE_$FLACENCODERSYNTAX" ;;
spx)
# Make sure a buncha things exist
for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
$OGGENCODER $OPUSENCODER $MKAENCODER $FLACENCODER $SPEEXENCODER $MPCENCODER \
- $AACENCODER $WVENCODER $CDDBTOOL $APENCODER $MP2ENCODER $TTAENCODER \
+ $AACENCODER $WVENCODER $CDDBTOOL $APENCODER $MP2ENCODER $TTAENCODER $AIFFENCODER \
${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \
${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
${NEEDWVGAIN+WVGAIN} ${NEEDAPETAG+$APETAG} \
${NEEDCUE2DISCID+$CUE2DISCID} ${NEEDNEROAACTAG+$NEROAACTAG} \
${NEEDGLYRC+$GLYRC} ${NEEDWINE+$WINE} ${NEEDATOMICPARSLEY+$ATOMICPARSLEY} \
- ${NEEDMID3V2+$MID3V2}
+ ${NEEDMID3V2+$MID3V2} ${NEEDEYED3+$EYED3} ${NEEDWVTAG+$WVTAG}
do
checkexec "$X"
done
if faac --help 2>&1 | grep -q -F 'MP4 support unavailable.'; then
echo "WARNING: Your copy of Faac does not have mp4 support"
echo "WARNING: Encoding untagged files to aac..."
- OUTPUTTYPE=aac
+ # Replace m4a with aac for single and multi-output encodes:
+ OUTPUTTYPE=$(echo "$OUTPUTTYPE" | sed 's/m4a/aac/')
else
echo "Using Faac to Tag AAC Tracks..."
fi
## Now that we have metaflac, check if we need cue2discid
#case $CDROMREADERSYNTAX in
# flac)
-# TRACKINFO=$($METAFLAC --show-tag=CDDB $CDROM | cut -d"=" -f2 | grep -E "[a-f0-9]{8}")
-# if [ "$TRACKINFO" = "" ]; then
+# CDDBTRACKINFO=$($METAFLAC --show-tag=CDDB $CDROM | cut -d"=" -f2 | grep -E "[a-f0-9]{8}")
+# if [ "$CDDBTRACKINFO" = "" ]; then
# checkexec ${NEEDCUE2DISCID+$CUE2DISCID}
# fi
# ;;
# Here it used to say:
# One thousand lines in, we can start doing stuff with things
# Well, right now we are at line 3737 ;)
+# Hey, for grins, as of 2016-08-30 this is now line 4814! -GR
# Export needed things so they can be read in this subshell
export CDDBTOOL ABCDETEMPDIR TRACKQUEUE LOWDISK EJECTCD EJECT EJECTOPTS
# start with a sane default:
CDDBLOCALSTATUS=notfound
if [ $CDDBUSELOCAL = "y" ]; then
- do_localcddb
+ do_localcddb_read
fi
if checkstatus cddb-choice > /dev/null; then
:
else
+ NUM_CDDB_MATCHES=0
if [ "$CDDBLOCALSTATUS" = "notfound" ] ; then
- case "$CDDBMETHOD" in
+ idx=0
+ for CDDBMETHCHOICE in $(echo "$CDDBMETHOD" | tr -d ' ' | tr , ' ')
+ do
+ addstatus "CDDB method $idx: $CDDBMETHCHOICE"
+ idx=$(($idx + 1))
+ vecho "Trying CDDB method ${CDDBMETHCHOICE}, found $NUM_CDDB_MATCHES matches so far"
+
+ # Run all the desired data acquisition methods, in the order
+ # specified by the user. Each will use its own temporary
+ # subdirectory, then copy the cddbread.* etc. files up into
+ # $ABCDETEMPDIR
+ case "$CDDBMETHCHOICE" in
cddb)
- do_cddbstat
- do_cddbquery
- do_cddbread
+ do_cddb_read
;;
musicbrainz)
- do_musicbrainz
+ do_musicbrainz_read
;;
- 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
+ cdtext)
+ do_cdtext_read
+ ;;
+ *)
+ echo "Unknown CDDB method $CDDBMETHCHOICE. Aborting." >&2
+ exit 1
+ ;;
+ esac
+
+ done
+
+ rm -f "${ABCDETEMPDIR}/cddbchoices"
+ CDDBDISCID=$(echo $CDDBTRACKINFO | cut -d' ' -f1)
+
+ if [ $NUM_CDDB_MATCHES = 0 ]; then
+ # If we got no matches, we need to
+ # generate a blank CDDB template.
+ vecho "Unable to find any matches, generating unknown template."
+ echo "No CDDB match." >> "${ABCDETEMPDIR}/cddbchoices"
+ $CDDBTOOL template $(cat "${ABCDETEMPDIR}/cddbdiscid") > "${ABCDETEMPDIR}/cddbread.0"
+ # List out disc title/author and contents of template
+ echo ---- Unknown Artist / Unknown Album ---- >> "${ABCDETEMPDIR}/cddbchoices"
+ UNKNOWNDISK=y
+ for TRACK in $(f_seq_row 1 $TRACKS)
+ do
+ echo $TRACK: "$(grep -a ^TTITLE$(expr $TRACK - 1)= "${ABCDETEMPDIR}/cddbread.0" | cut -f2- -d= | tr -d \\r\\n)" >> "${ABCDETEMPDIR}/cddbchoices"
+ done
+ echo >> "${ABCDETEMPDIR}/cddbchoices"
+ echo cddb-read-0-complete >> "${ABCDETEMPDIR}/status"
+ echo cddb-choice=0 >> "${ABCDETEMPDIR}/status"
+ echo 503 > "$ABCDETEMPDIR/cddbquery"
+ else
+ # We have matches; create the cddbchoices and cddbquery
+ # files from all the inputs we have
+ if [ $NUM_CDDB_MATCHES = 1 ]; then
+ echo "Retrieved 1 match..." >> "$ABCDETEMPDIR/cddbchoices"
+ echo -n "200 " > "$ABCDETEMPDIR/cddbquery"
+ cat "$ABCDETEMPDIR/cddbquery.1" >> "$ABCDETEMPDIR/cddbquery"
+ else
+ echo "Retrieved $NUM_CDDB_MATCHES matches..." >> "$ABCDETEMPDIR/cddbchoices"
+ echo "210 Found exact matches, list follows (until terminating .)" > "$ABCDETEMPDIR/cddbquery"
+ for X in $(f_seq_row 1 $NUM_CDDB_MATCHES)
+ do
+ cat "$ABCDETEMPDIR/cddbquery.$X" >> "$ABCDETEMPDIR/cddbquery"
+ done
+ echo "." >> "$ABCDETEMPDIR/cddbquery"
+ fi
+
+ for X in $(f_seq_row 1 $NUM_CDDB_MATCHES)
+ do
+ ATITLE=$(grep -a -e '^DTITLE=' "${ABCDETEMPDIR}/cddbread.$X" | cut -c8- | tr -d \\r\\n)
+ SOURCE=$(cat ${ABCDETEMPDIR}/datasource.$X)
+ echo "#$X ($SOURCE): ---- ${ATITLE} ----" >> "$ABCDETEMPDIR/cddbchoices"
+ for TRACK in $(f_seq_row 1 $TRACKS)
+ do
+ echo $TRACK: "$(grep -a ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.$X" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
+ done
+ echo >> "$ABCDETEMPDIR/cddbchoices"
+ done
+ fi
fi
fi
do_cddbedit
# CD tray. If not, we do not eject the CD, since it might be so that the
# user ejected it manually.
#CURRENTTRACKINFO=$($CDDISCID $CDROM)
- #if if [ "$?" != "1" ] && [ "$CURRENTTRACKINFO" = "$TRACKINFO" ] ; then
+ #if if [ "$?" != "1" ] && [ "$CURRENTTRACKINFO" = "$CDDBTRACKINFO" ] ; then
# More FreeBSD bits.
if [ X"$(uname)" = X"FreeBSD" ] ; then
# FreeBSD eject uses the EJECT environment variable to name the CDROM
do_replaygain
fi
+if [ "$EMBEDALBUMART" = "y" ]; then
+ do_embedalbumart
+fi
+
# Execute the user-defined post_encode function before cleaning up
post_encode
log warning "The encoded formats does not match with the moved ones"
log warning "Formats encoded: $( echo $ENCODED_FORMATS | tr "|" " " )"
log warning "Formats moved: $( echo $MOVED_FORMATS | tr "|" " " )"
- log warning "Use \"abcde -a clean -f -C $DISCID\" to force the removal of the remaining data."
+ log warning "Use \"abcde -a clean -f -C $CDDBDISCID\" to force the removal of the remaining data."
DOCLEAN=n
fi
fi