# Copyright for this work is to expire January 1, 2010, after which it
# shall be public domain.
-VERSION="2.2.4"
+VERSION="2.3.0"
usage ()
{
echo "-n No lookup. Don't query CDDB, just create and use template"
echo "-N Noninteractive. Never prompt for anything"
echo "-m Modify playlist to include CRLF endings, to comply with some players"
+echo "-M Create a CUE file"
echo "-o <type1[,type2]...>"
echo " Output file type(s) (ogg,mp3,flac,spx,mpc). Defaults to ogg"
echo "-p Pad track numbers with 0's (if less than 10 tracks)"
FR="$(echo "$FR" | cut -d/ -f2-)"
TO="../$TO"
done
+ ;;
esac
echo $TO
fi
}
+do_getgenreid () {
+local genre=$(echo "${@}" | tr '[A-Z]' '[a-z]')
+local id=""
+ case ${genre} in
+ "blues") id=0 ;;
+ "classic rock") id=1 ;;
+ "country") id=2 ;;
+ "dance") id=3 ;;
+ "disco") id=4 ;;
+ "funk") id=5 ;;
+ "grunge") id=6 ;;
+ "hip-hop") id=7 ;;
+ "jazz") id=8 ;;
+ "metal") id=9 ;;
+ "new age") id=10 ;;
+ "oldies") id=11 ;;
+ "other") id=12 ;;
+ "pop") id=13 ;;
+ "r&b") id=14 ;;
+ "rap") id=15 ;;
+ "reggae") id=16 ;;
+ "rock") id=17 ;;
+ "techno") id=18 ;;
+ "industrial") id=19 ;;
+ "alternative") id=20 ;;
+ "ska") id=21 ;;
+ "death metal") id=22 ;;
+ "pranks") id=23 ;;
+ "soundtrack") id=24 ;;
+ "euro-techno") id=25 ;;
+ "ambient") id=26 ;;
+ "trip-hop") id=27 ;;
+ "vocal") id=28 ;;
+ "jazz+funk") id=29 ;;
+ "fusion") id=30 ;;
+ "trance") id=31 ;;
+ "classical") id=32 ;;
+ "instrumental") id=33 ;;
+ "acid") id=34 ;;
+ "house") id=35 ;;
+ "game") id=36 ;;
+ "sound clip") id=37 ;;
+ "gospel") id=38 ;;
+ "noise") id=39 ;;
+ "alt. rock") id=40 ;;
+ "bass") id=41 ;;
+ "soul") id=42 ;;
+ "punk") id=43 ;;
+ "space") id=44 ;;
+ "meditative") id=45 ;;
+ "instrum. pop") id=46 ;;
+ "instrum. rock") id=47 ;;
+ "ethnic") id=48 ;;
+ "gothic") id=49 ;;
+ "darkwave") id=50 ;;
+ "techno-indust.") id=51 ;;
+ "electronic") id=52 ;;
+ "pop-folk") id=53 ;;
+ "eurodance") id=54 ;;
+ "dream") id=55 ;;
+ "southern rock") id=56 ;;
+ "comedy") id=57 ;;
+ "cult") id=58 ;;
+ "gangsta") id=59 ;;
+ "top 40") id=60 ;;
+ "christian rap") id=61 ;;
+ "pop/funk") id=62 ;;
+ "jungle") id=63 ;;
+ "native american") id=64 ;;
+ "cabaret") id=65 ;;
+ "new wave") id=66 ;;
+ "psychadelic") id=67 ;;
+ "rave") id=68 ;;
+ "showtunes") id=69 ;;
+ "trailer") id=70 ;;
+ "lo-fi") id=71 ;;
+ "tribal") id=72 ;;
+ "acid punk") id=73 ;;
+ "acid jazz") id=74 ;;
+ "polka") id=75 ;;
+ "retro") id=76 ;;
+ "musical") id=77 ;;
+ "rock & roll") id=78 ;;
+ "hard rock") id=79 ;;
+ "folk") id=80 ;;
+ "folk/rock") id=81 ;;
+ "national folk") id=82 ;;
+ "swing") id=83 ;;
+ "fusion") id=84 ;;
+ "bebob") id=85 ;;
+ "latin") id=86 ;;
+ "revival") id=87 ;;
+ "celtic") id=88 ;;
+ "bluegrass") id=89 ;;
+ "avantgarde") id=90 ;;
+ "gothic rock") id=91 ;;
+ "progress. rock") id=92 ;;
+ "psychadel. rock") id=93 ;;
+ "symphonic rock") id=94 ;;
+ "slow rock") id=95 ;;
+ "big band") id=96 ;;
+ "chorus") id=97 ;;
+ "easy listening") id=98 ;;
+ "acoustic") id=99 ;;
+ "humour") id=100 ;;
+ "speech") id=101 ;;
+ "chanson") id=102 ;;
+ "opera") id=103 ;;
+ "chamber music") id=104 ;;
+ "sonata") id=105 ;;
+ "symphony") id=106 ;;
+ "booty bass") id=107 ;;
+ "primus") id=108 ;;
+ "porn groove") id=109 ;;
+ "satire") id=110 ;;
+ "slow jam") id=111 ;;
+ "club") id=112 ;;
+ "tango") id=113 ;;
+ "samba") id=114 ;;
+ "folklore") id=115 ;;
+ "ballad") id=116 ;;
+ "power ballad") id=117 ;;
+ "rhythmic soul") id=118 ;;
+ "freestyle") id=119 ;;
+ "duet") id=120 ;;
+ "punk rock") id=121 ;;
+ "drum solo") id=122 ;;
+ "a capella") id=123 ;;
+ "euro-house") id=124 ;;
+ "dance hall") id=125 ;;
+ "goa") id=126 ;;
+ "drum & bass") id=127 ;;
+ "club-house") id=128 ;;
+ "hardcore") id=129 ;;
+ "terror") id=130 ;;
+ "indie") id=131 ;;
+ "britpop") id=132 ;;
+ "negerpunk") id=133 ;;
+ "polsk punk") id=134 ;;
+ "beat") id=135 ;;
+ "christian gangsta rap") id=136 ;;
+ "heavy metal") id=137 ;;
+ "black metal") id=138 ;;
+ "crossover") id=139 ;;
+ "contemporary christian")id=140 ;;
+ "christian rock") id=141 ;;
+ "merengue") id=142 ;;
+ "salsa") id=143 ;;
+ "thrash metal") id=144 ;;
+ "anime") id=145 ;;
+ "jpop") id=146 ;;
+ "synthpop") id=147 ;;
+ *) return 1 ;;
+ esac
+echo ${id}
+return 0
+}
+
# do_tag [tracknumber]
# id3 tags a filename
# variables used:
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
+ GENREID=$(do_getgenreid "${CDGENRE}")
+
run_command tagtrack-$1 $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
-A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" -y "$CDYEAR" \
- -g "$CDGENRE" -T "$1/$TRACKS" "$ABCDETEMPDIR/track$1.$OUTPUT"
+ -g "$GENREID" -T "${TRACKNUM:-$1/$TRACKS}" \
+ "$ABCDETEMPDIR/track$1.$OUTPUT"
;;
ogg)
case "$OGGENCODERSYNTAX" in
if [ -n "$CDGENRE" ]; then
echo GENRE="$CDGENRE"
fi
- echo TRACKNUMBER=$1
+ echo TRACKNUMBER=${TRACKNUM:-$1}
echo CDDB=$CDDBDISCID
if [ "$(eval echo ${COMMENT})" != "" ]; then
case "$COMMENTOUTPUT" in
esac
;;
flac)
+## FIXME ## [ "$FLACONOGG" = "y" ] && OUTPUT=ogg
(
echo ARTIST="$TRACKARTIST"
echo ALBUM="$DALBUM"
*) echo COMMENT="$COMMENTOUTPUT";;
esac
fi
- ) | run_command tagtrack-$1 $METAFLAC --import-tags-from=- --no-utf8-convert "$ABCDETEMPDIR/track$1.$OUTPUT"
+ ) | run_command tagtrack-$1 $METAFLAC --no-utf8-convert --import-tags-from=- "$ABCDETEMPDIR/track$1.$OUTPUT"
;;
spx)
run_command tagtrack-$1 true
# TRACKS, TRACKNAME, TRACKARTIST, DISTMP3, DISTMP3OPTS, {FOO}ENCODERSYNTAX, OUTPUTTYPE, ENCODEROPTS, DALBUM, DARTIST, ENCNICE, CDYEAR, CDGENRE, COMMENT
do_encode ()
{
- IN="$ABCDETEMPDIR/track$1.wav"
- # We need IN to proceed.
- if [ -s "$IN" ] ; then
+ if [ "$USEPIPES" = "y" ]; then
+ case "$OUTPUT" in
+ mp3)
+ TEMPARG="PIPE_$MP3ENCODERSYNTAX"
+ ;;
+ ogg)
+ TEMPARG="PIPE_$OGGENCODERSYNTAX"
+ ;;
+ flac)
+ TEMPARG="PIPE_$FLACENCODERSYNTAX"
+ ;;
+ spx)
+ TEMPARG="PIPE_$SPEEXENCODER"
+ ;;
+ mpc)
+ TEMPARG="PIPE_$MPPENCODER"
+ ;;
+ esac
+ IN=${!TEMPARG}
+ else
+ IN="$ABCDETEMPDIR/track$1.wav"
+ case "$OUTPUT" in
+ mp3)
+ case "$MP3ENCODERSYNTAX" in
+ # FIXME # check if mp3enc needs -if for pipes
+ mp3enc)
+ FILEARG="-if $IN"
+ ;;
+ *)
+ FILEARG=$IN
+ ;;
+ esac
+ ;;
+ *)
+ FILEARG=$IN
+ ;;
+ esac
+ fi
+ # We need IN to proceed, if we are not using pipes.
+ if [ -s "$IN" -o X"$USEPIPES" = "Xy" ] ; then
for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
do
OUT="$ABCDETEMPDIR/track$1.$OUTPUT"
- run_command '' echo "Encoding track $1 of $TRACKS: $TRACKNAME..."
+ if [ X"$USEPIPES" = "Xy" ]; then
+ RUN_COMMAND=""
+ else
+ run_command '' echo "Encoding track $1 of $TRACKS: $TRACKNAME..."
+ RUN_COMMAND="run_command encodetrack-$OUTPUT-$1"
+ fi
case "$OUTPUT" in
mp3)
case "$2" in
%local*%)
case "$MP3ENCODERSYNTAX" in
- lame|gogo) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS "$IN" "$OUT" ;;
- bladeenc) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS -quit "$IN" ;;
- l3enc|xingmp3enc) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $MP3ENCODER "$IN" "$OUT" $MP3ENCODEROPTS ;;
- mp3enc) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $MP3ENCODER -if "$IN" -of "$OUT" $MP3ENCODEROPTS ;;
+ lame|gogo) $RUN_COMMAND nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS "$IN" "$OUT" ;;
+ bladeenc) $RUN_COMMAND nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS -quit "$IN" ;;
+ l3enc|xingmp3enc) $RUN_COMMAND nice $ENCNICE $MP3ENCODER "$IN" "$OUT" $MP3ENCODEROPTS ;;
+ # FIXME # Relates to the previous FIXME since it might need the "-if" removed.
+ mp3enc) $RUN_COMMAND nice $ENCNICE $MP3ENCODER -if "$IN" -of "$OUT" $MP3ENCODEROPTS ;;
esac
;;
*)
- run_command encodetrack-$OUTPUT-$1 nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" >/dev/null 2>&1
+ $RUN_COMMAND nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" >/dev/null 2>&1
;;
esac
;;
case "$2" in
%local*%)
case "$OGGENCODERSYNTAX" in
- vorbize) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -w "$OUT" "$IN" ;;
- oggenc) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -o "$OUT" "$IN" ;;
+ vorbize) $RUN_COMMAND nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -w "$OUT" "$IN" ;;
+ oggenc) $RUN_COMMAND nice $ENCNICE $OGGENCODER $OGGENCODEROPTS -o "$OUT" "$IN" ;;
esac
;;
*)
- run_command encodetrack-$OUTPUT-$1 nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" >/dev/null 2>&1
+ $RUN_COMMAND nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" >/dev/null 2>&1
;;
esac
;;
case "$2" in
%local*%)
case "$FLACENCODERSYNTAX" in
- flac) run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $FLACENCODER $FLACENCODEROPTS -o "$OUT" "$IN" ;;
+ flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER $FLACENCODEROPTS -o "$OUT" "$IN" ;;
esac
;;
*)
echo -n "DISTMP3:"
echo "$DISTMP3 $DISTMP3OPTS $2 $IN $OUT >/dev/null 2>&1"
- run_command encodetrack-$OUTPUT-$1 nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" > /dev/null 2>&1
+ $RUN_COMMAND nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" > /dev/null 2>&1
;;
esac
;;
fi
# Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging
if [ ! "$DOTAG" = "y" ]; then
- run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" "$COMMENT" "$IN" "$OUT"
+ $RUN_COMMAND nice $ENCNICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" "$COMMENT" "$IN" "$OUT"
else
- run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
+ $RUN_COMMAND nice $ENCNICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
fi
;;
mpc)
# errors, so I have not tried it myself.
## FIXME ## Needs some cleanup to determine if an empty tag sent
## FIXME ## to the encoder ends up empty.
- run_command encodetrack-$OUTPUT-$1 nice $ENCNICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT"
+ $RUN_COMMAND nice $ENCNICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT"
;;
esac
done
FINALPLAYLISTDIR=$(dirname "$OUTPUTDIR/$PLAYLISTFILE")
mkdir -p "$FINALPLAYLISTDIR"
if [ -s "$OUTPUTDIR/$PLAYLISTFILE" ]; then
- #echo -n "Erase any existing playlist file? [y/n] (y): " >&2
echo -n "Erase, Append to, or Keep the existing playlist file? [e/a/k] (e): " >&2
if [ "$INTERACTIVE" = "y" ]; then
while [ "$DONE" != "y" ]; do
cdparanoia|debug)
if [ "$WEHAVEACD" = "y" ]; then
vecho "Querying the CD for audio tracks..."
- TRACKS=$( $CDROMREADER -d $CDROM -Q --verbose 2>&1 | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | awk '{print $1}' | tr -d "." | tr '\n' ' ' )
+ CDPARANOIAOUTPUT="$( $CDROMREADER -d $CDROM -Q --verbose 2>&1 )"
+ RET=$?
+ 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 | awk '{print $1}' | tr -d "." | tr '\n' ' ' )"
CDPARANOIAAUDIOTRACKS="$TRACKS"
else
if [ -f "$ABCDETEMPDIR/status" ] && checkstatus cdparanoia-audio-tracks ; then
else
TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
fi
+ if echo "$TRACKS" | grep [[:digit:]] > /dev/null 2>&1 ;then :;else
+ echo "The disc does not contain any tracks. Giving up..."
+ exit 0
+ fi
echo -n "Grabbing entire CD - tracks: "
if [ ! "$PADTRACKS" = "y" ] ; then
TRACKNUMPADDING=$(echo -n $TRACKS | wc -c | tr -d ' ')
fi
cat /dev/null > "$ABCDETEMPDIR/status"
fi
-
+ if [ X"$CUEFILE" = "Xy" -a X"$WEHAVEACD" = "Xy" ]; then
+ if checkstatus cuefile ; then :; else
+ $MKCUE $MKCUEOPTS > $ABCDETEMPDIR/cue-$(echo $TRACKINFO | cut -f1 -d' ').txt
+ echo cuefile >> "$ABCDETEMPDIR/status"
+ fi
+ fi
# If we got the CDPARANOIA status and it is not recorded, save it now
- ## FIXME ## ! is non-portable
- if [ -n "$CDPARANOIAAUDIOTRACKS" ] && ! checkstatus cdparanoia-audio-tracks; then
- if echo "$CDPARANOIAAUDIOTRACKS" >> "$ABCDETEMPDIR/cdparanoia-audio-tracks"; then
- echo "cdparanoia-audio-tracks" >> "$ABCDETEMPDIR/status"
+ 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
fi
fi
eval $(echo "$EDITOR") "$CDDBDATA"
fi
# If that fails, check for a vi
+ elif which vi >/dev/null 2>&1; then
+ vi "$CDDBDATA"
elif [ -x /usr/bin/vi ]; then
/usr/bin/vi "$CDDBDATA"
# nano should be on all (modern, i.e., sarge) debian systems
+ elif which nano >/dev/null 2>&1 ; then
+ nano "$CDDBDATA"
elif [ -x /usr/bin/nano ]; then
/usr/bin/nano "$CDDBDATA"
# mg should be on all OpenBSD systems
+ elif which mg >/dev/null 2>&1 ; then
+ mg "$CDDBDATA"
elif [ -x /usr/bin/mg ]; then
/usr/bin/mg "$CDDBDATA"
# bomb out
# Some heuristics first. Look at Disc Title, and if it starts with
# "Various", then we'll assume Various Artists
- if [ "$(grep ^DTITLE= "$CDDBDATA" | cut -f2 -d= | egrep -ci '^(various|soundtrack|varios|sonora|ost)')" != "0" ]; then
+ if [ "$(grep ^DTITLE= "$CDDBDATA" | cut -f2- -d= | egrep -ci '^(various|soundtrack|varios|sonora|ost)')" != "0" ]; then
echo "Looks like a Multi-Artist CD" >&2
VARIOUSARTISTS=y
else
echo "cddb-edit" >> "$ABCDETEMPDIR/status"
}
-# do_cdread_one [lasttrack] [firsttrack]
-#
-# Reads the CD in a single track. Live performances, concerts, mixes,... benefit from this.
-do_cdread_one ()
-{
- # The commands here don't go through run_command because they're never supposed to be silenced
- # return codes need to be doublechecked anyway, however
- LASTTRACKNUMBER=$1
- FIRSTTRACKNUMBER=$2
- WAVDATA="$ABCDETEMPDIR/track$FIRSTTRACKNUMBER.wav"
- echo "Grabbing the CD to a single track..." >&2
- case "$CDROMREADERSYNTAX" in
- cdparanoia) nice $READNICE $CDROMREADER -d $CDROM "1-" "$WAVDATA" >&2 ;;
- cdda2wav)
- if [ "$OSFLAVOUR" = "OSX" ] ; then
- # Hei, we have to unmount the device before running anything like cdda2wav in OSX
- disktool -u ${CDROM#/dev/} 0
- # Also, in OSX the cdrom device for cdda2wav changes...
- CDDA2WAVCDROM="IODVDServices"
- elif [ "$OSFLAVOUR" = "FBSD" ] ; then
- CDDA2WAVCDROM="$CDROMID"
- else
- if [ "$CDROMID" = "" ]; then
- CDDA2WAVCDROM="$CDROM"
- else
- CDDA2WAVCDROM="$CDROMID"
- fi
- fi
- nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t 1+$LASTTRACKNUM "$WAVDATA" >&2
- ;;
- dagrab) nice $READNICE $CDROMREADER -d $CDROM -f $WAVDATA -v $UTRACKNUM >&2 ;;
- cddafs)
- # Find the track's mounted path
- REALTRACKNUM=$(expr $UTRACKNUM + 0)
- FILEPATH=$(mount | grep "$CDROM on" | sed 's/^[^ ]* on \(.*\) (.*/\1/')
- FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM ");
- # If the file exists, copy it
- if [ -e "$FILEPATH" ] ; then
- nice $READNICE $CDROMREADER "$FILEPATH" "$WAVDATA" >&2
- else
- false
- fi ;;
- debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;;
- esac
- RETURN=$?
- if [ "$RETURN" != "0" -o ! -s "$WAVDATA" ]; then
- # Thank goodness errors is only machine-parseable up to the
- # first colon, otherwise this woulda sucked
- if [ "$RETURN" = "0" -a ! -s "$WAVDATA" ]; then
- RETURN=73 # fake a return code as cdparanoia return 0 also on aborted reads
- fi
- echo "readtrack-$FIRSTTRACKNUMBER: $CDROMREADER returned code $RETURN" >> "$ABCDETEMPDIR/errors"
- return $RETURN
- else
- echo readtrack-$FIRSTTRACKNUMBER >> "$ABCDETEMPDIR/status"
- fi
-}
-
# do_cdread [tracknumber]
# do_cdread onetrack [firsttrack] [lasttrack]
#
# return codes need to be doublechecked anyway, however
if [ "$1" = "onetrack" ]; then
# FIXME # Add the possibility of grabbing ranges of tracks in onetrack
- # FIXME # Until then, we grab the whole CD in one track, no matter what the user said
+ # FIXME # Until then, we grab the whole CD in one track, no matter what
+ # the user said
# We need the first and last track for cdda2wav
FIRSTTRACK=$2
LASTTRACK=$3
UTRACKNUM=$1
fi
CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
- WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav"
- if [ -r "$CDDBDATA" ]; then
- TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
- echo "Grabbing track $UTRACKNUM: $TRACKNAME..." >&2
- else
- echo "Grabbing track $UTRACKNUM..." >&2
- fi
if [ "$USEPIPES" = "y" ]; then
TEMPARG="PIPE_$CDROMREADERSYNTAX"
FILEARG=${!TEMPARG}
REDIR=""
+ PIPE_MESSAGE="and encoding "
else
+ WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav"
case "$CDROMREADERSYNTAX" in
+ ## FIXME ## Find the case for dagrab, to avoid exceptions
dagrab)
FILEARG="-f $WAVDATA"
;;
esac
REDIR=">&2"
fi
+ if [ -r "$CDDBDATA" ]; then
+ TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
+ echo "Grabbing ${PIPE_MESSAGE}track $UTRACKNUM: $TRACKNAME..." >&2
+ else
+ echo "Grabbing ${PIPE_MESSAGE}track $UTRACKNUM..." >&2
+ fi
case "$CDROMREADERSYNTAX" in
- cdparanoia) nice $READNICE $CDROMREADER -d $CDROM $UTRACKNUM "$WAVDATA" >&2 ;;
+ cdparanoia) nice $READNICE $CDROMREADER -d $CDROM $UTRACKNUM $FILEARG $REDIR ;;
cdda2wav)
if [ "$OSFLAVOUR" = "OSX" ] ; then
# Hei, we have to unmount the device before running anything like cdda2wav in OSX
CDDA2WAVCDROM="$CDROMID"
fi
fi
- nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t $UTRACKNUM "$WAVDATA" >&2
+ nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t $UTRACKNUM $FILEARG $REDIR
+ ;;
+ ## FIXME ## We have an exception for dagrab, since it uses -f
+ ## FIXME ## Shall we just use -f $FILEARG ??
+ dagrab) nice $READNICE $CDROMREADER -d $CDROM -v $UTRACKNUM $FILEARG $REDIR
;;
- dagrab) nice $READNICE $CDROMREADER -d $CDROM -f $WAVDATA -v $UTRACKNUM >&2 ;;
cddafs)
# Find the track's mounted path
REALTRACKNUM=$(expr $UTRACKNUM + 0)
FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM ");
# If the file exists, copy it
if [ -e "$FILEPATH" ] ; then
- nice $READNICE $CDROMREADER "$FILEPATH" "$WAVDATA" >&2
+ nice $READNICE $CDROMREADER "$FILEPATH" $FILEARG $REDIR
else
false
fi ;;
- debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;;
+ debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] $FILEARG $REDIR
+ ;;
esac
RETURN=$?
- if [ "$RETURN" != "0" -o ! -s "$WAVDATA" ]; then
+ # If we get some error or we get some missing wav
+ # (as long as we dont use pipes)
+ if [ "$RETURN" != "0" -o \( ! -s "$WAVDATA" -a X"$USEPIPES" != "Xy" \) ]; then
# Thank goodness errors is only machine-parseable up to the
# first colon, otherwise this woulda sucked
if [ "$RETURN" = "0" -a ! -s "$WAVDATA" ]; then
NORMALIZE=normalize-audio
CDSPEED=eject
VORBISGAIN=vorbisgain
+MKCUE=mkcue
# Options for programs called from abcde
# mp3
NORMALIZEOPTS=
CDSPEEDOPTS="-x"
CDSPEEDVALUE=
+MKCUEOPTS=
# Default to one process if -j isn't specified
MAXPROCS=1
# If USEID3 is set to n, no ID3 tagging is done
CDDBAVAIL=y
USEID3=y
+USEID3V2=y
if [ -z "$OUTPUTDIR" ]; then
OUTPUTDIR=$(pwd)
# Parse command line options
#while getopts 1a:bc:C:d:Dhj:klLnNo:pr:S:t:T:vVx opt ; do
-while getopts 1a:A:bc:C:d:Dhj:klLnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
+while getopts 1a:A:bc:C:d:Dhj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do
case "$opt" in
1) ONETRACK=y ;;
a) ACTIONS="$OPTARG" ;;
n) CDDBAVAIL=n ;;
N) INTERACTIVE=n ;;
m) DOSPLAYLIST=y ;;
+ M) CUEFILE=y ;;
o) OUTPUTTYPE="$OPTARG" ;;
p) PADTRACKS=y ;;
P) USEPIPES=y ;;
for ACTION in $(echo $ACTIONS | tr , \ )
do
case $ACTION in
- cddb) DOCDDB=y;;
- read) DOREAD=y;;
- normalize) DONORMALIZE=y; DOREAD=y;;
-# preprocess) DOPREPROCESS=y; DOREAD=y;;
- encode) DOENCODE=y; DOREAD=y;;
-# 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;;
- playlist) DOCDDB=y; DOPLAYLIST=y;;
- clean) DOCLEAN=y;;
+ cddb) DOCDDB=y;;
+ read) DOREAD=y;;
+ normalize) DONORMALIZE=y; DOREAD=y;;
+# preprocess) DOPREPROCESS=y; DOREAD=y;;
+ encode) DOENCODE=y; DOREAD=y;;
+# 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;;
+ playlist) DOCDDB=y; DOPLAYLIST=y;;
+ clean) DOCLEAN=y;;
esac
done
# Sanity checks:
# At this point a CDROM has to be defined, so we check it exists.
-if [ "$CDROM" != "" ] ; then
+if [ X"$CDROM" != "X" ] ; then
if [ "$CDROMREADERSYNTAX" = "cdda2wav" ] && [ "$NEEDCDROMID" = "y" ] ; then
if [ "$OSFLAVOUR" = "FBSD" ]; then
if ! echo "$CDROMID" | grep "^[0-9],[0-9],[0-9]$" >/dev/null 2>&1 ; then
exit 1
fi
fi
- elif [ ! -e $CDROM ] ; then
+ elif [ ! -e "$CDROM" -a X"$DOREAD" = "Xy" ]; then
echo "abcde error: CDROM device cannot be found." >&2
exit 1
fi
-else
+# avoid processing if we are not going to hit the CDROM.
+elif [ X"$DOREAD" = "Xy" ]; then
echo "abcde error: CDROM has not been defined or cannot be found" >&2
exit 1
fi
-# USEPIPES is not compatible with:
+# USEPIPES pre-tests, before we get into more serious stuff
+# Not compatible with:
# - multiple outputs
# - normalize
+# - lowdisk algorithm
# - anything else?
-if [ "$USEPIPES" = "y" ]; then
+if [ X"$USEPIPES" = "Xy" ]; then
if [ $(echo $OUTPUTTYPE | tr , \ | wc -w ) -gt 1 ]; then
echo "abcde error: Unix pipes not compatible with multiple outputs"
exit 1
fi
- if [ "$DONORMALIZE" = "y" ]; then
+ if [ X"$DONORMALIZE" = "Xy" ]; then
echo "abcde error: Unix pipes not compatible with normalizer"
# FIXME # Do we need to exit or shall we just disable the mode?
exit 1
fi
- if [ "$DOENCODE" = "n" ]; then
+ if [ X"$DOENCODE" = "Xn" ]; then
vecho "Disabling Unix pipes since we are not encoding!"
USEPIPES=n
fi
+ if [ X"$LOWDISK" = "Xy" ]; then
+ vecho "abcde error: Unix pipes not compatible with lowdisk algorithm"
+ exit 1
+ fi
fi
# Decide which CDROM reader we're gonna use
;;
esac
+# Allow -o OUTPUT(1):OPTIONS(1),...,OUTPUT(N):OPTIONS(N) mode of operation
+if echo $OUTPUTTYPE | grep ":" > /dev/null 2>&1 ; then
+ OLDFS="$FS"
+ export FS=","
+ for OUTPUT in "$OUTPUTTYPE"
+ do
+ case "$OUTPUT" in
+ ogg:*) OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+ mp3:*) MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+ flac:*) FLACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+ spx:*) SPEEXENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+ mpc:*) MPPENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+ esac
+ done
+ for OUTPUT in "$OUTPUTTYPE"
+ do
+ TEMPOUTPUT=$( echo "$OUTPUT" | cut -d: -f1 )
+ TEMPOUTPUTTYPE="${TEMPOUTPUTTYPE:+$TEMPOUTPUTTYPE,}$TEMPOUTPUT"
+ done
+ OUTPUTTYPE="$TEMPOUTPUTTYPE"
+ FS="$OLDFS"
+fi
+
# If nothing has been specified, use oggenc for oggs and lame for mp3s and flac for flacs and speexenc for speex and mppenc for mpps
# Getting ready for multiple output changes
for OUTPUT in $(echo $OUTPUTTYPE | tr , \ )
do
case $OUTPUT in
- ogg) [ "$OGGENCODERSYNTAX" = "default" ] && OGGENCODERSYNTAX=oggenc
- [ "$DOTAG" = "y" ] && NEEDCOMMENTER=y
- [ "$REPLAYGAIN" = "y" ] && NEEDVORBISGAIN=y
- ;;
- mp3) [ "$MP3ENCODERSYNTAX" = "default" ] && MP3ENCODERSYNTAX=lame
- [ "$DOTAG" = "y" ] && NEEDTAGGER=y
+ ogg) [ "$OGGENCODERSYNTAX" = "default" ] && OGGENCODERSYNTAX=oggenc
+ [ "$DOTAG" = "y" ] && NEEDCOMMENTER=y
+ [ "$REPLAYGAIN" = "y" ] && NEEDVORBISGAIN=y
+ ;;
+ mp3) [ "$MP3ENCODERSYNTAX" = "default" ] && MP3ENCODERSYNTAX=lame
+ [ "$DOTAG" = "y" ] && NEEDTAGGER=y
+ ;;
+ flac) [ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
+ [ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
+ ;;
+ spx) [ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc ;;
+ mpc) [ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc ;;
+ *) echo "abcde error: Invalid OUTPUTTYPE defined" >&2
+ exit 1
;;
- flac) [ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
- [ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
- ;;
- spx) [ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc ;;
- mpc) [ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc ;;
- *) echo "abcde error: Invalid OUTPUTTYPE defined" >&2
- exit 1
- ;;
esac
done
# decide which encoder
case "$MP3ENCODERSYNTAX" in
lame)
- MP3ENCODEROPTS="$LAMEOPTS"
+ MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$LAMEOPTS}"
MP3ENCODER="$LAME"
;;
gogo)
- MP3ENCODEROPTS="$GOGOOPTS"
+ MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$GOGOOPTS}"
MP3ENCODER="$GOGO"
;;
bladeenc)
- MP3ENCODEROPTS="$BLADEENCOPTS"
+ MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$BLADEENCOPTS}"
MP3ENCODER="$BLADEENC"
;;
l3enc)
- MP3ENCODEROPTS="$L3ENCOPTS"
+ MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$L3ENCOPTS}"
MP3ENCODER="$L3ENC"
;;
xingmp3enc)
- MP3ENCODEROPTS="$XINGMP3ENCOPTS"
+ MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$XINGMP3ENCOPTS}"
MP3ENCODER="$XINGMP3ENC"
;;
mp3enc)
- MP3ENCODEROPTS="$MP3ENCOPTS"
+ MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$MP3ENCOPTS}"
MP3ENCODER="$MP3ENC"
;;
esac
case "$OGGENCODERSYNTAX" in
vorbize)
- OGGENCODEROPTS="$VORBIZEOPTS"
+ OGGENCODEROPTS="${OGGENCODEROPTSCLI:-$VORBIZEOPTS}"
OGGENCODER="$VORBIZE"
;;
oggenc)
- OGGENCODEROPTS="$OGGENCOPTS"
+ OGGENCODEROPTS="${OGGENCODEROPTSCLI:-$OGGENCOPTS}"
OGGENCODER="$OGGENC"
;;
esac
case "$FLACENCODERSYNTAX" in
flac)
- FLACENCODEROPTS="$FLACOPTS"
- FLACENCODER="$FLAC"
+ FLACENCODEROPTS="${FLACENCODEROPTSCLI:-$FLACOPTS}"
+ FLACENCODER="$FLAC"
+ ## FIXME ## FLAC streams can be encapsulated on a Ogg transport layer
+ if echo "$FLACENCODEROPTS" | egrep -q -- "(^| )--ogg($| )" ;then
+ FLACONOGG=y
+ fi
;;
esac
case "$SPEEXENCODERSYNTAX" in
speexenc)
- SPEEXENCODEROPTS="$SPEEXENCOPTS"
+ SPEEXENCODEROPTS="${SPEEXENCODEROPTSCLI:-$SPEEXENCOPTS}"
SPEEXENCODER="$SPEEXENC"
;;
esac
case "$MPPENCODERSYNTAX" in
mppenc)
- MPPENCODEROPTS="$MPPENCOPTS"
+ MPPENCODEROPTS="${MPPENCODEROPTSCLI:-$MPPENCOPTS}"
MPPENCODER="$MPPENC"
;;
esac
-
+
# and which tagger
if [ "$ID3TAGV" = "1" ]; then
[ "$DONORMALIZE" = "y" ] && NEEDNORMALIZER=y
[ "$EJECTCD" = "y" ] && NEEDEJECT=y
[ ! "$CDDBAVAIL" = "n" ] && [ "$DOCDDB" = "y" ] && NEEDHTTPGET=y
+[ "$CUEFILE" = "y" ] && NEEDMKCUE=y
if [ X"$CDSPEEDVALUE" != "X" ]; then
case "$CDROMREADERSYNTAX" in
esac
fi
+# Rippers with USEPIPE support
+# FIXME # Include here all the rippers we can figure out support pipes
+PIPE_cdparanoia="-"
+
+# Encoders with USEPIPE support
+# FIXME # Include here all the encoders we can figure out support pipes
+PIPE_lame="-"
+PIPE_oggenc="-"
+
+# Figure out if we can use pipes with the ripper/encoder combination
+# exit otherwise
+if [ "$USEPIPES" = "y" ]; then
+ PIPERIPPERSVARCHECK="PIPE_${CDROMREADER}"
+ case "$OUTPUT" in
+ mp3)
+ PIPEENCODERSVARCHECK="PIPE_$MP3ENCODERSYNTAX" ;;
+ ogg)
+ PIPEENCODERSVARCHECK="PIPE_$OGGENCODERSYNTAX" ;;
+ flac)
+ PIPEENCODERSVARCHECK="PIPE_$FLACENCODERSYTNAX" ;;
+ spx)
+ PIPEENCODERSVARCHECK="PIPE_$SPEEXENCODER" ;;
+ mpc)
+ PIPEENCODERSVARCHECK="PIPE_$MPPENCODER" ;;
+ esac
+ if [ ! -n "${!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
+ exit 1;
+ fi
+ if [ ! -n "${!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
+ exit 1;
+ fi
+fi
+
# Make sure a buncha things exist
for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
- ${NEEDVORBISGAIN+$VORBISGAIN}
+ ${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMKCUE+$MKCUE}
do
# Cut off the command-line options we just added in
X=$(echo $X | cut -d' ' -f2)
TRACKS="$FIRSTTRACK"
for UTRACKNUM in $TRACKQUEUE; do :;done
if checkstatus readtrack-$FIRSTTRACK; then :; else
- do_cdread_one $UTRACKNUM $FIRSTTRACK
- # FIXME # Allow ranges of tracks to be encoded in one track
- # FIXME # do_cdread onetrack $FIRSTTRACK $UTRACKNUM
- # Until we have it we must use:
- #do_cdread onetrack $FIRSTTRACK $UTRACKNUM
+ do_cdread onetrack $FIRSTTRACK $UTRACKNUM
fi
else
for UTRACKNUM in $TRACKQUEUE
if [ "$DOREAD" = "y" ]; then
if [ "$USEPIPES" = "y" ]; then
if checkstatus readencodetrack-$UTRACKNUM; then :; else
- do_cdread $UTRACKNUM | do_encode $UTRACKNUM %local0%
+ # Read, pipe, shut up!
+ do_cdread $UTRACKNUM | do_encode $UTRACKNUM %local0% > /dev/null 2>&1
fi
else
if checkstatus readtrack-$UTRACKNUM; then :; else
# 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/\ \+$//')
splitvarious
fi
fi
if checkstatus normalizetrack-$UTRACKNUM; then :; else do_normalize $UTRACKNUM; fi
fi
fi
- if [ "$DOENCODE" = "y" ]; then
+ if [ "$DOENCODE" = "y" -a "$USEPIPES" != "y" ]; then
if checkstatus readtrack-$UTRACKNUM; then
#if checkstatus encodetrack-$UTRACKNUM; then :; else do_encode $UTRACKNUM $LOCATION; fi
if [ "$DONORMALIZE" = "y" ]; then
done
# Go through it again and make sure there's no distmp3 stragglers, otherwise
# we'll delete the files they're working on
-if [ "$DOENCODE" = "y" ]; then
+## FIXME ## Check also for files which are encoded using PIPEs.
+if [ "$DOENCODE" = "y" -a "$USEPIPES" != "y" ]; then
PROCEED=
until [ $PROCEED ]
do