echo "-C <discid#>"
echo " Specify discid to resume from (only needed if you no longer have the cd)"
echo "-d <device>"
-echo " Specify CDROM device to grab"
+echo " Specify CDROM device to grab (flac uses a single-track flac file)"
echo "-D Debugging mode (equivalent to sh -x abcde)"
echo "-e Erase encoded track information from status file"
+#echo "-E Set the encoding information for the tags"
echo "-h This help information"
#echo "-i Tag files while encoding, when possible (local only) -NWY-"
echo "-j <#> Number of encoder processes to run at once (localhost)"
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). Defaults to vorbis"
+echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav). 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 "-r <host1[,host2]...>"
f_seq_line ()
{
i=$1
- while [ $i -ne `expr $2 + 1` ]
- do
- printf $i" "
- i=`expr $i + 1`
- done
- echo
+ if echo i | grep -q "[[:digit:]]" ; then
+ while [ $i -ne `expr $2 + 1` ]
+ do
+ printf $i" "
+ i=`expr $i + 1`
+ done
+ echo
+ else
+ echo "abcde: syntax error while processing track numbers" >&2
+ exit 1
+ fi
}
# Functions to replace the need of awk {print $1} and {print $NF}
fi
}
+# page [file]
+# Finds the right pager in the system to display a file
+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"
+ else
+ # No bananas, just cat the thing
+ cat "$PAGEFILE" >&2
+ fi
+}
+
# run_command [blurb] [command...]
# Runs a command, silently if necessary, and updates the status file
run_command ()
fi
fi
case "$1" in
- normalize)
+ normalize|normalize-audio)
if [ "$RETURN" = "2" ]; then
# File was already normalized.
RETURN=0
echo $TO
}
+# do_getcddbinfo
+# Finds an specific field from cddbinfo
+#
+# TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2 -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')
+# TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
+# TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
+
+do_getcddbinfo()
+{
+ case $1 in
+ TRACKNAME1)
+ TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
+ ;;
+ TRACKNAME)
+ TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
+ ;;
+ esac
+}
+
+# do_gettracknum
+# Get the track number we are going to use for different actions
+do_gettracknum()
+{
+ if [ -n "$STARTTRACKNUMBER" ] ; then
+ # Get the trackpadding from the current track
+ CURRENTTRACKPADDING=$(echo -n $UTRACKNUM | wc -c)
+ TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
+ else
+ TRACKNUM=${UTRACKNUM}
+ fi
+}
+
+do_replaygain()
+{
+ if checkstatus replaygain; then :; else
+ run_command "" echo "Adding replygain information..."
+ for OUTPUT in $( echo $OUTPUTTYPE | tr , \ )
+ # THE OUTPUT NEEDS TO BE CORRECTED WITH THE CONTAINER?
+ do
+ case $OUTPUT in
+ vorbis|ogg)
+ OUTPUT=$OGGOUTPUTCONTAINER
+ ;;
+ flac)
+ OUTPUT=$FLACOUTPUTCONTAINER
+ ;;
+ esac
+ OUTPUTFILES=""
+ for UTRACKNUM in $TRACKQUEUE
+ do
+ CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
+ do_getcddbinfo TRACKNAME
+ splitvarious
+ TRACKFILE="$(mungefilename "$TRACKNAME")"
+ ARTISTFILE="$(mungefilename "$TRACKARTIST")"
+ ALBUMFILE="$(mungefilename "$DALBUM")"
+ do_gettracknum
+ if [ "$VARIOUSARTISTS" = "y" ]; then
+ OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
+ else
+ OUTPUTFILE=$(eval echo $OUTPUTFORMAT)
+ fi
+ OUTPUTFILES="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT $OUTPUTFILES"
+ done
+ case "$OUTPUT" in
+ flac)
+ run_command replaygain-flac $METAFLAC --add-replay-gain $OUTPUTFILES
+ ;;
+ vorbis|ogg)
+ run_command replaygain-vorbis $VORBISGAIN --album $OUTPUTFILES
+ ;;
+ *);;
+ esac
+ done
+ if checkerrors replaygain-.{3,6}; then :; else
+ run_command replaygain true
+ fi
+ fi
+}
+
# This code splits the a Various Artist track name from one of the following
# forms:
#
if [ "$VARIOUSARTISTS" = "y" ] && [ ! "$ONETRACK" = "y" ]; then
case "$VARIOUSARTISTSTYLE" in
forward)
- DTITLEARTIST=$(echo "$TRACKNAME" | sed 's- / -~-g')
- TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f1 -d~)
- TRACKNAME=$(echo "$DTITLEARTIST" | cut -f2 -d~)
+ DTITLEARTIST="$(echo "$TRACKNAME" | sed 's- / -~-g')"
+ TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
+ TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
;;
forward-dash)
- DTITLEARTIST=$(echo "$TRACKNAME" | sed 's, - ,~,g')
- TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f1 -d~)
- TRACKNAME=$(echo "$DTITLEARTIST" | cut -f2 -d~)
+ DTITLEARTIST="$(echo "$TRACKNAME" | sed 's, - ,~,g')"
+ TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
+ TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
;;
reverse)
- DTITLEARTIST=$(echo "$TRACKNAME" | sed 's- / -~-g')
- TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f2 -d~)
- TRACKNAME=$(echo "$DTITLEARTIST" | cut -f1 -d~)
+ DTITLEARTIST="$(echo "$TRACKNAME" | sed 's- / -~-g')"
+ TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
+ TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
;;
reverse-dash)
- DTITLEARTIST=$(echo "$TRACKNAME" | sed 's, - ,~,g')
- TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f2 -d~)
- TRACKNAME=$(echo "$DTITLEARTIST" | cut -f1 -d~)
+ DTITLEARTIST="$(echo "$TRACKNAME" | sed 's, - ,~,g')"
+ TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
+ TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
;;
colon)
- DTITLEARTIST=$(echo "$TRACKNAME" | sed 's-: -~-g')
- TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f1 -d~)
- TRACKNAME=$(echo "$DTITLEARTIST" | cut -f2 -d~)
+ DTITLEARTIST="$(echo "$TRACKNAME" | sed 's-: -~-g')"
+ TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
+ TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
;;
trailing-paren)
- DTITLEARTIST=$(echo "$TRACKNAME" | sed 's,^\(.*\) (\(.*\)),\1~\2,')
- TRACKARTIST=$(echo "$DTITLEARTIST" | cut -f2 -d~)
- TRACKNAME=$(echo "$DTITLEARTIST" | cut -f1 -d~)
+ DTITLEARTIST="$(echo "$TRACKNAME" | sed 's,^\(.*\) (\(.*\)),\1~\2,')"
+ TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
+ TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
;;
esac
- elif [ "$ONETRACK" = "y" ]; then
+ elif [ "$VARIOUSARTISTS" = "y" ] && [ "$ONETRACK" = "y" ]; then
TRACKARTIST="Various"
else
TRACKARTIST="$DARTIST"
"gangsta") id=59 ;;
"top 40") id=60 ;;
"christian rap") id=61 ;;
- "pop/funk") id=62 ;;
+ "pop/funk"|"pop / funk") id=62 ;;
"jungle") id=63 ;;
"native american") id=64 ;;
"cabaret") id=65 ;;
"anime") id=145 ;;
"jpop") id=146 ;;
"synthpop") id=147 ;;
+ "rock/pop"|"rock / pop") id=148 ;;
*) return 1 ;;
esac
echo ${id}
do_tag ()
{
COMMENTOUTPUT="$(eval echo ${COMMENT})"
+ CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1)
run_command '' echo "Tagging track $1 of $TRACKS: $TRACKNAME..."
# If we want to start the tracks with a given number, we need to modify the
# TRACKNUM value before evaluation
- if [ -n "$STARTTRACKNUMBER" -a -n "$STARTTRACKNUMBERTAG" ] ; then
- # Get the trackpadding from the current track
- CURRENTTRACKPADDING=$(echo -n $UTRACKNUM | wc -c)
- TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
+ if [ -n "$STARTTRACKNUMBERTAG" ] ; then
+ do_gettracknum
fi
for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
do
- case "$OUTPUT" in
- mp3)
- # id3v2 v0.1.9 claims to have solved the -c bug, so we merge both id3 and id3v2
- GENREID=$(do_getgenreid "${CDGENRE}")
-
- # FIXME # track numbers in mp3 come with 1/10, so we cannot happily substitute them with $TRACKNUM
- run_command tagtrack-$1 $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
- -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" -y "$CDYEAR" \
- -g "$GENREID" -T "${TRACKNUM:-$1/$TRACKS}" \
- "$ABCDETEMPDIR/track$1.$OUTPUT"
- ;;
- vorbis|ogg)
- case "$OGGENCODERSYNTAX" in
- vorbize|oggenc)
- # vorbiscomment can't do in-place modification, mv the file first
- if [ -f "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" -a ! -f "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER" ]; then
- mv "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER"
- fi
- (
- # These are from http://www.xiph.org/ogg/vorbis/doc/v-comment.html
- echo ARTIST="$TRACKARTIST"
- echo ALBUM="$DALBUM"
- echo TITLE="$TRACKNAME"
- if [ -n "$CDYEAR" ]; then
- echo DATE="$CDYEAR"
- fi
- if [ -n "$CDGENRE" ]; then
- echo GENRE="$CDGENRE"
- fi
- echo TRACKNUMBER=${TRACKNUM:-$1}
- echo CDDB=$CDDBDISCID
- if [ "$(eval echo ${COMMENT})" != "" ]; then
- case "$COMMENTOUTPUT" in
- *=*) echo "$COMMENTOUTPUT";;
- *) echo COMMENT="$COMMENTOUTPUT";;
- esac
- fi
- ) | run_command tagtrack-$1 $VORBISCOMMENT $VORBISCOMMENTOPTS -w \
- "$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"
- fi
- ;;
+ case "$OUTPUT" in
+ mp3)
+ # id3v2 v0.1.9 claims to have solved the -c bug, so we merge both id3 and id3v2
+ GENREID=$(do_getgenreid "${CDGENRE}")
+
+ 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 --commen=::"$COMMENTOUTPUT" \
+ -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
+ -G "$GENREID" -n "${TRACKNUM:-$1}" "${TRACKNUM:+-N $TRACKS}" \
+ "${ENCODING:+--set-encoding=$ENCODING}"
+ "$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}" \
+ "$ABCDETEMPDIR/track$1.$OUTPUT"
+ ;;
+ esac
+ ;;
+ vorbis|ogg)
+ case "$OGGENCODERSYNTAX" in
+ vorbize|oggenc)
+ # vorbiscomment can't do in-place modification, mv the file first
+ if [ -f "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" -a ! -f "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER" ]; then
+ mv "$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" "$ABCDETEMPDIR/track$1.uncommented.$OGGOUTPUTCONTAINER"
+ fi
+ (
+ # These are from http://www.xiph.org/ogg/vorbis/doc/v-comment.html
+ echo ARTIST="$TRACKARTIST"
+ echo ALBUM="$DALBUM"
+ echo TITLE="$TRACKNAME"
+ if [ -n "$CDYEAR" ]; then
+ echo DATE="$CDYEAR"
+ fi
+ if [ -n "$CDGENRE" ]; then
+ echo GENRE="$CDGENRE"
+ fi
+ echo TRACKNUMBER=${TRACKNUM:-$1}
+ echo CDDB=$CDDBDISCID
+ if [ "$(eval echo ${COMMENT})" != "" ]; then
+ case "$COMMENTOUTPUT" in
+ *=*) echo "$COMMENTOUTPUT";;
+ *) echo COMMENT="$COMMENTOUTPUT";;
+ esac
+ fi
+ ) | run_command tagtrack-$OUTPUT-$1 $VORBISCOMMENT $VORBISCOMMENTOPTS -w \
+ "$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"
+ fi
+ ;;
+ esac
+ ;;
+ flac)
+ (
+ echo ARTIST="$TRACKARTIST"
+ echo ALBUM="$DALBUM"
+ echo TITLE="$TRACKNAME"
+ if [ -n "$CDYEAR" ]; then
+ echo DATE="$CDYEAR"
+ fi
+ if [ -n "$CDGENRE" ]; then
+ echo GENRE="$CDGENRE"
+ fi
+ echo TRACKNUMBER="${TRACKNUM:-$1}"
+ echo CDDB="$CDDBDISCID"
+ if [ "$(eval echo ${COMMENT})" != "" ]; then
+ case "$COMMENTOUTPUT" in
+ *=*) echo "$COMMENTOUTPUT";;
+ *) echo COMMENT="$COMMENTOUTPUT";;
+ esac
+ fi
+ ) | run_command tagtrack-$OUTPUT-$1 $METAFLAC $METAFLACOPTS --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
+ ;;
+ spx)
+ run_command tagtrack-$OUTPUT-$1 true
+ ;;
+ mpc)
+ run_command tagtrack-$OUTPUT-$1 true
+ ;;
+ wav)
+ run_command tagtrack-$OUTPUT-$1 true
+ ;;
esac
- ;;
- flac)
- (
- echo ARTIST="$TRACKARTIST"
- echo ALBUM="$DALBUM"
- echo TITLE="$TRACKNAME"
- if [ -n "$CDYEAR" ]; then
- echo DATE="$CDYEAR"
- fi
- if [ -n "$CDGENRE" ]; then
- echo GENRE="$CDGENRE"
- fi
- echo TRACKNUMBER=${TRACKNUM:-$1}
- echo CDDB=$CDDBDISCID
- if [ "$(eval echo ${COMMENT})" != "" ]; then
- case "$COMMENTOUTPUT" in
- *=*) echo "$COMMENTOUTPUT";;
- *) echo COMMENT="$COMMENTOUTPUT";;
- esac
- fi
- ) | run_command tagtrack-$1 $METAFLAC $METAFLACOPTS --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
- ;;
- spx)
- run_command tagtrack-$1 true
- ;;
- mpc)
- run_command tagtrack-$1 true
- ;;
- esac
done
+ if checkerrors "tagtrack-(.{3,6})-$1"; then :; else
+ run_command tagtrack-$1 true
+ fi
+
}
# do_batch_encode
do
TRACKFILES="$TRACKFILES track$UTRACKNUM.wav"
done
- nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS --nogap $TRACKFILES
+ nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS `[ "$MP3ENCODER" = "lame" ] && echo "--nogap"` $TRACKFILES
RETURN=$?
if [ "$RETURN" != "0" ]; then
echo "batch-encode: $ENCODER returned code $RETURN" >> errors
else
for UTRACKNUM in $TRACKQUEUE
do
- echo encodetrack-$UTRACKNUM >> status
+ run_command encodetrack-$UTRACKNUM true
done
fi
)
TEMPARG="PIPE_$MPPENCODER"
;;
esac
- IN=${!TEMPARG}
+ IN="$( eval echo "\$$TEMPARG" )"
else
IN="$ABCDETEMPDIR/track$1.wav"
case "$OUTPUT" in
## 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"
;;
+ wav)
+ # In case of wav output we need nothing. Just keep the wavs.
+ run_command encodetrack-$OUTPUT-$1 true
+ ;;
esac
done
# Only remove .wav if the encoding succeeded
- if checkerrors "encodetrack-(.{3,4})-$1"; then
- run_command encodetrack-$1 false
- else
+ if checkerrors "encodetrack-(.{3,6})-$1"; then :; else
run_command encodetrack-$1 true
if [ ! "$KEEPWAVS" = "y" ] ; then
- rm -f "$IN"
+ if [ ! "$KEEPWAVS" = "move" ] ; then
+ rm -f "$IN"
+ fi
fi
fi
else
- if [ "$(checkstatus encode-output)" = "loud" ]; then
- echo "HEH! The file we were about to encode disappeared:"
- echo ">> $IN"
- fi
+ run_command "" echo "HEH! The file we were about to encode disappeared:"
+ run_command "" echo ">> $IN"
run_command encodetrack-$1 false
fi
}
{
for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
do
- case $OUTPUT in
- vorbis|ogg)
- OUTPUT=$OGGOUTPUTCONTAINER
- ;;
- flac)
- OUTPUT=$FLACOUTPUTCONTAINER
- ;;
- esac
# Create ALBUMFILE, ARTISTFILE, TRACKFILE
# Munge filenames as follows:
# ' ' -> '_'
# ''' -> ''
# '?' -> ''
# Eat control characters
- ALBUMFILE=$(mungefilename "$DALBUM")
- ARTISTFILE=$(mungefilename "$TRACKARTIST")
- TRACKFILE=$(mungefilename "$TRACKNAME")
- GENRE=$(mungegenre "$GENRE")
- YEAR=$(echo $CDYEAR)
+ ALBUMFILE="$(mungefilename "$DALBUM")"
+ ARTISTFILE="$(mungefilename "$TRACKARTIST")"
+ TRACKFILE="$(mungefilename "$TRACKNAME")"
+ GENRE="$(mungegenre "$GENRE")"
+ YEAR="$(echo $CDYEAR)"
# If we want to start the tracks with a given number, we need to modify the
# TRACKNUM value before evaluation
- if [ -n "$STARTTRACKNUMBER" ] ; then
- # Get the trackpadding from the current track
- CURRENTTRACKPADDING=$(echo -n $UTRACKNUM | wc -c)
- TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
- else
- TRACKNUM=${UTRACKNUM}
- fi
+ do_gettracknum
# Supported variables for OUTPUTFORMAT are GENRE, ALBUMFILE, ARTISTFILE,
# TRACKFILE, and TRACKNUM.
if [ "$VARIOUSARTISTS" = "y" ]; then
- OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
- else
- OUTPUTFILE=$(eval echo $OUTPUTFORMAT)
+ OUTPUTFILE="$(eval echo "$VAOUTPUTFORMAT")"
+ else
+ OUTPUTFILE="$(eval echo "$OUTPUTFORMAT")"
fi
- # Check that the directory for OUTPUTFILE exists, if it doesn't, create it
- OUTPUTFILEDIR=$(dirname "$OUTPUTDIR/$OUTPUTFILE")
- # mkdir -p shouldn't return an error if the directory already exists
- mkdir -p "$OUTPUTFILEDIR"
- # Silence the Moving output since it overlaps with encoding processes...
- #run_command '' vecho "Moving track$1.$OUTPUT to $OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
- run_command movetrack-$1 mv "$ABCDETEMPDIR/track$1.$OUTPUT" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
- # Lets move the cue file
- 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...
- #run_command '' vecho "Copying cue file to its destination directory..."
- if checkstatus onetrack >/dev/null ; then
- case $OUTPUT in
- # NOTE: Creating a cue file with the 3-char-extension files is to comply with
- # http://brianvictor.tripod.com/mp3cue.htm#details
- [a-z0-9][a-z0-9][a-z0-9])
- run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.cue"
- ;;
- *)
- run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT.cue"
- ;;
- esac
- else
- run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTFILEDIR/$CUEFILE"
+ 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
+ case $OUTPUT in
+ vorbis|ogg)
+ OUTPUT=$OGGOUTPUTCONTAINER
+ ;;
+ flac)
+ OUTPUT=$FLACOUTPUTCONTAINER
+ ;;
+ esac
+ # Check that the directory for OUTPUTFILE exists, if it doesn't, create it
+ OUTPUTFILEDIR="$(dirname "$OUTPUTDIR/$OUTPUTFILE")"
+ # mkdir -p shouldn't return an error if the directory already exists
+ mkdir -p "$OUTPUTFILEDIR"
+ run_command movetrack-$1 mv "$ABCDETEMPDIR/track$1.$OUTPUT" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
+ # Lets move the cue file
+ 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...
+ #run_command '' vecho "Copying cue file to its destination directory..."
+ if checkstatus onetrack >/dev/null ; then
+ case $OUTPUT in
+ # NOTE: Creating a cue file with the 3-char-extension files is to comply with
+ # http://brianvictor.tripod.com/mp3cue.htm#details
+ [a-z0-9][a-z0-9][a-z0-9])
+ run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.cue"
+ ;;
+ *)
+ run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT.cue"
+ ;;
+ esac
+ else
+ run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTFILEDIR/$CUEFILE"
+ fi
+ echo movecue-$OUTPUT >> "$ABCDETEMPDIR/status"
fi
- echo movecue-$OUTPUT >> "$ABCDETEMPDIR/status"
fi
fi
fi
{
for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
do
+ case $OUTPUT in
+ vorbis|ogg)
+ OUTPUT=$OGGOUTPUTCONTAINER
+ ;;
+ flac)
+ OUTPUT=$FLACOUTPUTCONTAINER
+ ;;
+ esac
# Create a playlist file for the playlist data to go into.
# We used to wipe it out if it existed. Now we request permision if interactive.
for LASTTRACK in $TRACKQUEUE; do :; done
- ALBUMFILE=$(mungefilename "$DALBUM")
- ARTISTFILE=$(mungefilename "$DARTIST")
+ ALBUMFILE="$(mungefilename "$DALBUM")"
+ ARTISTFILE="$(mungefilename "$DARTIST")"
GENRE=$(mungegenre "$GENRE")
YEAR=${CDYEAR:-$CDYEAR}
if [ "$VARIOUSARTISTS" = "y" ] ; then
do
# Shares some code with do_move since the filenames have to match
CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
- TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2 -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')
+ #TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2 -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')
+ do_getcddbinfo TRACKNAME
splitvarious
- TRACKFILE=$(mungefilename "$TRACKNAME")
- ARTISTFILE=$(mungefilename "$TRACKARTIST")
+ TRACKFILE="$(mungefilename "$TRACKNAME")"
+ ARTISTFILE="$(mungefilename "$TRACKARTIST")"
+ ALBUMFILE="$(mungefilename "$DALBUM")"
# If we want to start the tracks with a given number, we need to modify the
# TRACKNUM value before evaluation
- if [ -n "$STARTTRACKNUMBER" ] ; then
- # Get the trackpadding from the current track
- CURRENTTRACKPADDING=$(echo -n $UTRACKNUM | wc -c)
- TRACKNUM=$( printf %0.${CURRENTTRACKPADDING}d $(expr ${UTRACKNUM} + ${STARTTRACKNUMBER} - $FIRSTTRACK ))
- else
- TRACKNUM=${UTRACKNUM}
- fi
+ do_gettracknum
if [ "$VARIOUSARTISTS" = "y" ]; then
OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
else
if [ "$OSFLAVOUR" = "OSX" ]; then
disktool -u ${CDROM#/dev/}
fi
- TRACKINFO=$($CDDISCID $CDROM)
+ if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
+ TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM | $CUE2DISCID)
+ else
+ TRACKINFO=$($CDDISCID $CDROM)
+ fi
# Make sure there's a CD in there by checking cd-discid's return code
- if [ "$?" = "1" ]; then
- echo "abcde error: CD could not be read. Perhaps there's no CD in the drive?" >&2
- exit 1
+ if [ ! "$?" = "0" ]; then
+ if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
+ echo "abcde error: cuesheet information from the flac file could not be read." >&2
+ echo "abcde error: Perhaps the flac file does not contain a cuesheet?." >&2
+ exit 1
+ else
+ echo "abcde error: CD could not be read. Perhaps there's no CD in the drive?" >&2
+ exit 1
+ fi
fi
# In OSX, remount the disc again
if [ "$OSFLAVOUR" = "OSX" ]; then
if [ ! "$RET" = "0" ];then
echo "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" | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
CDPARANOIAAUDIOTRACKS="$TRACKS"
else
- if [ -f "$ABCDETEMPDIR/status" ] && checkstatus cdparanoia-audio-tracks ; then
- TRACKS=$( cat "$ABCDETEMPDIR/cdparanoia-audio-tracks" )
- else
+ if [ -f "$ABCDETEMPDIR/status" ] && TRACKS=$(checkstatus cdparanoia-audio-tracks); then :; else
TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
fi
fi
if checkstatus cuefile > /dev/null 2>&1 ; then :; else
CUEFILE=cue-$(echo "$TRACKINFO" | cut -f1 -d' ').txt
vecho "Creating cue file..."
- $MKCUE $MKCUEOPTS > "$ABCDETEMPDIR/$CUEFILE"
- echo cuefile=$CUEFILE >> "$ABCDETEMPDIR/status"
+ if $CUEREADER $CUEREADEROPTS > "$ABCDETEMPDIR/$CUEFILE"; then
+ echo cuefile=$CUEFILE >> "$ABCDETEMPDIR/status"
+ else
+ echo "abcde: reading the CUE sheet with mkcue is still considered experimental"
+ echo "abcde: and there was a problem with the CD reading. abcde will continue,"
+ echo "abcde: but consider reporting the problem to the abcde author"
+ fi
fi
fi
# If we got the CDPARANOIA status and it is not recorded, save it now
if [ -n "$CDPARANOIAAUDIOTRACKS" ]; then
- if checkstatus cdparanoia-audio-tracks; then :; else
- if echo "$CDPARANOIAAUDIOTRACKS" >> "$ABCDETEMPDIR/cdparanoia-audio-tracks"; then
- echo "cdparanoia-audio-tracks" >> "$ABCDETEMPDIR/status"
- fi
+ if checkstatus cdparanoia-audio-tracks > /dev/null 2>&1; then :; else
+ echo cdparanoia-audio-tracks=$CDPARANOIAAUDIOTRACKS >> "$ABCDETEMPDIR/status"
fi
fi
echo "---- $(grep DTITLE "${CDDBPARSEFILE}" | cut '-d=' -f2- | tr -d \\r\\n ) ----"
if [ X"$SHOWCDDBYEAR" = "Xy" ]; then
PARSEDYEAR=$(grep DYEAR "${CDDBPARSEFILE}" | cut '-d=' -f2-)
- if [ X"$PARSEDYEAR" = "X" ]; then
+ if [ ! X"$PARSEDYEAR" = "X" ]; then
echo "Year: $PARSEDYEAR"
fi
fi
if [ X"$SHOWCDDBGENRE" = "Xy" ]; then
PARSEDGENRE=$(grep DGENRE "${CDDBPARSEFILE}" | cut '-d=' -f2-)
- if [ X"$PARSEDGENRE" = "X" ]; then
+ if [ ! X"$PARSEDGENRE" = "X" ]; then
echo "Genre: $PARSEDGENRE"
fi
fi
else
# The user has a choice to make, display the info in a pager if necessary
if [ $(cat "$ABCDETEMPDIR/cddbchoices" | wc -l) -ge 24 ]; then
- # 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 "$ABCDETEMPDIR/cddbchoices"
- elif [ -x "$PAGER" ]; then
- # That failed, try to load the preferred editor, starting
- # with their PAGER variable
- $PAGER "$ABCDETEMPDIR/cddbchoices"
- # If that fails, check for less
- elif [ -x /usr/bin/less ]; then
- /usr/bin/less -f "$ABCDETEMPDIR/cddbchoices"
- # more should be on all UNIX systems
- elif [ -x /bin/more ]; then
- /bin/more "$ABCDETEMPDIR/cddbchoices"
- else
- # No bananas, just cat the thing
- cat "$ABCDETEMPDIR/cddbchoices" >&2
- fi
+ page "$ABCDETEMPDIR/cddbchoices"
else
# It's all going to fit in one page, cat it
cat "$ABCDETEMPDIR/cddbchoices" >&2
fi
CDDBCHOICENUM=""
+ # Setting the choice to an impossible integer to avoid errors in the numeric comparisons
CDCHOICENUM=-1
# I'll take CDDB read #3 for $400, Alex
while [ $CDCHOICENUM -lt 0 ] || [ $CDCHOICENUM -gt $CDDBCHOICES ]; do
[ X"$CDDBCHOICE" = "X" ] && CDDBCHOICE=1
if echo $CDDBCHOICE | egrep -q "[[:digit:]]+,[[:digit:]]+" ; then
if [ ! X"$DIFF" = "X" ]; then
- # 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"
- done
PARSECHOICE1=$(echo $CDDBCHOICE | cut -d"," -f1)
PARSECHOICE2=$(echo $CDDBCHOICE | cut -d"," -f2)
- echo "Showing diff between choices $PARSECHOICE1 and $PARSECHOICE2..."
- $DIFF $DIFFOPTS "$ABCDETEMPDIR/cddbread.parsechoice.$PARSECHOICE1" "$ABCDETEMPDIR/cddbread.parsechoice.$PARSECHOICE2"
+ 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
+ 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"
+ 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"
+ if [ $(cat "$ABCDETEMPDIR/cddbread.diff" | wc -l) -ge 24 ]; then
+ page "$ABCDETEMPDIR/cddbread.diff"
+ else
+ cat "$ABCDETEMPDIR/cddbread.diff" >&2
+ fi
+ fi
else
echo "The diff program was not found in your path. Please choose a number between 0 and $CDDBCHOICES." >&2
fi
echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
- if [ $CDDBDATAMD5SUM != "" ] && [ $CDDBDATAMD5SUM != $($MD5SUM "$CDDBDATA" | cut -d " " -f 1) ]; 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)
LASTTRACK=$3
UTRACKNUM=$FIRSTTRACK
case "$CDROMREADERSYNTAX" in
+ ### FIXME ### How are we calculating the tracks in flac mode?
+ flac) READTRACKNUMS="$FIRSTTRACK.1-$(($LASTTRACK + 1)).0" ;;
cdparanoia) READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;;
cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTRACK" ;;
*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
if [ "$USEPIPES" = "y" ]; then
TEMPARG="PIPE_$CDROMREADERSYNTAX"
- FILEARG="${!TEMPARG}"
+ FILEARG="$( eval echo "\$$TEMPARG" )"
REDIR=""
PIPE_MESSAGE="and encoding "
else
WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav"
case "$CDROMREADERSYNTAX" in
- ## FIXME ## Find the case for dagrab, to avoid exceptions
+ ## FIXME ## Find the cases for dagrab and flac, to avoid exceptions
+ flac)
+ FILEARG="--output-name=$WAVDATA"
+ ;;
dagrab)
FILEARG="-f $WAVDATA"
;;
echo "Grabbing ${PIPE_MESSAGE}tracks $UTRACKNUM - $LASTTRACK as one track ..." >&2
else
if [ -r "$CDDBDATA" ]; then
- TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
+ #TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
+ do_getcddbinfo TRACKNAME
echo "Grabbing ${PIPE_MESSAGE}track $UTRACKNUM: $TRACKNAME..." >&2
else
echo "Grabbing ${PIPE_MESSAGE}track $UTRACKNUM..." >&2
fi
fi
case "$CDROMREADERSYNTAX" in
+ ### FIXME ### use an exception for flac, since it uses -o
+ ### FIXME ### Shall we just use -o $FILEARG ??
+ flac)
+ nice $READNICE $FLAC -d --cue=${READTRACKNUMS:-$UTRACKNUM.1-$(($UTRACKNUM + 1)).0} "$FILEARG" "$CDROM" ;;
cdparanoia)
nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;
cdda2wav)
SPEEXENCODERSYNTAX=default
MPPENCODERSYNTAX=default
NORMALIZERSYNTAX=default
+CUEREADERSYNTAX=default
OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
# Use the following VAOUTPUTFORMAT to revert to 2.0.x VA format:
ID3=id3
ID3V2=id3v2
+EYED3=eyeD3
CDPARANOIA=cdparanoia
CDDA2WAV=cdda2wav
DAGRAB=dagrab
MKCUE=mkcue
MKTOC=cdrdao
DIFF=diff
+CUE2DISCID=cue2discid
# Options for programs called from abcde
# mp3
# Let's use these checkings to determine the OS flavour, which will be used later
if [ X$(uname) = "XFreeBSD" ] ; then
HTTPGET=fetch
+ MD5SUM=md5
NEEDCDROMID=y
OSFLAVOUR=FBSD
elif [ X$(uname) = "XDarwin" ] ; then
elif [ X$(uname) = "XOpenBSD" ] ; then
HTTPGET=wget
MD5SUM=md5
+elif [ X$(uname) = "XNetBSD" ] ; then
+ HTTPGET=ftp
+ MD5SUM=md5
else
HTTPGET=wget
fi
wget) HTTPGETOPTS="-q -O -";;
curl) HTTPGETOPTS="-f -s";;
fetch)HTTPGETOPTS="-q -o -";;
+ ftp) HTTPGETOPTS="-q -o -";;
*) echo "abcde warning: HTTPGET in non-standard and HTTPGETOPTS are not defined." >&2 ;;
esac
fi
# Parse command line options
#while getopts 1a:A:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
-while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
+while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do
case "$opt" in
1) ONETRACK=y ;;
a) ACTIONS="$OPTARG" ;;
- A) EXPACTIONS="$OPTARG";;
+ A) EXPACTIONS="$OPTARG" ;;
b) BATCH=y ;;
c) if [ -e "$OPTARG" ] ; then . "$OPTARG" ; else echo "abcde error: config file \"$OPTARG\" cannot be found." >&2 ; exit 1 ; fi ;;
C) DISCID="${OPTARG#abcde.}" ;;
e) ERASEENCODEDSTATUS=y ;;
h) usage; exit ;;
e) ERASEENCODEDSTATUS=y ;;
+ E) ENCODING="$OPTARG" ;;
# f) FORCECDDBUSELOCAL=y ;;
i) INLINETAG=y ;;
j) MAXPROCS="$OPTARG" ;;
exit 1
fi
;;
+ z) echo "Placeholder for a future autodebug option" ;;
?) usage; exit ;;
esac
done
shift $(($OPTIND - 1))
+# If the user specified a flac file, then switch to special flac mode
+if echo $CDROM | grep -i -q '.flac$'; then
+ vecho "abcde: switching to flac CDROMREADERSYNTAX..."
+ CDROMREADERSYNTAX=flac
+ if [ "$EJECTCD" = "y" ];then
+ vecho "abcde: CDROM flac mode, deactivating EJECTCD..."
+ EJECTCD=n
+ fi
+fi
+
# Decide if we can continue.
if [ "$ONETRACK" = "y" ]; then
# FIXME # remove check as soon as we find out about the other readers
case "$CDROMREADERSYNTAX" in
+ flac) ;;
cdparanoia) ;;
cdda2wav) ;;
*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
DOPOSTPROCESS=n
DOTAG=n
DOMOVE=n
+DOREPLAYGAIN=n
DOPLAYLIST=n
DOCLEAN=n
# postprocess) DOPREPROCESS=y; DOENCODE=y; DOREAD=y;;
tag) DOTAG=y; DOREAD=y; DOENCODE=y; DOCDDB=y;;
move) DOMOVE=y; DOTAG=y; DOREAD=y; DOENCODE=y; DOCDDB=y;;
+ replaygain) DOCDDB=y; DOREAD=y; DOENCODE=y; DOTAG=y; DOMOVE=y; DOREPLAYGAIN=y;;
playlist) DOCDDB=y; DOPLAYLIST=y;;
clean) DOCLEAN=y;;
esac
done
+if [ "$DONORMALIZE" = "y" ] && [ "$DOREPLAYGAIN" = "y" ]; then
+ # FIXME # should we abort on error or just inform the user?
+ :
+fi
+
for SHOWCDDBFIELD in $(echo $SHOWCDDBFIELDS | tr , \ ); do
case $SHOWCDDBFIELD in
y*|Y*) SHOWCDDBYEAR="y";;
CDROMREADER="$CDDAFS"
CDROMREADEROPTS="$CDDAFSOPTS"
;;
+ flac)
+ CDROMREADER="$FLAC"
+ CDROMREADEROPTS="$FLACOPTS"
+ ;;
esac
# There's only one normalize...
# Allow -o OUTPUT(1):OPTIONS(1),...,OUTPUT(N):OPTIONS(N) mode of operation
if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then
- for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ); do
+ for OUTPUT in "$(echo "$OUTPUTTYPE" | tr , \ )"; do
case "$OUTPUT" in
vorbis:*|ogg:*) OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
mp3:*) MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
mpc:*) MPPENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
esac
done
- for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ); do
+ for OUTPUT in "$(echo "$OUTPUTTYPE" | tr , \ )"; do
TEMPOUTPUT=$( echo "$OUTPUT" | cut -d: -f1 )
TEMPOUTPUTTYPE="${TEMPOUTPUTTYPE:+$TEMPOUTPUTTYPE,}$TEMPOUTPUT"
done
;;
flac)
[ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
+ [ "$REPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
[ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
;;
spx)
mpc)
[ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc
;;
+ wav)
+ if [ "$KEEPWAVS" = "y" ]; then
+ vecho "Unsetting the KEEPWAVS option, since the resulting wav files were requested..."
+ fi
+ KEEPWAVS=move
+ ;;
*) echo "abcde error: Invalid OUTPUTTYPE defined" >&2
exit 1
;;
TAGGEROPTS="$ID3V2OPTS"
fi
+# Options for mkcue
+case "$CUEREADERSYNTAX" in
+ default|mkcue)
+ CUEREADEROPTS="${CDROM}"
+ CUEREADER="$MKCUE"
+ ;;
+esac
+
# Check if both OGGEOUTPUTCONTAINER and FLACOUTPUTCONTAINER are the same, and differentiante them
if [ X"$OGGOUTPUTCONTAINER" = "Xogg" ] && [ X"$FLACOUTPUTCONTAINER" = "Xogg" ]; then
echo "abcde error: FLAC on an Ogg container is not yet supported" >&2
if [ ! "$CDDBAVAIL" = "n" ] && [ "$DOCDDB" = "y" ]; then
NEEDHTTPGET=y
fi
-if [ "$CUEFILE" = "y" ]; then
- NEEDMKCUE=y
+if [ "$MAKECUEFILE" = "y" ]; then
+ NEEDCUEREADER=y
fi
if [ X"$CDSPEEDVALUE" != "X" ]; then
case "$CDROMREADERSYNTAX" in
cdparanoia|debug) CDROMREADEROPTS="$CDPARANOIAOPTS -S $CDSPEEDVALUE" ;;
+ ### FIXME ### translate "cue2discid" from python to bash
+ flac) NEEDMETAFLAC=y ; NEEDCUE2DISCID=y ;;
*) NEEDCDSPEED=y ;;
esac
fi
# Rippers with USEPIPE support
# FIXME # Include here all the rippers we can figure out support pipes
PIPE_cdparanoia="-"
+PIPE_flac="-c "
# Encoders with USEPIPE support
# FIXME # Include here all the encoders we can figure out support pipes
mpc)
PIPEENCODERSVARCHECK="PIPE_$MPPENCODER" ;;
esac
- if [ ! -n "${!PIPERIPPERSVARCHECK}" ] ; then
+ if [ ! -n "$( eval echo "\$$PIPERIPPERSVARCHECK" )" ] ; then
echo "abcde error: no support for pipes with given ripper" >&2
- echo "read the USEPIPES file from the source tarball to help" >&2
- echo "on a Debian system, read /usr/share/doc/abcde/USEPIPES.gz" >&2
+ echo "read the USEPIPES file from the source tarball to get help." >&2
+ echo "On a Debian system, it is under /usr/share/doc/abcde/USEPIPES.gz" >&2
exit 1;
fi
- if [ ! -n "${!PIPEENCODERSVARCHECK}" ] ; then
+ if [ ! -n "$( eval echo "\$$PIPEENCODERSVARCHECK" )" ] ; then
echo "abcde error: no support for pipes with given encoder" >&2
echo "read the USEPIPES file from the source tarball to help" >&2
echo "on a Debian system, read /usr/share/doc/abcde/USEPIPES.gz" >&2
${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
- ${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMKCUE+$MKCUE}
+ ${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDCUEREADER+$CUEREADER} \
+ ${NEEDCUE2DISCID+$CUE2DISCID}
do
# Cut off the command-line options we just added in
X=$(echo $X | cut -d' ' -f2)
fi
do_cddbedit
- eval $($CDDBTOOL parse "$CDDBDATA")
+ eval "$($CDDBTOOL parse "$CDDBDATA")"
fi
# Before reading tracks, we set the speed of the device
if [ X"$CDSPEEDVALUE" != "X" ]; then
case "$CDROMREADERSYNTAX" in
- cdparanoia|debug) : ;;
+ cdparanoia|debug) ;;
+ flac) ;;
*) do_cdspeed ;;
esac
fi
# TRACKNUM=$(printf %0.${TRACKNUMPADDING}d $(expr ${UTRACKNUM} + 0))
TRACKNUM=$UTRACKNUM
CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
- TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
+ #TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
+ do_getcddbinfo TRACKNAME
splitvarious
fi
fi
fi
# If the above didn't catch the stragglers, this will
wait
+if [ "$REPLAYGAIN" = "y" ]; then
+ do_replaygain
+fi
# Check to see if run_command logged any errors
if [ -f "$ABCDETEMPDIR/errors" ]; then
echo "The following commands failed to run:"
HCoop / clinton / abcde.git / blobdiff