X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/73b0af6ed427ce7daa5313858de5038ff5a7fb6f..a9b99f530791c0d08afa0eeb3fba108a344dc24d:/abcde diff --git a/abcde b/abcde index 3fc4cc5..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" @@ -85,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 } @@ -333,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 @@ -378,6 +374,7 @@ do_replaygain() ;; esac OUTPUTFILES="" + REPLAYINDEX=0 for UTRACKNUM in $TRACKQUEUE do CDDBTRACKNUM=$(expr $UTRACKNUM - 1) @@ -392,17 +389,21 @@ do_replaygain() else 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 @@ -839,20 +840,22 @@ 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 @@ -895,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 ;; *) @@ -1040,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 () { @@ -2410,6 +2413,7 @@ NORMALIZE=normalize-audio CDSPEED=eject VORBISGAIN=vorbisgain MP3GAIN=mp3gain +MPPGAIN=replaygain MKCUE=mkcue MKTOC=cdrdao DIFF=diff @@ -2428,7 +2432,7 @@ MP3ENCOPTS= VORBIZEOPTS= OGGENCOPTS= # flac -FLACOPTS="-f" +FLACOPTS= # speex SPEEXENCOPTS= # mpc @@ -2539,7 +2543,7 @@ 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: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 ;; @@ -2867,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 @@ -3081,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 @@ -3391,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 @@ -3470,10 +3475,6 @@ if [ "$DOREPLAYGAIN" = "y" ]; then do_replaygain fi -# FIXME # -# Check if all the encoded formats have been actually moved to the final destination -# ... - # Check to see if run_command logged any errors if [ -f "$ABCDETEMPDIR/errors" ]; then log error "The following commands failed to run:"