# 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 ()
{
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 "${TRACKNUM:-$1/$TRACKS}" "$ABCDETEMPDIR/track$1.$OUTPUT"
+ -g "$GENREID" -T "${TRACKNUM:-$1/$TRACKS}" \
+ "$ABCDETEMPDIR/track$1.$OUTPUT"
;;
ogg)
case "$OGGENCODERSYNTAX" 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
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
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)
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 $FILEARG $REDIR ;;
cdda2wav)
exit 1
fi
fi
- elif [ ! -e "$CDROM" -a X"$DOREAD" = "y" ]; then
+ elif [ ! -e "$CDROM" -a X"$DOREAD" = "Xy" ]; then
echo "abcde error: CDROM device cannot be found." >&2
exit 1
fi
# avoid processing if we are not going to hit the CDROM.
-elif [ X"$DOREAD" = "y" ]; then
+elif [ X"$DOREAD" = "Xy" ]; then
echo "abcde error: CDROM has not been defined or cannot be found" >&2
exit 1
fi
case "$FLACENCODERSYNTAX" in
flac)
FLACENCODEROPTS="${FLACENCODEROPTSCLI:-$FLACOPTS}"
- FLACENCODER="$FLAC"
+ 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
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
HCoop / clinton / abcde.git / blobdiff