X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/6fba8f1211e36abc72e6c6b61523b419c4ca2d4e..a9b99f530791c0d08afa0eeb3fba108a344dc24d:/abcde diff --git a/abcde b/abcde index 21dff41..b4cd993 100755 --- a/abcde +++ b/abcde @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright (c) 1998-2001 Robert Woodcock # Copyright (c) 2003-2005 Jesus Climent # This code is hereby licensed for public consumption under either the @@ -10,8 +10,10 @@ # # Copyright for this work is to expire January 1, 2010, after which it # shall be public domain. +# +# $Id$ -VERSION="2.3.99" +VERSION='2.3.99-$Revision$' usage () { @@ -32,7 +34,6 @@ echo "-d " 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 "-f Force operations that otherwise are considered harmful. Read \"man abcde\"" echo "-g Use \"lame --nogap\" for MP3 encoding. Disables low disk and pipes flags" echo "-h This help information" @@ -57,6 +58,7 @@ echo " Show dielfs from the CDDB info (year,genre)" echo "-S <#> Set the CD speed" echo "-t <#> Start the track numbering at a given number" echo "-T <#> Same as -t but modifies tag numbering" +echo "-u Use UNICODE tags and comments" echo "-v Show version number and exit" echo "-V Be a bit more verbose about what is happening behind the scenes" echo "-x Eject CD after all tracks are read" @@ -84,9 +86,9 @@ log () BLURB="$1" shift case $BLURB in - error) echo "[ERR] abcde: $@" >&2 ;; - warning) echo "[WAR] $@" >&2 ;; - info) echo "[INF] $@" ;; + error) echo "[ERROR] abcde: $@" >&2 ;; + warning) echo "[WARNING] $@" >&2 ;; + info) echo "[INFO] $@" ;; esac } @@ -332,11 +334,6 @@ relpath () # 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 @@ -377,6 +374,7 @@ do_replaygain() ;; esac OUTPUTFILES="" + REPLAYINDEX=0 for UTRACKNUM in $TRACKQUEUE do CDDBTRACKNUM=$(expr $UTRACKNUM - 1) @@ -387,21 +385,25 @@ do_replaygain() ALBUMFILE="$(mungefilename "$DALBUM")" do_gettracknum if [ "$VARIOUSARTISTS" = "y" ]; then - OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT) + OUTPUTFILE="$(eval echo $VAOUTPUTFORMAT)" else - OUTPUTFILE=$(eval echo $OUTPUTFORMAT) + OUTPUTFILE="$(eval echo $OUTPUTFORMAT)" fi - OUTPUTFILES="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT $OUTPUTFILES" + OUTPUTFILES[$REPLAYINDEX]="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT" + (( REPLAYINDEX = $REPLAYINDEX + 1 )) done case "$OUTPUT" in flac) - run_command replaygain-flac $METAFLAC --add-replay-gain $OUTPUTFILES + run_command replaygain-flac $METAFLAC --add-replay-gain "${OUTPUTFILES[@]}" ;; vorbis|ogg) - run_command replaygain-vorbis $VORBISGAIN --album $OUTPUTFILES + run_command replaygain-vorbis $VORBISGAIN --album "${OUTPUTFILES[@]}" ;; mp3) - run_command replaygain-mp3 $MP3GAIN -a $OUTPUTFILES + run_command replaygain-mp3 $MP3GAIN -a "${OUTPUTFILES[@]}" + ;; + mpc) + run_command replaygain-mpc $MPPGAIN --auto "${OUTPUTFILES[@]}" ;; *);; esac @@ -838,22 +840,26 @@ do_encode () if [ -s "$IN" -o X"$USEPIPES" = "Xy" ] ; then for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ) do - if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then - continue - fi case "$OUTPUT" in vorbis|ogg) OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" + OUTPUT=$OGGOUTPUTCONTAINER ;; flac) OUT="$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER" + OUTPUT=$FLACOUTPUTCONTAINER ;; *) OUT="$ABCDETEMPDIR/track$1.$OUTPUT" ;; esac + if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then + continue + fi if [ X"$USEPIPES" = "Xy" ]; then RUN_COMMAND="" + # We need a way to store the creation of the files when using PIPES + RUN_COMMAND_PIPES="run_command encodetrack-$OUTPUT-$1 true" else run_command '' echo "Encoding track $1 of $TRACKS: $TRACKNAME..." RUN_COMMAND="run_command encodetrack-$OUTPUT-$1" @@ -892,7 +898,7 @@ do_encode () case "$2" in %local*%) case "$FLACENCODERSYNTAX" in - flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER $FLACENCODEROPTS -o "$OUT" "$IN" ;; + flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER -f $FLACENCODEROPTS -o "$OUT" "$IN" ;; esac ;; *) @@ -928,9 +934,9 @@ do_encode () ;; wav) # In case of wav output we need nothing. Just keep the wavs. - run_command encodetrack-$OUTPUT-$1 true ;; esac + $RUN_COMMAND_PIPES done # Only remove .wav if the encoding succeeded if checkerrors "encodetrack-(.{3,6})-$1"; then :; else @@ -1037,7 +1043,7 @@ do_single_gain () # do_batch_gain # variables used: -# MP3GAIN, MP3GAINOPTS, VORBISGAIN, VORBISGAINOPTS +# MP3GAIN, MP3GAINOPTS, VORBISGAIN, VORBISGAINOPTS, MPPGAIN, MPPGAINOPTS # FIXME # do_batch_gain () { @@ -2273,8 +2279,12 @@ fi decho () { if [ x"$DEBUG" != "x" ]; then - DEBUGECHO=$(echo "$@" | tr -d '[]') - echo "[DEBUG] $DEBUGECHO: `eval echo \\$${DEBUGECHO}`" + if echo $1 | grep -q "^\[" ; then + DEBUGECHO=$(echo "$@" | tr -d '[]') + echo "[DEBUG] $DEBUGECHO: `eval echo \\$${DEBUGECHO}`" + else + echo "[DEBUG] $1" + fi fi } @@ -2403,6 +2413,7 @@ NORMALIZE=normalize-audio CDSPEED=eject VORBISGAIN=vorbisgain MP3GAIN=mp3gain +MPPGAIN=replaygain MKCUE=mkcue MKTOC=cdrdao DIFF=diff @@ -2421,7 +2432,7 @@ MP3ENCOPTS= VORBIZEOPTS= OGGENCOPTS= # flac -FLACOPTS="-f" +FLACOPTS= # speex SPEEXENCOPTS= # mpc @@ -2443,6 +2454,7 @@ MKCUEOPTS= MKTOCOPTS="" VORBISCOMMENTOPTS="-R" METAFLACOPTS="--no-utf8-convert" +DIFFOPTS= # Default to one process if -j isn't specified MAXPROCS=1 @@ -2531,8 +2543,8 @@ if [ "$CDROM" = "" ] ; then 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:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:vVxw:W:z opt ; do +#while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do +while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do case "$opt" in 1) ONETRACK=y ;; a) ACTIONS="$OPTARG" ;; @@ -2565,11 +2577,9 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:vVxw:W:z opt ; do R) DOREPLAYGAIN=y ;; s) SHOWCDDBFIELDS="$OPTARG" ;; S) CDSPEEDVALUE="$OPTARG" ;; -# t) PREPROCESSFORMATS="$OPTARG" -# PREPROCESS=y ;; -# T) POSTPROCESSFORMATS="$OPTARG" ;; t) STARTTRACKNUMBER="$OPTARG" ;; T) STARTTRACKNUMBER="$OPTARG" ; STARTTRACKNUMBERTAG="y" ;; + u) CDDBPROTO=6 ;; v) echo "This is abcde v$VERSION." echo "Usage: abcde [options] [tracks]" @@ -2603,6 +2613,9 @@ if echo $CDROM | grep -i -q '.flac$'; then fi fi +# If the user provided a DISCID, disable eject +if [ -n "$DISCID" ]; then EJECTCD=n ; fi + # Decide if we can continue. if [ "$ONETRACK" = "y" ]; then # FIXME # remove check as soon as we find out about the other readers @@ -2858,9 +2871,11 @@ do ;; spx) [ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc +# [ "$DOREPLAYGAIN" = "y" ] && ;; mpc) [ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc + [ "$DOREPLAYGAIN" = "y" ] && NEEDMPPGAIN=y ;; wav) if [ "$KEEPWAVS" = "y" ]; then @@ -3015,9 +3030,12 @@ if [ X"$CDSPEEDVALUE" != "X" ]; then esac fi +###USEPIPESSUPPORT### + # Rippers with USEPIPE support # FIXME # Include here all the rippers we can figure out support pipes PIPERIPPER_cdparanoia="-" +PIPERIPPER_debug="-" PIPERIPPER_flac="-c " # Encoders with USEPIPE support @@ -3043,13 +3061,17 @@ if [ "$USEPIPES" = "y" ]; then mpc) PIPEENCODERSVARCHECK="PIPE_$MPPENCODER" ;; esac - if [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "$" ] ; then + decho "PIPERIPPERSVARCHECK: $( eval echo "\$$PIPERIPPERSVARCHECK" )" + if [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "$" ] || \ + [ "$( eval echo "\$$PIPERIPPERSVARCHECK" )" = "" ] ; then log error "no support for pipes with given ripper" log error "read the USEPIPES file from the source tarball to get help." log error "On a Debian system, it is under /usr/share/doc/abcde/USEPIPES.gz" exit 1; fi - if [ "$( eval echo "\$$PIPEENCODERSVARCHECK" )" = "$" ] ; then + decho "PIPEENCODERSVARCHECK: $( eval echo "\$$PIPEENCODERSVARCHECK" )" + if [ "$( eval echo "\$$PIPEENCODERSVARCHECK" )" = "$" ] || \ + [ "$( eval echo "\$$PIPEENCODERSVARCHECK" )" = "" ] ; then log error "no support for pipes with given encoder" log error "read the USEPIPES file from the source tarball to help" log error "on a Debian system, read /usr/share/doc/abcde/USEPIPES.gz" @@ -3065,6 +3087,7 @@ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \ ${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \ ${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \ ${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMP3GAIN+$MP3GAIN} \ + ${NEEDMPPGAIN+$MPPGAIN} \ ${NEEDCUEREADER+$CUEREADER} ${NEEDCUE2DISCID+$CUE2DISCID} do # Cut off the command-line options we just added in @@ -3195,6 +3218,11 @@ else if [ "$NOGAP" = "y" ] || [ "$BATCHNORM" = "y" ]; then : else + # If we are not reading, set the encode output to loud already, so + # that we can see the output of the first track. + if [ "$MAXPROCS" = "1" ] && [ ! "$DOREAD" = "y" ]; then + echo "encode-output=loud" >> "$ABCDETEMPDIR/status" + fi echo NEXTTRACK # Get the encoder machine churning again if [ "$DOREAD" = "y" ]; then if [ "$LOWDISK" = "y" ] && [ "$DOENCODE" = "y" ]; then @@ -3370,10 +3398,8 @@ do TRACKNUM="$FIRSTTRACK" splitvarious 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/\ \+$//')" do_getcddbinfo TRACKNAME splitvarious fi @@ -3448,6 +3474,7 @@ wait if [ "$DOREPLAYGAIN" = "y" ]; then do_replaygain fi + # Check to see if run_command logged any errors if [ -f "$ABCDETEMPDIR/errors" ]; then log error "The following commands failed to run:"