X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/f23735e2213936f0f6e458989fa7fee20b791a1e..3b4d8f9b5214afc50dad321b2393348c8d382d7f:/abcde diff --git a/abcde b/abcde index aa91e87..27779b1 100755 --- a/abcde +++ b/abcde @@ -334,6 +334,54 @@ relpath () echo $TO } +checkexec () +{ + if [ ! "$@" = "" ]; then + # Cut off the command-line options we just added in + X=$(echo $@ | 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 + fi +} + +# diffentries , +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 +} + # do_getcddbinfo # Finds an specific field from cddbinfo do_getcddbinfo() @@ -365,15 +413,18 @@ 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 @@ -726,7 +777,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 @@ -846,9 +897,9 @@ 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 @@ -859,6 +910,7 @@ do_encode () ;; *) OUT="$ABCDETEMPDIR/track$1.$OUTPUT" + OUTPUT=$TMPOUTPUT ;; esac if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then @@ -1244,15 +1296,18 @@ 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. @@ -1349,7 +1404,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) ;; @@ -1532,13 +1592,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 @@ -1628,15 +1697,17 @@ do_localcddb () if [ "$CDDBLOCALRECURSIVE" = "y" ]; then CDDBLOCALRESULTS="$(find ${CDDBLOCALDIR} -name "${CDDBDISCID}" -type f 2> /dev/null)" - if (( $(echo "${CDDBLOCALRESULTS}" | wc -l) = 1 )); then - CDDBLOCALFILE="${CDDBLOCALDIR}/${CDDBLOCALRESULTS}" - CDDBLOCALMATCH=single - elif (( $(echo "${CDDBLOCALRESULTS}" | wc -l) > 1 )); then - CDDBLOCALMATCH=multiple + 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 CDDBLOCALMATCH=none fi - elif [ -r "${CDDBLOCALDIR}/${CDDBDISCID}" ]; then + elif [ "$CDDBLOCALMATCH" = "none" ] && [ -r "${CDDBLOCALDIR}/${CDDBDISCID}" ]; then CDDBLOCALFILE="${CDDBLOCALDIR}/${CDDBDISCID}" CDDBLOCALMATCH=single else @@ -1646,33 +1717,53 @@ do_localcddb () # 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 - cat "$CDDBLOCALRESULTS" | while read RESULT ; do + echo "$CDDBLOCALRESULTS" | while read RESULT ; do X=$(expr $X + 1) # List out disc title/author and contents CDDBLOCALREAD="$ABCDETEMPDIR/cddblocalread.$X" - cat "$RESULT" >> "${CDDBLOCALREAD}" + cat "$RESULT" > "${CDDBLOCALREAD}" { - echo -n "\#$X: " + echo -n "#$X: " do_cddbparse "${CDDBLOCALREAD}" + echo "" } >> "$ABCDETEMPDIR/cddblocalchoices" done - CDDBLOCALCHOICES=$X + if [ $(cat "$ABCDETEMPDIR/cddblocalchoices" | wc -l) -ge 24 ]; 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 CDDBLOCALRESP - [ x"$CDDBLOCALRESP" = "x" ] && CDDBLOCALRESP="1" + read CDDBLOCALCHOICE + [ x"$CDDBLOCALCHOICE" = "x" ] && CDDBLOCALCHOICE="1" + # FIXME # Introduce diff's + if echo $CDDBLOCALCHOICE | egrep -q "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" ; then + diffentries cddblocalread "$CDDBLOCALCHOICES" "$CDDBLOCALCHOICE" + elif echo $CDDBLOCALCHOICE | egrep -q "[[:space:]]*[[:digit:]]+[[:space:]]*" ; 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 fi - if [ ! "$CDDBLOCALRESP" = "0" ]; then + 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.$CDDBLOCALRESP" >> "$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" @@ -1686,7 +1777,11 @@ do_localcddb () single) # List out disc title/author and contents do_cddbparse "${CDDBLOCALFILE}" - echo -n "Locally cached CDDB entry found, use it? [y/n] (y): " >&2 + 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 @@ -2240,12 +2335,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 @@ -2288,9 +2383,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 @@ -2347,9 +2443,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 } @@ -2372,7 +2468,7 @@ vecho () { if [ x"$EXTRAVERBOSE" != "x" ]; then case $1 in - warning) log warning "$@" ;; + warning) shift ; log warning "$@" ;; *) echo "$@" ;; esac fi @@ -2725,16 +2821,16 @@ shift $(($OPTIND - 1)) # 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..." + vecho warning "abcde: switching to flac CDROMREADERSYNTAX..." CDROMREADERSYNTAX=flac - if [ "$EJECTCD" = "y" ];then - vecho "abcde: CDROM flac mode, deactivating EJECTCD..." - EJECTCD=n - fi + # 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 @@ -3176,11 +3272,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 @@ -3242,33 +3338,35 @@ 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 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 @@ -3295,6 +3393,8 @@ case "$CDDBMETHOD" in esac if [ "$DOCDDB" = "y" ]; then + # start with a sane default: + CDDBLOCALSTATUS=notfound if [ $CDDBUSELOCAL = "y" ]; then do_localcddb fi @@ -3339,6 +3439,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 ( @@ -3358,10 +3467,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