#!/bin/bash
# Copyright (c) 1998-2001 Robert Woodcock <rcw@debian.org>
# 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>
# This code is hereby licensed for public consumption under either the
# GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice.
#
#
# $Id$
-VERSION='2.3.99-$Revision$'
+VERSION='2.5.5-UNRELEASED'
usage ()
{
echo "-k Keep the wav tracks for later use"
echo "-l Use low disk space algorithm"
echo "-L Use local CDDB storage directory"
+echo "-m Modify playlist to include CRLF endings, to comply with some players"
+#echo " WARNING: Deprecated. Use \"cue\" action"
+#echo "-M Create a CUE file"
echo "-n No lookup. Don't query CDDB, just create and use template"
echo "-N Noninteractive. Never prompt for anything"
-echo "-m Modify playlist to include CRLF endings, to comply with some players"
-echo "-M Create a CUE file"
echo "-o <type1[,type2]...>"
-echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a). Defaults to vorbis"
+echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a,opus). 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 <level>"
+echo " Set quality level (high,medium,low)"
echo "-r <host1[,host2]...>"
echo " Also encode on these remote hosts"
-echo "-R Use local CDDB in recursive mode"
echo "-s <field>"
-echo " Show dielfs from the CDDB info (year,genre)"
+echo " Show fields from the CDDB info (year,genre)"
echo "-S <#> Set the CD speed"
echo "-t <#> Start the track numbering at a given number"
echo "-T <#> Same as -t but modifies tag numbering"
-echo "-u Use UNICODE (UTF8) tags and comments"
echo "-U Do NOT use UNICODE (UTF8) tags and comments"
echo "-v Show version number and exit"
echo "-V Be a bit more verbose about what is happening behind the scenes"
echo "-x Eject CD after all tracks are read"
echo "-w <comment>"
echo " Add a comment to the CD tracks"
-echo "-W <#> Contatenate CDs: -T #01 -w \"CD #\""
+echo "-W <#> Concatenate CDs: -T #01 -w \"CD #\""
echo "-z Use debug CDROMREADERSYNTAX option (needs cdparanoia)"
echo ""
echo "Tracks is a space-delimited list of tracks to grab."
}
# log [level] [message]
-#
+#
# log outputs the right message in a common format
log ()
{
esac
}
-# Funtions to replace the need of seq, which is too distribution dependant.
+# Functions to replace the need of seq, which is too distribution dependent.
f_seq_row ()
{
i=$1
done
echo
else
- log error "syntax error while processing track numbers"
+ log error "syntax error while processing track numbers ($i)"
exit 1
fi
}
{
# Take the last line in the status file if there's multiple matches
PATTERN="^$1(=.*)?$"
- BLURB=$(egrep $PATTERN "$ABCDETEMPDIR/status" | tail -n 1)
+ BLURB=$(grep -E $PATTERN "$ABCDETEMPDIR/status" | tail -n 1)
if [ -z "$BLURB" ]; then
# No matches found
fi
# Take the last line in the status file if there's multiple matches
PATTERN="^$1(:.*)?$"
- BLURB="$(egrep $PATTERN "$ABCDETEMPDIR/warnings" | tail -n 1)"
+ BLURB="$(grep -E $PATTERN "$ABCDETEMPDIR/warnings" | tail -n 1)"
if [ -z "$BLURB" ]; then
# negative, we did not have a negative...
fi
# Take the last line in the status file if there's multiple matches
PATTERN="^$1(:.*)?$"
- BLURB="$(egrep $PATTERN "$ABCDETEMPDIR/errors" | tail -n 1)"
+ BLURB="$(grep -E $PATTERN "$ABCDETEMPDIR/errors" | tail -n 1)"
if [ -z "$BLURB" ]; then
# negative, we did not have a negative...
# 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
if [ ! "$@" = "" ]; then
# Cut off any command-line option we added in
X=$(echo $@ | cut -d' ' -f2)
+ # Test for built-in abcde.function
+ [ "$X" != "${X#abcde.}" ] && type $X >/dev/null 2>&1 && return
if [ "$(which $X)" = "" ]; then
log error "$X is not in your path." >&2
log info "Define the full path to the executable if it exists on your system." >&2
+ if [ -e /etc/debian_release ] ; then
+ case $X in
+ oggenc) MISSING_PACKAGE=vorbis-tools ;;
+ lame|flac) MISSING_PACKAGE=$X ;;
+ esac
+ log info "Hint: apt-get install $MISSING_PACKAGE" >&2
+ fi
exit 1
elif [ ! -x "$(which $X)" ]; then
log error "$X is not executable." >&2
PARSECHOICE2=$(echo $CDDBDIFFCHOICE | cut -d"," -f2 | xargs printf %d 2>/dev/null)
if [ $PARSECHOICE1 -lt 1 ] || [ $PARSECHOICE1 -gt $CDDBDIFFCHOICES ] || \
[ $PARSECHOICE2 -lt 1 ] || [ $PARSECHOICE2 -gt $CDDBDIFFCHOICES ] || \
- [ $PARSECHOICE1 -eq $PARSECHOICE2 ]; then
- echo "Invalid diff range. Please select two coma-separated numbers between 1 and $CDDBDIFFCHOICES" >&2
+ [ $PARSECHOICE1 -eq $PARSECHOICE2 ]; then
+ echo "Invalid diff range. Please select two comma-separated numbers between 1 and $CDDBDIFFCHOICES" >&2
else
# We parse the 2 choices to diff, store them in temporary files and diff them.
for PARSECHOICE in $(echo $CDDBDIFFCHOICE | tr , \ ); do
TRACKNAME)
TRACKNAME="$(grep ^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'
+ ;;
esac
}
gettracknum()
{
if [ -n "$STARTTRACKNUMBER" ] ; then
- # Get the trackpadding from the current track
- CURRENTTRACKPADDING=$(echo -n $UTRACKNUM | wc -c)
+ # Get the trackpadding from the current track, also trim whitespace for MacOSX
+ CURRENTTRACKPADDING=$(echo -n $UTRACKNUM | wc -c | tr -d ' ')
TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
else
TRACKNUM=${UTRACKNUM}
PREGAP=$(($(echo $OFFSETS | cut -f1 -d' ')))
TOTALTIME=$(( (($LEADOUT + $LEADIN + $PREGAP) / $CDFRAMES) - (($LEADIN + $PREGAP) / $CDFRAMES)))
- printf -v HEXSUM "%08lx" $(( ($CDDBCKSUM % 0xff) << 24 | $TOTALTIME << 8 | $TRACKS))
- TRACKINFO="${HEXSUM} $((TRACKS)) ${COOKEDOFFSETS} $((($LEADOUT + $LEADIN + $IDMAGICNUM) / $CDFRAMES))"
+ case "$CDDBMETHOD" in
+ cddb)
+ printf -v DISCID "%08lx" $(( ($CDDBCKSUM % 0xff) << 24 | $TOTALTIME << 8 | $TRACKS))
+ ;;
+ 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)
+ ;;
+ esac
+
+ TRACKINFO="${DISCID} $((TRACKS)) ${COOKEDOFFSETS} $((($LEADOUT + $LEADIN + $IDMAGICNUM) / $CDFRAMES))"
}
do_replaygain()
{
if checkstatus replaygain; then :; else
- run_command "" echo "Adding replygain information..."
+ run_command "" echo "Adding replaygain information..."
for TMPOUTPUT in $( echo $OUTPUTTYPE | tr , \ )
do
case $TMPOUTPUT in
vorbis|ogg)
OUTPUT=$OGGOUTPUTCONTAINER
;;
+ opus)
+ OUTPUT=$OPUSOUTPUTCONTAINER
+ ;;
flac)
OUTPUT=$FLACOUTPUTCONTAINER
;;
TRACKFILE="$(mungefilename "$TRACKNAME")"
ARTISTFILE="$(mungefilename "$TRACKARTIST")"
ALBUMFILE="$(mungefilename "$DALBUM")"
+ GENRE="$(mungegenre "$GENRE")"
+ YEAR=${CDYEAR:-$CDYEAR}
gettracknum
- if [ "$ONETRACK" = "y" ]; then
+ if [ "$ONETRACK" = "y" ]; then
if [ "$VARIOUSARTISTS" = "y" ]; then
OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\")"
else
done
case "$OUTPUT" in
flac)
- run_command replaygain-flac $METAFLAC --add-replay-gain "${OUTPUTFILES[@]}"
+ run_command replaygain-flac nice $ENCNICE $METAFLAC $FLACGAINOPTS "${OUTPUTFILES[@]}"
+ #run_command replaygain-flac true
;;
vorbis|ogg)
- run_command replaygain-vorbis $VORBISGAIN --album "${OUTPUTFILES[@]}"
+ run_command replaygain-vorbis nice $ENCNICE $VORBISGAIN $VORBISGAINOPTS "${OUTPUTFILES[@]}"
;;
mp3)
- run_command replaygain-mp3 $MP3GAIN -a "${OUTPUTFILES[@]}"
+ run_command replaygain-mp3 nice $ENCNICE $MP3GAIN $MP3GAINOPTS "${OUTPUTFILES[@]}"
;;
mpc)
- run_command replaygain-mpc $MPPGAIN --auto "${OUTPUTFILES[@]}"
+ run_command replaygain-mpc nice $ENCNICE $MPPGAIN --auto "${OUTPUTFILES[@]}"
;;
*);;
esac
# do_tag [tracknumber]
# id3 tags a filename
# variables used:
-# TRACKS, TRACKNAME, TRACKARTIST, TAGGER, TAGGEROPTS, VORBISCOMMENT, METAFLAC,
-# COMMENT, DALBUM, DARTIST, CDYEAR, CDGENRE (and temporarily) ID3TAGV
+# TRACKS, TRACKNAME, TRACKARTIST, TAGGER, TAGGEROPTS, VORBISCOMMENT, METAFLAC, ATOMICPARSLEY
+# COMMENT, DALBUM, DARTIST, CDYEAR, CDGENRE
do_tag ()
{
COMMENTOUTPUT="$(eval echo ${COMMENT})"
- CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
+ if [ -z "$COMMENTOUTPUT" ]; then
+ COMMENTOUTPUT="$(getcddbinfo TRACK-INFO)"
+ fi
+ if [ "$CDDBMETHOD" = "cddb" ]; then
+ CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
+ fi
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
mp3)
# id3v2 v0.1.9 claims to have solved the -c bug, so we merge both id3 and id3v2
GENREID=$(do_getgenreid "${CDGENRE}")
+ # Set TPE2 in case we have a Various Artists rip.
+ TPE2=""
+ if [ "$VARIOUSARTISTS" = "y" ]; then
+ TPE2="Various"
+ fi
case "$ID3SYNTAX" in
id3);;
eyed3)
# FIXME # track numbers in mp3 come with 1/10, so we cannot
# happily substitute them with $TRACKNUM
- run_command tagtrack-$OUTPUT-$1 $TAGGER $TAGGEROPTS \
+ run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \
--comment=::"$COMMENTOUTPUT" -A "$DALBUM" \
-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
- -G "$GENREID" -n "${TRACKNUM:-$1}" "${TRACKNUM:+-N $TRACKS}" \
- "${ENCODING:+--set-encoding=$ENCODING}" \
+ -G "$GENREID" -n "${TRACKNUM:-$1}" \
+ ${TRACKNUM:+-N "$TRACKS"} \
+ ${ENCODING:+--set-encoding="$ENCODING"} \
+ ${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
"$ABCDETEMPDIR/track$1.$OUTPUT"
;;
# FIXME # Still not activated...
id3ed)
- run_command tagtrack-$OUTPUT-$1 $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
- -a "$DALBUM" -n "$TRACKARTIST" -s "$TRACKNAME" -y "$CDYEAR" \
- -g "$GENREID" -k "${TRACKNUM:-$1}" \
+ run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
+ $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
+ -a "$DALBUM" -n "$TRACKARTIST" -s "$TRACKNAME" \
+ -y "$CDYEAR" -g "$GENREID" -k "${TRACKNUM:-$1}" \
"$ABCDETEMPDIR/track$1.$OUTPUT"
;;
*)
# FIXME # track numbers in mp3 come with 1/10, so we cannot
# happily substitute them with $TRACKNUM
- run_command tagtrack-$OUTPUT-$1 $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
- -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" -y "$CDYEAR" \
- -g "$GENREID" -T "${TRACKNUM:-$1/$TRACKS}" \
+ run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
+ $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
+ -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
+ -y "$CDYEAR" -g "$GENREID" \
+ -T "${TRACKNUM:-$1}/$TRACKS" \
+ ${TPE2:+--TPE2 "$TPE2"} \
"$ABCDETEMPDIR/track$1.$OUTPUT"
;;
esac
mv "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER"
fi
(
- # These are from http://www.xiph.org/ogg/vorbis/doc/v-comment.html
+ # These are from
+ # http://www.xiph.org/ogg/vorbis/doc/v-comment.html
+
echo ARTIST="$TRACKARTIST"
echo ALBUM="$DALBUM"
echo TITLE="$TRACKNAME"
echo GENRE="$CDGENRE"
fi
echo TRACKNUMBER=${TRACKNUM:-$1}
+ if [ -n "$DISCNUMBER" ]; then
+ echo DISCNUMBER="$DISCNUMBER"
+ fi
echo CDDB=$CDDBDISCID
if [ "$(eval echo ${COMMENT})" != "" ]; then
case "$COMMENTOUTPUT" in
*) echo COMMENT="$COMMENTOUTPUT";;
esac
fi
- ) | run_command tagtrack-$OUTPUT-$1 $VORBISCOMMENT $VORBISCOMMENTOPTS -w \
+ ) | run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
+ $VORBISCOMMENT $VORBISCOMMENTOPTS -w \
"$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER"
- # Doublecheck that the commented file was created successfully before wiping the original
+ # Doublecheck that the commented file was created
+ # successfully before wiping the original
if [ -f "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" ]; then
rm -f "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER"
else
;;
esac
;;
+ opus)
+ run_command tagtrack-$OUTPUT-$1 true
+ ;;
+
flac)
(
echo ARTIST="$TRACKARTIST"
echo GENRE="$CDGENRE"
fi
echo TRACKNUMBER="${TRACKNUM:-$1}"
+ if [ -n "$DISCNUMBER" ]; then
+ echo DISCNUMBER="$DISCNUMBER"
+ fi
echo CDDB="$CDDBDISCID"
if [ "$(eval echo ${COMMENT})" != "" ]; then
case "$COMMENTOUTPUT" in
*) echo COMMENT="$COMMENTOUTPUT";;
esac
fi
- ) | run_command tagtrack-$OUTPUT-$1 $METAFLAC $METAFLACOPTS ${IMPORTCUESHEET:+--import-cuesheet-from="$ABCDETEMPDIR/$CUEFILE"} --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
+ ) | run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $METAFLAC $METAFLACOPTS ${IMPORTCUESHEET:+--import-cuesheet-from="$ABCDETEMPDIR/$CUEFILE"} --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
;;
spx)
run_command tagtrack-$OUTPUT-$1 true
run_command tagtrack-$OUTPUT-$1 true
;;
m4a)
- run_command tagtrack-$OUTPUT-$1 true
+ # Use a temp-file of our choice. --overWrite seems to
+ # case core dumps with AtomicParsley 0.9.0
+ ATOMICTEMPFILE="$ABCDETEMPDIR/track$1.m4a-atomic"
+
+ VARIOUSBOOL="false"
+ if [ "$VARIOUSARTISTS" = "y" ]; then
+ VARIOUSBOOL="true"
+ fi
+
+ #It has to be command file opts for AtomicParsley
+ run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $ATOMICPARSLEY "$ABCDETEMPDIR/track$1.m4a" --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --tracknum ${TRACKNUM:-$1} --year "$CDYEAR" --genre "$CDGENRE" --compilation $VARIOUSBOOL --comment "$COMMENTOUTPUT" --output $ATOMICTEMPFILE
+ if [ -f $ATOMICTEMPFILE ]; then
+ mv "$ATOMICTEMPFILE" "$ABCDETEMPDIR/track$1.m4a"
+ fi
;;
wav)
run_command tagtrack-$OUTPUT-$1 true
# OUTPUTTYPE, {FOO}ENCODERSYNTAX, ENCNICE, ENCODER, ENCODEROPTS
do_nogap_encode ()
{
- # The commands here don't go through run_command because they're never supposed to be silenced
+ # The commands here don't go through run_command because they're never
+ # supposed to be silenced
echo "Encoding gapless MP3 tracks: $TRACKQUEUE"
for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
do
case "$OUTPUT" in
mp3)
case "$MP3ENCODERSYNTAX" in
- lame)
+ lame|toolame)
(
cd "$ABCDETEMPDIR"
TRACKFILES=
fi
fi
fi
- # Other encoders fall through to normal encoding as the tracks
- # have not been entered in the status file.
+ # Other encoders fall through to normal encoding as the tracks have not
+ # been entered in the status file.
}
# do_encode [tracknumber] [hostname]
vorbis|ogg)
TEMPARG="PIPE_$OGGENCODERSYNTAX"
;;
+ opus)
+ TEMPARG="PIPE_$OPUSENCODERSYNTAX"
+ ;;
flac)
TEMPARG="PIPE_$FLACENCODERSYNTAX"
;;
TEMPARG="PIPE_$SPEEXENCODER"
;;
mpc)
- TEMPARG="PIPE_$MPPENCODER"
+ TEMPARG="PIPE_$MPCENCODER"
;;
m4a)
- TEMPARG="PIPE_$MPPENCODER"
+ TEMPARG="PIPE_$AACENCODERSYNTAX"
;;
esac
IN="$( eval echo "\$$TEMPARG" )"
vorbis|ogg)
OUTPUT=$OGGOUTPUTCONTAINER
;;
+ opus)
+ OUTPUT=$OPUSOUTPUTCONTAINER
+ ;;
flac)
OUTPUT=$FLACOUTPUTCONTAINER
;;
;;
esac
OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
- if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then
+ if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then
continue
fi
if [ X"$USEPIPES" = "Xy" ]; then
RUN_COMMAND=""
# We need a way to store the creation of the files when using PIPES
RUN_COMMAND_PIPES="run_command encodetrack-$OUTPUT-$1 true"
+ # When pipping it does not make sense to have a higher nice for
+ # reading than for encoding, since it will be hold by the
+ # encoding process. Setting an effective nice, to calm down a
+ # bit the reading process.
+ EFFECTIVE_NICE=$READNICE
else
run_command '' echo "Encoding track $1 of $TRACKS: $TRACKNAME..."
RUN_COMMAND="run_command encodetrack-$OUTPUT-$1"
+ EFFECTIVE_NICE=$ENCNICE
fi
case "$OUTPUT" in
mp3)
case "$2" in
%local*%)
case "$MP3ENCODERSYNTAX" in
- lame|gogo) $RUN_COMMAND nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS "$IN" "$OUT" ;;
- bladeenc) $RUN_COMMAND nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS -quit "$IN" ;;
- l3enc|xingmp3enc) $RUN_COMMAND nice $ENCNICE $MP3ENCODER "$IN" "$OUT" $MP3ENCODEROPTS ;;
+ lame|toolame|gogo) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER $MP3ENCODEROPTS "$IN" "$OUT" ;;
+ bladeenc) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER $MP3ENCODEROPTS -quit "$IN" ;;
+ l3enc|xingmp3enc) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER "$IN" "$OUT" $MP3ENCODEROPTS ;;
# FIXME # Relates to the previous FIXME since it might need the "-if" removed.
- mp3enc) $RUN_COMMAND nice $ENCNICE $MP3ENCODER -if "$IN" -of "$OUT" $MP3ENCODEROPTS ;;
+ mp3enc) $RUN_COMMAND nice $EFFECTIVE_NICE $MP3ENCODER -if "$IN" -of "$OUT" $MP3ENCODEROPTS ;;
esac
;;
*)
case "$2" in
%local*%)
case "$OGGENCODERSYNTAX" in
- vorbize) $RUN_COMMAND nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -w "$OUT" "$IN" ;;
- oggenc) $RUN_COMMAND nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -o "$OUT" "$IN" ;;
+ vorbize) $RUN_COMMAND nice $EFFECTIVE_NICE $OGGENCODER $OGGENCODEROPTS -w "$OUT" "$IN" ;;
+ oggenc) $RUN_COMMAND nice $EFFECTIVE_NICE $OGGENCODER $OGGENCODEROPTS -o "$OUT" "$IN" ;;
+ esac
+ ;;
+ *)
+ $RUN_COMMAND nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" >/dev/null 2>&1
+ ;;
+ esac
+ ;;
+ opus)
+ case "$2" in
+ %local*%)
+ case "$OPUSENCODERSYNTAX" in
+ opusenc)
+
+ if [ "$(eval echo ${COMMENT})" != "" ]; then
+ case "$COMMENT" in
+ *=*) ;;
+ *) COMMENT="COMMENT=$COMMENT" ;;
+ esac
+ fi
+ # Tag the file at encode time, as it can't be done after encoding.
+ if [ "$DOTAG" = "y" ]; then
+ $RUN_COMMAND nice $EFFECTIVE_NICE $OPUSENCODER $OPUSENCODEROPTS --artist "$TRACKARTIST" --comment album="$DALBUM" --title "$TRACKNAME" --comment track="$1" --comment genre="$CDGENRE" --comment year="$CDYEAR" ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT"
+ else
+ $RUN_COMMAND nice $EFFECTIVE_NICE $OPUSENCODER $OPUSENCODEROPTS "$IN" "$OUT"
+ fi
+ ;;
esac
;;
*)
case "$2" in
%local*%)
case "$FLACENCODERSYNTAX" in
- flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER -f $FLACENCODEROPTS -o "$OUT" "$IN" ;;
- esac
+ flac) $RUN_COMMAND nice $EFFECTIVE_NICE $FLACENCODER -f $FLACENCODEROPTS -o "$OUT" "$IN" ;;
+ esac
;;
*)
vecho -n "DISTMP3:"
*=*) ;;
*) 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 $ENCNICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" "$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 $ENCNICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
fi
;;
mpc)
# MPP/MP+(Musepack) format (.mpc) is done locally, with inline
- # tagging.
- # I tried compiling the mppenc from corecodecs.org and got some
- # errors, so I have not tried it myself.
- ## FIXME ## Needs some cleanup to determine if an empty tag sent
- ## FIXME ## to the encoder ends up empty.
- $RUN_COMMAND nice $ENCNICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT"
+ # tagging. Uses mpcenc for Musepack SV8 encoding, changed from
+ # Musepack SV7 which used mppenc....
+ $RUN_COMMAND nice $EFFECTIVE_NICE $MPCENCODER $MPCENCODEROPTS --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
- $RUN_COMMAND nice $ENCNICE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" -o "$OUT" "$IN"
+ # Tag the file at encode time, as it can't be done after encoding.
+ if [ "$AACENC" = "neroAacEnc" ] ; then
+ DOTAG=y
+ $RUN_COMMAND nice $ENCNICE $AACENC $AACENCOPTS -if "$IN" -of "$OUT"
+ elif [ ! "$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
$RUN_COMMAND nice $ENCNICE $AACENCODER $AACENCODEROPTS -o "$OUT" "$IN"
# esac
# done
# # Only remove .wav if the encoding succeeded
-# if checkerrors "preprocess-(.{3,4})-$1"; then
+# if checkerrors "preprocess-(.{3,4})-$1"; then
# run_command preprocess-$1 false
# else
# run_command preprocess-$1 true
# run_command postprocess-$OUTPUT-$1 nice $POSTNICE $SPX_POST $IF $OF ;;
# esac
# # Only remove .wav if the encoding succeeded
-# if checkerrors "postprocess-(.{3,4})-$1"; then
+# if checkerrors "postprocess-(.{3,4})-$1"; then
# run_command postprocess-$1 false
# else
# run_command postprocess-$1 true
gettracknum
# Supported variables for OUTPUTFORMAT are GENRE, YEAR, ALBUMFILE,
# ARTISTFILE, TRACKFILE, and TRACKNUM.
- if [ "$ONETRACK" = "y" ]; then
+ if [ "$ONETRACK" = "y" ]; then
if [ "$VARIOUSARTISTS" = "y" ]; then
OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\")"
else
OUTPUTFILE="$(eval echo \""$ONETRACKOUTPUTFORMAT"\")"
- fi
+ fi
else
if [ "$VARIOUSARTISTS" = "y" ]; then
OUTPUTFILE="$(eval echo \""$VAOUTPUTFORMAT"\")"
else
OUTPUTFILE="$(eval echo \""$OUTPUTFORMAT"\")"
fi
- fi
+ fi
if checkerrors "tagtrack-$OUTPUT-$1"; then :; else
# Once we know the specific output was successful, we can change
# the OUTPUT to the value containing the container
vorbis|ogg)
OUTPUT=$OGGOUTPUTCONTAINER
;;
+ opus)
+ OUTPUT=$OPUSOUTPUTCONTAINER
+ ;;
flac)
OUTPUT=$FLACOUTPUTCONTAINER
;;
;;
esac
# Lets move the cue file
- if CUEFILE=$(checkstatus cuefile) >/dev/null ; then
+ if CUEFILE=$(checkstatus cuefile) >/dev/null ; then
if [ -r "$ABCDETEMPDIR/$CUEFILE" ]; then
if checkstatus movecue-$OUTPUT; then :; else
# Silence the Copying output since it overlaps with encoding processes...
vorbis|ogg)
OUTPUT=$OGGOUTPUTCONTAINER
;;
+ opus)
+ OUTPUT=$OPUSOUTPUTCONTAINER
+ ;;
flac)
OUTPUT=$FLACOUTPUTCONTAINER
;;
read ERASEPLAYLIST
case $ERASEPLAYLIST in
e|E|a|A|k|K) DONE=y ;;
+ "") ERASEPLAYLIST=e ; DONE=y ;;
*) ;;
esac
done
## this will convert the playlist to have CRLF line-endings, if specified
## (some hardware players insist on CRLF endings)
if [ "$DOSPLAYLIST" = "y" ]; then
- awk '{substr("\r",""); printf "%s\r\n", $0}' "$OUTPUTDIR/$PLAYLISTFILE" > "$ABCDETEMPDIR/PLAYLISTFILE.tmp"
+ awk '{sub("\r$",""); printf "%s\r\n", $0}' "$OUTPUTDIR/$PLAYLISTFILE" > "$ABCDETEMPDIR/PLAYLISTFILE.tmp"
# mv -f "$ABCDETEMPDIR/PLAYLISTFILE.tmp" "$OUTPUTDIR/$PLAYLISTFILE"
cat "$ABCDETEMPDIR/PLAYLISTFILE.tmp" | sed 's/\//\\/' > "$OUTPUTDIR/$PLAYLISTFILE"
fi
done
}
+# abcde.cue2discid
+# This function reads a cuefile on stdin and writes an extended
+# cddb query on stdout. Any PREGAP for track 1 is properly
+# handled, although cue files embedded in FLAC files do not
+# appear to properly store the PREGAP setting. :(
+abcde.cue2discid () {
+
+ cddb_sum () {
+ val=$1
+ ret=0
+ while [ $val -gt 0 ] ; do
+ ret=$(( $ret + ( $val % 10) ))
+ val=$(( $val / 10 ))
+ done
+ echo $ret
+ }
+
+ msf2lba () {
+ OIFS="$IFS"
+ IFS=":"
+ set -- $1
+ IFS="$OIFS"
+ local first second third
+ first=$(expr ${1} + 0 )
+ second=$(expr ${2} + 0 )
+ third=$(expr ${3} + 0 )
+
+ echo $(( ((($first * 60) + $second) * 75) + $third ))
+ }
+
+ OFFSET=150
+ PREGAP=0
+ LEADOUT=0
+ LEADIN=88200
+ i=0
+ N=0
+
+ while read line ; do
+ set -- $line
+ case "$1" in
+ TRACK) i=$(( i + 1 ))
+ ;;
+ INDEX) if [ "$2" -eq 1 ] ; then
+ LBA=$(msf2lba $3)
+ START=$(( $LBA + $PREGAP + $OFFSET ))
+ eval TRACK$i=$START
+ X=$(cddb_sum $(( $START / 75 )) )
+ N=$(( $N + $X ))
+ fi
+ ;;
+ PREGAP) PREGAP=$(msf2lba $2)
+ ;;
+ REM) case "$2" in
+ FLAC__lead-out)
+ LEADOUT=$(( $4 / 588 ))
+ ;;
+ FLAC__lead-in)
+ LEADIN=$(( $3 / 588 ))
+ ;;
+ esac
+ ;;
+ esac
+
+ done
+
+ TRACKS=$i
+ LEADOUT=$(( $LEADOUT + $LEADIN ))
+
+ LENGTH=$(( $LEADOUT/75 - $TRACK1/75 ))
+ DISCID=$(( ( $N % 255 ) * 2**24 | $LENGTH * 2**8 | $TRACKS ))
+ printf "%08x %i" $DISCID $TRACKS
+
+ j=1
+ while [ $j -le $TRACKS ] ; do
+ eval echo -n "\" \$TRACK$j\""
+ j=$((j+1))
+ done
+ echo " $(( $LEADOUT / 75 ))"
+}
+
+# abcde.mkcue
+# abcde.mkcue [--wholedisk]
+# This creates a cuefile directly from the extended discid information
+# The --wholedisk option controls whether we're ripping data from the
+# start of track one or from the start of the disk (usually, but not
+# always the same thing!)
+#
+# Track one leadin/pregap (if any) handeling:
+# --wholedisk specified:
+# TRACK 01 AUDIO
+# INDEX 00 00:00:00
+# INDEX 01 <pregap value>
+# Remaining track index values unchanged from disc TOC
+#
+# --wholedisk not specified
+# TRACK 01 AUDIO
+# PREGAP <pregap value>
+# INDEX 01 00:00:00
+# Remaining track index values offset by <pregap value>
+#
+# Variables used:
+# TRACKINFO
+abcde.mkcue () {
+
+ echomsf () {
+ printf "$1%02i:%02i:%02i\n" $(($2/4500)) $((($2/75)%60)) $(($2%75))
+ }
+
+ local MODE DISCID TRACKS
+ local i OFFSET LBA
+ local CUEWAVFILE
+
+ if [ "$1" = --wholedisc ] ; then
+ MODE=INDEX
+ else
+ MODE=PREGAP
+ fi
+
+ vecho "One track is $ONETRACK"
+ TRACKFILE="$(mungefilename "$TRACKNAME")"
+ ARTISTFILE="$(mungefilename "$TRACKARTIST")"
+ ALBUMFILE="$(mungefilename "$DALBUM")"
+ if [ "$ONETRACK" = "y" ]; then
+ if [ "$VARIOUSARTISTS" = "y" ]; then
+ CUEWAVFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\" | sed -e 's@^.*/@@').$OUTPUT"
+ else
+ CUEWAVFILE="$(eval echo \""$ONETRACKOUTPUTFORMAT"\" | sed -e 's@^.*/@@').$OUTPUT"
+ fi
+ vecho "Cue wav file is $CUEWAVFILE"
+ else
+ CUEWAVFILE="dummy.wav"
+ fi
+
+ set -- $TRACKINFO
+
+ DISCID=$1
+ TRACKS=$2
+ shift 2
+
+ echo REM DISCID $DISCID
+ echo FILE \""$CUEWAVFILE"\" WAVE
+
+ if [ $1 -ne 150 ] && [ $MODE = "PREGAP" ] ; then
+ OFFSET=$1
+ else
+ OFFSET=150
+ fi
+
+ i=1
+ while [ $i -le "$TRACKS" ] ; do
+ LBA=$(( $1 - $OFFSET ))
+ printf " TRACK %02i AUDIO\n" $i
+ if [ $i -eq 1 -a $1 -ne 150 ] ; then
+ if [ $MODE = PREGAP ] ; then
+ echomsf " PREGAP " $(($OFFSET-150))
+ else
+ echo " INDEX 00 00:00:00"
+ fi
+ fi
+ echomsf " INDEX 01 " $LBA
+ i=$(($i+1))
+ shift
+ done
+}
+
# do_discid
# This essentially the start of things
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)
if $METAFLAC $METAFLACOPTS --export-cuesheet-to=- "$CDROM" > /dev/null 2>&1 ; then
case "$CUE2DISCID" in
+ # FIXME # right now we have 2 cue2discid internal
+ # implementations: builtin and abcde.cue2discid. Test
+ # both of them and decide which one we want to use.
builtin)
#vecho "Using builtin cue2discid implementation..."
CUESHEET="$(metaflac $METAFLACOPTS --export-cuesheet-to=- "$CDROM")"
- #TRACKS=$(echo $CUESHEET | egrep "TRACK \+[[:digit:]]\+ \+AUDIO" |wc -l)
+ #TRACKS=$(echo $CUESHEET | grep -E "TRACK \+[[:digit:]]\+ \+AUDIO" |wc -l)
#TRACKS=0
OFFSETTIMES=( $(echo "$CUESHEET" | sed -n -e's/\ *INDEX 01\ \+//p' ) )
TRACKS=${#OFFSETTIMES[@]}
#OFFSETS[${#OFFSETS[*]}]=$(( 10#${OFFSETTIME:0:2} * 4500 + 10#${OFFSETTIME:3:2} * 75 + 10#${OFFSETTIME:6:2} ))
done
- LEADOUT=$(( $(echo "$CUESHEET" | grep lead-out | get_last) / 44100 * 75 ))
- LEADIN=$(( $(echo "$CUESHEET" | grep lead-in | get_last) / 44100 * 75 ))
+ LEADOUT=$(( $(echo "$CUESHEET" | grep lead-out | get_last) * 75 / 44100 ))
+ LEADIN=$(( $(echo "$CUESHEET" | grep lead-in | get_last) * 75 / 44100 ))
makeids
;;
*)
fi
;;
# cdparanoia|debug)
-# CDPARANOIAOUTPUT="$( $CDROMREADER -$CDPARANOIACDROMBUS $CDROM -Q --verbose 2>&1 )"
+# 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" | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
+# TRACKS="$(echo "$CDPARANOIAOUTPUT" | grep -E '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
# CDPARANOIAAUDIOTRACKS="$TRACKS"
#
-# LEADOUT="$(echo "$CDPARANOIAOUTPUT" | egrep -o '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)"
-# OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')"
+# 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) ;;
- # FIXME # musicbrainz needs a cleanup
- musicbrainz) TRACKINFO=$($MUSICBRAINZ -c $CDROM ) ;;
+ cddb) TRACKINFO=$($CDDISCID "$CDROM") ;;
+ musicbrainz) TRACKINFO=$($MUSICBRAINZ --command id --device "$CDROM") ;;
esac
;;
esac
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' ')
cdparanoia|debug)
if [ "$WEHAVEACD" = "y" ]; then
vecho "Querying the CD for audio tracks..."
- CDPARANOIAOUTPUT="$( $CDROMREADER -$CDPARANOIACDROMBUS $CDROM -Q --verbose 2>&1 )"
+ 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" | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
+ TRACKS="$(echo "$CDPARANOIAOUTPUT" | grep -E '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
CDPARANOIAAUDIOTRACKS="$TRACKS"
else
# Previous versions of abcde would store the tracks on a file, instead of the status record.
exit 1
fi
echo -n .
- # It's a directory, let's see if it's owned by us
- if [ ! -O "$ABCDETEMPDIR" ]; then
+ # It's a directory, let's see if it's writable by us
+ if [ ! -r "$ABCDETEMPDIR" ] || [ ! -w "$ABCDETEMPDIR" ] || [ ! -x "$ABCDETEMPDIR" ]; then
# Nope, complain and exit
echo >&2
- echo "abcde: directory $ABCDETEMPDIR already exists and is not owned by you." >&2
+ echo "abcde: directory $ABCDETEMPDIR already exists and is not writeable." >&2
echo "Please investigate, remove it, and rerun abcde." >&2
exit 1
fi
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
# Store the abcde version in the status file.
echo "abcde-version=$VERSION" >> "$ABCDETEMPDIR/status"
fi
- if [ X"$MAKECUEFILE" = "Xy" -a X"$WEHAVEACD" = "Xy" ]; then
+ 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
vecho "Creating cue file..."
case $CDROMREADERSYNTAX in
flac)
- if $METAFLAC --export-cuesheet-to=- $CDROM > "$ABCDETEMPDIR/$CUEFILE"; then :; else
+ if $METAFLAC --export-cuesheet-to=- "$CDROM" > "$ABCDETEMPDIR/$CUEFILE"; then
+ echo cuefile=$CUEFILE >> "$ABCDETEMPDIR/status"
+ else
log warning "the input flac file does not contain a cuesheet."
fi
;;
n=1
echo "PERFORMER \"$DARTIST\"" >> "$CUEFILE_OUT"
echo "TITLE \"$DALBUM\"" >> "$CUEFILE_OUT"
+ # Set IFS to <newline> to prevent read from swallowing spaces and tabs
+ OIFS="$IFS"
+ IFS='
+'
cat "$CUEFILE_IN" | while read line
do
if echo "$line" | grep "INDEX 01" > /dev/null 2>&1 ; then
+# FIXME # Possible patch: remove the line above, uncomment the 2 lines below.
+# echo "$line" >> "$CUEFILE_OUT"
+# if echo "$line" | grep "^[[:space:]]*TRACK" > /dev/null 2>&1 ; then
eval track="\$TRACK$n"
n=$(expr $n + 1)
- echo "TITLE \"$track\"" >> "$CUEFILE_OUT"
+ echo " TITLE \"$track\"" >> "$CUEFILE_OUT"
+ # When making a single-track rip, put the
+ # actual file name into the file declaration
+ # in the cue file so that it is usable by
+ # music players and the like
+ elif [ "$ONETRACK" = "y" ] &&
+ echo "$line" | grep '^FILE "dummy.wav" WAVE' > /dev/null 2>&1 ; then
+
+ TRACKFILE="$(mungefilename "$TRACKNAME")"
+ ARTISTFILE="$(mungefilename "$TRACKARTIST")"
+ ALBUMFILE="$(mungefilename "$DALBUM")"
+
+ if [ "$VARIOUSARTISTS" = "y" ]; then
+ OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\" | sed -e 's@^.*/@@').$OUTPUT"
+ else
+ OUTPUTFILE="$(eval echo \""$ONETRACKOUTPUTFORMAT"\" | sed -e 's@^.*/@@').$OUTPUT"
+ fi
+
+ echo "FILE \"$OUTPUTFILE\" WAVE" >> "$CUEFILE_OUT"
+ continue
fi
+# FIXME # If the lines above are uncommented, remove the line below.
echo "$line" >> "$CUEFILE_OUT"
done
+ IFS="$OIFS"
mv "$CUEFILE_OUT" "$CUEFILE_IN"
echo "cleancuefile" >> "$ABCDETEMPDIR/status"
fi
cat "$RESULT" > "${CDDBLOCALREAD}"
{
echo -n "#$X: "
- do_cddbparse "${CDDBLOCALREAD}"
+ do_cddbparse "${CDDBLOCALREAD}"
echo ""
##FIXME## QUICK HACK !!!!
if [ ! "$INTERACTIVE" = "y" ]; then break ; fi
read CDDBLOCALCHOICE
[ x"$CDDBLOCALCHOICE" = "x" ] && CDDBLOCALCHOICE="1"
# FIXME # Introduce diff's
- if echo $CDDBLOCALCHOICE | egrep "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then
+ if echo $CDDBLOCALCHOICE | grep -E "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then
diffentries cddblocalread "$CDDBLOCALCHOICES" "$CDDBLOCALCHOICE"
- elif echo $CDDBLOCALCHOICE | egrep "[[:space:]]*[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then
+ elif echo $CDDBLOCALCHOICE | grep -E "[[:space:]]*[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then
# Make sure we get a valid choice
CDDBLOCALCHOICENUM=$(echo $CDDBLOCALCHOICE | xargs printf %d 2>/dev/null)
if [ $CDDBLOCALCHOICENUM -lt 0 ] || [ $CDDBLOCALCHOICENUM -gt $CDDBLOCALCHOICES ]; then
# 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
fi
}
-do_musicbrainzstat ()
+# 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 [ "$OSFLAVOUR" = "OSX" ] ; then
+ # Hei, we have to unmount the device before running anything like cdda2wav/icedax in OSX
+ diskutil unmount ${CDROM#/dev/}
+ # Also, in OSX the cdrom device for cdda2wav/icedax changes...
+ CDDA2WAVCDROM="IODVDServices"
+ elif [ "$OSFLAVOUR" = "FBSD" ] ; then
+ CDDA2WAVCDROM="$CDROMID"
+ else
+ if [ "$CDROMID" = "" ]; then
+ CDDA2WAVCDROM="$CDROM"
+ else
+ CDDA2WAVCDROM="$CDROMID"
+ fi
+ 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 "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"
+ 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
+# to go, but it Works For Me (TM)
+
do_musicbrainz ()
{
- :
+ 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"
+
+ # 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"
+ 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
RESPONSECODE=$(head -n 1 "$ABCDETEMPDIR/cddbstat" | cut -f1 -d' ')
case "$RESPONSECODE" in
210) # 210 OK, status information follows (until terminating `.')
- rc=0;
+ rc=0
;;
- 501|*) # 501 Illegal CDDB protocol level: <n>.
+ 501) # 501 Illegal CDDB protocol level: <n>.
CDDBPROTO=`expr $CDDBPROTO - 1`
;;
- esac
+ *) # 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' ')
+ case "$RESPONSECODE" in
+ 2??) # Server responded, everything seems OK
+ rc=0
+ ;;
+ *) # unknown error
+ break
+ ;;
+ esac
+ ;;
+ esac
done
if test $rc -eq 1; then
- CDDBAVAIL="n"
+ CDDBAVAIL="n"
fi
fi
echo cddb-statcomplete >> "$ABCDETEMPDIR/status"
ERRORCODE=no_query
echo 503 > "$ABCDETEMPDIR/cddbquery"
# The default CDDBLOCALSTATUS is "notfound"
- # This part will be triggered if the user CDDB repo does not
+ # 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.
else
vecho "Querying the CDDB server..."
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"
+ echo cddb-choice=1 >> "$ABCDETEMPDIR/status"
else
echo "Multiple ${IN}exact matches:" >> "$ABCDETEMPDIR/cddbchoices"
fi
if [ -n "$CHOICE" ] ; then
case $CDDBCHOICES in
-1) if head -1 "$ABCDETEMPDIR/cddbquery" | grep "^$" > /dev/null 2>&1 ; then
- log error "CDDB query failed!"
+ log error "CDDB query failed!"
exit 1
else
cat "$ABCDETEMPDIR/cddbchoices"
echo -n "Which entry would you like abcde to use (0 for none)? [0-$CDDBCHOICES]: " >&2
read CDDBCHOICE
[ X"$CDDBCHOICE" = "X" ] && CDDBCHOICE=1
- if echo $CDDBCHOICE | egrep "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then
+ 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 ] || \
- [ $PARSECHOICE1 -eq $PARSECHOICE2 ]; then
- echo "Invalid diff range. Please select two coma-separated numbers between 1 and $CDDBCHOICES" >&2
+ [ $PARSECHOICE1 -eq $PARSECHOICE2 ]; then
+ echo "Invalid diff range. Please select two comma-separated numbers between 1 and $CDDBCHOICES" >&2
else
# We parse the 2 choices to diff, store them in temporary files and diff them.
for PARSECHOICE in $(echo $CDDBCHOICE | tr , \ ); do
else
echo "The diff program was not found in your path. Please choose a number between 0 and $CDDBCHOICES." >&2
fi
- elif echo $CDDBCHOICE | egrep "[[:space:]]*[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then
+ 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
if [ "$USELOCALRESP" = "y" ]; then :; else
if [ -n "$CHOICE" ] ; then
case $CDDBCHOICES in
- 0)
+ 0)
UNKNOWNDISK=y
echo "Selected template."
;;
# 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= | egrep -ci '^(various|soundtrack|varios|sonora|ost)')" != "0" ]; then
+ if [ "$(grep ^DTITLE= "$CDDBDATA" | cut -f2- -d= | grep -Eci '^(various|soundtrack|varios|sonora|ost)')" != "0" ]; then
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
# Set a default
DEFAULTSTYLE=1
# Need NUMTRACKS before cddb-tool will return it:
- NUMTRACKS=$(egrep '^TTITLE[0-9]+=' "$CDDBDATA" | wc -l)
+ NUMTRACKS=$(grep -E '^TTITLE[0-9]+=' "$CDDBDATA" | wc -l)
if [ "$(grep -c "^TTITLE.*\/" "$CDDBDATA")" -gt "$(expr $NUMTRACKS / 2 )" ]; then
# More than 1/2 tracks contain a "/", so guess forward
DEFAULTSTYLE=1
echo "variousartists=$VARIOUSARTISTS" >> "$ABCDETEMPDIR/status"
echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
- if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
+ if [ "$EDITCDDB" = "y" ] && [ "$CDDBMETHOD" = "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
- # (see http://www.freedb.org/src/latest/DBFORMAT)
+ # (see http://www.freedb.org/src/latest/DBFORMAT)
# and can create an error-free entry on your own, then put
# UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE=y in your
# abcde.conf to enable it. Put CDDBSUBMIT=email@address in
# 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" != "" ]
# do_cdread [tracknumber]
# do_cdread onetrack [firsttrack] [lasttrack]
-#
+#
do_cdread ()
{
# The commands here don't go through run_command because they're never supposed to be silenced
# FIXME # Add the possibility of grabbing ranges of tracks in onetrack
# FIXME # Until then, we grab the whole CD in one track, no matter what
# the user said
- # We need the first and last track for cdda2wav
+ # We need the first and last track for cdda2wav/icedax
FIRSTTRACK=$2
LASTTRACK=$(expr $3 + 0)
UTRACKNUM=$FIRSTTRACK
case "$CDROMREADERSYNTAX" in
flac) READTRACKNUMS="$FIRSTTRACK.1-$(($LASTTRACK + 1)).0" ;;
- cdparanoia) READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;;
- cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTTRACK" ;;
+ cdparanoia)
+ #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" ;;
+ cdda2wav | icedax) READTRACKNUMS="$FIRSTTRACK+$LASTTRACK" ;;
*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
exit 1 ;;
esac
if [ "$USEPIPES" = "y" ]; then
TEMPARG="PIPERIPPER_$CDROMREADERSYNTAX"
FILEARG="$( eval echo "\$$TEMPARG" )"
- REDIR=""
+ REDIR="y"
PIPE_MESSAGE="and encoding "
else
WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav"
FILEARG="$WAVDATA"
;;
esac
- REDIR=">&2"
+ REDIR="n"
fi
if [ "$1" = "onetrack" ]; then
echo "Grabbing ${PIPE_MESSAGE}tracks $UTRACKNUM - $LASTTRACK as one track ..." >&2
# 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)
- nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;
- cdda2wav)
+ cdparanoia)
+ if [ "$REDIR" = "y" ]; then
+ nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" >&2
+ else
+ nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG"
+ fi;;
+
+ cdda2wav | icedax)
if [ "$OSFLAVOUR" = "OSX" ] ; then
- # Hei, we have to unmount the device before running anything like cdda2wav in OSX
- disktool -u ${CDROM#/dev/} 0
- # Also, in OSX the cdrom device for cdda2wav changes...
+ # Hei, we have to unmount the device before running anything like cdda2wav/icedax in OSX
+ diskutil unmount ${CDROM#/dev/}
+ # Also, in OSX the cdrom device for cdda2wav/icedax changes...
CDDA2WAVCDROM="IODVDServices"
elif [ "$OSFLAVOUR" = "FBSD" ] ; then
CDDA2WAVCDROM="$CDROMID"
CDDA2WAVCDROM="$CDROMID"
fi
fi
- nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR
- ;;
+ if [ "$REDIR" = "y" ]; then
+ nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" >&2
+ else
+ nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG"
+ fi ;;
## FIXME ## We have an exception for dagrab, since it uses -f
## FIXME ## Shall we just use -f $FILEARG ??
- dagrab) nice $READNICE $CDROMREADER -d $CDROM -v $UTRACKNUM "$FILEARG" $REDIR
- ;;
+ dagrab)
+ if [ "$REDIR" = "y" ]; then
+ nice $READNICE $CDROMREADER -d "$CDROM" -v $UTRACKNUM "$FILEARG" >&2
+ else
+ nice $READNICE $CDROMREADER -d "$CDROM" -v $UTRACKNUM "$FILEARG"
+ fi ;;
cddafs)
# Find the track's mounted path
REALTRACKNUM=$(expr $UTRACKNUM + 0)
FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM ");
# If the file exists, copy it
if [ -e "$FILEPATH" ] ; then
- nice $READNICE $CDROMREADER "$FILEPATH" "$FILEARG" $REDIR
+ if [ "$REDIR" = "y" ]; then
+ nice $READNICE $CDROMREADER "$FILEPATH" "$FILEARG" >&2
+ else
+ nice $READNICE $CDROMREADER "$FILEPATH" "$FILEARG"
+ fi
else
false
fi ;;
- debug) nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM -w $UTRACKNUM-[:1] "$FILEARG" $REDIR
- ;;
+ debug)
+ if [ "$REDIR" = "y" ]; then
+ nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" -w $UTRACKNUM-[:1] "$FILEARG" >&2
+ else
+ nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS "$CDROM" -w $UTRACKNUM-[:1] "$FILEARG"
+ fi ;;
esac
RETURN=$?
- # If we get some error or we get some missing wav
+ # If we get some error or we get some missing wav
# (as long as we dont use pipes)
if [ "$RETURN" != "0" -o \( ! -s "$WAVDATA" -a X"$USEPIPES" != "Xy" \) ]; then
# Thank goodness errors is only machine-parseable up to the
# do_cdspeed
# No values accepted, only uses env variables
-do_cdspeed ()
+do_cdspeed ()
{
if "$CDSPEED" "$CDSPEEDOPTS" "$CDSPEEDVALUE" >/dev/null ; then
vecho "Setting CD speed to ${CDSPEEDVALUE}x"
# 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 "$@" ;;
:
}
+# post_encode
+# Empty post_encode function, to be defined in the configuration file.
+post_encode ()
+{
+:
+}
+
###############################################################################
# End of functions
#
# Builtin defaults
# CDDB
-# Defaults to FreeDB, but a python musicbrainz can be used
+# Defaults to FreeDB, but musicbrainz can be used too, via the abcde-musicbrainz-tool script
CDDBMETHOD=cddb
CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi"
CDDBSUBMIT=freedb-submit@freedb.org
MP3ENCODERSYNTAX=default
OGGENCODERSYNTAX=default
+OPUSENCODERSYNTAX=default
FLACENCODERSYNTAX=default
SPEEXENCODERSYNTAX=default
-MPPENCODERSYNTAX=default
+MPCENCODERSYNTAX=default
AACENCODERSYNTAX=default
NORMALIZERSYNTAX=default
CUEREADERSYNTAX=default
PADTRACKS=n
NOGAP=n
BATCHNORM=n
+NOCDDBQUERY=n
-# If using scsi devices, cdda2wav needs a CDROMID, instead of a device node
+# If using scsi devices, cdda2wav/icedax needs a CDROMID, instead of a device node
# i.e. CDROMID="1,0,0"
CDROMID=""
# If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d"
# ogg
VORBIZE=vorbize
OGGENC=oggenc
+#opus
+OPUSENC=opusenc
# flac
FLAC=flac
# speex
SPEEXENC=speexenc
# mpp (Musepack)
-MPPENC=mppenc
+MPCENC=mpcenc
# m4a
AACENC=faac
ID3=id3
-ID3V2=id3v2
EYED3=eyeD3
+VORBISCOMMENT=vorbiscomment
+METAFLAC=metaflac
+AACTAG=faac
+ATOMICPARSLEY=AtomicParsley
+
CDPARANOIA=cdparanoia
-CDDA2WAV=cdda2wav
+CDDA2WAV=icedax
DAGRAB=dagrab
CDDAFS=cp
CDDISCID=cd-discid
CDDBTOOL=cddb-tool
-MUSICBRAINZ=musicbrainz-get-tracks
+MUSICBRAINZ=abcde-musicbrainz-tool
EJECT=eject
MD5SUM=md5sum
DISTMP3=distmp3
-VORBISCOMMENT=vorbiscomment
-METAFLAC=metaflac
NORMALIZE=normalize-audio
CDSPEED=eject
VORBISGAIN=vorbisgain
L3ENCOPTS=
XINGMP3ENCOPTS=
MP3ENCOPTS=
+MP3GAINOPTS="-a -k"
# ogg
VORBIZEOPTS=
OGGENCOPTS=
+VORBISGAINOPTS="--album"
+#opus
+OPUSENCOPTS=
# flac
FLACOPTS=
+FLACGAINOPTS="--add-replay-gain"
# speex
SPEEXENCOPTS=
# mpc
-MPPENCOPTS=
+MPCENCOPTS=
# m4a
AACENCOPTS=
ID3OPTS=
-ID3V2OPTS=
+EYED3OPTS="--set-encoding=utf16-LE"
CDPARANOIAOPTS=
CDDA2WAVOPTS=
DAGRABOPTS=
# List of actions to perform - by default, run to completion
ACTIONS=cddb,read,encode,tag,move,clean
-# This option is basicaly for Debian package dependencies:
-# List of prefered 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
+# 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:toolame,mp3:lame,mp3:bladeenc,spx:speex,m4a:faac:opus
-# List of prefered cdromreaders - by default, run whichever we have in the path
-DEFAULT_CDROMREADERS="cdparanoia cdda2wav"
+# List of preferred cdromreaders - by default, run whichever we have in the path
+DEFAULT_CDROMREADERS="cdparanoia icedax cdda2wav"
-# Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for
+# List of quality levels associated with the encoders:
+DEFAULT_QUALITY_XLO="oggenc:-q -1,lame:-q 9,speex:--quality 1,m4a:"
+DEFAULT_QUALITY_LO="oggenc:-q 1,lame:-q 7,speex:--quality 5,m4a:"
+DEFAULT_QUALITY_HI="oggenc:-q 7,lame:--preset standard,speex:--quality 9,m4a:"
+DEFAULT_QUALITY_XHI="oggenc:-q 10,lame:--preset extreme,speex:--quality 10,m4a:"
+
+# Assume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for
# Linux/OpenBSD. ftp is user for NetBSD.
# Let's use these checkings to determine the OS flavour, which will be used
# later
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
+ # We won't find the eject program in OSX, and doing checkexec will fail further below...
+ unset EJECT
elif [ X$(uname) = "XOpenBSD" ] ; then
HTTPGET=wget
MD5SUM=md5
fi
# If CDDBAVAIL is set to n, no CDDB read is done
-# If USEID3 is set to n, no ID3 tagging is done
CDDBAVAIL=y
-USEID3=y
-USEID3V2=y
+
+# There we go..
+# But before we get into business, let us chop off any GREP environmental
+# variables.
+GREP_OPTIONS=""
+GREP_COLOR=""
if [ -z "$OUTPUTDIR" ]; then
OUTPUTDIR=$(pwd)
if [ "$HTTPGETOPTS" = "" ] ; then
case $HTTPGET in
- wget) HTTPGETOPTS="-q -O -";;
+ wget) HTTPGETOPTS="-q -nv -e timestamping=off -O -";;
curl) HTTPGETOPTS="-f -s";;
fetch)HTTPGETOPTS="-q -o -";;
ftp) HTTPGETOPTS="-a -V -o - ";;
if [ "$CDROM" = "" ] ; then
if [ -e /dev/cdroms/cdrom0 ]; then
CDROM=/dev/cdroms/cdrom0
+ elif [ "$OSFLAVOUR" = "OSX" ] && [[ $(diskutil list) =~ CD_part.*(disk.)$'\n' ]]; then
+ CDROM=/dev/${BASH_REMATCH[1]}
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
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:pPr:Rs:S:t:T:vVxw:W: opt ; do
-while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxX:w:W:z opt ; do
+#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
case "$opt" in
1) ONETRACK=y ;;
a) ACTIONS="$OPTARG" ;;
n) CDDBAVAIL=n ;;
N) INTERACTIVE=n ;;
m) DOSPLAYLIST=y ;;
- M) MAKECUEFILE=y ;;
+ M) DOCUE=y ;;
o) OUTPUTTYPE="$OPTARG" ;;
p) PADTRACKS=y ;;
P) USEPIPES=y ;;
+ q) QUALITYLEVEL="$OPTARG" ;;
r) REMOTEHOSTS="$OPTARG" ;;
R) CDDBLOCALRECURSIVE=y ;;
s) SHOWCDDBFIELDS="$OPTARG" ;;
S) CDSPEEDVALUE="$OPTARG" ;;
t) STARTTRACKNUMBER="$OPTARG" ;;
T) STARTTRACKNUMBER="$OPTARG" ; STARTTRACKNUMBERTAG="y" ;;
- u) CDDBPROTO=6 ;;
U) CDDBPROTO=5 ;;
- v)
+ v)
echo "This is abcde v$VERSION."
echo "Usage: abcde [options] [tracks]"
echo "abcde -h for extra help"
exit
;;
- V) EXTRAVERBOSE="y" ;;
+ V) EXTRAVERBOSE=$(($EXTRAVERBOSE + 1)) ;;
x) EJECTCD="y" ;;
X) CUE2DISCID="$OPTARG" ;;
w) COMMENT="$OPTARG" ;;
- W) if echo $OPTARG | grep "[[:digit:]]" > /dev/null 2>&1 ; then
- STARTTRACKNUMBER="${OPTARG}01" ; STARTTRACKNUMBERTAG="y" ; COMMENT="CD${OPTARG}"
+ W) if echo $OPTARG | grep "[[:digit:]]" > /dev/null 2>&1 ; then
+ STARTTRACKNUMBER="${OPTARG}01"
+ STARTTRACKNUMBERTAG="y"
+ COMMENT="CD${OPTARG}"
+ DISCNUMBER="${OPTARG}"
else
- log error "argument of -W must be integer"
+ log error "argument of -W must be integer"
exit 1
fi
;;
# ripping, we have a mixture of sanity checks, verifications, default settigs
# and other crazy stuff that interdepends, but hey, someone has to do it.
+# If NOCDDBQUERY is set, don't query the CDDB server.
+if [ "$NOCDDBQUERY" = "y" ]; then
+ CDDBAVAIL="n"
+fi
+
# If the user specified a flac file, then switch to special flac mode
if echo "$CDROM" | grep -i '.flac$' > /dev/null 2>&1 ; then
if [ ! -f "$CDROM" ]; then
fi
# Decide if we can continue.
-if [ "$ONETRACK" = "y" ]; then
+if [ "$ONETRACK" = "y" ]; then
# FIXME # remove check as soon as we find out about the other readers
case "$CDROMREADERSYNTAX" in
flac) ;;
cdparanoia) ;;
- cdda2wav) ;;
+ cdda2wav | icedax) ;;
*) log error "$CDROMREADERSYNTAX does not support ONETRACK mode"
- exit 1 ;;
+ exit 1 ;;
esac
if [ "$BATCHNORM" = "y" ]; then
log warning "BATCHNORM mode is not compatible with ONETRACK mode. Disabling..."
else
while [ $# -gt 0 ]; do
# Range parsing code courtesy of Vincent Ho
- RSTART=$(echo $1 | cut -f1 -d-)
- REND=$(echo $1 | cut -f2 -d-)
- if [ "$RSTART" = "$REND" ]; then
- NEWTRACKS="$RSTART"
+ # Cleaned up to use shell built-ins by Charles Steinkuehler
+ if [ "${1#*[^0-9-]}" != "$1" ]; then
+ log error "syntax error while processing track numbers ($1)"
+ exit 1
else
- NEWTRACKS=$(f_seq_line $RSTART $REND)
+ RSTART=${1%%-*}
+ REND=${1##*-}
+ while [ ${RSTART:=1} -le ${REND:=0} ] ; do
+ TRACKQUEUE="$TRACKQUEUE $RSTART"
+ RSTART=$(( $RSTART + 1 ))
+ done
fi
- TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS")
shift
done
fi
DOREPLAYGAIN=n
DOPLAYLIST=n
DOCLEAN=n
+## FIXME ## Lets keep compatibility with -M
+[ "$DOCUE" != "y" ] && DOCUE=n
for ACTION in $(echo $ACTIONS | tr , \ )
do
case $ACTION in
default) DOCDDB=y; DOREAD=y; DOENCODE=y; DOTAG=y; DOMOVE=y; DOCLEAN=y;;
+ cue) DOCUE=y ; MAKECUEFILE=y ;;
cddb) DOCDDB=y;;
read) DOREAD=y;;
normalize) DONORMALIZE=y; DOREAD=y;;
done
# At this point a CDROM has to be defined, so we check it exists.
-if [ X"$CDROM" != "X" ] ; then
- if [ "$CDROMREADERSYNTAX" = "cdda2wav" ] && [ "$NEEDCDROMID" = "y" ] ; then
+if [ X"$CDROM" != "X" ] ; then
+ if ( [ "$CDROMREADERSYNTAX" = "cdda2wav" ] || [ "$CDROMREADERSYNTAX" = "icedax" ] ) && [ "$NEEDCDROMID" = "y" ] ; then
if [ "$OSFLAVOUR" = "FBSD" ]; then
if echo "$CDROMID" | grep "^[0-9],[0-9],[0-9]$" >/dev/null 2>&1 ; then :; else
log error "CDROMID not in the right format for $CDROMREADERSYNTAX"
- log error "Use \"cdrecord -scanbus\" to obtain a adecuate ID an set CDROMID accordingly"
+ log error "Use \"cdrecord -scanbus\" to obtain an adequate ID and set CDROMID accordingly"
exit 1
fi
fi
fi
# BATCHNORM pre-tests, before we get into serious problems
-# Not compatible with
+# Not compatible with
if [ "$BATCHNORM" = "y" ] && [ "$DONORMALIZE" = "n" ]; then
vecho warning "Disabling BATCHNORM since we are not normalizing!"
BATCHNORM=n
fi
-# Check the encoding format from the ones available in the system, if nothing has been configured in the system.
+# Check the encoding format from the ones available in the system, if nothing has been configured.
if [ X"$OUTPUTTYPE" = "X" ]; then
for DEFAULT_OUTPUT in $( echo "$DEFAULT_OUTPUT_BINARIES" | tr , \ ); do
DEFAULT_OUTPUT_FORMAT="$(echo $DEFAULT_OUTPUT | cut -d ":" -f 1)"
CDROMREADER="$CDPARANOIA"
CDROMREADEROPTS="$CDPARANOIAOPTS"
;;
- cdda2wav)
+ cdda2wav | icedax)
CDROMREADER="$CDDA2WAV"
CDROMREADEROPTS="$CDDA2WAVOPTS"
;;
for OUTPUT in "$(echo "$OUTPUTTYPE" | tr \ \|| tr , \ | tr \| \ )"; do
case "$OUTPUT" in
vorbis:*|ogg:*) OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+ opus:*) OPUSENCODEROPTSCLI="$( 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- )" ;;
- mpc:*) MPPENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+ mpc:*) MPCENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
m4a:*) AACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
esac
done
fi
# If nothing has been specified, use oggenc for oggs and lame for mp3s and flac
-# for flacs and speexenc for speex and mppenc for mpps and faac for m4as
+# for flacs and speexenc for speex and mpcenc for mpcs and faac for m4as
# Getting ready for multiple output changes
for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
[ "$DOREPLAYGAIN" = "y" ] && NEEDVORBISGAIN=y
OGGOUTPUTCONTAINER=ogg
;;
+ opus)
+ [ "$OPUSENCODERSYNTAX" = "default" ] && OPUSENCODERSYNTAX=opusenc
+ OPUSOUTPUTCONTAINER=opus
+ ;;
mp3)
[ "$MP3ENCODERSYNTAX" = "default" ] && MP3ENCODERSYNTAX=lame
[ "$DOTAG" = "y" ] && NEEDTAGGER=y
[ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
[ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
[ "$DOREPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
- [ "$ONETRACK" = "y" ] && [ "$MAKECUEFILE" = "y" ] && NEEDMETAFLAC=y
+ [ "$ONETRACK" = "y" ] && [ "$DOCUE" = "y" ] && NEEDMETAFLAC=y
;;
spx)
[ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc
# [ "$DOREPLAYGAIN" = "y" ] &&
;;
mpc)
- [ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc
+ [ "$MPCENCODERSYNTAX" = "default" ] && MPCENCODERSYNTAX=mpcenc
[ "$DOREPLAYGAIN" = "y" ] && NEEDMPPGAIN=y
;;
m4a)
[ "$AACENCODERSYNTAX" = "default" ] && AACENCODERSYNTAX=faac
+ [ "$DOTAG" = "y" ] && CHECKATOMICPARSLEY=y
;;
wav)
if [ "$KEEPWAVS" = "y" ]; then
OGGENCODER="$OGGENC"
;;
esac
+case "$OPUSENCODERSYNTAX" in
+ opusenc)
+ OPUSENCODEROPTS="${OPUSENCODEROPTSCLI:-$OPUSENCOPTS}"
+ OPUSENCODER="$OPUSENC"
+ ;;
+esac
case "$FLACENCODERSYNTAX" in
flac)
FLACENCODEROPTS="${FLACENCODEROPTSCLI:-$FLACOPTS}"
FLACENCODER="$FLAC"
+ if [ "$DOREPLAYGAIN" = "y" ]; then
+ FLACENCODEROPTS="${FLACENCODEROPTS} --replay-gain"
+ fi
# FLAC streams can be encapsulated on a Ogg transport layer
- if echo "$FLACENCODEROPTS" | egrep -- "(^| )--ogg($| )" > /dev/null 2>&1 ;then
+ if echo "$FLACENCODEROPTS" | grep -E -- "(^| )--ogg($| )" > /dev/null 2>&1 ;then
log error "FLAC on an Ogg container is not yet supported"
log error "due to problem with adding comments to such files"
exit 1
SPEEXENCODER="$SPEEXENC"
;;
esac
-case "$MPPENCODERSYNTAX" in
- mppenc)
- MPPENCODEROPTS="${MPPENCODEROPTSCLI:-$MPPENCOPTS}"
- MPPENCODER="$MPPENC"
+case "$MPCENCODERSYNTAX" in
+ mpcenc)
+ MPCENCODEROPTS="${MPCENCODEROPTSCLI:-$MPCENCOPTS}"
+ MPCENCODER="$MPCENC"
;;
esac
case "$AACENCODERSYNTAX" in
TAGGER="$ID3"
TAGGEROPTS="$ID3OPTS"
else
- TAGGER="$ID3V2"
- TAGGEROPTS="$ID3V2OPTS"
+ TAGGER="$EYED3"
+ TAGGEROPTS="$EYED3OPTS"
+ ID3SYNTAX=eyed3
fi
-# Specific for NOGAP is the use of lame. Another encoder fails...
+# NOGAP is specific to lame. Other encoders fail ...
if [ "$NOGAP" = "y" ] && [ ! "$MP3ENCODER" = "lame" ]; then
- log warning "the NOGAP option is specific of lame. Deactivating..."
+ log warning "the NOGAP option is specific to lame. Deactivating..."
NOGAP=n
fi
fi
# Don't check for stuff if it's not needed
-if [ "$REMOTEHOSTS" ]; then
+if [ "$REMOTEHOSTS" ]; then
NEEDDISTMP3=y
fi
if [ "$DONORMALIZE" = "y" ]; then
:
fi
fi
-if [ "$MAKECUEFILE" = "y" ]; then
+if [ "$DOCUE" = "y" ]; then
NEEDCUEREADER=y
fi
PIPE_lame="-"
PIPE_bladeenc="-"
PIPE_oggenc="-"
+PIPE_opusenc="-"
PIPE_flac="-"
# Figure out if we can use pipes with the ripper/encoder combination
PIPEENCODERSVARCHECK="PIPE_$MP3ENCODERSYNTAX" ;;
vorbis|ogg)
PIPEENCODERSVARCHECK="PIPE_$OGGENCODERSYNTAX" ;;
+ opus)
+ PIPEENCODERSVARCHECK="PIPE_$OPUSENCODERSYNTAX" ;;
flac)
PIPEENCODERSVARCHECK="PIPE_$FLACENCODERSYNTAX" ;;
spx)
PIPEENCODERSVARCHECK="PIPE_$SPEEXENCODER" ;;
mpc)
- PIPEENCODERSVARCHECK="PIPE_$MPPENCODER" ;;
+ PIPEENCODERSVARCHECK="PIPE_$MPCENCODER" ;;
esac
decho "PIPERIPPERSVARCHECK: $( eval echo "\$$PIPERIPPERSVARCHECK" )"
if [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "$" ] || \
# Make sure a buncha things exist
for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
- $OGGENCODER $FLACENCODER $SPEEXENCODER $MPPENCODER \
- $AACENCODER \
+ $OGGENCODER $OPUSENCODER $FLACENCODER $SPEEXENCODER $MPCENCODER \
+ $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}
checkexec "$X"
done
+if [ "$CHECKATOMICPARSLEY" = "y" ]; then
+ if ! new_checkexec "$ATOMICPARSLEY"; then
+ echo "WARNING: $ATOMICPARSLEY Not Found Not Post-Tagging!"
+ DOTAG='n'
+ else
+ echo "Using $ATOMICPARSLEY To Tag AAC Tracks."
+ fi
+fi
+
# And last but not least, check if we can diff between files. We do not abort,
# since diffing is not critical...
if [ -x $(which $DIFF) ]; then :; else
## 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
+# TRACKINFO=$($METAFLAC --show-tag=CDDB $CDROM | cut -d"=" -f2 | grep -E "[a-f0-9]{8}")
+# if [ "$TRACKINFO" = "" ]; 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 3306 ;)
+# Well, right now we are at line 3737 ;)
# Export needed things so they can be read in this subshell
export CDDBTOOL ABCDETEMPDIR TRACKQUEUE LOWDISK EJECTCD EJECT EJECTOPTS
# - set the CD speed value with eject -x
vecho -n "Executing customizable pre-read function... "
- pre_read # Execute the user-defined pre-read funtion. Close the CD with it.
+ pre_read # Execute the user-defined pre-read function. Close the CD with it.
vecho "done."
fi
-case "$CDDBMETHOD" in
- cddb)
- do_discid # Get ABCDETEMPDIR created and status file initialized
- ;;
- musicbrainz)
- do_musicbrainz id
- ;;
-esac
+# Get ABCDETEMPDIR created and status file initialized
+do_discid
if [ "$DOCDDB" = "y" ]; then
# start with a sane default:
fi
if checkstatus cddb-choice > /dev/null; then
:
- else
+ else
if [ "$CDDBLOCALSTATUS" = "notfound" ] ; then
case "$CDDBMETHOD" in
cddb)
;;
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
if checkstatus onetrack ; then ONETRACK=y ; fi
-if [ "$ONETRACK" = "y" ]; then
+if [ "$ONETRACK" = "y" ]; then
# Reuse the CUEFILE in case we created it (now or in a previous run)
if CUEFILE=$(checkstatus cuefile); then
IMPORTCUESHEET=y
echo "encode-output=loud" >> "$ABCDETEMPDIR/status"
fi
-if [ "$ONETRACK" = "y" ]; then
+if [ "$ONETRACK" = "y" ]; then
TRACKS="$FIRSTTRACK"
if [ "$USEPIPES" = "y" ]; then
if checkstatus readencodetrack-$FIRSTTRACK; then :; else
fi
fi
if [ "$NOGAP" = "y" ] || [ "$BATCHNORM" = "y" ]; then
- :
+ :
else
# If we are not reading, set the encode output to loud already, so
# that we can see the output of the first track.
echo NEXTTRACK
fi
-# Execute the user-defined post_read funtion before ejecting CD
+# Execute the user-defined post_read function before ejecting CD
post_read
# We are now finished with the cdrom - it can be safely ejected. Note that
# abcde will not have completed yet.
-if [ "$EJECTCD" = "y" ] && [ -x $(which $EJECT) ]; then
- # We check if the disk we are processing is actually the disk inside the
+if [ "$EJECTCD" = "y" ]; then
+ # We check if the disk we are processing is actually the disk inside the
# 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" = "$TRACKINFO" ] ; then
# More FreeBSD bits.
if [ X"$(uname)" = X"FreeBSD" ] ; then
# FreeBSD eject uses the EJECT environment variable to name the CDROM
cd="$(echo $CDROM | sed -e 's=.*/==;s=[a-h]$==;')"
$eject $EJECTOPTS $cd
elif [ X"$(uname)" = X"Darwin" ] ; then
- disktool -e ${CDROM#/dev/} 0
- else
- $EJECT $EJECTOPTS $CDROM
+ diskutil eject ${CDROM#/dev/} 0
+ elif [ -x $(which $EJECT) ]; then
+ $EJECT $EJECTOPTS "$CDROM"
fi
#fi
fi
) | (
-## Do we need to pre-process
+## Do we need to pre-process
#if [ x"$PREPROCESS" = "x" ] ; then
# cat
#else
# # all locations are working, wait and try again later
# if [ ! $PREPROCEED ]; then sleep 3; fi
# done
-# ( do_preprocess $PRETRACKNUM
+# ( do_preprocess $PRETRACKNUM
# echo "NEXTTRACK"
# ) &
# done
fi
# Don't proceed with the rest of the loop if we can't encode
if [ "$ABORT" ]; then continue; fi
- ## FIXME ## Add here
+ ## FIXME ## Add here
## run_command tagtrack-$OUTPUT-$1 $METAFLAC $METAFLACOPTS ${IMPORTCUESHEET:+--import-cuesheet-from="$ABCDETEMPDIR/$CUEFILE"} --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
# Set TRACKNUM, TRACKNAME
if [ -e "$CDDBDATA" ]; then
- if [ "$ONETRACK" = "y" ]; then
+ if [ "$ONETRACK" = "y" ]; then
TRACKNAME="$DALBUM"
TRACKNUM="$FIRSTTRACK"
splitvarious
fi
# Lets tag the cue file
if checkstatus cleancuefile >/dev/null; then :; else
- if checkstatus cuefile >/dev/null ; then
+ if checkstatus cuefile >/dev/null ; then
do_cleancue
fi
fi
do_replaygain
fi
+# Execute the user-defined post_encode function before cleaning up
+post_encode
+
# Check to see if run_command logged any errors
if [ -f "$ABCDETEMPDIR/errors" ]; then
log error "The following commands failed to run:"
fi
# Check if we have moved all the formats we had previously encoded, if we are not using the FORCE.
if [ "$DOCLEAN" = "y" ] && [ ! "$FORCE" = "y" ]; then
- ENCODED_FORMATS=$(egrep "^encodetrack-(.{3,6})-(.{1,2})$" "$ABCDETEMPDIR/status" | cut -d"-" -f2 | sort -u | tr '\n' '|')
- MOVED_FORMATS=$(egrep "^movetrack-output-(.{3,6})$" "$ABCDETEMPDIR/status" | cut -d"-" -f3 | sort -u | tr '\n' '|')
+ ENCODED_FORMATS=$(grep -E "^encodetrack-(.{3,6})-(.{1,2})$" "$ABCDETEMPDIR/status" | cut -d"-" -f2 | sort -u | tr '\n' '|')
+ MOVED_FORMATS=$(grep -E "^movetrack-output-(.{3,6})$" "$ABCDETEMPDIR/status" | cut -d"-" -f3 | sort -u | tr '\n' '|')
if [ "$ENCODED_FORMATS" != "$MOVED_FORMATS" ]; then
log warning "The encoded formats does not match with the moved ones"
log warning "Formats encoded: $( echo $ENCODED_FORMATS | tr "|" " " )"
HCoop / clinton / abcde.git / blobdiff