X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/66fd4e44406229db58535d2432fea71b73708316..e7530e7c17acbb94af451881b25c2fad3d7a2a2c:/abcde diff --git a/abcde b/abcde index 139b353..047210b 100755 --- a/abcde +++ b/abcde @@ -53,7 +53,7 @@ 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,mp3)" +echo "-R Use local CDDB in recursive mode" echo "-s " echo " Show dielfs from the CDDB info (year,genre)" echo "-S <#> Set the CD speed" @@ -107,7 +107,7 @@ f_seq_row () f_seq_line () { i=$1 - if echo $i | grep -q "[[:digit:]]" ; then + if echo $i | grep "[[:digit:]]" > /dev/null 2>&1 ; then while [ $i -ne `expr $2 + 1` ] do printf $i" " @@ -333,9 +333,73 @@ relpath () echo $TO } -# do_getcddbinfo +new_checkexec () +{ + if [ ! "$@" = "" ]; then + # Cut off any command-line option we added in + X=$(echo $@ | cut -d' ' -f2) + if [ "$(which $X)" = "" ]; then + return 1 + elif [ ! -x $(which $X) ]; then + return 2 + fi + fi + return 0 +} + +checkexec () +{ + if [ ! "$@" = "" ]; then + # Cut off any command-line option we added in + X=$(echo $@ | cut -d' ' -f2) + if [ "$(which $X)" = "" ]; then + log error "$X is not in your path." >&2 + log info "Define the full path to the executable if it exists on your system." >&2 + exit 1 + elif [ ! -x "$(which $X)" ]; then + log error "$X is not executable." >&2 + exit 1 + fi + fi +} + +# diffentries , +# max_value: the range of entries goes from 1 to +diffentries () +{ + FILENAME=$1 + shift + local CDDBDIFFCHOICES=$1 + shift + local CDDBDIFFCHOICE="$@" + if [ ! X"$DIFF" = "X" ]; then + PARSECHOICE1=$(echo $CDDBDIFFCHOICE | cut -d"," -f1 | xargs printf %d 2>/dev/null) + PARSECHOICE2=$(echo $CDDBDIFFCHOICE | cut -d"," -f2 | xargs printf %d 2>/dev/null) + if [ $PARSECHOICE1 -lt 1 ] || [ $PARSECHOICE1 -gt $CDDBDIFFCHOICES ] || \ + [ $PARSECHOICE2 -lt 1 ] || [ $PARSECHOICE2 -gt $CDDBDIFFCHOICES ] || \ + [ $PARSECHOICE1 -eq $PARSECHOICE2 ]; then + echo "Invalid diff range. Please select two coma-separated numbers between 1 and $CDDBDIFFCHOICES" >&2 + else + # We parse the 2 choices to diff, store them in temporary files and diff them. + for PARSECHOICE in $(echo $CDDBDIFFCHOICE | tr , \ ); do + do_cddbparse "$ABCDETEMPDIR/$FILENAME.$PARSECHOICE" > "$ABCDETEMPDIR/$FILENAME.parsechoice.$PARSECHOICE" + done + echo "Showing diff between choices $PARSECHOICE1 and $PARSECHOICE2..." > "$ABCDETEMPDIR/$FILENAME.diff" + $DIFF $DIFFOPTS "$ABCDETEMPDIR/$FILENAME.parsechoice.$PARSECHOICE1" "$ABCDETEMPDIR/$FILENAME.parsechoice.$PARSECHOICE2" >> "$ABCDETEMPDIR/$FILENAME.diff" + if [ $(cat "$ABCDETEMPDIR/$FILENAME.diff" | wc -l) -ge 24 ]; then + page "$ABCDETEMPDIR/$FILENAME.diff" + else + cat "$ABCDETEMPDIR/$FILENAME.diff" >&2 + fi + fi + else + echo "The diff program was not found in your path. Please choose a number between 0 and $CDDBDIFFCHOICES." >&2 + fi +} + +# getcddbinfo # Finds an specific field from cddbinfo -do_getcddbinfo() +getcddbinfo() { case $1 in TRACKNAME1) @@ -347,9 +411,9 @@ do_getcddbinfo() esac } -# do_gettracknum +# gettracknum # Get the track number we are going to use for different actions -do_gettracknum() +gettracknum() { if [ -n "$STARTTRACKNUMBER" ] ; then # Get the trackpadding from the current track @@ -364,31 +428,34 @@ do_replaygain() { if checkstatus replaygain; then :; else run_command "" echo "Adding replygain information..." - for OUTPUT in $( echo $OUTPUTTYPE | tr , \ ) + for TMPOUTPUT in $( echo $OUTPUTTYPE | tr , \ ) do - case $OUTPUT in + case $TMPOUTPUT in vorbis|ogg) OUTPUT=$OGGOUTPUTCONTAINER ;; flac) OUTPUT=$FLACOUTPUTCONTAINER ;; + *) + OUTPUT=$TMPOUTPUT + ;; esac OUTPUTFILES="" REPLAYINDEX=0 for UTRACKNUM in $TRACKQUEUE do CDDBTRACKNUM=$(expr $UTRACKNUM - 1) - do_getcddbinfo TRACKNAME + getcddbinfo TRACKNAME splitvarious TRACKFILE="$(mungefilename "$TRACKNAME")" ARTISTFILE="$(mungefilename "$TRACKARTIST")" ALBUMFILE="$(mungefilename "$DALBUM")" - do_gettracknum + gettracknum if [ "$VARIOUSARTISTS" = "y" ]; then - OUTPUTFILE="$(eval echo $VAOUTPUTFORMAT)" + OUTPUTFILE="$(eval echo "$VAOUTPUTFORMAT")" else - OUTPUTFILE="$(eval echo $OUTPUTFORMAT)" + OUTPUTFILE="$(eval echo "$OUTPUTFORMAT")" fi OUTPUTFILES[$REPLAYINDEX]="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT" (( REPLAYINDEX = $REPLAYINDEX + 1 )) @@ -641,7 +708,7 @@ do_tag () # If we want to start the tracks with a given number, we need to modify the # TRACKNUM value before evaluation if [ -n "$STARTTRACKNUMBERTAG" ] ; then - do_gettracknum + gettracknum fi for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ) do @@ -653,15 +720,25 @@ do_tag () case "$ID3SYNTAX" in id3);; eyed3) - # FIXME # track numbers in mp3 come with 1/10, so we cannot happily substitute them with $TRACKNUM - run_command tagtrack-$OUTPUT-$1 $TAGGER $TAGGEROPTS --commen=::"$COMMENTOUTPUT" \ - -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \ + # FIXME # track numbers in mp3 come with 1/10, so we cannot + # happily substitute them with $TRACKNUM + run_command tagtrack-$OUTPUT-$1 $TAGGER $TAGGEROPTS \ + --comment=::"$COMMENTOUTPUT" -A "$DALBUM" \ + -a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \ -G "$GENREID" -n "${TRACKNUM:-$1}" "${TRACKNUM:+-N $TRACKS}" \ - "${ENCODING:+--set-encoding=$ENCODING}" + "${ENCODING:+--set-encoding=$ENCODING}" \ + "$ABCDETEMPDIR/track$1.$OUTPUT" + ;; + # FIXME # Still not activated... + id3ed) + run_command tagtrack-$OUTPUT-$1 $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \ + -a "$DALBUM" -n "$TRACKARTIST" -s "$TRACKNAME" -y "$CDYEAR" \ + -g "$GENREID" -k "${TRACKNUM:-$1}" \ "$ABCDETEMPDIR/track$1.$OUTPUT" ;; *) - # FIXME # track numbers in mp3 come with 1/10, so we cannot happily substitute them with $TRACKNUM + # FIXME # track numbers in mp3 come with 1/10, so we cannot + # happily substitute them with $TRACKNUM run_command tagtrack-$OUTPUT-$1 $TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \ -A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" -y "$CDYEAR" \ -g "$GENREID" -T "${TRACKNUM:-$1/$TRACKS}" \ @@ -725,7 +802,7 @@ do_tag () *) echo COMMENT="$COMMENTOUTPUT";; esac fi - ) | run_command tagtrack-$OUTPUT-$1 $METAFLAC $METAFLACOPTS --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER" + ) | run_command tagtrack-$OUTPUT-$1 $METAFLAC $METAFLACOPTS ${IMPORTCUESHEET:+--import-cuesheet-from="$ABCDETEMPDIR/$CUEFILE"} --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER" ;; spx) run_command tagtrack-$OUTPUT-$1 true @@ -845,21 +922,20 @@ do_encode () 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 , \ ) + for TMPOUTPUT in $(echo $OUTPUTTYPE | tr , \ ) do - case "$OUTPUT" in + case "$TMPOUTPUT" in vorbis|ogg) - OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" OUTPUT=$OGGOUTPUTCONTAINER ;; flac) - OUT="$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER" OUTPUT=$FLACOUTPUTCONTAINER ;; *) - OUT="$ABCDETEMPDIR/track$1.$OUTPUT" + OUTPUT=$TMPOUTPUT ;; esac + OUT="$ABCDETEMPDIR/track$1.$OUTPUT" if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then continue fi @@ -1141,8 +1217,12 @@ do_normalize () # TRACKNUM, TRACKNAME, TRACKARTIST, DALBUM, OUTPUTFORMAT, CDGENRE, CDYEAR do_move () { - for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ) + for TMPOUTPUT in $(echo $OUTPUTTYPE | tr , \ ) do + # For now, set OUTPUT as TMPOUTPUT, and then change it once we have + # defined the OUTPUTFILE: + OUTPUT="$TMPOUTPUT" + # Create ALBUMFILE, ARTISTFILE, TRACKFILE # Munge filenames as follows: # ' ' -> '_' @@ -1154,26 +1234,30 @@ do_move () ARTISTFILE="$(mungefilename "$TRACKARTIST")" TRACKFILE="$(mungefilename "$TRACKNAME")" GENRE="$(mungegenre "$GENRE")" - YEAR="$(echo $CDYEAR)" - # If we want to start the tracks with a given number, we need to modify the - # TRACKNUM value before evaluation - do_gettracknum - # Supported variables for OUTPUTFORMAT are GENRE, ALBUMFILE, ARTISTFILE, - # TRACKFILE, and TRACKNUM. + YEAR=${CDYEAR:-$CDYEAR} + # If we want to start the tracks with a given number, we need to modify + # the TRACKNUM value before evaluation + gettracknum + # Supported variables for OUTPUTFORMAT are GENRE, YEAR, ALBUMFILE, + # ARTISTFILE, TRACKFILE, and TRACKNUM. if [ "$VARIOUSARTISTS" = "y" ]; then OUTPUTFILE="$(eval echo "$VAOUTPUTFORMAT")" else OUTPUTFILE="$(eval echo "$OUTPUTFORMAT")" fi if checkerrors "tagtrack-$OUTPUT-$1"; then :; else - # Once we know the specific output was successful, we can change the OUTPUT to the value containing the container - case $OUTPUT in + # Once we know the specific output was successful, we can change + # the OUTPUT to the value containing the container + case $TMPOUTPUT in vorbis|ogg) OUTPUT=$OGGOUTPUTCONTAINER ;; flac) OUTPUT=$FLACOUTPUTCONTAINER ;; + *) + OUTPUT=$TMPOUTPUT + ;; esac # Check that the directory for OUTPUTFILE exists, if it doesn't, create it OUTPUTFILEDIR="$(dirname "$OUTPUTDIR/$OUTPUTFILE")" @@ -1243,29 +1327,32 @@ do_move () # VARIOUSARTISTS, OUTPUTDIR do_playlist () { - for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ) + for TMPOUTPUT in $(echo $OUTPUTTYPE | tr , \ ) do - case $OUTPUT in + case $TMPOUTPUT in vorbis|ogg) OUTPUT=$OGGOUTPUTCONTAINER ;; flac) OUTPUT=$FLACOUTPUTCONTAINER ;; + *) + OUTPUT=$TMPOUTPUT + ;; esac # Create a playlist file for the playlist data to go into. # We used to wipe it out if it existed. Now we request permision if interactive. for LASTTRACK in $TRACKQUEUE; do :; done ALBUMFILE="$(mungefilename "$DALBUM")" ARTISTFILE="$(mungefilename "$DARTIST")" - GENRE=$(mungegenre "$GENRE") + GENRE="$(mungegenre "$GENRE")" YEAR=${CDYEAR:-$CDYEAR} if [ "$VARIOUSARTISTS" = "y" ] ; then - PLAYLISTFILE=$(eval echo $VAPLAYLISTFORMAT) + PLAYLISTFILE="$(eval echo "$VAPLAYLISTFORMAT")" else - PLAYLISTFILE=$(eval echo $PLAYLISTFORMAT) + PLAYLISTFILE="$(eval echo "$PLAYLISTFORMAT")" fi - FINALPLAYLISTDIR=$(dirname "$OUTPUTDIR/$PLAYLISTFILE") + FINALPLAYLISTDIR="$(dirname "$OUTPUTDIR/$PLAYLISTFILE")" mkdir -p "$FINALPLAYLISTDIR" if [ -s "$OUTPUTDIR/$PLAYLISTFILE" ]; then echo -n "Erase, Append to, or Keep the existing playlist file? [e/a/k] (e): " >&2 @@ -1293,18 +1380,18 @@ do_playlist () do # Shares some code with do_move since the filenames have to match CDDBTRACKNUM=$(expr $UTRACKNUM - 1) - do_getcddbinfo TRACKNAME + getcddbinfo TRACKNAME splitvarious TRACKFILE="$(mungefilename "$TRACKNAME")" ARTISTFILE="$(mungefilename "$TRACKARTIST")" ALBUMFILE="$(mungefilename "$DALBUM")" # If we want to start the tracks with a given number, we need to modify the # TRACKNUM value before evaluation - do_gettracknum + gettracknum if [ "$VARIOUSARTISTS" = "y" ]; then - OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT) + OUTPUTFILE="$(eval echo "$VAOUTPUTFORMAT")" else - OUTPUTFILE=$(eval echo $OUTPUTFORMAT) + OUTPUTFILE="$(eval echo "$OUTPUTFORMAT")" fi if [ "$VARIOUSARTISTS" = "y" ]; then if [ "$VAPLAYLISTDATAPREFIX" ] ; then @@ -1348,7 +1435,12 @@ do_discid () disktool -u ${CDROM#/dev/} fi if [ "$CDROMREADERSYNTAX" = "flac" ] ; then - TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM | $CUE2DISCID) + if $METAFLAC $METAFLACOPTS --export-cuesheet-to=- "$CDROM" > /dev/null 2>&1 ; then + TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- "$CDROM" | $CUE2DISCID) + else + log error "the input flac file does not contain a cuesheet." + exit 1 + fi else case "$CDDBMETHOD" in cddb) TRACKINFO=$($CDDISCID $CDROM) ;; @@ -1531,13 +1623,22 @@ do_discid () if checkstatus cuefile > /dev/null 2>&1 ; then :; else CUEFILE=cue-$(echo "$TRACKINFO" | cut -f1 -d' ').txt vecho "Creating cue file..." - if $CUEREADER $CUEREADEROPTS > "$ABCDETEMPDIR/$CUEFILE"; then - echo cuefile=$CUEFILE >> "$ABCDETEMPDIR/status" - else - 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 + case $CDROMREADERSYNTAX in + flac) + if $METAFLAC --export-cuesheet-to=- $CDROM > "$ABCDETEMPDIR/$CUEFILE"; then :; else + log warning "the input flac file does not contain a cuesheet." + fi + ;; + *) + if $CUEREADER $CUEREADEROPTS > "$ABCDETEMPDIR/$CUEFILE"; then + echo cuefile=$CUEFILE >> "$ABCDETEMPDIR/status" + else + 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 + ;; + esac fi fi # If we got the CDPARANOIA status and it is not recorded, save it now @@ -1570,8 +1671,7 @@ do_cleancue() echo "TITLE \"$DALBUM\"" >> "$CUEFILE_OUT" cat "$CUEFILE_IN" | while read line do - if echo "$line" | grep -q "INDEX" - then + if echo "$line" | grep "INDEX" > /dev/null 2>&1 ; then eval track="\$TRACK$n" n=$(expr $n + 1) echo "TITLE \"$track\"" >> "$CUEFILE_OUT" @@ -1621,42 +1721,128 @@ do_localcddb () { if checkstatus cddb-readcomplete && checkstatus cddb-choice >/dev/null; then :; else - CDDBLOCALSUCCESS="n" + CDDBLOCALSTATUS="notfound" CDDBDISCID=$(echo $TRACKINFO | cut -d' ' -f1) - CDDBLOCALFILE="${CDDBLOCALDIR}/${CDDBDISCID}" USELOCALRESP="y" - - # If the user has selected to check a local CDDB repo, we proceed with it - if [ -r "${CDDBLOCALFILE}" ]; then - # List out disc title/author and contents - do_cddbparse "${CDDBLOCALFILE}" - echo -n "Locally cached CDDB entry found, use it? [y/n] (y): " - if [ "$INTERACTIVE" = "y" ]; then - read USELOCALRESP - while [ "$USELOCALRESP" != "y" ] && [ "$USELOCALRESP" != "n" ] && [ "$USELOCALRESP" != "" ] ; do - echo -n 'Invalid selection. Please answer "y" or "n": ' - read USELOCALRESP - done - [ x"$USELOCALRESP" = "x" ] && USELOCALRESP="y" - else - echo "y" >&2 - fi - if [ "$USELOCALRESP" = "y" ]; then - #echo "Using local copy of CDDB data" - 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" - echo cddb-choice=1 >> "$ABCDETEMPDIR/status" - CDDBLOCALSUCCESS="y" + + if [ "$CDDBLOCALRECURSIVE" = "y" ]; then + CDDBLOCALRESULTS="$(find ${CDDBLOCALDIR} -name "${CDDBDISCID}" -type f 2> /dev/null)" + if [ ! "${CDDBLOCALRESULTS}" = "" ]; then + if (( $(echo "${CDDBLOCALRESULTS}" | wc -l) == 1 )); then + CDDBLOCALFILE="${CDDBLOCALRESULTS}" + CDDBLOCALMATCH=single + elif (( $(echo "${CDDBLOCALRESULTS}" | wc -l) > 1 )); then + CDDBLOCALMATCH=multiple + fi else - #echo "Not using local copy of CDDB data" - CDDBLOCALSUCCESS="n" + CDDBLOCALMATCH=none fi + elif [ "$CDDBLOCALMATCH" = "none" ] && [ -r "${CDDBLOCALDIR}/${CDDBDISCID}" ]; then + CDDBLOCALFILE="${CDDBLOCALDIR}/${CDDBDISCID}" + CDDBLOCALMATCH=single else - CDDBLOCALSUCCESS="n" + CDDBLOCALMATCH=none fi + + # If the user has selected to check a local CDDB repo, we proceed with it + case $CDDBLOCALMATCH in + multiple) + echo "Processing multiple matching CDDB entries..." > "$ABCDETEMPDIR/cddblocalchoices" + X=0 + echo "$CDDBLOCALRESULTS" | while read RESULT ; do + X=$(expr $X + 1) + # List out disc title/author and contents + CDDBLOCALREAD="$ABCDETEMPDIR/cddblocalread.$X" + cat "$RESULT" > "${CDDBLOCALREAD}" + { + echo -n "#$X: " + do_cddbparse "${CDDBLOCALREAD}" + echo "" + ##FIXME## QUICK HACK !!!! + if [ ! "$INTERACTIVE" = "y" ]; then break ; fi + } >> "$ABCDETEMPDIR/cddblocalchoices" + done + if [ $(cat "$ABCDETEMPDIR/cddblocalchoices" | wc -l) -ge 24 ] && [ "$INTERACTIVE" = "y" ]; then + page "$ABCDETEMPDIR/cddblocalchoices" + else + # It's all going to fit in one page, cat it + cat "$ABCDETEMPDIR/cddblocalchoices" >&2 + fi + CDDBLOCALCHOICES=$( echo "$CDDBLOCALRESULTS" | wc -l ) + # Setting the choice to an impossible integer to avoid errors in the numeric comparisons + CDDBLOCALCHOICENUM=-1 + if [ "$INTERACTIVE" = "y" ]; then + while [ $CDDBLOCALCHOICENUM -lt 0 ] || [ $CDDBLOCALCHOICENUM -gt $CDDBLOCALCHOICES ]; do + echo -n "Locally cached CDDB entries found. Which one would you like to use (0 for none)? [0-$CDDBLOCALCHOICES]: " >&2 + read CDDBLOCALCHOICE + [ x"$CDDBLOCALCHOICE" = "x" ] && CDDBLOCALCHOICE="1" + # FIXME # Introduce diff's + if echo $CDDBLOCALCHOICE | egrep "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then + diffentries cddblocalread "$CDDBLOCALCHOICES" "$CDDBLOCALCHOICE" + elif echo $CDDBLOCALCHOICE | egrep "[[:space:]]*[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then + # Make sure we get a valid choice + CDDBLOCALCHOICENUM=$(echo $CDDBLOCALCHOICE | xargs printf %d 2>/dev/null) + if [ $CDDBLOCALCHOICENUM -lt 0 ] || [ $CDDBLOCALCHOICENUM -gt $CDDBLOCALCHOICES ]; then + echo "Invalid selection. Please choose a number between 0 and $CDDBLOCALCHOICES." >&2 + fi + fi + done + else + ### FIXME ### + #echo "Selected ..." + CDDBLOCALRESP=y + CDDBLOCALCHOICENUM=1 + fi + if [ ! "$CDDBLOCALCHOICENUM" = "0" ]; then + #echo "Using local copy of CDDB data" + echo "# DO NOT ERASE THIS LINE! Added by abcde to imitate cddb output" > "$ABCDETEMPDIR/cddbread.1" + cat "$ABCDETEMPDIR/cddblocalread.$CDDBLOCALCHOICENUM" >> "$ABCDETEMPDIR/cddbread.1" + echo 999 > "$ABCDETEMPDIR/cddbquery" # Assuming 999 isn't used by CDDB + echo cddb-readcomplete >> "$ABCDETEMPDIR/status" + do_cddbparse "$ABCDETEMPDIR/cddbread.1" > "$ABCDETEMPDIR/cddbchoices" + echo cddb-choice=1 >> "$ABCDETEMPDIR/status" + CDDBLOCALSTATUS="found" + else + #echo "Not using local copy of CDDB data" + CDDBLOCALSTATUS="notfound" + fi + ;; + single) + # List out disc title/author and contents + do_cddbparse "${CDDBLOCALFILE}" + if [ "$CDROMREADERSYNTAX" = "flac" ] ; then + echo -n "Embedded cuesheet entry found, use it? [y/n] (y): " >&2 + else + echo -n "Locally cached CDDB entry found, use it? [y/n] (y): " >&2 + fi + if [ "$INTERACTIVE" = "y" ]; then + read USELOCALRESP + while [ "$USELOCALRESP" != "y" ] && [ "$USELOCALRESP" != "n" ] && [ "$USELOCALRESP" != "" ] ; do + echo -n 'Invalid selection. Please answer "y" or "n": ' >&2 + read USELOCALRESP + done + [ x"$USELOCALRESP" = "x" ] && USELOCALRESP="y" + else + echo "y" >&2 + fi + if [ "$USELOCALRESP" = "y" ]; then + #echo "Using local copy of CDDB data" + 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" + echo cddb-choice=1 >> "$ABCDETEMPDIR/status" + CDDBLOCALSTATUS="single" + else + #echo "Not using local copy of CDDB data" + CDDBLOCALSTATUS="notfound" + fi + ;; + none) + CDDBLOCALSTATUS="notfound" + ;; + esac fi } @@ -1715,7 +1901,7 @@ do_cddbquery () if [ "$CDDBAVAIL" = "n" ]; then ERRORCODE=no_query echo 503 > "$ABCDETEMPDIR/cddbquery" - # The default CDDBLOCALSUCCESS is "n" + # The default CDDBLOCALSTATUS is "notfound" # This part will be triggered if the user CDDB repo does not # contain the entry, or if we are not trying to use the repo. else @@ -1854,7 +2040,7 @@ do_cddbedit () if [ "$INTERACTIVE" = "y" ]; then # We should show the CDDB results both when we are not using the local CDDB repo # or when we are using it but we could not find a proper match - if [ "$CDDBUSELOCAL" = "y" ] && [ ! "$CDDBLOCALSUCCESS" = "y" ] || [ ! "$CDDBUSELOCAL" = "y" ]; then + if [ "$CDDBUSELOCAL" = "y" ] && [ "$CDDBLOCALSTATUS" = "notfound" ] || [ ! "$CDDBUSELOCAL" = "y" ]; then # Display the $ABCDETEMPDIR/cddbchoices file created above # Pick a pager so that if the tracks overflow the screen the user can still view everything if [ -r "$ABCDETEMPDIR/cddbchoices" ]; then @@ -1862,8 +2048,12 @@ do_cddbedit () CHOICE=$(checkstatus cddb-choice) if [ -n "$CHOICE" ] ; then case $CDDBCHOICES in - -1) log error "CDDB query failed!" - exit 1 + -1) if head -1 "$ABCDETEMPDIR/cddbquery" | grep "^$" > /dev/null 2>&1 ; then + log error "CDDB query failed!" + exit 1 + else + cat "$ABCDETEMPDIR/cddbchoices" + fi ;; 1) cat "$ABCDETEMPDIR/cddbchoices" ;; *) @@ -1888,7 +2078,7 @@ 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 "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" ; then + if echo $CDDBCHOICE | egrep "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then if [ ! X"$DIFF" = "X" ]; then PARSECHOICE1=$(echo $CDDBCHOICE | cut -d"," -f1 | xargs printf %d 2>/dev/null) PARSECHOICE2=$(echo $CDDBCHOICE | cut -d"," -f2 | xargs printf %d 2>/dev/null) @@ -1912,7 +2102,7 @@ do_cddbedit () else echo "The diff program was not found in your path. Please choose a number between 0 and $CDDBCHOICES." >&2 fi - elif echo $CDDBCHOICE | egrep -q "[[:space:]]*[[:digit:]]+[[:space:]]*" ; then + elif echo $CDDBCHOICE | egrep "[[:space:]]*[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; 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 @@ -1963,7 +2153,7 @@ do_cddbedit () # Show the choice if we are not using the locally stored one # or when the local search failed to find a match. PREVIOUSCHOICE=$(checkstatus cddb-choice) - if [ "$CDDBUSELOCAL" = "y" ] && [ "$CDDBLOCALSUCCESS" = "n" ] || [ ! "$CDDBUSELOCAL" = "y" ]; then + if [ "$CDDBUSELOCAL" = "y" ] && [ "$CDDBLOCALSTATUS" = "notfound" ] || [ ! "$CDDBUSELOCAL" = "y" ]; then #if [ "$PREVIOUSCHOICE" ]; then cat "$ABCDETEMPDIR/cddbchoices" #fi @@ -2153,10 +2343,12 @@ do_cddbedit () fi fi fi - # Make sure the cache directory exists - mkdir -p $CDDBLOCALDIR + ### FIXME ### + # User CDDBLOCALPOLICY to find out if we store the file or not... # Cache edited CDDB entry in the user's cddb dir - if [ "$CDDBCOPYLOCAL" = "y" ] || [ "$COPYCDDBLOCAL" = "Y" ]; then + if [ "$CDDBCOPYLOCAL" = "y" ]; then + # Make sure the cache directory exists + mkdir -p $CDDBLOCALDIR cat "$CDDBDATA" | tail -n $(expr $(cat "$CDDBDATA" | wc -l ) - 1 ) > ${CDDBLOCALDIR}/$(echo "$TRACKINFO" | cut -d' ' -f1) fi @@ -2176,12 +2368,12 @@ do_cdread () # the user said # We need the first and last track for cdda2wav FIRSTTRACK=$2 - LASTTRACK=$3 + LASTTRACK=$(expr $3 + 0) UTRACKNUM=$FIRSTTRACK case "$CDROMREADERSYNTAX" in flac) READTRACKNUMS="$FIRSTTRACK.1-$(($LASTTRACK + 1)).0" ;; cdparanoia) READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;; - cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTRACK" ;; + cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTTRACK" ;; *) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode" exit 1 ;; esac @@ -2214,7 +2406,7 @@ do_cdread () echo "Grabbing ${PIPE_MESSAGE}tracks $UTRACKNUM - $LASTTRACK as one track ..." >&2 else if [ -r "$CDDBDATA" ]; then - do_getcddbinfo TRACKNAME + getcddbinfo TRACKNAME echo "Grabbing ${PIPE_MESSAGE}track $UTRACKNUM: $TRACKNAME..." >&2 else echo "Grabbing ${PIPE_MESSAGE}track $UTRACKNUM..." >&2 @@ -2224,9 +2416,10 @@ do_cdread () ### FIXME ### use an exception for flac, since it uses -o ### FIXME ### Shall we just use -o $FILEARG ?? flac) - nice $READNICE $FLAC -d --cue=${READTRACKNUMS:-$UTRACKNUM.1-$(($UTRACKNUM + 1)).0} "$FILEARG" "$CDROM" ;; + # Avoid problems wit math expressions by unpadding the given UTRACKNUM + STRIPTRACKNUM=$(expr $UTRACKNUM + 0) + nice $READNICE $FLAC -d -f --cue=${READTRACKNUMS:-$STRIPTRACKNUM.1-$(($STRIPTRACKNUM + 1)).0} "$FILEARG" "$CDROM" ;; cdparanoia) - echo "nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;" > /tmp/log nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;; cdda2wav) if [ "$OSFLAVOUR" = "OSX" ] ; then @@ -2283,9 +2476,9 @@ do_cdread () echo readencodetrack-$UTRACKNUM >> "$ABCDETEMPDIR/status" else echo readtrack-$UTRACKNUM >> "$ABCDETEMPDIR/status" - if [ "$1" = "onetrack" ]; then - echo onetrack >> "$ABCDETEMPDIR/status" - fi + fi + if [ "$1" = "onetrack" ]; then + echo onetrack >> "$ABCDETEMPDIR/status" fi fi } @@ -2308,7 +2501,7 @@ vecho () { if [ x"$EXTRAVERBOSE" != "x" ]; then case $1 in - warning) log warning "$@" ;; + warning) shift ; log warning "$@" ;; *) echo "$@" ;; esac fi @@ -2320,7 +2513,7 @@ fi decho () { if [ x"$DEBUG" != "x" ]; then - if echo $1 | grep -q "^\[" ; then + if echo $1 | grep "^\[" > /dev/null 2>&1 ; then DEBUGECHO=$(echo "$@" | tr -d '[]') echo "[DEBUG] $DEBUGECHO: `eval echo \\$${DEBUGECHO}`" else @@ -2373,6 +2566,8 @@ CDDBSUBMIT=freedb-submit@freedb.org CDDBPROTO=5 HELLOINFO="$(whoami)@$(hostname)" CDDBCOPYLOCAL="n" +CDDBLOCALPOLICY="always" +CDDBLOCALRECURSIVE="y" CDDBLOCALDIR="$HOME/.cddb" CDDBUSELOCAL="n" @@ -2520,8 +2715,10 @@ DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:lame,mp3:bladeenc,spx:speex # List of prefered cdromreaders - by default, run whichever we have in the path DEFAULT_CDROMREADERS="cdparanoia cdda2wav" -# Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for Linux/OpenBSD/NetBSD. -# Let's use these checkings to determine the OS flavour, which will be used later +# Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for +# Linux/OpenBSD. ftp is user for NetBSD. +# Let's use these checkings to determine the OS flavour, which will be used +# later if [ X$(uname) = "XFreeBSD" ] ; then HTTPGET=fetch MD5SUM=md5 @@ -2536,9 +2733,15 @@ elif [ X$(uname) = "XDarwin" ] ; then elif [ X$(uname) = "XOpenBSD" ] ; then HTTPGET=wget MD5SUM=md5 + OSFLAVOUR=OBSD elif [ X$(uname) = "XNetBSD" ] ; then HTTPGET=ftp MD5SUM=md5 + OSFLAVOUR=NBSD +elif [ X$(uname) = "SunOS" ] ; then + HTTPGET="" + MD5SUM=md5 + OSFLAVOUR=SunOS else HTTPGET=wget fi @@ -2628,7 +2831,7 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do p) PADTRACKS=y ;; P) USEPIPES=y ;; r) REMOTEHOSTS="$OPTARG" ;; - R) DOREPLAYGAIN=y ;; + R) CDDBLOCALRECURSIVE=y ;; s) SHOWCDDBFIELDS="$OPTARG" ;; S) CDSPEEDVALUE="$OPTARG" ;; t) STARTTRACKNUMBER="$OPTARG" ;; @@ -2643,7 +2846,7 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do V) EXTRAVERBOSE="y" ;; x) EJECTCD="y" ;; w) COMMENT="$OPTARG" ;; - W) if echo $OPTARG | grep -q "[[:digit:]]" ; then + W) if echo $OPTARG | grep "[[:digit:]]" > /dev/null 2>&1 ; then STARTTRACKNUMBER="${OPTARG}01" ; STARTTRACKNUMBERTAG="y" ; COMMENT="CD${OPTARG}" else log error "argument of -W must be integer" @@ -2657,23 +2860,31 @@ done shift $(($OPTIND - 1)) +# Here it comes the worse part of the whole thing. From here until we start +# ripping, we have a mixture of sanity checks, verifications, default settigs +# and other crazy stuff that interdepends, but hey, someone has to do it. + # If the user specified a flac file, then switch to special flac mode -if echo $CDROM | grep -i -q '.flac$'; then - vecho "abcde: switching to flac CDROMREADERSYNTAX..." - CDROMREADERSYNTAX=flac - if [ "$EJECTCD" = "y" ];then - vecho "abcde: CDROM flac mode, deactivating EJECTCD..." - EJECTCD=n +if echo "$CDROM" | grep -i '.flac$' > /dev/null 2>&1 ; then + if [ ! -f "$CDROM" ]; then + log error "the defined file for FLAC ripping cannot be found" >&2 + exit 1 fi + vecho warning "switching to flac CDROMREADERSYNTAX..." + CDROMREADERSYNTAX=flac + # Added a need on CUE2DISCID until we manage to convert the python script to bash. + NEEDCUE2DISCID=y + NEEDMETAFLAC=y + EJECTCD=n fi # If the user provided a DISCID, disable eject -if [ -n "$DISCID" ]; then EJECTCD=n ; fi +if [ -n "$DISCID" ] || [ "$CDROMREADERSYNTAX" = "flac" ]; then EJECTCD=n ; fi # Check the available cd rippers in the system, from the ones we know. if [ "$CDROMREADERSYNTAX" = "" ]; then for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do - if [ -x $( which $DEFAULT_CDROMREADER ) ]; then + if new_checkexec $DEFAULT_CDROMREADER; then CDROMREADERSYNTAX=$DEFAULT_CDROMREADER break fi @@ -2743,6 +2954,7 @@ DOCLEAN=n for ACTION in $(echo $ACTIONS | tr , \ ) do case $ACTION in + default) DOCDDB=y; DOREAD=y; DOENCODE=y; DOTAG=y; DOMOVE=y; DOCLEAN=y;; cddb) DOCDDB=y;; read) DOREAD=y;; normalize) DONORMALIZE=y; DOREAD=y;; @@ -2770,13 +2982,11 @@ for SHOWCDDBFIELD in $(echo $SHOWCDDBFIELDS | tr , \ ); do esac done -# Sanity checks: - # At this point a CDROM has to be defined, so we check it exists. 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 + if echo "$CDROMID" | grep "^[0-9],[0-9],[0-9]$" >/dev/null 2>&1 ; then :; else 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 @@ -2900,7 +3110,7 @@ esac # Allow -o OUTPUT(1):OPTIONS(1),...,OUTPUT(N):OPTIONS(N) mode of operation if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then - for OUTPUT in "$(echo "$OUTPUTTYPE" | tr , \ )"; do + for OUTPUT in "$(echo "$OUTPUTTYPE" | tr \ \|| tr , \ | tr \| \ )"; do case "$OUTPUT" in vorbis:*|ogg:*) OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; mp3:*) MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; @@ -2953,7 +3163,7 @@ do ;; wav) if [ "$KEEPWAVS" = "y" ]; then - vecho "Unsetting the KEEPWAVS option, since the resulting wav files were requested..." + vecho "Setting the KEEPWAVS option, since the resulting wav files were requested..." fi KEEPWAVS=move ;; @@ -3009,7 +3219,7 @@ case "$FLACENCODERSYNTAX" in FLACENCODEROPTS="${FLACENCODEROPTSCLI:-$FLACOPTS}" FLACENCODER="$FLAC" # FLAC streams can be encapsulated on a Ogg transport layer - if echo "$FLACENCODEROPTS" | egrep -q -- "(^| )--ogg($| )" ;then + if echo "$FLACENCODEROPTS" | egrep -- "(^| )--ogg($| )" > /dev/null 2>&1 ;then log error "FLAC on an Ogg container is not yet supported" log error "due to problem with adding comments to such files" exit 1 @@ -3037,8 +3247,8 @@ case "$AACENCODERSYNTAX" in AACENCODER="$AACENC" ;; esac -# and which tagger +# and which tagger if [ "$ID3TAGV" = "1" ]; then TAGGER="$ID3" TAGGEROPTS="$ID3OPTS" @@ -3061,6 +3271,12 @@ case "$CUEREADERSYNTAX" in ;; esac +# which information retrieval tool are we using? +case "$CDDBTOOL" in + cddb) ;; + musicbrainz) ;; +esac + # Check if both OGGEOUTPUTCONTAINER and FLACOUTPUTCONTAINER are the same, and differentiante them if [ X"$OGGOUTPUTCONTAINER" = "Xogg" ] && [ X"$FLACOUTPUTCONTAINER" = "Xogg" ]; then log error "FLAC on an Ogg container is not yet supported" @@ -3104,11 +3320,11 @@ if [ "$MAKECUEFILE" = "y" ]; then NEEDCUEREADER=y fi -if [ X"$CDSPEEDVALUE" != "X" ]; then +if [ X"$CDSPEEDVALUE" != "X" ] && [ "$DOREAD" = "y" ]; then case "$CDROMREADERSYNTAX" in cdparanoia|debug) CDROMREADEROPTS="$CDPARANOIAOPTS -S $CDSPEEDVALUE" ;; ### FIXME ### translate "cue2discid" from python to bash - flac) NEEDMETAFLAC=y ; NEEDCUE2DISCID=y ;; + flac) NEEDMETAFLAC=y ; NEEDCUE2DISCID=y ; CDSPEEDVALUE="" ;; *) NEEDCDSPEED=y ;; esac fi @@ -3170,64 +3386,71 @@ 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} + ${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 - log error "$X is not in your path." >&2 - exit 1 - elif [ ! -x $(which $X) ]; then - log error "$X is not executable." >&2 - exit 1 - fi + checkexec "$X" done -CDROMREADER="$CDROMREADER $CDROMREADEROPTS" -CDDBTOOL="$CDDBTOOL $CDDBTOOLOPTS" -HTTPGET="$HTTPGET $HTTPGETOPTS" - -# And last but not least, check if we can diff between files +# And last but not least, check if we can diff between files. We do not abort, +# since diffing is not critical... if [ -x $(which $DIFF) ]; then :; else vecho warning "Disabling diff since we cannot find it in the \$PATH..." DIFF="" fi +## Now that we have metaflac, check if we need cue2discid +#case $CDROMREADERSYNTAX in +# flac) +# TRACKINFO=$($METAFLAC --show-tag=CDDB $CDROM | cut -d"=" -f2 | egrep "[a-f0-9]{8}") +# if [ "$TRACKINFO" = "" ]; then +# checkexec ${NEEDCUE2DISCID+$CUE2DISCID} +# fi +# ;; +#esac + +CDROMREADER="$CDROMREADER $CDROMREADEROPTS" +CDDBTOOL="$CDDBTOOL $CDDBTOOLOPTS" +HTTPGET="$HTTPGET $HTTPGETOPTS" + # Here it used to say: # One thousand lines in, we can start doing stuff with things -# Well, right now we are at line 2736 ;) +# Well, right now we are at line 3306 ;) # Export needed things so they can be read in this subshell export CDDBTOOL ABCDETEMPDIR TRACKQUEUE LOWDISK EJECTCD EJECT EJECTOPTS export CDROM CDDBDATA REMOTEHOSTS MAXPROCS HTTPGET MD5SUM -# User-definable function to set some things. Use it for -# - closing the CD tray with eject -t -# - set the CD speed value with eject -x -vecho -n "Executing customizable pre-read function... " +if [ "$DOREAD" = "y" ]; then + # User-definable function to set some things. Use it for + # - closing the CD tray with eject -t + # - set the CD speed value with eject -x + vecho -n "Executing customizable pre-read function... " -pre_read # Execute the user-defined pre-read funtion. Close the CD with it. + pre_read # Execute the user-defined pre-read funtion. Close the CD with it. -vecho "done." + vecho "done." +fi case "$CDDBMETHOD" in cddb) do_discid # Get ABCDETEMPDIR created and status file initialized ;; musicbrainz) - do_musicbrainz + do_musicbrainz id ;; esac if [ "$DOCDDB" = "y" ]; then + # start with a sane default: + CDDBLOCALSTATUS=notfound if [ $CDDBUSELOCAL = "y" ]; then do_localcddb fi if checkstatus cddb-choice > /dev/null; then : else - if [ ! "$CDDBLOCALSUCCESS" = "y" ] ; then + if [ "$CDDBLOCALSTATUS" = "notfound" ] ; then case "$CDDBMETHOD" in cddb) do_cddbstat @@ -3265,6 +3488,15 @@ if [ -f "$ABCDETEMPDIR/status" ] && [ X"$ERASEENCODEDSTATUS" = "Xy" ]; then | grep -v ^encode-output > "$ABCDETEMPDIR/status" fi +if checkstatus onetrack ; then ONETRACK=y ; fi + +if [ "$ONETRACK" = "y" ]; then + # Reuse the CUEFILE in case we created it in a previous run + if CUEFILE=$(checkstatus cuefile); then + IMPORTCUESHEET=y + fi +fi + # Create playlist if needed (backgroundable) and start reading in tracks ( @@ -3284,10 +3516,12 @@ fi if [ "$ONETRACK" = "y" ]; then TRACKS="$FIRSTTRACK" - if checkstatus readtrack-$FIRSTTRACK; then :; else - if [ "$USEPIPES" = "y" ]; then + if [ "$USEPIPES" = "y" ]; then + if checkstatus readencodetrack-$FIRSTTRACK; then :; else do_cdread onetrack $FIRSTTRACK $LASTTRACK | do_encode $FIRSTTRACK %local0% > /dev/null 2>&1 - else + fi + else + if checkstatus readtrack-$FIRSTTRACK; then :; else do_cdread onetrack $FIRSTTRACK $LASTTRACK fi fi @@ -3497,7 +3731,7 @@ do else TRACKNUM=$UTRACKNUM CDDBTRACKNUM=$(expr $UTRACKNUM - 1) - do_getcddbinfo TRACKNAME + getcddbinfo TRACKNAME splitvarious fi fi