X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/d823b8fc40e953b872be749c47c11333dd6d9c71..f0582268a00c97c92f40f3a218c6b195c50e5239:/abcde diff --git a/abcde b/abcde index 539c95c..1ce8ba8 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 () { @@ -20,9 +22,10 @@ echo "Usage: abcde [options] [tracks]" echo "Options:" echo "-1 Encode the whole CD in a single file" echo "-a " -echo " Actions to perform (cddb,read,normalize,encode,tag,move,playlist,clean)" +echo " Actions to perform (cddb,read,normalize,encode,tag,move,replaygain,playlist,clean)" #echo "-A Experimental actions (retag, transcode)" -echo "-b Batch mode: enable album normalization and nogap encoding" +echo "-b Enable batch normalization" +#echo "-B Disable batch replaygain (do file by file)" echo "-c " echo " Specify a configuration file (overrides system and user config files)" echo "-C " @@ -31,7 +34,8 @@ 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" #echo "-i Tag files while encoding, when possible (local only) -NWY-" echo "-j <#> Number of encoder processes to run at once (localhost)" @@ -48,20 +52,20 @@ echo "-p Pad track numbers with 0's (if less than 10 tracks)" echo "-P Use UNIX pipes to read+encode without wav files" echo "-r " echo " Also encode on these remote hosts" -echo "-R Add replaygain values to the tag info (only for vorbis,flac)" +#echo "-R Add replaygain values to the tag info (only for vorbis,flac,mp3)" echo "-s " echo " Show dielfs from the CDDB info (year,genre)" echo "-S <#> Set the CD speed" -#echo "-t File types to preprocess (wav)" -#echo "-T Set postprocessing options" 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" echo "-w " echo " Add a comment to the CD tracks" echo "-W <#> Contatenate CDs: -T #01 -w \"CD #\"" +echo "-z Use debug CDROMREADERSYNTAX option (needs cdparanoia)" echo "" echo "Tracks is a space-delimited list of tracks to grab." echo "Ranges specified with hyphens are allowed (i.e., 1-5)." @@ -69,6 +73,25 @@ echo "" #echo "Double hyphens are used to concatenate tracks" } +addstatus () +{ + echo "$@" >> "$ABCDETEMPDIR/status" +} + +# log [level] [message] +# +# log outputs the right message in a common format +log () +{ + BLURB="$1" + shift + case $BLURB in + error) echo "[ERROR] abcde: $@" >&2 ;; + warning) echo "[WARNING] $@" >&2 ;; + info) echo "[INFO] $@" ;; + esac +} + # Funtions to replace the need of seq, which is too distribution dependant. f_seq_row () { @@ -91,7 +114,7 @@ f_seq_line () done echo else - echo "abcde: syntax error while processing track numbers" >&2 + log error "syntax error while processing track numbers" exit 1 fi } @@ -144,6 +167,29 @@ checkstatus () fi } +# chechwarnings [blurb] +# Returns "0" if the blurb was found (meaning there was an warning), +# returns 1 if it wasn't (yes this is a little backwards). +# Does not print the blurb on stdout. +# Otherwise, returns "". +checkwarnings () +{ + if [ -e "$ABCDETEMPDIR/warnings" ]; then :; else + return 1 + fi + # Take the last line in the status file if there's multiple matches + PATTERN="^$1(:.*)?$" + BLURB="$(egrep $PATTERN "$ABCDETEMPDIR/warnings" | tail -n 1)" + + if [ -z "$BLURB" ]; then + # negative, we did not have a negative... + return 1 + else + # affirmative, we had a negative... + return 0 + fi +} + # checkerrors [blurb] # Returns "0" if the blurb was found (meaning there was an error), # returns 1 if it wasn't (yes this is a little backwards). @@ -288,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 @@ -323,7 +364,6 @@ do_replaygain() if checkstatus replaygain; then :; else run_command "" echo "Adding replygain information..." for OUTPUT in $( echo $OUTPUTTYPE | tr , \ ) - # THE OUTPUT NEEDS TO BE CORRECTED WITH THE CONTAINER? do case $OUTPUT in vorbis|ogg) @@ -334,6 +374,7 @@ do_replaygain() ;; esac OUTPUTFILES="" + REPLAYINDEX=0 for UTRACKNUM in $TRACKQUEUE do CDDBTRACKNUM=$(expr $UTRACKNUM - 1) @@ -344,23 +385,30 @@ 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[@]}" + ;; + mpc) + run_command replaygain-mpc $MPPGAIN --auto "${OUTPUTFILES[@]}" ;; *);; esac done - if checkerrors replaygain-.{3,6}; then :; else + if checkerrors "replaygain-.{3,6}"; then :; else run_command replaygain true fi fi @@ -695,40 +743,50 @@ do_tag () } -# do_batch_encode +# do_nogap_encode # variables used: # OUTPUTTYPE, {FOO}ENCODERSYNTAX, ENCNICE, ENCODER, ENCODEROPTS -do_batch_encode () +do_nogap_encode () { # The commands here don't go through run_command because they're never supposed to be silenced - echo "Batch encoding tracks: $TRACKQUEUE" - OUTPUT=$(echo $OUTPUTTYPE | grep "mp3" ) - case "$OUTPUT" in - mp3) - case "$MP3ENCODERSYNTAX" in - lame) - ( - cd "$ABCDETEMPDIR" - TRACKFILES= - for UTRACKNUM in $TRACKQUEUE - do - TRACKFILES="$TRACKFILES track$UTRACKNUM.wav" - done - nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS `[ "$MP3ENCODER" = "lame" ] && echo "--nogap"` $TRACKFILES - RETURN=$? - if [ "$RETURN" != "0" ]; then - echo "batch-encode: $ENCODER returned code $RETURN" >> errors - else + echo "Encoding gapless MP3 tracks: $TRACKQUEUE" + for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ) + do + case "$OUTPUT" in + mp3) + case "$MP3ENCODERSYNTAX" in + lame) + ( + cd "$ABCDETEMPDIR" + TRACKFILES= for UTRACKNUM in $TRACKQUEUE do - run_command encodetrack-$UTRACKNUM true + TRACKFILES="$TRACKFILES track$UTRACKNUM.wav" done - fi - ) + nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS --nogap $TRACKFILES + RETURN=$? + if [ "$RETURN" != "0" ]; then + echo "nogap-encode: $ENCODER returned code $RETURN" >> errors + else + for UTRACKNUM in $TRACKQUEUE + do + run_command encodetrack-$OUTPUT-$UTRACKNUM true + #run_command encodetrack-$UTRACKNUM true + done + fi + ) + ;; + esac ;; esac - ;; - esac + done + if checkerrors "nogap-encode"; then :; else + if [ ! "$KEEPWAVS" = "y" ] ; then + if [ ! "$KEEPWAVS" = "move" ] ; then + rm -f "$IN" + fi + fi + fi # Other encoders fall through to normal encoding as the tracks # have not been entered in the status file. } @@ -764,6 +822,7 @@ do_encode () mp3) case "$MP3ENCODERSYNTAX" in # FIXME # check if mp3enc needs -if for pipes + # FIXME # I have not been able to find a working mp3enc binary mp3enc) FILEARG="-if $IN" ;; @@ -784,16 +843,23 @@ do_encode () 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" @@ -830,16 +896,15 @@ do_encode () ;; flac) case "$2" in - %local*%) + %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 - ;; - - *) - echo -n "DISTMP3:" - echo "$DISTMP3 $DISTMP3OPTS $2 $IN $OUT >/dev/null 2>&1" - $RUN_COMMAND nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" > /dev/null 2>&1 + ;; + *) + vecho -n "DISTMP3:" + vecho "$DISTMP3 $DISTMP3OPTS $2 $IN $OUT >/dev/null 2>&1" + $RUN_COMMAND nice $DISTMP3NICE $DISTMP3 $DISTMP3OPTS "$2" "$IN" "$OUT" > /dev/null 2>&1 ;; esac ;; @@ -869,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 @@ -978,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 () { @@ -992,7 +1057,7 @@ do_batch_gain () do MP3FILES="$TRACKFILES track$UTRACKNUM.mp3" done - # XXX: Hard-coded batch option! + # FIXME # Hard-coded batch option! $NORMALIZER -b $NORMALIZEROPTS $TRACKFILES RETURN=$? if [ "$RETURN" != "0" ]; then @@ -1096,9 +1161,29 @@ do_move () esac # Check that the directory for OUTPUTFILE exists, if it doesn't, create it OUTPUTFILEDIR="$(dirname "$OUTPUTDIR/$OUTPUTFILE")" - # mkdir -p shouldn't return an error if the directory already exists - mkdir -p "$OUTPUTFILEDIR" - run_command movetrack-$1 mv "$ABCDETEMPDIR/track$1.$OUTPUT" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT" + case $OUTPUT in + wav) + if [ "$DOCLEAN" != "y" ] && [ "$FORCE" != "y" ]; then + # FIXME # introduce warnings? + : + else + # mkdir -p shouldn't return an error if the directory already exists + mkdir -p "$OUTPUTFILEDIR" + run_command movetrack-$1 mv "$ABCDETEMPDIR/track$1.$OUTPUT" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT" + if checkstatus movetrack-output-$OUTPUT; then :; else + run_command movetrack-output-$OUTPUT true + fi + fi + ;; + *) + # mkdir -p shouldn't return an error if the directory already exists + mkdir -p "$OUTPUTFILEDIR" + run_command movetrack-$1 mv "$ABCDETEMPDIR/track$1.$OUTPUT" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT" + if checkstatus movetrack-output-$OUTPUT; then :; else + run_command movetrack-output-$OUTPUT true + fi + ;; + esac # Lets move the cue file if CUEFILE=$(checkstatus cuefile) >/dev/null ; then if [ -r "$ABCDETEMPDIR/$CUEFILE" ]; then @@ -1107,6 +1192,14 @@ do_move () #run_command '' vecho "Copying cue file to its destination directory..." if checkstatus onetrack >/dev/null ; then case $OUTPUT in + wav) + if [ "$DOCLEAN" != "y" ] && [ "$FORCE" != "y" ]; then + # We dont have the dir, since it was not created before. + : + else + run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.cue" + fi + ;; # NOTE: Creating a cue file with the 3-char-extension files is to comply with # http://brianvictor.tripod.com/mp3cue.htm#details [a-z0-9][a-z0-9][a-z0-9]) @@ -1184,7 +1277,6 @@ do_playlist () do # Shares some code with do_move since the filenames have to match CDDBTRACKNUM=$(expr $UTRACKNUM - 1) - #TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2 -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//') do_getcddbinfo TRACKNAME splitvarious TRACKFILE="$(mungefilename "$TRACKNAME")" @@ -1247,11 +1339,11 @@ do_discid () # Make sure there's a CD in there by checking cd-discid's return code if [ ! "$?" = "0" ]; then if [ "$CDROMREADERSYNTAX" = "flac" ] ; then - echo "abcde error: cuesheet information from the flac file could not be read." >&2 - echo "abcde error: Perhaps the flac file does not contain a cuesheet?." >&2 + log error "cuesheet information from the flac file could not be read." + log error "Perhaps the flac file does not contain a cuesheet?." exit 1 else - echo "abcde error: CD could not be read. Perhaps there's no CD in the drive?" >&2 + log error "CD could not be read. Perhaps there's no CD in the drive?" exit 1 fi fi @@ -1260,6 +1352,7 @@ do_discid () disktool -m ${CDROM#/dev/} fi WEHAVEACD=y + DISCID=$(echo $TRACKINFO | cut -f1 -d' ') else TRACKINFO=$(cat "$WAVOUTPUTDIR/abcde.$DISCID/discid") fi @@ -1286,11 +1379,16 @@ do_discid () CDPARANOIAOUTPUT="$( $CDROMREADER -$CDPARANOIACDROMBUS $CDROM -Q --verbose 2>&1 )" RET=$? if [ ! "$RET" = "0" ];then - echo "Warning: Something went wrong while querying the CD... Maybe a DATA CD?" + log warning "something went wrong while querying the CD... Maybe a DATA CD?" fi TRACKS="$(echo "$CDPARANOIAOUTPUT" | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')" CDPARANOIAAUDIOTRACKS="$TRACKS" else + # Previous versions of abcde would store the tracks on a file, instead of the status record. + if [ -f "$ABCDETEMPDIR/cdparanoia-audio-tracks" ]; then + echo cdparanoia-audio-tracks=$( cat "$ABCDETEMPDIR/cdparanoia-audio-tracks" ) >> "$ABCDETEMPDIR/status" + rm -f "$ABCDETEMPDIR/cdparanoia-audio-tracks" + fi if [ -f "$ABCDETEMPDIR/status" ] && TRACKS=$(checkstatus cdparanoia-audio-tracks); then :; else TRACKS=$(echo $TRACKINFO | cut -f2 -d' ') fi @@ -1302,7 +1400,7 @@ do_discid () 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..." + log info "The disc does not contain any tracks. Giving up..." exit 0 fi echo -n "Grabbing entire CD - tracks: " @@ -1314,7 +1412,7 @@ do_discid () while [ "$X" -ne "$TRACKS" ] do X=$(printf "%0.${TRACKNUMPADDING}d" $(expr $X + 1)) - TRACKQUEUE=$(echo "$TRACKQUEUE" $X) + TRACKQUEUE=$(echo $TRACKQUEUE $X) done echo $TRACKQUEUE else @@ -1406,6 +1504,8 @@ do_discid () exit 1 fi cat /dev/null > "$ABCDETEMPDIR/status" + # Store the abcde version in the status file. + echo "abcde-version=$VERSION" >> "$ABCDETEMPDIR/status" fi if [ X"$MAKECUEFILE" = "Xy" -a X"$WEHAVEACD" = "Xy" ]; then if checkstatus cuefile > /dev/null 2>&1 ; then :; else @@ -1414,9 +1514,9 @@ do_discid () if $CUEREADER $CUEREADEROPTS > "$ABCDETEMPDIR/$CUEFILE"; then echo cuefile=$CUEFILE >> "$ABCDETEMPDIR/status" else - echo "abcde: reading the CUE sheet with mkcue is still considered experimental" - echo "abcde: and there was a problem with the CD reading. abcde will continue," - echo "abcde: but consider reporting the problem to the abcde author" + log warning "reading the CUE sheet with mkcue is still considered experimental" + log warning "and there was a problem with the CD reading. abcde will continue," + log warning "but consider reporting the problem to the abcde author" fi fi fi @@ -1435,7 +1535,6 @@ do_discid () # Create a proper CUE file based on the CUE file we created before. do_cleancue() { - # FIXME # we can get the name of the cuefile from the status file if CUEFILE_IN="$ABCDETEMPDIR"/$(checkstatus cuefile); then CUEFILE_OUT=$CUEFILE_IN.out ### FIXME ### checkstatus cddb @@ -1521,7 +1620,8 @@ do_localcddb () fi if [ "$USELOCALRESP" = "y" ]; then #echo "Using local copy of CDDB data" - cp "${CDDBLOCALFILE}" "$ABCDETEMPDIR/cddbread.1" + echo "# DO NOT ERASE THIS LINE! Added by abcde to imitate cddb output" > "$ABCDETEMPDIR/cddbread.1" + cat "${CDDBLOCALFILE}" >> "$ABCDETEMPDIR/cddbread.1" echo 999 > "$ABCDETEMPDIR/cddbquery" # Assuming 999 isn't used by CDDB echo cddb-readcomplete >> "$ABCDETEMPDIR/status" do_cddbparse "${CDDBLOCALFILE}" > "$ABCDETEMPDIR/cddbchoices" @@ -1752,16 +1852,15 @@ do_cddbedit () echo -n "Which entry would you like abcde to use (0 for none)? [0-$CDDBCHOICES]: " >&2 read CDDBCHOICE [ X"$CDDBCHOICE" = "X" ] && CDDBCHOICE=1 - if echo $CDDBCHOICE | egrep -q "[[:digit:]]+,[[:digit:]]+" ; then + if echo $CDDBCHOICE | egrep -q "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" ; then if [ ! X"$DIFF" = "X" ]; then - PARSECHOICE1=$(echo $CDDBCHOICE | cut -d"," -f1) - PARSECHOICE2=$(echo $CDDBCHOICE | cut -d"," -f2) + PARSECHOICE1=$(echo $CDDBCHOICE | cut -d"," -f1 | xargs printf %d 2>/dev/null) + PARSECHOICE2=$(echo $CDDBCHOICE | cut -d"," -f2 | xargs printf %d 2>/dev/null) if [ $PARSECHOICE1 -lt 1 ] || [ $PARSECHOICE1 -gt $CDDBCHOICES ] || \ [ $PARSECHOICE2 -lt 1 ] || [ $PARSECHOICE2 -gt $CDDBCHOICES ] || \ [ $PARSECHOICE1 -eq $PARSECHOICE2 ]; then echo "Invalid diff range. Please select two coma-separated numbers between 1 and $CDDBCHOICES" >&2 else - # We parse the 2 choices to diff, store them in temporary files and diff them. for PARSECHOICE in $(echo $CDDBCHOICE | tr , \ ); do do_cddbparse "$ABCDETEMPDIR/cddbread.$PARSECHOICE" > "$ABCDETEMPDIR/cddbread.parsechoice.$PARSECHOICE" @@ -1777,10 +1876,10 @@ do_cddbedit () else echo "The diff program was not found in your path. Please choose a number between 0 and $CDDBCHOICES." >&2 fi - else + elif echo $CDDBCHOICE | egrep -q "[[:space:]]*[[:digit:]]+[[:space:]]*" ; then + # Make sure we get a valid choice + CDCHOICENUM=$(echo $CDDBCHOICE | xargs printf %d 2>/dev/null) if [ $CDCHOICENUM -lt 0 ] || [ $CDCHOICENUM -gt $CDDBCHOICES ]; then - # Make sure we get a valid choice - CDCHOICENUM=$(echo $CDDBCHOICE | xargs printf %d 2>/dev/null) echo "Invalid selection. Please choose a number between 0 and $CDDBCHOICES." >&2 fi fi @@ -1897,7 +1996,7 @@ do_cddbedit () /usr/bin/mg "$CDDBDATA" # bomb out else - echo "No editor available. Check your EDITOR environment variable." >&2 + log warning "no editor available. Check your EDITOR environment variable." fi # delete editor backup file if it exists if [ -w "$CDDBDATA~" ]; then @@ -2043,20 +2142,12 @@ do_cdread () FIRSTTRACK=$2 LASTTRACK=$3 UTRACKNUM=$FIRSTTRACK - case "$CDROMREADERSYNTAX" in - ### FIXME ### How are we calculating the tracks in flac mode? - flac) READTRACKNUMS="$FIRSTTRACK.1-$(($LASTTRACK + 1)).0" ;; - cdparanoia) READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;; - cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTRACK" ;; - *) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode" - exit 1 ;; - esac else UTRACKNUM=$1 fi CDDBTRACKNUM=$(expr $UTRACKNUM - 1) if [ "$USEPIPES" = "y" ]; then - TEMPARG="PIPE_$CDROMREADERSYNTAX" + TEMPARG="PIPERIPPER_$CDROMREADERSYNTAX" FILEARG="$( eval echo "\$$TEMPARG" )" REDIR="" PIPE_MESSAGE="and encoding " @@ -2080,7 +2171,6 @@ do_cdread () echo "Grabbing ${PIPE_MESSAGE}tracks $UTRACKNUM - $LASTTRACK as one track ..." >&2 else if [ -r "$CDDBDATA" ]; then - #TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\]) do_getcddbinfo TRACKNAME echo "Grabbing ${PIPE_MESSAGE}track $UTRACKNUM: $TRACKNAME..." >&2 else @@ -2173,7 +2263,25 @@ do_cdspeed () vecho () { if [ x"$EXTRAVERBOSE" != "x" ]; then - echo $@ + case $1 in + warning) log warning "$@" ;; + *) echo "$@" ;; + esac +fi +} + +# decho [message] +# +# decho outputs a debug message if DEBUG is selected +decho () +{ +if [ x"$DEBUG" != "x" ]; then + if echo $1 | grep -q "^\[" ; then + DEBUGECHO=$(echo "$@" | tr -d '[]') + echo "[DEBUG] $DEBUGECHO: `eval echo \\$${DEBUGECHO}`" + else + echo "[DEBUG] $1" + fi fi } @@ -2255,6 +2363,8 @@ VARIOUSARTISTS=n VARIOUSARTISTSTYLE=forward KEEPWAVS=n PADTRACKS=n +NOGAP=n +BATCHNORM=n # If using scsi devices, cdda2wav needs a CDROMID, instead of a device node # i.e. CDROMID="1,0,0" @@ -2266,6 +2376,7 @@ CDPARANOIACDROMBUS="d" # program paths - defaults to checking your $PATH # mp3 LAME=lame +TOOLAME=toolame GOGO=gogo BLADEENC=bladeenc L3ENC=l3enc @@ -2298,6 +2409,8 @@ METAFLAC=metaflac NORMALIZE=normalize-audio CDSPEED=eject VORBISGAIN=vorbisgain +MP3GAIN=mp3gain +MPPGAIN=replaygain MKCUE=mkcue MKTOC=cdrdao DIFF=diff @@ -2306,6 +2419,7 @@ CUE2DISCID=cue2discid # Options for programs called from abcde # mp3 LAMEOPTS= +TOOLAMEOPTS= GOGOOPTS= BLADEENCOPTS= L3ENCOPTS= @@ -2315,7 +2429,7 @@ MP3ENCOPTS= VORBIZEOPTS= OGGENCOPTS= # flac -FLACOPTS="-f" +FLACOPTS= # speex SPEEXENCOPTS= # mpc @@ -2337,6 +2451,7 @@ MKCUEOPTS= MKTOCOPTS="" VORBISCOMMENTOPTS="-R" METAFLACOPTS="--no-utf8-convert" +DIFFOPTS= # Default to one process if -j isn't specified MAXPROCS=1 @@ -2403,7 +2518,7 @@ if [ "$HTTPGETOPTS" = "" ] ; then curl) HTTPGETOPTS="-f -s";; fetch)HTTPGETOPTS="-q -o -";; ftp) HTTPGETOPTS="-q -o -";; - *) echo "abcde warning: HTTPGET in non-standard and HTTPGETOPTS are not defined." >&2 ;; + *) log warning "HTTPGET in non-standard and HTTPGETOPTS are not defined." ;; esac fi @@ -2425,22 +2540,24 @@ 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: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" ;; A) EXPACTIONS="$OPTARG" ;; - b) BATCH=y ;; - c) if [ -e "$OPTARG" ] ; then . "$OPTARG" ; else echo "abcde error: config file \"$OPTARG\" cannot be found." >&2 ; exit 1 ; fi ;; - C) DISCID="${OPTARG#abcde.}" ;; + b) BATCHNORM=y ;; + B) NOBATCHREPLAYGAIN=y ;; + c) if [ -e "$OPTARG" ] ; then . "$OPTARG" ; else log error "config file \"$OPTARG\" cannot be found." ; exit 1 ; fi ;; + C) DISCID="$( echo ${OPTARG#abcde.} | tr -d /)" ;; d) CDROM="$OPTARG" ;; D) set -x ;; e) ERASEENCODEDSTATUS=y ;; h) usage; exit ;; e) ERASEENCODEDSTATUS=y ;; E) ENCODING="$OPTARG" ;; -# f) FORCECDDBUSELOCAL=y ;; + f) FORCE=y ;; + g) NOGAP=y ;; i) INLINETAG=y ;; j) MAXPROCS="$OPTARG" ;; k) KEEPWAVS=y ;; @@ -2454,14 +2571,12 @@ while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do p) PADTRACKS=y ;; P) USEPIPES=y ;; r) REMOTEHOSTS="$OPTARG" ;; - R) REPLAYGAIN=y ;; + 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]" @@ -2474,11 +2589,11 @@ while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W:z opt ; do W) if echo $OPTARG | grep -q "[[:digit:]]" ; then STARTTRACKNUMBER="${OPTARG}01" ; STARTTRACKNUMBERTAG="y" ; COMMENT="CD${OPTARG}" else - echo "abcde error: argument of -W must be integer" + log error "argument of -W must be integer" exit 1 fi ;; - z) echo "Placeholder for a future autodebug option" ;; + z) DEBUG=y ; CDROMREADERSYNTAX=debug ; EJECTCD="n" ;; ?) usage; exit ;; esac done @@ -2495,6 +2610,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 @@ -2502,17 +2620,21 @@ if [ "$ONETRACK" = "y" ]; then flac) ;; cdparanoia) ;; cdda2wav) ;; - *) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode" + *) log error "$CDROMREADERSYNTAX does not support ONETRACK mode" exit 1 ;; esac - if [ "$BATCH" = "y" ]; then - echo "abcde error: BATCH mode is not compatible with ONETRACK mode" - BATCH=n + if [ "$BATCHNORM" = "y" ]; then + log warning "BATCHNORM mode is not compatible with ONETRACK mode. Disabling..." + BATCHNORM=n + fi + if [ "$NOGAP" = "y" ]; then + log warning "NOGAP mode is not compatible with ONETRACK mode. Disabling..." + NOGAP=n fi # It does not matter how many tracks we want. In ONETRACK mode we grab them all # FIXME # allow ranges of tracks to be selected for onetrack ripping if [ $# -gt 0 ]; then - vecho "abcde warning: ONETRACK mode selected, grabbing all tracks..." + log warning "ONETRACK mode selected, grabbing all tracks..." fi else while [ $# -gt 0 ]; do @@ -2565,7 +2687,7 @@ done if [ "$DONORMALIZE" = "y" ] && [ "$DOREPLAYGAIN" = "y" ]; then # FIXME # should we abort on error or just inform the user? - : + log warning "selected both normalize and replaygain actions" fi for SHOWCDDBFIELD in $(echo $SHOWCDDBFIELDS | tr , \ ); do @@ -2583,18 +2705,18 @@ 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 - echo "abcde error: CDROMID not in the right format for $CDROMREADERSYNTAX" - echo "Use \"cdrecord -scanbus\" to obtain a adecuate ID an set CDROMID accordingly" + log error "CDROMID not in the right format for $CDROMREADERSYNTAX" + log error "Use \"cdrecord -scanbus\" to obtain a adecuate ID an set CDROMID accordingly" exit 1 fi fi elif [ ! -e "$CDROM" -a X"$DOREAD" = "Xy" ]; then - echo "abcde error: CDROM device cannot be found." >&2 + log error "CDROM device cannot be found." exit 1 fi # 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 + log error "CDROM has not been defined or cannot be found" exit 1 fi @@ -2606,24 +2728,54 @@ fi # - anything else? if [ X"$USEPIPES" = "Xy" ]; then if [ $(echo "$OUTPUTTYPE" | tr , \ | wc -w ) -gt 1 ]; then - echo "abcde error: Unix pipes not compatible with multiple outputs" >&2 + log error "Unix pipes not compatible with multiple outputs" exit 1 fi if [ X"$DONORMALIZE" = "Xy" ]; then - echo "abcde error: Unix pipes not compatible with normalizer" + log error "Unix pipes not compatible with normalizer" # FIXME # Do we need to exit or shall we just disable the mode? exit 1 fi + if [ X"$BATCHNORM" = "Xy" ]; then + log error "Unix pipes not compatible with BATCHNORM encoding" + exit 1 + fi + if [ X"$NOGAP" = "Xy" ]; then + log error "Unix pipes not compatible with NOGAP encoding" + exit 1 + fi if [ X"$DOENCODE" = "Xn" ]; then - vecho "Disabling Unix pipes since we are not encoding!" + vecho warning "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" + log error "Unix pipes not compatible with lowdisk algorithm" + exit 1 + fi +fi + +# LOWDISK pre-tests, before we get into more problematic stuff +# Not compatible with anything that needs all the files in the hard disc: +# - BATCHNORM +# - NOGAP lame mode +if [ X"$LOWDISK" = "Xy" ]; then + if [ X"$BATCHNORM" = "Xy" ]; then + log error "Unix pipes not compatible with BATCHNORM encoding" + exit 1 + fi + if [ X"$NOGAP" = "Xy" ]; then + log error "Unix pipes not compatible with NOGAP encoding" exit 1 fi fi +# BATCHNORM pre-tests, before we get into serious problems +# Not compatible with +if [ "$BATCHNORM" = "y" ] && [ "$DONORMALIZE" = "n" ]; then + vecho warning "Disabling BATCHNORM since we are not normalizing!" + BATCHNORM=n +fi + # Check the encoding format from the ones available in the system, if nothing has been configured in the system. if [ X"$OUTPUTTYPE" = "X" ]; then for DEFAULT_OUTPUT in $( echo "$DEFAULT_OUTPUT_BINARIES" | tr , \ ); do @@ -2636,8 +2788,8 @@ if [ X"$OUTPUTTYPE" = "X" ]; then fi done if [ X"$OUTPUTTYPE" = "X" ]; then - echo "abcde error: no encoder found in the PATH" >&2 - echo "hits: are all dependencies installed? has the \$PATH been modified?" >&2 + log error "no encoder found in the PATH" + log error "hints: are all dependencies installed? has the \$PATH been modified?" exit 1 fi fi @@ -2701,29 +2853,34 @@ do vorbis|ogg) [ "$OGGENCODERSYNTAX" = "default" ] && OGGENCODERSYNTAX=oggenc [ "$DOTAG" = "y" ] && NEEDCOMMENTER=y - [ "$REPLAYGAIN" = "y" ] && NEEDVORBISGAIN=y + [ "$DOREPLAYGAIN" = "y" ] && NEEDVORBISGAIN=y OGGOUTPUTCONTAINER=ogg ;; mp3) [ "$MP3ENCODERSYNTAX" = "default" ] && MP3ENCODERSYNTAX=lame [ "$DOTAG" = "y" ] && NEEDTAGGER=y + [ "$DOREPLAYGAIN" = "y" ] && NEEDMP3GAIN=y ;; flac) [ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac - [ "$REPLAYGAIN" = "y" ] && NEEDMETAFLAC=y [ "$DOTAG" = "y" ] && NEEDMETAFLAC=y + [ "$DOREPLAYGAIN" = "y" ] && NEEDMETAFLAC=y ;; spx) [ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc +# [ "$DOREPLAYGAIN" = "y" ] && ;; mpc) [ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc + [ "$DOREPLAYGAIN" = "y" ] && NEEDMPPGAIN=y ;; wav) - vecho "Unsetting the KEEPWAVS option, since the resulting wav files were requested..." + if [ "$KEEPWAVS" = "y" ]; then + vecho "Unsetting the KEEPWAVS option, since the resulting wav files were requested..." + fi KEEPWAVS=move ;; - *) echo "abcde error: Invalid OUTPUTTYPE defined" >&2 + *) log error "Invalid OUTPUTTYPE defined" exit 1 ;; esac @@ -2735,6 +2892,10 @@ case "$MP3ENCODERSYNTAX" in MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$LAMEOPTS}" MP3ENCODER="$LAME" ;; + toolame) + MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$TOOLAMEOPTS}" + MP3ENCODER="$TOOLAME" + ;; gogo) MP3ENCODEROPTS="${MP3ENCODEROPTSCLI:-$GOGOOPTS}" MP3ENCODER="$GOGO" @@ -2772,8 +2933,8 @@ case "$FLACENCODERSYNTAX" in FLACENCODER="$FLAC" # FLAC streams can be encapsulated on a Ogg transport layer if echo "$FLACENCODEROPTS" | egrep -q -- "(^| )--ogg($| )" ;then - echo "abcde error: FLAC on an Ogg container is not yet supported" >&2 - echo " due to problem with adding comments to such files" >&2 + log error "FLAC on an Ogg container is not yet supported" + log error "due to problem with adding comments to such files" exit 1 FLACOUTPUTCONTAINER=ogg else @@ -2804,6 +2965,12 @@ else TAGGEROPTS="$ID3V2OPTS" fi +# Specific for NOGAP is the use of lame. Another encoder fails... +if [ "$NOGAP" = "y" ] && [ ! "$MP3ENCODER" = "lame" ]; then + log warning "the NOGAP option is specific of lame. Deactivating..." + NOGAP=n +fi + # Options for mkcue case "$CUEREADERSYNTAX" in default|mkcue) @@ -2814,12 +2981,12 @@ esac # Check if both OGGEOUTPUTCONTAINER and FLACOUTPUTCONTAINER are the same, and differentiante them if [ X"$OGGOUTPUTCONTAINER" = "Xogg" ] && [ X"$FLACOUTPUTCONTAINER" = "Xogg" ]; then - echo "abcde error: FLAC on an Ogg container is not yet supported" >&2 - echo " due to problem with adding comments to such files" >&2 + log error "FLAC on an Ogg container is not yet supported" + log error "due to problem with adding comments to such files" exit 1 OGGOUTPUTCONTAINER=ogg.ogg FLACOUTPUTCONTAINER=flac.ogg - vecho "abcde warning: modified file endings due to conflicting transport layers in Ogg/Vorbis and Ogg/FLAC" + vecho warning "modified file endings due to conflicting transport layers in Ogg/Vorbis and Ogg/FLAC" fi # Clean up nice options (either use '-n NICELEVEL or -NICELEVEL') @@ -2860,21 +3027,25 @@ if [ X"$CDSPEEDVALUE" != "X" ]; then esac fi +###USEPIPESSUPPORT### + # Rippers with USEPIPE support # FIXME # Include here all the rippers we can figure out support pipes -PIPE_cdparanoia="-" -PIPE_flac="-c " +PIPERIPPER_cdparanoia="-" +PIPERIPPER_debug="-" +PIPERIPPER_flac="-c " # Encoders with USEPIPE support # FIXME # Include here all the encoders we can figure out support pipes PIPE_lame="-" PIPE_bladeenc="-" PIPE_oggenc="-" +PIPE_flac="-" # Figure out if we can use pipes with the ripper/encoder combination # exit otherwise if [ "$USEPIPES" = "y" ]; then - PIPERIPPERSVARCHECK="PIPE_${CDROMREADER}" + PIPERIPPERSVARCHECK="PIPERIPPER_${CDROMREADERSYNTAX}" case "$OUTPUT" in mp3) PIPEENCODERSVARCHECK="PIPE_$MP3ENCODERSYNTAX" ;; @@ -2887,16 +3058,20 @@ if [ "$USEPIPES" = "y" ]; then mpc) PIPEENCODERSVARCHECK="PIPE_$MPPENCODER" ;; esac - if [ ! -n "$( eval echo "\$$PIPERIPPERSVARCHECK" )" ] ; then - echo "abcde error: no support for pipes with given ripper" >&2 - echo "read the USEPIPES file from the source tarball to get help." >&2 - echo "On a Debian system, it is under /usr/share/doc/abcde/USEPIPES.gz" >&2 + 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 [ ! -n "$( eval echo "\$$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 + 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" exit 1; fi fi @@ -2908,16 +3083,17 @@ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \ ${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \ ${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \ ${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \ - ${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDCUEREADER+$CUEREADER} \ - ${NEEDCUE2DISCID+$CUE2DISCID} + ${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMP3GAIN+$MP3GAIN} \ + ${NEEDMPPGAIN+$MPPGAIN} \ + ${NEEDCUEREADER+$CUEREADER} ${NEEDCUE2DISCID+$CUE2DISCID} do # Cut off the command-line options we just added in X=$(echo $X | cut -d' ' -f2) if [ "$(which $X)" = "" ]; then - echo "abcde error: $X is not in your path." >&2 + log error "$X is not in your path." >&2 exit 1 elif [ ! -x $(which $X) ]; then - echo "abcde error: $X is not executable." >&2 + log error "$X is not executable." >&2 exit 1 fi done @@ -2928,7 +3104,7 @@ HTTPGET="$HTTPGET $HTTPGETOPTS" # And last but not least, check if we can diff between files if [ -x $(which $DIFF) ]; then :; else - vecho "[WAR] Disabling diff since we cannot find it in the \$PATH..." + vecho warning "Disabling diff since we cannot find it in the \$PATH..." DIFF="" fi @@ -3009,7 +3185,11 @@ fi if [ "$ONETRACK" = "y" ]; then TRACKS="$FIRSTTRACK" if checkstatus readtrack-$FIRSTTRACK; then :; else - do_cdread onetrack $FIRSTTRACK $LASTTRACK + if [ "$USEPIPES" = "y" ]; then + do_cdread onetrack $FIRSTTRACK $LASTTRACK | do_encode $FIRSTTRACK %local0% > /dev/null 2>&1 + else + do_cdread onetrack $FIRSTTRACK $LASTTRACK + fi fi else for UTRACKNUM in $TRACKQUEUE @@ -3032,9 +3212,14 @@ else fi fi fi - if [ "$BATCH" = "y" ]; then + 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 @@ -3058,7 +3243,7 @@ if [ "$MAXPROCS" = "1" ]; then fi # All tracks read, start encoding. -if [ "$BATCH" = "y" ] || [ "$ONETRACK" = "y" ]; then +if [ "$NOGAP" = "y" ] || [ "$BATCHNORM" = "y" ] || [ "$ONETRACK" = "y" ]; then echo NEXTTRACK fi @@ -3115,19 +3300,28 @@ fi # #) | ( -# In batch mode, we want all tracks to be read first. -if [ "$BATCH" = "y" ]; then +# In BATCHNORM and/or NOGAP modes, we want all tracks to be read first. +#BACK +if [ "$BATCHNORM" = "y" ] || [ "$NOGAP" = "y" ]; then read GOAHEAD # For blocking - will contain either "NO" or "NEXTTRACK" if [ "$GOAHEAD" = "NO" ]; then break; fi for LASTTRACK in $TRACKQUEUE; do :; done if checkstatus readtrack-$LASTTRACK; then - if [ "$DONORMALIZE" = "y" ]; then + if [ "$DONORMALIZE" = "y" ] && [ "$BATCHNORM" = "y" ]; then if checkstatus normalizetrack-$LASTTRACK; then :; else do_batch_normalize; fi - if checkerrors batch-normalize; then exit; fi + if checkerrors batch-normalize; then exit 1; fi fi - if [ "$DOENCODE" = "y" ]; then - if checkstatus encodetrack-$LASTTRACK; then :; else do_batch_encode; fi - if checkerrors batch-encode; then exit; fi + if [ "$DOENCODE" = "y" ] && [ "$NOGAP" = "y" ]; then + if [ "$DONORMALIZE" = "y" ]; then + for UTRACKNUM in $TRACKQUEUE + do + if checkstatus readtrack-$UTRACKNUM; then + if checkstatus normalizetrack-$UTRACKNUM; then :; else do_normalize $UTRACKNUM; fi + fi + done + fi + if checkstatus encodetrack-$LASTTRACK; then :; else do_nogap_encode; fi + if checkerrors nogap-encode; then exit 1; fi fi fi fi @@ -3201,10 +3395,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 @@ -3276,12 +3468,13 @@ if [ "$DOENCODE" = "y" -a "$USEPIPES" != "y" ]; then fi # If the above didn't catch the stragglers, this will wait -if [ "$REPLAYGAIN" = "y" ]; then +if [ "$DOREPLAYGAIN" = "y" ]; then do_replaygain fi + # Check to see if run_command logged any errors if [ -f "$ABCDETEMPDIR/errors" ]; then - echo "The following commands failed to run:" + log error "The following commands failed to run:" cat "$ABCDETEMPDIR/errors" # Don't clean up DOCLEAN=n @@ -3290,6 +3483,18 @@ if [ "$KEEPWAVS" = "y" ];then # Don't clean up DOCLEAN=n fi +# Check if we have moved all the formats we had previously encoded, if we are not using the FORCE. +if [ "$DOCLEAN" = "y" ] && [ ! "$FORCE" = "y" ]; then + ENCODED_FORMATS=$(egrep "^encodetrack-(.{3,6})-(.{1,2})$" "$ABCDETEMPDIR/status" | cut -d"-" -f2 | sort -u | tr '\n' '|') + MOVED_FORMATS=$(egrep "^movetrack-output-(.{3,6})$" "$ABCDETEMPDIR/status" | cut -d"-" -f3 | sort -u | tr '\n' '|') + if [ "$ENCODED_FORMATS" != "$MOVED_FORMATS" ]; then + log warning "The encoded formats does not match with the moved ones" + log warning "Formats encoded: $( echo $ENCODED_FORMATS | tr "|" " " )" + log warning "Formats moved: $( echo $MOVED_FORMATS | tr "|" " " )" + log warning "Use \"abcde -a clean -f -C $DISCID\" to force the removal of the remaining data." + DOCLEAN=n + fi +fi if [ "$DOCLEAN" = "y" ]; then # Wipe all the evidence # Gimme gimme gimme some more time!