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
TRACKARTIST="Various"
else
- TRACKARTIST=$DARTIST
+ TRACKARTIST="$DARTIST"
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}")
-
- # FIXME # track numbers in mp3 come with 1/10, so we cannot happily substitute them with $TRACKNUM
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}" \
fi
(
# These are from http://www.xiph.org/ogg/vorbis/doc/v-comment.html
- echo ARTIST=$TRACKARTIST
+ echo ARTIST="$TRACKARTIST"
echo ALBUM="$DALBUM"
- echo TITLE=$TRACKNAME
+ echo TITLE="$TRACKNAME"
if [ -n "$CDYEAR" ]; then
echo DATE="$CDYEAR"
fi
esac
;;
flac)
+## FIXME ## [ "$FLACONOGG" = "y" ] && OUTPUT=ogg
(
echo ARTIST="$TRACKARTIST"
echo ALBUM="$DALBUM"
# 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
# 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)
# Custom filename munging:
mungefilename ()
{
- echo "$@" | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
+ #echo "$@" | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
+ echo "$@" | sed s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
}
# Custom genre munging:
if [ "$ONETRACK" = "y" ]; then
# FIXME # remove check as soon as we find out about the other readers
case "$CDROMREADERSYNTAX" in
- dagrab|cddafs|debug) echo "abcde error: ONETRACK reading is not suported with "$CDROMREADERSYNTAX" yet"
+ dagrab|cddafs|debug) echo "abcde error: ONETRACK reading is not suported with $CDROMREADERSYNTAX yet"
exit 1 ;;
esac
if [ "$BATCH" = "y" ]; then
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
# Encoders with USEPIPE support
# FIXME # Include here all the encoders we can figure out support pipes
PIPE_lame="-"
+PIPE_bladeenc="-"
PIPE_oggenc="-"
# Figure out if we can use pipes with the ripper/encoder combination
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
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/\ \+$//')
+ CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
+ TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
splitvarious
fi
fi
HCoop / clinton / abcde.git / blobdiff