fi
# Take the last line in the status file if there's multiple matches
PATTERN="^$1(:.*)?$"
- BLURB="$(egrep $PATTERN $ABCDETEMPDIR/errors | tail -n 1)"
+ BLURB="$(egrep $PATTERN "$ABCDETEMPDIR/errors" | tail -n 1)"
if [ -z "$BLURB" ]; then
# negative, we did not have a negative...
echo ARTIST="$TRACKARTIST"
echo ALBUM="$DALBUM"
echo TITLE="$TRACKNAME"
- if [ -n "$CDYEAR" ]; then
+ if [ -n "$CDYEAR" ]; then
echo DATE="$CDYEAR"
- fi
- if [ -n "$CDGENRE" ]; then
+ fi
+ if [ -n "$CDGENRE" ]; then
echo GENRE="$CDGENRE"
- fi
+ fi
echo TRACKNUMBER=${TRACKNUM:-$1}
echo CDDB=$CDDBDISCID
if [ "$(eval echo ${COMMENT})" != "" ]; then
FILEARG="-if $IN"
;;
*)
- FILEARG=$IN
+ FILEARG="$IN"
;;
esac
;;
*)
- FILEARG=$IN
+ FILEARG="$IN"
;;
esac
fi
# done
#}
+# do_single_gain
+# variables used:
+# FIXME #
+do_single_gain ()
+{
+:
+}
+
# do_batch_gain
# variables used:
# MP3GAIN, MP3GAINOPTS, VORBISGAIN, VORBISGAINOPTS
+# FIXME #
do_batch_gain ()
{
# The commands here don't go through run_command because they're never supposed to be silenced
ALBUMFILE=$(mungefilename "$DALBUM")
ARTISTFILE=$(mungefilename "$DARTIST")
GENRE=$(mungegenre "$GENRE")
+ YEAR=${CDYEAR:-$CDYEAR}
if [ "$VARIOUSARTISTS" = "y" ] ; then
PLAYLISTFILE=$(eval echo $VAPLAYLISTFORMAT)
else
#elif [ -z "$DISCID" ]; then
if [ -z "$DISCID" ]; then
vecho -n "Getting CD track info... "
+ if [ "$OSFLAVOUR" = "OSX" ]; then
+ disktool -u ${CDROM#/dev/}
+ fi
TRACKINFO=$($CDDISCID $CDROM)
+ if [ "$OSFLAVOUR" = "OSX" ]; then
+ disktool -m ${CDROM#/dev/}
+ fi
# Make sure there's a CD in there by checking cd-discid's return code
if [ "$?" = "1" ]; then
echo "abcde error: CD could not be read. Perhaps there's no CD in the drive?" >&2
cat /dev/null > "$ABCDETEMPDIR/status"
fi
if [ X"$CUEFILE" = "Xy" -a X"$WEHAVEACD" = "Xy" ]; then
- if checkstatus cuefile ; then :; else
- $MKCUE $MKCUEOPTS > $ABCDETEMPDIR/cue-$(echo $TRACKINFO | cut -f1 -d' ').txt
- echo cuefile >> "$ABCDETEMPDIR/status"
+ if checkstatus cuefile >/dev/null ; then :; else
+ CUEFILE=cue-$(echo $TRACKINFO | cut -f3 -d' ').txt
+ $MKCUE $MKCUEOPTS > $ABCDETEMPDIR/$CUEFILE
+ echo cuefile=$CUEFILE >> "$ABCDETEMPDIR/status"
fi
fi
# If we got the CDPARANOIA status and it is not recorded, save it now
echo "$TRACKINFO" > "$ABCDETEMPDIR/discid"
}
+# do_cleancue
+# Create a proper CUE file based on the CUE file we created before.
+do_cleancue()
+{
+ if checkstatus cuefile; then :; else
+ $CUEFILE_INPUT="$ABCDETEMPDIR/cue-$(echo $TRACKINFO | cut -f1 -d' ').txt"
+ ### FIXME ### checkstatus cddb
+ if [ "$DOCDDB" = "y" ]; then
+ MARKER
+ fi
+ fi
+}
+
# do_cddbparse
# Parses a CDDB file and outputs the title and the track names.
# Variables: CDDBFILE
UNKNOWNDISK=y
$CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > $ABCDETEMPDIR/cddbread.0
else
- echo "Selected: #$CDCHOICENUM ($(grep ^DTITLE= $ABCDETEMPDIR/cddbread.$CDCHOICENUM | cut -f2- -d= | tr -d \\r\\n))" >&2
+ echo "Selected: #$CDCHOICENUM ($(grep ^DTITLE= "$ABCDETEMPDIR/cddbread.$CDCHOICENUM" | cut -f2- -d= | tr -d \\r\\n))" >&2
do_cddbparse "$ABCDETEMPDIR/cddbread.$CDCHOICENUM"
fi
echo "cddb-choice=$CDCHOICENUM" >> "$ABCDETEMPDIR/status"
CDCHOICENUM=1
echo "cddb-choice=$CDCHOICENUM" >> "$ABCDETEMPDIR/status"
fi
- echo "Selected: #$CDCHOICENUM ($(grep ^DTITLE= $ABCDETEMPDIR/cddbread.$CDCHOICENUM | cut -f2- -d= | tr -d \\r\\n))" >&2
+ echo "Selected: #$CDCHOICENUM ($(grep ^DTITLE= "$ABCDETEMPDIR/cddbread.$CDCHOICENUM" | cut -f2- -d= | tr -d \\r\\n))" >&2
fi
fi
if [ -x $(which "${EDITOR%%\ *}") ]; then
# That failed, try to load the preferred editor, starting
# with their EDITOR variable
- eval $(echo "$EDITOR") "$CDDBDATA"
+ eval $(echo "$EDITOR") \"$CDDBDATA\"
fi
# If that fails, check for a vi
elif which vi >/dev/null 2>&1; then
# We need the first and last track for cdda2wav
FIRSTTRACK=$2
LASTTRACK=$3
+ UTRACKNUM=$FIRSTTRACK
case "$CDROMREADERSYNTAX" in
- cdparanoia) UTRACKNUM="$FIRSTTRACK-$LASTTRACK" ;;
- cdda2wav) UTRACKNUM="$FIRSTTRACK+$LASTRACK" ;;
+ cdparanoia) READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;;
+ cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTRACK" ;;
*) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode"
exit 1 ;;
esac
CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
if [ "$USEPIPES" = "y" ]; then
TEMPARG="PIPE_$CDROMREADERSYNTAX"
- FILEARG=${!TEMPARG}
+ FILEARG="${!TEMPARG}"
REDIR=""
PIPE_MESSAGE="and encoding "
else
FILEARG="-f $WAVDATA"
;;
*)
- FILEARG=$WAVDATA
+ FILEARG="$WAVDATA"
;;
esac
REDIR=">&2"
fi
if [ "$1" = "onetrack" ]; then
- echo "Grabbing ${PIPE_MESSAGE}tracks $UTRACKNUM..." >&2
+ echo "Grabbing ${PIPE_MESSAGE}tracks $UTRACKNUM - $LASTTRACK ..." >&2
else
if [ -r "$CDDBDATA" ]; then
TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
fi
fi
case "$CDROMREADERSYNTAX" in
- cdparanoia) nice $READNICE $CDROMREADER -d $CDROM $UTRACKNUM $FILEARG $REDIR ;;
+ cdparanoia)
+ nice $READNICE $CDROMREADER -d $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;
cdda2wav)
if [ "$OSFLAVOUR" = "OSX" ] ; then
# Hei, we have to unmount the device before running anything like cdda2wav in OSX
CDDA2WAVCDROM="$CDROMID"
fi
fi
- nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t $UTRACKNUM $FILEARG $REDIR
+ nice $READNICE $CDROMREADER -D $CDDA2WAVCDROM -t ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR
;;
## FIXME ## We have an exception for dagrab, since it uses -f
## FIXME ## Shall we just use -f $FILEARG ??
- dagrab) nice $READNICE $CDROMREADER -d $CDROM -v $UTRACKNUM $FILEARG $REDIR
+ dagrab) nice $READNICE $CDROMREADER -d $CDROM -v $UTRACKNUM "$FILEARG" $REDIR
;;
cddafs)
# Find the track's mounted path
FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM ");
# If the file exists, copy it
if [ -e "$FILEPATH" ] ; then
- nice $READNICE $CDROMREADER "$FILEPATH" $FILEARG $REDIR
+ nice $READNICE $CDROMREADER "$FILEPATH" "$FILEARG" $REDIR
else
false
fi ;;
- debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] $FILEARG $REDIR
+ debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$FILEARG" $REDIR
;;
esac
RETURN=$?
:
}
+# do_movecue
+# Standalone function to move the CUE file to the final location
+
###############################################################################
# End of functions
#
OSFLAVOUR=OSX
# We should have disktool in OSX, but let's be sure...
NEEDDISKTOOL=y
+ CDROMREADERSYNTAX=cddafs
elif [ X$(uname) = "XOpenBSD" ] ; then
HTTPGET=wget
MD5SUM=md5
fi
) &
done
+
+# Lets move the cue file
+if checkstatus cuefile >/dev/null ; then
+ do_movecue
+fi
+
# Go through it again and make sure there's no distmp3 stragglers, otherwise
# we'll delete the files they're working on
## FIXME ## Check also for files which are encoded using PIPEs.
HCoop / clinton / abcde.git / blobdiff