# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-VERSION='2.8.2-UNRELEASED'
+VERSION='2.9.3-REV'
usage ()
{
echo "Options:"
echo "-1 Encode the whole CD in a single file"
echo "-a <action1[,action2]...>"
-echo " Actions to perform:"
-echo " cddb,read,getalbumart,embedalbumart,normalize,encode,tag,move,replaygain,playlist,clean"
+echo " Actions to perform, comma separated:"
+echo " (cddb,read,getalbumart,embedalbumart,normalize,encode,"
+echo " 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 "-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,aiff). Defaults to vorbis"
+echo " Output file type(s), comma separated"
+echo " (vorbis,mp3,flac,spx,mpc,wav,m4a,opus,mka,wv,ape,mp2,tta,aiff)."
+echo " 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 "-Q CD lookup method(s), comma separated"
+echo " (musicbrainz,cddb,cdtext). Defaults to musicbrainz".
echo "-r <host1[,host2]...>"
echo " Also encode on these remote hosts"
echo "-s <field>"
# Functions to replace the need of seq, which is too distribution dependent.
f_seq_row ()
{
- i="$1"
- while [ "$i" -le "$2" ]
+ i=$1
+ while [ $i -le $2 ]
do
- echo "$i"
- i=$(("$i" + 1))
+ echo $i
+ i=$(( $i + 1 ))
done
}
f_seq_line ()
{
- i="$1"
+ i=$1
if echo "$i" | grep "[[:digit:]]" > /dev/null 2>&1 ; then
- while [ "$i" -le "$2" ]
+ while [ $i -le $2 ]
do
printf "%d " "$i"
- i=$(("$i" + 1))
+ i=$(( $i + 1 ))
done
echo
else
last=$stdin
done
else
- for last in "$@" ; do :; done
+ for last in $@ ; do :; done
fi
echo "$last"
}
}
# page [file]
-# Finds the right pager in the system to display a file
+# Display a file. If it's too long to fit the current terminal size,
+# find the right pager in the system and use it
page ()
{
PAGEFILE="$1"
- # Use the debian sensible-pager wrapper to pick the pager
- # user has requested via their $PAGER environment variable
- if [ -x "/usr/bin/sensible-pager" ]; then
- /usr/bin/sensible-pager "$PAGEFILE"
- elif [ -x "$PAGER" ]; then
- # That failed, try to load the preferred editor, starting
- # with their PAGER variable
- $PAGER "$PAGEFILE"
- # If that fails, check for less
- elif [ -x /usr/bin/less ]; then
- /usr/bin/less -f "$PAGEFILE"
- # more should be on all UNIX systems
- elif [ -x /bin/more ]; then
- /bin/more "$PAGEFILE"
+ local NUM_LINES=$(wc -l < "$PAGEFILE")
+ local LINES=""
+
+ # Check the terminal length every time we're called - the user
+ # might have resized since last time we were here
+ # First, try tput
+ if new_checkexec tput; then
+ LINES=$(tput lines)
+ fi
+
+ # If tput didn't work, 24 will do...
+ if [ -z "$LINES" ]; then
+ LINES=24
+ fi
+
+ # Is the text long enough to need a pager?
+ if [ "$NUM_LINES" -ge $LINES ]; then
+ # Yes!
+ # Use the debian sensible-pager wrapper to pick the pager user
+ # has requested via their $PAGER environment variable
+ if [ -x "/usr/bin/sensible-pager" ]; then
+ /usr/bin/sensible-pager "$PAGEFILE"
+ elif [ -x "$PAGER" ]; then
+ # That failed, try to load the preferred pager, starting
+ # with their PAGER variable
+ $PAGER "$PAGEFILE"
+ # If that fails, check for less
+ elif [ -x /usr/bin/less ]; then
+ /usr/bin/less -f "$PAGEFILE"
+ # more should be on all UNIX systems
+ elif [ -x /bin/more ]; then
+ /bin/more "$PAGEFILE"
+ else
+ # No bananas, just cat the thing
+ cat "$PAGEFILE" >&2
+ fi
else
- # No bananas, just cat the thing
+ # No, just cat the thing
cat "$PAGEFILE" >&2
fi
}
if [ "$PARSECHOICE1" -lt 1 ] || [ "$PARSECHOICE1" -gt "$CDDBDIFFCHOICES" ] || \
[ "$PARSECHOICE2" -lt 1 ] || [ "$PARSECHOICE2" -gt "$CDDBDIFFCHOICES" ] || \
[ "$PARSECHOICE1" -eq "$PARSECHOICE2" ]; then
- echo "Invalid diff range. Please select two comma-separated numbers between 1 and $CDDBDIFFCHOICES" >&2
+ echo "Invalid diff range." >&2
+ echo "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
do_cddbparse "${ABCDETEMPDIR}/$FILENAME.$PARSECHOICE" > "${ABCDETEMPDIR}/$FILENAME.parsechoice.$PARSECHOICE"
done
echo "Showing diff between choices $PARSECHOICE1 and $PARSECHOICE2..." > "${ABCDETEMPDIR}/$FILENAME.diff"
- $DIFF $DIFFOPTS "${ABCDETEMPDIR}/$FILENAME.parsechoice.$PARSECHOICE1" "${ABCDETEMPDIR}/$FILENAME.parsechoice.$PARSECHOICE2" >> "${ABCDETEMPDIR}/$FILENAME.diff"
- NUM_LINES=$(wc -l < "${ABCDETEMPDIR}/$FILENAME.diff")
- if [ "$NUM_LINES" -ge $LINES ]; then
- page "${ABCDETEMPDIR}/$FILENAME.diff"
- else
- cat "${ABCDETEMPDIR}/$FILENAME.diff" >&2
- fi
+ $DIFF $DIFFOPTS "${ABCDETEMPDIR}/$FILENAME.parsechoice.$PARSECHOICE1" \
+ "${ABCDETEMPDIR}/$FILENAME.parsechoice.$PARSECHOICE2" >> "${ABCDETEMPDIR}/$FILENAME.diff"
+ page "${ABCDETEMPDIR}/$FILENAME.diff"
fi
else
- echo "The diff program was not found in your path. Please choose a number between 0 and $CDDBDIFFCHOICES." >&2
+ echo "The diff program was not found in your path." >&2
+ echo "Please choose a number between 0 and $CDDBDIFFCHOICES." >&2
fi
}
if [ -n "$STARTTRACKNUMBER" ] ; then
# 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 $(("${UTRACKNUM}" + "${STARTTRACKNUMBER}" - "${FIRSTTRACK}")))
+ REALTRACKNUM=$(expr $UTRACKNUM + 0) # Unpad
+ TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $((${REALTRACKNUM} + ${STARTTRACKNUMBER} - ${FIRSTTRACK})))
else
- TRACKNUM="${UTRACKNUM}"
+ TRACKNUM=${UTRACKNUM}
fi
}
REPLAYINDEX=0
for UTRACKNUM in $TRACKQUEUE
do
- CDDBTRACKNUM=$(("$UTRACKNUM" - 1))
+ CDDBTRACKNUM=$(expr $UTRACKNUM - 1) # Unpad
getcddbinfo TRACKNAME
splitvarious
TRACKFILE="$(mungetrackname "$TRACKNAME")"
}
do_getgenreid () {
- local genre=$(echo "${@}" | tr '[A-Z]' '[a-z]')
+ local genre=$(echo "${@}" | tr 'A-Z' 'a-z')
local id=""
case ${genre} in
"blues") id=0 ;;
fi
) | run_command "tagtrack-$OUTPUT-$1" nice $ENCNICE \
$VORBISCOMMENT $VORBISCOMMENTOPTS -w \
- "${ABCDETEMPDIR}/track$1.uncommented.$OGGOUTPUTCONTAINER" "${ABCDETEMPDIR}/track$1.$OGGOUTPUTCONTAINER"
+ "${ABCDETEMPDIR}/track$1.uncommented.$OGGOUTPUTCONTAINER" \
+ "${ABCDETEMPDIR}/track$1.$OGGOUTPUTCONTAINER"
# 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
- mv "${ABCDETEMPDIR}/track$1.uncommented.$OGGOUTPUTCONTAINER" "${ABCDETEMPDIR}/track$1.$OGGOUTPUTCONTAINER"
+ mv "${ABCDETEMPDIR}/track$1.uncommented.$OGGOUTPUTCONTAINER" \
+ "${ABCDETEMPDIR}/track$1.$OGGOUTPUTCONTAINER"
fi
;;
esac
*) echo COMMENT="$COMMENTOUTPUT";;
esac
fi
- ) | run_command "tagtrack-$OUTPUT-$1" nice $ENCNICE $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
# This tagging syntax is suitable for Robert Muth's application 'apetag', the Monkey's Audio
# Console port (mac) used for encoding does not have the ability to tag.
run_command "tagtrack-$OUTPUT-$1" nice $ENCNICE "$APETAG" -i "${ABCDETEMPDIR}/track$1.ape" -m overwrite \
- -p artist="$TRACKARTIST" -p album="$DALBUM" -p title="$TRACKNAME" -p track="${TRACKNUM:-$1}" \
- -p year="$CDYEAR" -p genre="$CDGENRE" ${COMMENTOUTPUT:+-p comment="$COMMENTOUTPUT"}
+ -p artist="$TRACKARTIST" -p album="$DALBUM" -p title="$TRACKNAME" -p track="${TRACKNUM:-$1}" \
+ -p year="$CDYEAR" -p genre="$CDGENRE" ${COMMENTOUTPUT:+-p comment="$COMMENTOUTPUT"}
;;
mp2)
# Using Mutagen's mid3v2 for tagging with id3v2.4.0. Interesting enough vlc, MPlayer and XMMS ignore
# these tags but they are read by Audacious, Xine, Aqualung, mediainfo, ffplay, ffprobe. FFmpeg does
# not currently tag mp2 audio so twolame and FFmpeg will both use mid3v2...
- run_command "tagtrack-$OUTPUT-$1" nice $ENCNICE "$MID3V2" --verbose -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
- -y "$CDYEAR" -g "$CDGENRE" -T "${TRACKNUM:-$1}/$TRACKS" ${TPE2:+--TPE2 "$TPE2"} ${COMMENTOUTPUT:+--comment="$COMMENTOUTPUT"} \
- "${ABCDETEMPDIR}/track$1.mp2"
+ run_command "tagtrack-$OUTPUT-$1" nice $ENCNICE "$MID3V2" --verbose -A "$DALBUM" \
+ -a "$TRACKARTIST" -t "$TRACKNAME" -y "$CDYEAR" -g "$CDGENRE" \
+ -T "${TRACKNUM:-$1}/$TRACKS" ${TPE2:+--TPE2 "$TPE2"} \
+ ${COMMENTOUTPUT:+--comment="$COMMENTOUTPUT"} \
+ "${ABCDETEMPDIR}/track$1.mp2"
;;
aac)
run_command "tagtrack-$OUTPUT-$1" true
;;
neroAacEnc)
# Tag post encode with neroAacTag...
- run_command "tagtrack-$OUTPUT-$1" nice $ENCNICE "$NEROAACTAG" "${ABCDETEMPDIR}/track$1.m4a" \
- -meta:artist="$TRACKARTIST" -meta:album="$DALBUM" -meta:title="$TRACKNAME" -meta:track="${TRACKNUM:-$1}" \
- -meta:year="$CDYEAR" -meta:genre="$CDGENRE" -meta:comment="$COMMENT"
+ run_command "tagtrack-$OUTPUT-$1" nice $ENCNICE "$NEROAACTAG" \
+ "${ABCDETEMPDIR}/track$1.m4a" \
+ -meta:artist="$TRACKARTIST" -meta:album="$DALBUM" \
+ -meta:title="$TRACKNAME" -meta:track="${TRACKNUM:-$1}" \
+ -meta:year="$CDYEAR" -meta:genre="$CDGENRE" -meta:comment="$COMMENT"
;;
faac)
run_command "tagtrack-$OUTPUT-$1" true
fhgaacenc)
# Tag post encode with AtomicParsley. Note that previous problems with seg fault when using
# 'overWrite' cannot be reproduced with newer versions: https://bitbucket.org/wez/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" --comment="$COMMENT" $ATOMICPARSLEYOPTS --overWrite
+ 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" --comment="$COMMENT" \
+ $ATOMICPARSLEYOPTS --overWrite
;;
ffmpeg)
run_command "tagtrack-$OUTPUT-$1" true
;;
tta)
# We use mid3v2 tagging for True Audio:
- run_command "tagtrack-$OUTPUT-$1" nice $ENCNICE "$MID3V2" --verbose -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
- -y "$CDYEAR" -g "$CDGENRE" -T "${TRACKNUM:-$1}/$TRACKS" ${TPE2:+--TPE2 "$TPE2"} ${COMMENTOUTPUT:+--comment="$COMMENTOUTPUT"} \
- "${ABCDETEMPDIR}/track$1.tta"
+ run_command "tagtrack-$OUTPUT-$1" nice $ENCNICE "$MID3V2" --verbose -A "$DALBUM" \
+ -a "$TRACKARTIST" -t "$TRACKNAME" -y "$CDYEAR" -g "$CDGENRE" \
+ -T "${TRACKNUM:-$1}/$TRACKS" ${TPE2:+--TPE2 "$TPE2"} \
+ ${COMMENTOUTPUT:+--comment="$COMMENTOUTPUT"} "${ABCDETEMPDIR}/track$1.tta"
;;
wav)
run_command "tagtrack-$OUTPUT-$1" true
(
cd "${ABCDETEMPDIR}"
TRACKFILES=
- for UTRACKNUM in $TRACKQUEUE
+ for THISTRACKNUM in $TRACKQUEUE
do
- TRACKFILES="$TRACKFILES track$UTRACKNUM.wav"
+ TRACKFILES="$TRACKFILES track$THISTRACKNUM.wav"
done
nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS --nogap $TRACKFILES
RETURN=$?
if [ "$RETURN" != "0" ]; then
echo "nogap-encode: $MP3ENCODER returned code $RETURN" >> "${ABCDETEMPDIR}/errors"
else
- for UTRACKNUM in $TRACKQUEUE
+ for THISTRACKNUM in $TRACKQUEUE
do
- run_command "encodetrack-$OUTPUT-$UTRACKNUM" true
+ run_command "encodetrack-$OUTPUT-$THISTRACKNUM" true
done
fi
)
opusenc)
# 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" \
- --album "$DALBUM" --title "$TRACKNAME" --genre "$CDGENRE" --date "$CDYEAR" --comment TRACKNUMBER="$1" \
- ${COMMENT:+--comment COMMENT="$COMMENT"} "$IN" "$OUT"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $OPUSENCODER $OPUSENCODEROPTS \
+ --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" \
+ --genre "$CDGENRE" --date "$CDYEAR" --comment TRACKNUMBER="$1" \
+ ${COMMENT:+--comment COMMENT="$COMMENT"} "$IN" "$OUT"
else
$RUN_COMMAND nice $EFFECTIVE_NICE $OPUSENCODER $OPUSENCODEROPTS "$IN" "$OUT"
fi
case "$MKAENCODERSYNTAX" in
ffmpeg)
if [ "$DOTAG" = "y" ]; then
- $RUN_COMMAND nice $EFFECTIVE_NICE $MKAENCODER -i "$IN" $MKAENCODEROPTS -metadata artist="$TRACKARTIST" \
- -metadata album="$DALBUM" -metadata title="$TRACKNAME" -metadata track="${TRACKNUM:-$1}" -metadata date="$CDYEAR" \
- -metadata genre="$CDGENRE" -metadata comment="$COMMENT" "$OUT"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $MKAENCODER -i "$IN" $MKAENCODEROPTS \
+ -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 $MKAENCODER -i "$IN" $MKAENCODEROPTS "$OUT"
fi
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"
+ $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
fi
# Tag the file at encode time, as it can't be done after encoding.
if [ "$DOTAG" = "y" ]; then
- $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" \
- ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS \
+ --author "$TRACKARTIST" --title "$TRACKNAME" \
+ ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT"
else
$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
fi
mpc)
# Tag the file inline at encode time.
if [ "$DOTAG" = "y" ]; then
- $RUN_COMMAND nice $EFFECTIVE_NICE $MPCENCODER $MPCENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" \
- --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $MPCENCODER $MPCENCODEROPTS \
+ --artist "$TRACKARTIST" --album "$DALBUM" \
+ --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" \
+ --year "$CDYEAR" ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT"
else
$RUN_COMMAND nice $EFFECTIVE_NICE $MPCENCODER $MPCENCODEROPTS "$IN" "$OUT"
fi
case "$WVENCODERSYNTAX" in
wavpack)
if [ "$DOTAG" = "y" ]; then
- $RUN_COMMAND nice $EFFECTIVE_NICE $WVENCODER $WVENCODEROPTS -w Artist="$TRACKARTIST" -w Album="$DALBUM" \
- -w Title="$TRACKNAME" -w Track="$1" -w Genre="$CDGENRE" -w Year="$CDYEAR" ${COMMENT:+-w Comment="$COMMENT"} "$IN" -o "$OUT"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $WVENCODER $WVENCODEROPTS \
+ -w Artist="$TRACKARTIST" -w Album="$DALBUM" \
+ -w Title="$TRACKNAME" -w Track="$1" -w Genre="$CDGENRE" \
+ -w Year="$CDYEAR" ${COMMENT:+-w Comment="$COMMENT"} "$IN" -o "$OUT"
else
$RUN_COMMAND nice $EFFECTIVE_NICE $WVENCODER $WVENCODEROPTS "$IN" -o "$OUT"
fi
;;
ffmpeg)
if [ "$DOTAG" = "y" ]; then
- $RUN_COMMAND nice $EFFECTIVE_NICE $WVENCODER -i "$IN" $WVENCODEROPTS -metadata artist="$TRACKARTIST" \
- -metadata album="$DALBUM" -metadata title="$TRACKNAME" -metadata track="${TRACKNUM:-$1}" -metadata date="$CDYEAR" \
- -metadata genre="$CDGENRE" -metadata comment="$COMMENT" "$OUT"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $WVENCODER -i "$IN" $WVENCODEROPTS \
+ -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 $WVENCODER -i "$IN" $WVENCODEROPTS "$OUT"
fi
mp2)
case "$MP2ENCODERSYNTAX" in
twolame)
- $RUN_COMMAND nice $EFFECTIVE_NICE $MP2ENCODER $MP2ENCODEROPTS "$IN" "$OUT"
- ;;
+ $RUN_COMMAND nice $EFFECTIVE_NICE $MP2ENCODER $MP2ENCODEROPTS "$IN" "$OUT"
+ ;;
ffmpeg)
- $RUN_COMMAND nice $EFFECTIVE_NICE $MP2ENCODER -i "$IN" $MP2ENCODEROPTS "$OUT"
- ;;
+ $RUN_COMMAND nice $EFFECTIVE_NICE $MP2ENCODER -i "$IN" $MP2ENCODEROPTS "$OUT"
+ ;;
esac
;;
aac)
case "$AACENCODERSYNTAX" in
faac)
if [ "$DOTAG" = "y" ]; then
- $RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" \
- --title "$TRACKNAME" --track "${TRACKNUM:-$1}" --year "$CDYEAR" --genre "$CDGENRE" --comment "$COMMENT" -o "$OUT" "$IN"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS \
+ --artist "$TRACKARTIST" --album "$DALBUM" \
+ --title "$TRACKNAME" --track "${TRACKNUM:-$1}" \
+ --year "$CDYEAR" --genre "$CDGENRE" --comment "$COMMENT" -o "$OUT" "$IN"
else
$RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS -o "$OUT" "$IN"
fi
;;
fdkaac)
if [ "$DOTAG" = "y" ]; then
- $RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" \
- --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --date "$CDYEAR" --comment "$COMMENT" "$IN" -o "$OUT"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS \
+ --artist "$TRACKARTIST" --album "$DALBUM" \
+ --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" \
+ --date "$CDYEAR" --comment "$COMMENT" "$IN" -o "$OUT"
else
$RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS "$IN" -o "$OUT"
fi
;;
qaac)
if [ "$DOTAG" = "y" ]; then
- $RUN_COMMAND nice $EFFECTIVE_NICE $WINE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" \
- --title "$TRACKNAME" --track "${TRACKNUM:-$1}" --date "$CDYEAR" --genre "$CDGENRE" --comment "$COMMENT" -o "$OUT" "$IN"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $WINE $AACENCODER $AACENCODEROPTS \
+ --artist "$TRACKARTIST" --album "$DALBUM" \
+ --title "$TRACKNAME" --track "${TRACKNUM:-$1}" \
+ --date "$CDYEAR" --genre "$CDGENRE" --comment "$COMMENT" -o "$OUT" "$IN"
else
$RUN_COMMAND nice $EFFECTIVE_NICE $WINE $AACENCODER $AACENCODEROPTS -o "$OUT" "$IN"
fi
;;
ffmpeg)
if [ "$DOTAG" = "y" ]; then
- $RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER -i "$IN" $AACENCODEROPTS -metadata artist="$TRACKARTIST" \
- -metadata album="$DALBUM" -metadata title="$TRACKNAME" -metadata track="${TRACKNUM:-$1}" -metadata date="$CDYEAR" \
- -metadata genre="$CDGENRE" -metadata comment="$COMMENT" "$OUT"
+ $RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER -i "$IN" \
+ $AACENCODEROPTS -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 $AACENCODER -i "$IN" $AACENCODEROPTS "$OUT"
fi
# do_preprocess [tracknumber]
# variables used:
-# TRACKS, TRACKNAME, TRACKARTIST, DISTMP3, DISTMP3OPTS, {FOO}ENCODERSYNTAX, OUTPUTTYPE, ENCODEROPTS, DALBUM, DARTIST, ENCNICE, CDYEAR, CDGENRE, COMMENT
+# TRACKS, TRACKNAME, TRACKARTIST, DISTMP3, DISTMP3OPTS, {FOO}ENCODERSYNTAX,
+# OUTPUTTYPE, ENCODEROPTS, DALBUM, DARTIST, ENCNICE, CDYEAR, CDGENRE, COMMENT
#do_preprocess ()
#{
# IN="${ABCDETEMPDIR}/track$1.wav"
# do_postprocess [tracknumber]
# variables used:
-# TRACKS, TRACKNAME, TRACKARTIST, DISTMP3, DISTMP3OPTS, {FOO}ENCODERSYNTAX, OUTPUTTYPE, ENCODEROPTS, DALBUM, DARTIST, ENCNICE, CDYEAR, CDGENRE, COMMENT
+# TRACKS, TRACKNAME, TRACKARTIST, DISTMP3, DISTMP3OPTS, {FOO}ENCODERSYNTAX, OUTPUTTYPE, ENCODEROPTS,
+# DALBUM, DARTIST, ENCNICE, CDYEAR, CDGENRE, COMMENT
#do_postprocess ()
#{
# for POSTPROCESSFORMAT in $(echo $POSTPROCESSFORMATS | tr , \ )
for UTRACKNUM in $TRACKQUEUE
do
# Shares some code with do_move since the filenames have to match
- CDDBTRACKNUM=$(($UTRACKNUM - 1))
+ CDDBTRACKNUM=$(expr $UTRACKNUM - 1) # Unpad
getcddbinfo TRACKNAME
splitvarious
TRACKFILE="$(mungetrackname "$TRACKNAME")"
## (some hardware players insist on CRLF endings)
if [ "$DOSPLAYLIST" = "y" ]; then
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
echo "playlistcomplete" >> "${ABCDETEMPDIR}/status"
val=$1
ret=0
while [ "$val" -gt 0 ] ; do
- ret=$(( "$ret" + ( "$val" % 10) ))
- val=$(( "$val" / 10 ))
+ ret=$(( $ret + ( $val % 10) ))
+ val=$(( $val / 10 ))
done
echo "$ret"
}
msf2lba () {
OIFS="$IFS"
IFS=":"
- set -- "$1"
+ set -- $1
IFS="$OIFS"
local first second third
first=$(( $1 + 0 ))
second=$(( $2 + 0 ))
third=$(( $3 + 0 ))
- echo $(( ((("$first" * 60) + "$second") * 75) + "$third" ))
+ echo $(( ((($first * 60) + $second) * 75) + $third ))
}
OFFSET=150
N=0
while read line ; do
- set -- "$line"
+ set -- $line
case "$1" in
- TRACK) i=$(( i + 1 ))
+ TRACK)
+ i=$(( i + 1 ))
;;
- INDEX) if [ "$2" -eq 1 ] ; then
- LBA=$(msf2lba "$3")
- START=$(( "$LBA" + "$PREGAP" + "$OFFSET" ))
+ 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" ))
+ X=$(cddb_sum $(( $START / 75 )) )
+ N=$(( $N + $X ))
fi
;;
- PREGAP) PREGAP=$(msf2lba "$2")
+ PREGAP)
+ PREGAP=$(msf2lba $2)
;;
- REM) case "$2" in
+ REM)
+ case "$2" in
FLAC__lead-out)
- LEADOUT=$(( "$4" / 588 ))
+ LEADOUT=$(( $4 / 588 ))
;;
FLAC__lead-in)
- LEADIN=$(( "$3" / 588 ))
+ LEADIN=$(( $3 / 588 ))
;;
esac
;;
done
- TRACKS="$i"
- LEADOUT=$(( "$LEADOUT" + "$LEADIN" ))
+ TRACKS=$i
+ LEADOUT=$(( $LEADOUT + $LEADIN ))
- LENGTH=$(( "$LEADOUT"/75 - "$TRACK1"/75 ))
- CDDBDISCID=$(( ( "$N" % 255 ) * 2**24 | "$LENGTH" * 2**8 | "$TRACKS" ))
- printf "%08x %i" "${CDDBDISCID}" "$TRACKS"
+ LENGTH=$(( $LEADOUT/75 - $TRACK1/75 ))
+ CDDBDISCID=$(( ( $N % 255 ) * 2**24 | $LENGTH * 2**8 | $TRACKS ))
+ printf %08x %i ${CDDBDISCID} $TRACKS
j=1
- while [ $j -le "$TRACKS" ] ; do
+ while [ $j -le $TRACKS ] ; do
eval echo -n "\" \$TRACK$j\""
j=$(( $j + 1))
done
- echo " $(( $LEADOUT / 75 ))"
+ echo $(( $LEADOUT / 75 ))
}
# abcde.mkcue
local i OFFSET LBA
local CUEWAVFILE
- if [ "$1" = --wholedisk ] ; then
+ if [ "$1" = "--wholedisk" ] ; then
MODE=INDEX
else
MODE=PREGAP
CUEWAVFILE="dummy.wav"
fi
- set -- "$CDDBTRACKINFO"
+ set -- $CDDBTRACKINFO
- DISCID="$1"
- TRACKS="$2"
+ DISCID=$1
+ TRACKS=$2
shift 2
echo "REM DISCID $DISCID"
echo FILE \""$CUEWAVFILE"\" WAVE
- if [ "$1" -ne 150 ] && [ "$MODE" = "PREGAP" ] ; then
- OFFSET="$1"
+ if [ $1 -ne 150 ] && [ $MODE = "PREGAP" ] ; then
+ OFFSET=$1
else
- OFFSET="150"
+ OFFSET=150
fi
i=1
OFFSETTIMES=( $(echo "$CUESHEET" | sed -n -e's/\ *INDEX 01\ \+//p' ) )
TRACKS=${#OFFSETTIMES[@]}
unset OFFSETS
- #echo "processing offsetimes ${OFFSETTIMES[@]}"
- for OFFSETTIME in "${OFFSETTIMES[@]}"; do
+ vecho "processing offsetimes ${OFFSETTIMES[@]}"
+ for OFFSETTIME in ${OFFSETTIMES[@]}; do
OFFSETS="$OFFSETS $(( 10#${OFFSETTIME:0:2} * 4500 + 10#${OFFSETTIME:3:2} * 75 + 10#${OFFSETTIME:6:2} ))"
- #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) * 75 / 44100 ))
TRACKNUMPADDING=2
fi
- ABCDETEMPDIR="$WAVOUTPUTDIR/abcde.$(echo "$CDDBTRACKINFO" | cut -f1 -d' ')"
+ ABCDETEMPDIR="$WAVOUTPUTDIR/abcde.${CDDBDISCID}"
if [ -z "$TRACKQUEUE" ]; then
if [ ! "$STRIPDATATRACKS" = "n" ]; then
case "$CDROMREADERSYNTAX" in
fi
echo -n "Grabbing entire CD - tracks: "
if [ ! "$PADTRACKS" = "y" ] ; then
- TRACKNUMPADDING=$(echo -n "$TRACKS" | wc -c | tr -d ' ')
+ TRACKNUMPADDING=$(echo -n $TRACKS | wc -c | tr -d ' ')
fi
TRACKS=$(printf "%0.${TRACKNUMPADDING}d" $TRACKS)
- X=0
- while [ "$X" -ne "$TRACKS" ]
+ X=1
+ while [ $X -le $TRACKS ]
do
- PT=$(printf "%0.${TRACKNUMPADDING}d" $(($X + 1)))
+ PT=$(printf "%0.${TRACKNUMPADDING}d" $X)
TRACKQUEUE="$TRACKQUEUE $PT"
X=$(($X + 1))
done
TRACKNUMPADDING=$(echo -n "$LASTTRACK" | wc -c | tr -d ' ')
fi
# Now we normalize the trackqueue
- for TRACK in $TRACKQUEUE ; do
- TRACKNUM=$(printf "%0.${TRACKNUMPADDING}d" $(($TRACK + 0)))
- PADTRACKQUEUE="$PADTRACKQUEUE $TRACKNUM"
+ for TRACK in $TRACKQUEUE; do
+ PADTRACKNUM=$(printf "%0.${TRACKNUMPADDING}d" $(expr ${TRACK} + 0 ))
+ PADTRACKQUEUE="$PADTRACKQUEUE $PADTRACKNUM"
done
TRACKQUEUE="$PADTRACKQUEUE"
echo Grabbing tracks: "$TRACKQUEUE"
exit 1
fi
echo .
+ # Check to see the version of abcde that was used. If it's not
+ # the same version as we are, bail.
+ RESUME_VERSION="$(checkstatus abcde-version)"
+ if [ "$RESUME_VERSION" != "$VERSION" ]; then
+ # Nope, complain and exit
+ echo >&2
+ echo "abcde: Working directory ${ABCDETEMPDIR} was created using version $RESUME_VERSION." >&2
+ echo "abcde: Current version is $VERSION." >&2
+ echo "abcde: Refusing to resume with a version mismatch." >&2
+ echo "Please remove it, and rerun abcde." >&2
+ exit 1
+ fi
+ echo .
# See if it's populated
if [ ! -f "${ABCDETEMPDIR}/cddbdiscid" ]; then
# Wipe and start fresh
# Everything is fine. Check for ^encodetracklocation-
# and encode-output entries in the status file and
# remove them. These are not relevant across sessions.
+ echo "Resuming" >> "${ABCDETEMPDIR}/status"
if [ -f "${ABCDETEMPDIR}/status" ]; then
mv "${ABCDETEMPDIR}/status" "${ABCDETEMPDIR}/status.old"
grep -v ^encodetracklocation- < "${ABCDETEMPDIR}/status.old" \
else
log warning "reading the CUE sheet is still considered experimental"
log warning "and there was a problem with the CD reading. abcde will continue,"
- log warning "but consider reporting the problem to the abcde author"
+ log warning "but consider reporting the problem to the abcde authors"
fi
;;
esac
fi
fi
if [ ! "$ONETRACK" = "y" ]; then
- for TRACK in $(f_seq_row 1 "$TRACKS")
+ for TRACK in $(f_seq_row 1 $TRACKS)
do
echo "$TRACK": "$(grep -a ^TTITLE$(($TRACK - 1))= "${CDDBPARSEFILE}" | cut -f2- -d= | tr -d \\r\\n)"
done
if [ ! "$INTERACTIVE" = "y" ]; then break ; fi
} >> "${ABCDETEMPDIR}/cddblocalchoices"
done
- NUM_LINES=$(wc -l < "${ABCDETEMPDIR}/cddblocalchoices")
- if [ "$NUM_LINES" -ge $LINES ] && [ "$INTERACTIVE" = "y" ]; then
- page "${ABCDETEMPDIR}/cddblocalchoices"
- else
- # It's all going to fit in one page, cat it
- cat "${ABCDETEMPDIR}/cddblocalchoices" >&2
- fi
+ page "${ABCDETEMPDIR}/cddblocalchoices"
CDDBLOCALCHOICES=$( echo "$CDDBLOCALRESULTS" | wc -l )
# Setting the choice to an impossible integer to avoid errors in the numeric comparisons
CDDBLOCALCHOICENUM=-1
if [ "$INTERACTIVE" = "y" ]; then
while [ "$CDDBLOCALCHOICENUM" -lt 0 ] || [ "$CDDBLOCALCHOICENUM" -gt "$CDDBLOCALCHOICES" ]; do
- echo -n "Locally cached CDDB entries found. Which one would you like to use (0 for none)? [0-$CDDBLOCALCHOICES]: " >&2
+ echo "Locally cached CDDB entries found." >&2
+ echo -n "Which one would you like to use (0 for none)? [0-$CDDBLOCALCHOICES]: " >&2
read CDDBLOCALCHOICE
[ x"$CDDBLOCALCHOICE" = "x" ] && CDDBLOCALCHOICE="1"
# FIXME # Introduce diff's
return 0
fi
- vecho "Obtaining CD-Text results..."
- 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/}"
- # Also, in OSX the cdrom device for cdda2wav/icedax changes...
- CDDA2WAVCDROM="IODVDServices"
- elif [ "$OSFLAVOUR" = "FBSD" ] || [ "$OSFLAVOUR" = "IRIX" ]; then
- CDDA2WAVCDROM="$CDROMID"
+ if checkstatus cdtext-readcomplete; then
+ NUM_RESPONSES=$(checkstatus "cdtext-entries")
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + $NUM_RESPONSES))
+ vecho "Re-using existing data from CD-Text"
else
- if [ "$CDROMID" = "" ]; then
- CDDA2WAVCDROM="$CDROM"
- else
+ vecho "Obtaining CD-Text results..."
+ 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/}"
+ # Also, in OSX the cdrom device for cdda2wav/icedax changes...
+ CDDA2WAVCDROM="IODVDServices"
+ elif [ "$OSFLAVOUR" = "FBSD" ] || [ "$OSFLAVOUR" = "IRIX" ]; then
CDDA2WAVCDROM="$CDROMID"
+ else
+ if [ "$CDROMID" = "" ]; then
+ CDDA2WAVCDROM="$CDROM"
+ else
+ CDDA2WAVCDROM="$CDROMID"
+ fi
fi
- fi
- # Do we have CD-Text on the disc (and can the drive read it?)
- (
- 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
-
- NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + 1))
- # Make an empty template
- $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 [ "$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
+ # Do we have CD-Text on the disc (and can the drive read it?)
+ (
+ 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
- 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.* )
- for file in ${SOURCE_WORKDIR}/cddbread.* ${SOURCE_WORKDIR}/cddbquery.* ${SOURCE_WORKDIR}/datasource.*; do
- if [ -f "$file" ]; then
- cp "$file" "${ABCDETEMPDIR}"
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + 1))
+ # Make an empty template
+ $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 [ "$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
- done
- echo "cdtext-readcomplete" >> "${ABCDETEMPDIR}/status"
+
+ 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.*
+ for file in cddbread.* cddbquery.* datasource.*; do
+ if [ -f "$file" ]; then
+ cp "$file" "${ABCDETEMPDIR}"
+ fi
+ done
+ )
+ echo "cdtext-readcomplete" >> "${ABCDETEMPDIR}/status"
+ echo "cdtext-entries=1" >> "${ABCDETEMPDIR}/status"
+ fi
}
# do_musicbrainz_read
#
do_musicbrainz_read ()
{
- if checkstatus musicbrainz-readcomplete; then :; else
+ if checkstatus musicbrainz-readcomplete; then
+ NUM_RESPONSES=$(checkstatus "musicbrainz-entries")
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + $NUM_RESPONSES))
+ vecho "Re-using existing data from $NUM_RESPONSES Musicbrainz match(es)"
+ else
vecho "Obtaining Musicbrainz results..."
# If MB is to be used, interpret the query results and read all
# the available entries.
# Check for no matches.
# The helper script will write disc matches out to
# cddbread.*. Count how many we have
- NUM_RESPONSES=$(echo "${SOURCE_WORKDIR}"/cddbread.* | wc -w)
- if [ "$NUM_RESPONSES" -gt 0 ] ; then
+ NUM_RESPONSES=$(ls -1 "${SOURCE_WORKDIR}"/cddbread.* 2>/dev/null | wc -l)
+ if [ $NUM_RESPONSES -gt 0 ] ; then
# One or more exact matches
i=1
- while [ $i -le "$NUM_RESPONSES" ]; do
+ 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"
done
fi
echo "musicbrainz-readcomplete" >> "${ABCDETEMPDIR}/status"
+ echo "musicbrainz-entries=$NUM_RESPONSES" >> "${ABCDETEMPDIR}/status"
fi
}
# 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
+ if checkstatus cddb-readcomplete; then
+ NUM_RESPONSES=$(checkstatus "cddb-entries")
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + $NUM_RESPONSES))
+ vecho "Re-using existing data from $NUM_RESPONSES cddb match(es)"
+ else
RESPONSECODE=$(head -n 1 "${SOURCE_WORKDIR}/cddbquery" | cut -f1 -d' ')
vecho "Obtaining CDDB results..."
case "$RESPONSECODE" in
200)
# One exact match, retrieve it
# 200 [section] [discid] [artist] / [title]
- 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}"
+ NUM_RESPONSES=1
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + $NUM_RESPONSES))
+ $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"
do
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}"
+ $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" > "${SOURCE_WORKDIR}/datasource.${NUM_CDDB_MATCHES}"
echo "cddb-read-${NUM_CDDB_MATCHES}-complete" >> "${ABCDETEMPDIR}/status"
# Need to re-count the entries here to be able
# to incrememnt $NUM_CDDB_MATCHES in the
# parent
- NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + $(echo "${SOURCE_WORKDIR}/datasource.*" | wc -w)))
+ NUM_RESPONSES=$(ls -1 "${SOURCE_WORKDIR}"/datasource.* 2>/dev/null | wc -l)
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + $NUM_RESPONSES))
vecho "done."
;;
999)
# Using local copy.
- NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + 1))
+ NUM_RESPONSES=1
+ NUM_CDDB_MATCHES=$(($NUM_CDDB_MATCHES + $NUM_RESPONSES))
echo "cddb-read-${NUM_CDDB_MATCHES}-complete" >> "${ABCDETEMPDIR}/status"
;;
esac
+ (
+ cd "${SOURCE_WORKDIR}"
+ for file in cddbread.* cddbquery.* datasource.*; do
+ if [ -f "$file" ]; then
+ cp "$file" "${ABCDETEMPDIR}"
+ fi
+ done
+ )
echo "cddb-readcomplete" >> "${ABCDETEMPDIR}/status"
- for file in ${SOURCE_WORKDIR}/cddbread.* ${SOURCE_WORKDIR}/cddbquery.* ${SOURCE_WORKDIR}/datasource.*; do
- if [ -f "$file" ]; then
- cp "$file" "${ABCDETEMPDIR}"
- fi
- done
+ echo "cddb-entries=$NUM_RESPONSES" >> "${ABCDETEMPDIR}/status"
fi
}
# or when we are using it but we could not find a proper match
if [ "$CDDBUSELOCAL" = "y" ] && [ "$CDDBLOCALSTATUS" = "notfound" ] || [ ! "$CDDBUSELOCAL" = "y" ]; then
# 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
CHOICE=$(checkstatus cddb-choice)
if [ -n "$CHOICE" ] ; then
;;
esac
else
- # The user has a choice to make, display the info in a pager if necessary
- NUM_LINES=$(wc -l < "${ABCDETEMPDIR}/cddbchoices")
- if [ "$NUM_LINES" -ge $LINES ]; then
- page "${ABCDETEMPDIR}/cddbchoices"
- else
- # It's all going to fit in one page, cat it
- cat "${ABCDETEMPDIR}/cddbchoices" >&2
- fi
-
+ page "${ABCDETEMPDIR}/cddbchoices"
CDDBCHOICENUM=""
# Setting the choice to an impossible integer to avoid errors in the numeric comparisons
CDCHOICENUM=-1
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 $NUM_CDDB_MATCHES" >&2
+ echo "Invalid diff range." >&2
+ echo "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
- do_cddbparse "${ABCDETEMPDIR}/cddbread.$PARSECHOICE" > "${ABCDETEMPDIR}/cddbread.parsechoice.$PARSECHOICE"
+ do_cddbparse "${ABCDETEMPDIR}/cddbread.$PARSECHOICE" \
+ > "${ABCDETEMPDIR}/cddbread.parsechoice.$PARSECHOICE"
done
- echo "Showing diff between choices $PARSECHOICE1 and $PARSECHOICE2..." > "${ABCDETEMPDIR}/cddbread.diff"
- $DIFF $DIFFOPTS "${ABCDETEMPDIR}/cddbread.parsechoice.$PARSECHOICE1" "${ABCDETEMPDIR}/cddbread.parsechoice.$PARSECHOICE2" >> "${ABCDETEMPDIR}/cddbread.diff"
- NUM_LINES=$(wc -l < "${ABCDETEMPDIR}/cddbread.diff")
- if [ "$NUM_LINES" -ge $LINES ]; then
- page "${ABCDETEMPDIR}/cddbread.diff"
- else
- cat "${ABCDETEMPDIR}/cddbread.diff" >&2
- fi
+ echo "Showing diff between choices $PARSECHOICE1 and $PARSECHOICE2..." \
+ > "${ABCDETEMPDIR}/cddbread.diff"
+ $DIFF $DIFFOPTS "${ABCDETEMPDIR}/cddbread.parsechoice.$PARSECHOICE1" \
+ "${ABCDETEMPDIR}/cddbread.parsechoice.$PARSECHOICE2" \
+ >> "${ABCDETEMPDIR}/cddbread.diff"
+ page "${ABCDETEMPDIR}/cddbread.diff"
fi
else
- echo "The diff program was not found in your path. Please choose a number between 0 and $NUM_CDDB_MATCHES." >&2
+ echo "The diff program was not found in your path." >&2
+ echo "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
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
+ do_cddbparse "${ABCDETEMPDIR}/cddbread.$CDCHOICENUM"
echo "cddb-choice=$CDCHOICENUM" >> "${ABCDETEMPDIR}/status"
fi
fi
# We need some code to show the selected option when local repository is selected and we have found a match
vecho "Using cached CDDB match..." >&2
# 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
CHOICE=$(checkstatus cddb-choice)
if [ "$USELOCALRESP" = "y" ]; then :; else
# try to download CD cover
do_getalbumart()
{
- # set variables
- 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*)
- # try musicbrainz mbid
- if [ -s "${ABCDETEMPDIR}/mbid.$(checkstatus cddb-choice)" ]; then
- MBID=$(cat "${ABCDETEMPDIR}/mbid.$(checkstatus cddb-choice)")
- vecho "trying to get cover from coverartarchive.orq with musicbrainz mbid $MBID" >&2
- ALBUMARTURL="http://coverartarchive.org/release/$MBID/front"
- vecho "cover URL: $ALBUMARTURL" >&2
- $HTTPGET "$ALBUMARTURL" > "${ABCDETEMPDIR}/$ALBUMARTFILE"
- if [ $? -ne 0 ]; then
- vecho "could not download cover from musicbrainz" >&2
- # try amazon asin
- if [ -s "${ABCDETEMPDIR}/asin.$(checkstatus cddb-choice)" ]; then
- ASIN=$(cat "${ABCDETEMPDIR}/asin.$(checkstatus cddb-choice)")
- vecho "trying to get cover from amazon.com with asin $ASIN" >&2
- ALBUMARTURL="http://ec1.images-amazon.com/images/P/$ASIN.01.LZZZZZZZZ.jpg"
- vecho "cover URL: $ALBUMARTURL" >&2
- $HTTPGET "$ALBUMARTURL" > "${ABCDETEMPDIR}/$ALBUMARTFILE"
- if [ $? -ne 0 ]; then
- vecho "could not download cover from amazon" >&2
- else
- # Check that size is reasonable; sometimes when there is no cover image
- # on amazon.com a 1x1 pixel gif image will be downloaded instead:
- FILESIZE=$(wc -c < "${ABCDETEMPDIR}/$ALBUMARTFILE")
- if [ "$FILESIZE" -lt 1024 ]; then
- rm "${ABCDETEMPDIR}/$ALBUMARTFILE"
+ if checkstatus "get-album-art"; then :; else
+ # set variables
+ 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*)
+ # try musicbrainz mbid
+ if [ -s "${ABCDETEMPDIR}/mbid.$(checkstatus cddb-choice)" ]; then
+ MBID=$(cat "${ABCDETEMPDIR}/mbid.$(checkstatus cddb-choice)")
+ vecho "trying to get cover from coverartarchive.orq with musicbrainz mbid $MBID" >&2
+ ALBUMARTURL="http://coverartarchive.org/release/$MBID/front"
+ vecho "cover URL: $ALBUMARTURL" >&2
+ $HTTPGET "$ALBUMARTURL" > "${ABCDETEMPDIR}/$ALBUMARTFILE"
+ if [ $? -ne 0 ]; then
+ vecho "could not download cover from musicbrainz" >&2
+ # try amazon asin
+ if [ -s "${ABCDETEMPDIR}/asin.$(checkstatus cddb-choice)" ]; then
+ ASIN=$(cat "${ABCDETEMPDIR}/asin.$(checkstatus cddb-choice)")
+ vecho "trying to get cover from amazon.com with asin $ASIN" >&2
+ ALBUMARTURL="http://ec1.images-amazon.com/images/P/$ASIN.01.LZZZZZZZZ.jpg"
+ vecho "cover URL: $ALBUMARTURL" >&2
+ $HTTPGET "$ALBUMARTURL" > "${ABCDETEMPDIR}/$ALBUMARTFILE"
+ if [ $? -ne 0 ]; then
vecho "could not download cover from amazon" >&2
+ else
+ # Check that size is reasonable; sometimes when there is no cover image
+ # on amazon.com a 1x1 pixel gif image will be downloaded instead:
+ FILESIZE=$(wc -c < "${ABCDETEMPDIR}/$ALBUMARTFILE")
+ if [ "$FILESIZE" -lt 1024 ]; then
+ rm "${ABCDETEMPDIR}/$ALBUMARTFILE"
+ vecho "could not download cover from amazon" >&2
+ fi
fi
+ else
+ vecho "no amazon ID found" >&2
fi
- else
- vecho "no amazon ID found" >&2
fi
+ else
+ vecho "no musicbrainz ID found" >&2
fi
+ ;;
+ esac
+ # use glyrc
+ if [ ! -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ]; then
+ vecho "trying to get cover with glyrc for $ARTISTFILE / $ALBUMFILE" >&2
+ env LC_ALL=C $GLYRC cover --artist "$ARTISTFILE" --album "$ALBUMFILE" --write "${ABCDETEMPDIR}/$ALBUMARTFILE" $GLYRCOPTS
+ if [ $? -ne 0 ]; then
+ vecho "could not download cover with glyrc" >&2
else
- vecho "no musicbrainz ID found" >&2
+ ALBUMARTURL="glyrc"
fi
- ;;
- esac
- # use glyrc
- if [ ! -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ]; then
- vecho "trying to get cover with glyrc for $ARTISTFILE / $ALBUMFILE" >&2
- $GLYRC cover --artist "$ARTISTFILE" --album "$ALBUMFILE" --write "${ABCDETEMPDIR}/$ALBUMARTFILE" $GLYRCOPTS
- if [ $? -ne 0 ]; then
- vecho "could not download cover with glyrc" >&2
- else
- ALBUMARTURL="glyrc"
fi
- fi
- if [ "$INTERACTIVE" = "y" ]; then
- if [ -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ]; then
- # display properties of coverart when identify is available
- if new_checkexec "$IDENTIFY"; then
- $IDENTIFY $IDENTIFYOPTS "${ABCDETEMPDIR}/$ALBUMARTFILE" >&2
- fi
- # display coverart when DISPLAY is set and display command is available
- if new_checkexec "$DISPLAYCMD" && [ "$DISPLAY" != "" ]; then
- $DISPLAYCMD $DISPLAYCMDOPTS "${ABCDETEMPDIR}/$ALBUMARTFILE" >&2 &
+ if [ "$INTERACTIVE" = "y" ]; then
+ if [ -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ]; then
+ # display properties of coverart when identify is available
+ if new_checkexec "$IDENTIFY"; then
+ $IDENTIFY $IDENTIFYOPTS "${ABCDETEMPDIR}/$ALBUMARTFILE" >&2
+ fi
+ # display coverart when DISPLAY is set and display command is available
+ if new_checkexec "$DISPLAYCMD" && [ "$DISPLAY" != "" ]; then
+ $DISPLAYCMD $DISPLAYCMDOPTS "${ABCDETEMPDIR}/$ALBUMARTFILE" >&2 &
+ fi
+ else
+ # nothing downloaded yet
+ vecho "automatic album art downloading failed" >&2
fi
- else
- # nothing downloaded yet
- vecho "automatic album art downloading failed" >&2
- fi
- # see if the user can find a better album art manually
- echo -n "Do you want to enter URL or local path for the album art [y/N]? " >&2
- read YESNO
- while [ "$YESNO" != "y" ] && [ "$YESNO" != "n" ] && [ "$YESNO" != "Y" ] && \
- [ "$YESNO" != "N" ] && [ "$YESNO" != "" ]
- do
- echo -n 'Invalid selection. Please answer "y" or "n": ' >&2
+ # see if the user can find a better album art manually
+ echo -n "Do you want to enter URL or local path for the album art [y/N]? " >&2
read YESNO
- done
- if [ "$YESNO" = "y" ] || [ "$YESNO" = "Y" ]; then
- echo -n "Enter URL or local path (ENTER to cancel) :" >&2
- read ALBUMARTURL
- if [ ! -z "$ALBUMARTURL" ]; then
- if [[ ${ALBUMARTURL} =~ (https?|ftp|file)://.* ]]; then
- $HTTPGET "$ALBUMARTURL" > "${ABCDETEMPDIR}/$ALBUMARTFILE"
- if [ ! -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ]; then
- vecho "unable to download $ALBUMARTURL" >&2
- fi
- else # it's a local path
- cp "$ALBUMARTURL" "${ABCDETEMPDIR}/$ALBUMARTFILE"
- if [ ! -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ]; then
- vecho "unable to copy $ALBUMARTURL to ${ABCDETEMPDIR}/$ALBUMARTFILE" >&2
+ while [ "$YESNO" != "y" ] && [ "$YESNO" != "n" ] && [ "$YESNO" != "Y" ] && \
+ [ "$YESNO" != "N" ] && [ "$YESNO" != "" ]
+ do
+ echo -n 'Invalid selection. Please answer "y" or "n": ' >&2
+ read YESNO
+ done
+ if [ "$YESNO" = "y" ] || [ "$YESNO" = "Y" ]; then
+ echo -n "Enter URL or local path (ENTER to cancel) :" >&2
+ read ALBUMARTURL
+ if [ ! -z "$ALBUMARTURL" ]; then
+ if [[ ${ALBUMARTURL} =~ (https?|ftp|file)://.* ]]; then
+ $HTTPGET "$ALBUMARTURL" > "${ABCDETEMPDIR}/$ALBUMARTFILE"
+ if [ ! -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ]; then
+ vecho "unable to download $ALBUMARTURL" >&2
+ fi
+ else # it's a local path
+ cp "$ALBUMARTURL" "${ABCDETEMPDIR}/$ALBUMARTFILE"
+ if [ ! -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ]; then
+ vecho "unable to copy $ALBUMARTURL to ${ABCDETEMPDIR}/$ALBUMARTFILE" >&2
+ fi
fi
fi
fi
fi
- fi
- # convert to ALBUMARTTYPE if ImageMagick is available, if not assume correct type
- if [ -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ] && new_checkexec "$IDENTIFY"; then
- ALBUMARTURLTYPE=$($IDENTIFY "${ABCDETEMPDIR}/$ALBUMARTFILE" | cut -d' ' -f2)
- if [ "$ALBUMARTURLTYPE" != "$ALBUMARTTYPE" ] || [ "$ALBUMARTALWAYSCONVERT" = "y" ]; then
- if new_checkexec "$CONVERT"; then
- mv "${ABCDETEMPDIR}/$ALBUMARTFILE" "${ABCDETEMPDIR}/$ALBUMARTFILE.tmp"
- $CONVERT "${ABCDETEMPDIR}/$ALBUMARTFILE.tmp" $CONVERTOPTS "${ABCDETEMPDIR}/$ALBUMARTFILE"
- rm -f "${ABCDETEMPDIR}/$ALBUMARTFILE.tmp"
- else
- rm -f "${ABCDETEMPDIR}/$ALBUMARTFILE"
- vecho "sorry, cannot convert $ALBUMARTURLTYPE to $ALBUMARTTYPE without ImageMagick convert" >&2
+ # convert to ALBUMARTTYPE if ImageMagick is available, if not assume correct type
+ if [ -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ] && new_checkexec "$IDENTIFY"; then
+ ALBUMARTURLTYPE=$($IDENTIFY "${ABCDETEMPDIR}/$ALBUMARTFILE" | cut -d' ' -f2)
+ if [ "$ALBUMARTURLTYPE" != "$ALBUMARTTYPE" ] || [ "$ALBUMARTALWAYSCONVERT" = "y" ]; then
+ if new_checkexec "$CONVERT"; then
+ mv "${ABCDETEMPDIR}/$ALBUMARTFILE" "${ABCDETEMPDIR}/$ALBUMARTFILE.tmp"
+ $CONVERT "${ABCDETEMPDIR}/$ALBUMARTFILE.tmp" $CONVERTOPTS "${ABCDETEMPDIR}/$ALBUMARTFILE"
+ rm -f "${ABCDETEMPDIR}/$ALBUMARTFILE.tmp"
+ else
+ rm -f "${ABCDETEMPDIR}/$ALBUMARTFILE"
+ vecho "sorry, cannot convert $ALBUMARTURLTYPE to $ALBUMARTTYPE" >&2
+ vecho "without ImageMagick convert" >&2
+ fi
fi
fi
- fi
- # copy to target directories
- if [ -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ]; then
- for OUTPUT in $(echo "$OUTPUTTYPE" | tr , \ )
- do
- # put cover in the same place as the album
- if [ "$ONETRACK" = "y" ] ; then
- if [ "$VARIOUSARTISTS" = "y" ] ; then
- ALBUMARTDIR="$(eval echo "$VAONETRACKOUTPUTFORMAT")"
+ # copy to target directories
+ if [ -s "${ABCDETEMPDIR}/$ALBUMARTFILE" ]; then
+ for OUTPUT in $(echo "$OUTPUTTYPE" | tr , \ )
+ do
+ # put cover in the same place as the album
+ if [ "$ONETRACK" = "y" ] ; then
+ if [ "$VARIOUSARTISTS" = "y" ] ; then
+ ALBUMARTDIR="$(eval echo "$VAONETRACKOUTPUTFORMAT")"
+ else
+ ALBUMARTDIR="$(eval echo "$ONETRACKOUTPUTFORMAT")"
+ fi
else
- ALBUMARTDIR="$(eval echo "$ONETRACKOUTPUTFORMAT")"
- fi
+ if [ "$VARIOUSARTISTS" = "y" ] ; then
+ ALBUMARTDIR="$(eval echo "$VAOUTPUTFORMAT")"
+ else
+ ALBUMARTDIR="$(eval echo "$OUTPUTFORMAT")"
+ fi
+ fi
+ FINALALBUMARTDIR="$(dirname "$OUTPUTDIR/$ALBUMARTDIR")"
+ vecho "copying cover to target directory $FINALALBUMARTDIR" >&2
+ mkdir -p "$FINALALBUMARTDIR"
+ cp "${ABCDETEMPDIR}/$ALBUMARTFILE" "$FINALALBUMARTDIR"
+ done
+ rm -f "${ABCDETEMPDIR}/$ALBUMARTFILE"
+ echo "get-album-art=$ALBUMARTURL" >> "${ABCDETEMPDIR}/status"
else
- if [ "$VARIOUSARTISTS" = "y" ] ; then
- ALBUMARTDIR="$(eval echo "$VAOUTPUTFORMAT")"
- else
- ALBUMARTDIR="$(eval echo "$OUTPUTFORMAT")"
- fi
+ log warning "could not get cover"
+ echo "get-album-art=none" >> "${ABCDETEMPDIR}/status"
fi
- FINALALBUMARTDIR="$(dirname "$OUTPUTDIR/$ALBUMARTDIR")"
- vecho "copying cover to target directory $FINALALBUMARTDIR" >&2
- mkdir -p "$FINALALBUMARTDIR"
- cp "${ABCDETEMPDIR}/$ALBUMARTFILE" "$FINALALBUMARTDIR"
- done
- rm -f "${ABCDETEMPDIR}/$ALBUMARTFILE"
- echo "get-album-art=$ALBUMARTURL" >> "${ABCDETEMPDIR}/status"
- else
- log warning "could not get cover"
- echo "get-album-art=none" >> "${ABCDETEMPDIR}/status"
fi
}
# 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.
+ # Might need some fine tuning but it is a start for abcde 2.9. 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.
# ----------------
# the user said
# We need the first and last track for cdda2wav/icedax
FIRSTTRACK=$2
- LASTTRACK=$(($3 + 0))
- UTRACKNUM="$FIRSTTRACK"
+ LASTTRACK=$(expr $3 + 0) # Unpad
+ UTRACKNUM=$FIRSTTRACK
case "$CDROMREADERSYNTAX" in
flac) READTRACKNUMS="-" ;;
cdparanoia|libcdio)
else
UTRACKNUM=$1
fi
- CDDBTRACKNUM=$(($UTRACKNUM - 1))
+ CDDBTRACKNUM=$(expr $UTRACKNUM - 1) # Unpad
if [ "$USEPIPES" = "y" ]; then
TEMPARG="PIPERIPPER_$CDROMREADERSYNTAX"
FILEARG="$( eval echo "\$$TEMPARG" )"
### FIXME ### Shall we just use -o $FILEARG ??
flac)
# Avoid problems with math expressions by unpadding the given UTRACKNUM
- STRIPTRACKNUM=$(( $UTRACKNUM + 0 ))
+ STRIPTRACKNUM=$(expr $UTRACKNUM + 0 )
nice $READNICE $FLAC -d -f --cue="${READTRACKNUMS:-$STRIPTRACKNUM.1-$(($STRIPTRACKNUM + 1)).0}" "$FILEARG" "$CDROM" ;;
cdparanoia|libcdio)
if [ "$USEPIPES" = "y" ]; then
;;
cddafs)
# Find the track's mounted path
- REALTRACKNUM=$(($UTRACKNUM + 0))
+ REALTRACKNUM=$(expr $UTRACKNUM + 0) # Unpad
FILEPATH=$(mount | grep "$CDROM on" | sed 's/^[^ ]* on \(.*\) (.*/\1/')
FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM ");
# If the file exists, copy it
GREP_OPTIONS=""
GREP_COLOR=""
-# Length of the terminal *should* be in $LINES. If it's not, guess at
-# a reasonable number instead
-if [ -z "$LINES" ]; then
- LINES=24
-fi
-
if [ -z "$OUTPUTDIR" ]; then
OUTPUTDIR=$(pwd)
fi
esac
# Parse command line options
-while getopts 1a:bBc:C:d:DefgGhj:klLmMnNo:pP:Q:r:s:S:t:T:UvVxX:w:W:z opt ; do
+while getopts 1a:bBc:C:d:DefgGhj:klLmMnNo:pPQ: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) if [ -e "$OPTARG" ]; then
+ . "$OPTARG"
+ else
+ log error "config file \"$OPTARG\" cannot be found."
+ exit 1
+ fi
+ ;;
C) CDDBDISCID="$( echo "${OPTARG#abcde.}" | tr -d /)" ;;
d) CDROM="$OPTARG" ;;
D) set -x ;;
exit 1
OGGOUTPUTCONTAINER=ogg.ogg
FLACOUTPUTCONTAINER=flac.ogg
- vecho warning "modified file endings due to conflicting transport layers in Ogg/Vorbis and Ogg/FLAC"
+ vecho warning "modified file endings due to conflicting transport"
+ vecho warning "layers in Ogg/Vorbis and Ogg/FLAC"
fi
# Clean up nice options (either use '-n NICELEVEL or -NICELEVEL')
# 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
-export CDROM CDDBDATA REMOTEHOSTS MAXPROCS HTTPGET MD5SUM
+export CDDBTOOL # Path and options for the tool to query CDDB
+export ABCDETEMPDIR # Path to the tmpdir for this rip
+export TRACKQUEUE # 0-padded list of tracks to be processed
+export LOWDISK # Are we using the low-diskspace algorithm?
+export EJECTCD # Should we eject the CD when we're finished ripping?
+export EJECT # The commend to use to eject the CD, if we have one
+export EJECTOPTS # Options to that command
+export CDROM # Device path for the CD device
+export CDDBDATA # The filename we're using for CD lookup data
+export REMOTEHOSTS # List of remote hosts for parallel encoding, if given
+export MAXPROCS # The number of *local* encodes to do in parallel
+export HTTPGET # Program to use to grab files via http
+export MD5SUM # Program to calculate MD5 checksums
if [ "$DOREAD" = "y" ]; then
# User-definable function to set some things. Use it for
# 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")
+ for TRACK in $(f_seq_row 1 $TRACKS)
do
echo "$TRACK:" "$(grep -a ^TTITLE$(($TRACK - 1))= "${ABCDETEMPDIR}/cddbread.0" | cut -f2- -d= | tr -d \\r\\n)" >> "${ABCDETEMPDIR}/cddbchoices"
done
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$(($TRACK - 1))= "${ABCDETEMPDIR}/cddbread.$X" | cut -f2- -d= | tr -d \\r\\n)" >> "${ABCDETEMPDIR}/cddbchoices"
- done
- echo >> "${ABCDETEMPDIR}/cddbchoices"
+ for TRACK in $(f_seq_row 1 $TRACKS)
+ do
+ echo "$TRACK:" "$(grep -a ^TTITLE$(($TRACK - 1))= "${ABCDETEMPDIR}/cddbread.$X" | cut -f2- -d= | tr -d \\r\\n)" >> "${ABCDETEMPDIR}/cddbchoices"
+ done
+ echo >> "${ABCDETEMPDIR}/cddbchoices"
done
fi
fi
fi
if [ "$ONETRACK" = "y" ]; then
- TRACKS="$FIRSTTRACK"
+ TRACKS=$FIRSTTRACK
if [ "$USEPIPES" = "y" ]; then
if checkstatus "readencodetrack-$FIRSTTRACK"; then :; else
- do_cdread onetrack "$FIRSTTRACK" "$LASTTRACK" | do_encode "$FIRSTTRACK" %local0% > /dev/null 2>&1
+ do_cdread onetrack $FIRSTTRACK $LASTTRACK | do_encode $FIRSTTRACK %local0% > /dev/null 2>&1
fi
else
if checkstatus "readtrack-$FIRSTTRACK"; then :; else
- do_cdread onetrack "$FIRSTTRACK" "$LASTTRACK"
+ do_cdread onetrack $FIRSTTRACK $LASTTRACK
fi
fi
else
if [ "$USEPIPES" = "y" ]; then
if checkstatus "readencodetrack-$UTRACKNUM"; then :; else
# Read, pipe, shut up!
- do_cdread "$UTRACKNUM" | do_encode "$UTRACKNUM" %local0% > /dev/null 2>&1
+ do_cdread $UTRACKNUM | do_encode $UTRACKNUM %local0% > /dev/null 2>&1
fi
else
if checkstatus "readtrack-$UTRACKNUM"; then :; else
- do_cdread "$UTRACKNUM"
+ do_cdread $UTRACKNUM
fi
if [ "$?" != "0" ]; then
# CD read failed - don't give the goahead to
# Figure out where each track is going to be encoded
ENCODELOCATIONS="$(echo "$REMOTEHOSTS" | tr , ' ')"
if [ "$MAXPROCS" != "0" ]; then
- for NUM in $(f_seq_row 1 "$MAXPROCS")
+ for NUM in $(f_seq_row 1 $MAXPROCS)
do
ENCODELOCATIONS="$ENCODELOCATIONS %local$NUM%"
done
splitvarious
else
TRACKNUM="$UTRACKNUM"
- CDDBTRACKNUM=$(($UTRACKNUM - 1))
+ CDDBTRACKNUM=$(expr $UTRACKNUM - 1) # Unpad
getcddbinfo TRACKNAME
splitvarious
fi