#!/bin/bash
# Copyright (c) 1998-2001 Robert Woodcock <rcw@debian.org>
-# Copyright (c) 2003-2005 Jesus Climent <jesus.climent@hispalinux.es>
+# Copyright (c) 2003-2006 Jesus Climent <jesus.climent@hispalinux.es>
# This code is hereby licensed for public consumption under either the
# GNU GPL v2 or greater, or Larry Wall's Artistic license - your choice.
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Copyright for this work is to expire January 1, 2010, after which it
# shall be public domain.
echo "-r <host1[,host2]...>"
echo " Also encode on these remote hosts"
echo "-R Use local CDDB in recursive mode"
-#echo "-R Add replaygain values to the tag info (only for vorbis,flac,mp3)"
echo "-s <field>"
echo " Show dielfs from the CDDB info (year,genre)"
echo "-S <#> Set the CD speed"
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 "-u Use UNICODE (UTF8) tags and comments"
+echo "-U Do NOT use UNICODE (UTF8) 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"
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" "
fi
}
-# chechwarnings [blurb]
+# checkwarnings [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.
echo $TO
}
+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 the command-line options we just added in
+ # 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
+ elif [ ! -x "$(which $X)" ]; then
log error "$X is not executable." >&2
exit 1
fi
}
# diffentries <filename> <max_value> <entry1>,<entry2>
+# max_value: the range of entries goes from 1 to <max_value>
diffentries ()
{
FILENAME=$1
fi
}
-# do_getcddbinfo
+# getcddbinfo
# Finds an specific field from cddbinfo
-do_getcddbinfo()
+getcddbinfo()
{
case $1 in
TRACKNAME1)
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
fi
}
+# makeids
+#
+# Calculate cddb disc ids without requiring specialized helper programs.
+# largely copied from cd-discid and musicbrainz examples. some of the steps
+# don't make sense, but they're necessary to match the ids generated by other
+# programs.
+#
+## FIXME ## Right now, we get 2 frames more than with cue2discid ??
+# data@petit:~$ sh /tmp/cue2discid /home/data/tmp/flac/01.Roisin_Murphy--Ruby_Blue.flac
+# processing offsetimes 00:00:00 04:47:10 08:20:37 11:46:46 17:45:36 21:41:57 27:32:21 32:03:73 35:39:28 38:27:33 43:50:38 44:42:34
+# 980b4b0c 12 150 21685 37687 53146 80061 97782 124071 144448 160603 173208 197438 201334 2895
+# data@petit:~$ metaflac --export-cuesheet-to=- /home/data/tmp/flac/01.Roisin_Murphy--Ruby_Blue.flac| python /home/data/sources/abcde/trunk/examples/cue2discid
+# 980b4b0c 12 150 21685 37687 53146 80061 97782 124071 144448 160603 173208 197438 201334 2893
+#
+# Variables: OFFSETS, TRACKS, LEADOUT, [LEADIN]
+makeids ()
+{
+ if [ X"$LEADOUT" = "X" ]; then
+ log warning "Error trying to calculate disc ids without lead-out information."
+ exit 1
+ fi
+
+ # default to a two second lead-in
+ IDMAGICNUM=150
+ LEADIN=${LEADIN:=150}
+
+ # number of cdframes per second
+ CDFRAMES=75
+
+ # reset cddb checksum for cddb disc-id calululation
+ CDDBCKSUM=0
+
+ COOKEDOFFSETS=""
+ for OFFSET in $(echo $OFFSETS)
+ do
+ COOKEDOFFSETS="${COOKEDOFFSETS} $(($OFFSET + $LEADIN))"
+
+ OFFSETTIME=$(( ($OFFSET + $LEADIN) / $CDFRAMES ))
+ while [ $OFFSETTIME -gt 0 ]; do
+ CDDBCKSUM=$(($CDDBCKSUM + $OFFSETTIME % 10))
+ OFFSETTIME=$(($OFFSETTIME / 10))
+ done
+
+ done
+
+ COOKEDOFFSETS="${COOKEDOFFSETS:1}" # eat the leading space
+
+ PREGAP=$(($(echo $OFFSETS | cut -f1 -d' ')))
+ TOTALTIME=$(( (($LEADOUT + $LEADIN + $PREGAP) / $CDFRAMES) - (($LEADIN + $PREGAP) / $CDFRAMES)))
+
+ printf -v HEXSUM "%08lx" $(( ($CDDBCKSUM % 0xff) << 24 | $TOTALTIME << 8 | $TRACKS))
+ TRACKINFO="${HEXSUM} $((TRACKS)) ${COOKEDOFFSETS} $((($LEADOUT + $LEADIN + $IDMAGICNUM) / $CDFRAMES))"
+}
+
do_replaygain()
{
if checkstatus replaygain; then :; else
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
- if [ "$VARIOUSARTISTS" = "y" ]; then
- OUTPUTFILE="$(eval echo $VAOUTPUTFORMAT)"
- else
- OUTPUTFILE="$(eval echo $OUTPUTFORMAT)"
+ gettracknum
+ if [ "$ONETRACK" = "y" ]; then
+ if [ "$VARIOUSARTISTS" = "y" ]; then
+ OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\")"
+ else
+ OUTPUTFILE="$(eval echo \""$ONETRACKOUTPUTFORMAT"\")"
+ fi
+ else
+ if [ "$VARIOUSARTISTS" = "y" ]; then
+ OUTPUTFILE="$(eval echo \""$VAOUTPUTFORMAT"\")"
+ else
+ OUTPUTFILE="$(eval echo \""$OUTPUTFORMAT"\")"
+ fi
fi
OUTPUTFILES[$REPLAYINDEX]="$OUTPUTDIR/$OUTPUTFILE.$OUTPUT"
(( REPLAYINDEX = $REPLAYINDEX + 1 ))
# 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
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}" \
do
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
# 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:
# ' ' -> '_'
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.
- if [ "$VARIOUSARTISTS" = "y" ]; then
- OUTPUTFILE="$(eval echo "$VAOUTPUTFORMAT")"
- else
- OUTPUTFILE="$(eval echo "$OUTPUTFORMAT")"
- fi
+ 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 [ "$ONETRACK" = "y" ]; then
+ if [ "$VARIOUSARTISTS" = "y" ]; then
+ OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\")"
+ else
+ OUTPUTFILE="$(eval echo \""$ONETRACKOUTPUTFORMAT"\")"
+ fi
+ else
+ if [ "$VARIOUSARTISTS" = "y" ]; then
+ OUTPUTFILE="$(eval echo \""$VAOUTPUTFORMAT"\")"
+ else
+ OUTPUTFILE="$(eval echo \""$OUTPUTFORMAT"\")"
+ fi
+ 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")"
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
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
if [ "$OSFLAVOUR" = "OSX" ]; then
disktool -u ${CDROM#/dev/}
fi
- if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
- 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) ;;
- # FIXME # musicbrainz needs a cleanup
- musicbrainz) TRACKINFO=$($MUSICBRAINZ -c $CDROM ) ;;
- esac
- fi
+ case "$CDROMREADERSYNTAX" in
+ flac)
+ if $METAFLAC $METAFLACOPTS --export-cuesheet-to=- "$CDROM" > /dev/null 2>&1 ; then
+ case "$CUE2DISCID" in
+ builtin)
+ CUESHEET="$(metaflac $METAFLACOPTS --export-cuesheet-to=- "$CDROM")"
+
+ #TRACKS=$(echo $CUESHEET | egrep "TRACK \+[[:digit:]]\+ \+AUDIO" |wc -l)
+ #TRACKS=0
+ OFFSETTIMES=( $(echo "$CUESHEET" | sed -n -e's/\ *INDEX 01\ \+//p' ) )
+ TRACKS=${#OFFSETTIMES[@]}
+ unset OFFSETS
+ #echo "processing offsetimes ${OFFSETTIMES[@]}"
+ for OFFSETTIME in ${OFFSETTIMES[@]}; do
+ OFFSETS="$OFFSETS $(( 10#${OFFSETTIME:0:2} * 4500 + 10#${OFFSETTIME:3:2} * 75 + 10#${OFFSETTIME:6:2} ))"
+ #OFFSETS[${#OFFSETS[*]}]=$(( 10#${OFFSETTIME:0:2} * 4500 + 10#${OFFSETTIME:3:2} * 75 + 10#${OFFSETTIME:6:2} ))
+ done
+
+ LEADOUT=$(( $(echo "$CUESHEET" | grep lead-out | get_last) / 44100 * 75 ))
+ LEADIN=$(( $(echo "$CUESHEET" | grep lead-in | get_last) / 44100 * 75 ))
+ makeids
+ ;;
+ *)
+ TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- "$CDROM" | $CUE2DISCID)
+ ;;
+ esac
+ else
+ log error "the input flac file does not contain a cuesheet."
+ exit 1
+ fi
+ ;;
+# cdparanoia|debug)
+# CDPARANOIAOUTPUT="$( $CDROMREADER -$CDPARANOIACDROMBUS $CDROM -Q --verbose 2>&1 )"
+# RET=$?
+# if [ ! "$RET" = "0" ];then
+# 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"
+#
+# LEADOUT="$(echo "$CDPARANOIAOUTPUT" | egrep -o '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)"
+# OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')"
+# makeids
+# ;;
+ *)
+ case "$CDDBMETHOD" in
+ cddb) TRACKINFO=$($CDDISCID $CDROM) ;;
+ # FIXME # musicbrainz needs a cleanup
+ musicbrainz) TRACKINFO=$($MUSICBRAINZ -c $CDROM ) ;;
+ esac
+ ;;
+ esac
# Make sure there's a CD in there by checking cd-discid's return code
if [ ! "$?" = "0" ]; then
if [ "$CDROMREADERSYNTAX" = "flac" ] ; then
ABCDETEMPDIR="$WAVOUTPUTDIR/abcde.$(echo $TRACKINFO | cut -f1 -d' ')"
if [ -z "$TRACKQUEUE" ]; then
- if [ ! "$STRIPDATATRACKS" = "y" ]; then
+ if [ ! "$STRIPDATATRACKS" = "n" ]; then
case "$CDROMREADERSYNTAX" in
cdparanoia|debug)
if [ "$WEHAVEACD" = "y" ]; then
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 "reading the CUE sheet 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
echo "TITLE \"$DALBUM\"" >> "$CUEFILE_OUT"
cat "$CUEFILE_IN" | while read line
do
- if echo "$line" | grep -q "INDEX"
- then
+ if echo "$line" | grep "INDEX 01" > /dev/null 2>&1 ; then
eval track="\$TRACK$n"
n=$(expr $n + 1)
echo "TITLE \"$track\"" >> "$CUEFILE_OUT"
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 ]; then
+ 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
read CDDBLOCALCHOICE
[ x"$CDDBLOCALCHOICE" = "x" ] && CDDBLOCALCHOICE="1"
# FIXME # Introduce diff's
- if echo $CDDBLOCALCHOICE | egrep -q "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" ; then
+ if echo $CDDBLOCALCHOICE | egrep "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" > /dev/null 2>&1 ; then
diffentries cddblocalread "$CDDBLOCALCHOICES" "$CDDBLOCALCHOICE"
- elif echo $CDDBLOCALCHOICE | egrep -q "[[:space:]]*[[:digit:]]+[[:space:]]*" ; then
+ 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
done
else
### FIXME ###
- echo "Selected ..."
+ #echo "Selected ..."
CDDBLOCALRESP=y
+ CDDBLOCALCHOICENUM=1
fi
if [ ! "$CDDBLOCALCHOICENUM" = "0" ]; then
#echo "Using local copy of CDDB data"
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
+ #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
+ #fi
if [ "$INTERACTIVE" = "y" ]; then
read USELOCALRESP
while [ "$USELOCALRESP" != "y" ] && [ "$USELOCALRESP" != "n" ] && [ "$USELOCALRESP" != "" ] ; do
:
}
-do_musizbrainz ()
+do_musicbrainz ()
{
:
}
CHOICE=$(checkstatus cddb-choice)
if [ -n "$CHOICE" ] ; then
case $CDDBCHOICES in
- -1) if head -1 "$ABCDETEMPDIR/cddbquery" | grep -q "^$" ; then
+ -1) if head -1 "$ABCDETEMPDIR/cddbquery" | grep "^$" > /dev/null 2>&1 ; then
log error "CDDB query failed!"
exit 1
else
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)
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
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
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
CDDBMETHOD=cddb
CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi"
CDDBSUBMIT=freedb-submit@freedb.org
-CDDBPROTO=5
+CDDBPROTO=6
HELLOINFO="$(whoami)@$(hostname)"
CDDBCOPYLOCAL="n"
CDDBLOCALPOLICY="always"
# This option is basicaly for Debian package dependencies:
# List of prefered outputs - by default, run with whatever we have in the path
-DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:lame,mp3:bladeenc,spx:speex
+DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:lame,mp3:bladeenc,spx:speex,m4a:faac
# 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
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
wget) HTTPGETOPTS="-q -O -";;
curl) HTTPGETOPTS="-f -s";;
fetch)HTTPGETOPTS="-q -o -";;
- ftp) HTTPGETOPTS="-q -o -";;
+ ftp) HTTPGETOPTS="-a -V -o - ";;
*) log warning "HTTPGET in non-standard and HTTPGETOPTS are not defined." ;;
esac
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" ;;
p) PADTRACKS=y ;;
P) USEPIPES=y ;;
r) REMOTEHOSTS="$OPTARG" ;;
- R) DOREPLAYGAIN=y ;;
+ R) CDDBLOCALRECURSIVE=y ;;
s) SHOWCDDBFIELDS="$OPTARG" ;;
S) CDSPEEDVALUE="$OPTARG" ;;
t) STARTTRACKNUMBER="$OPTARG" ;;
T) STARTTRACKNUMBER="$OPTARG" ; STARTTRACKNUMBERTAG="y" ;;
u) CDDBPROTO=6 ;;
+ U) CDDBPROTO=5 ;;
v)
echo "This is abcde v$VERSION."
echo "Usage: abcde [options] [tracks]"
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"
fi
;;
z) DEBUG=y ; CDROMREADERSYNTAX=debug ; EJECTCD="n" ;;
+ Z) CUE2DISCID=builtin;;
?) usage; exit ;;
esac
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 warning "abcde: switching to flac CDROMREADERSYNTAX..."
+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
+ # We have a builtin version of cue2discid...
+ case "$CUE2DISCID" in
+ builtin);;
+ *) NEEDCUE2DISCID=y;;
+ esac
NEEDMETAFLAC=y
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
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;;
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
# 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- )" ;;
[ "$FLACENCODERSYNTAX" = "default" ] && FLACENCODERSYNTAX=flac
[ "$DOTAG" = "y" ] && NEEDMETAFLAC=y
[ "$DOREPLAYGAIN" = "y" ] && NEEDMETAFLAC=y
+ [ "$ONETRACK" = "y" ] && [ "$MAKECUEFILE" = "y" ] && NEEDMETAFLAC=y
;;
spx)
[ "$SPEEXENCODERSYNTAX" = "default" ] && SPEEXENCODERSYNTAX=speexenc
;;
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
;;
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
AACENCODER="$AACENC"
;;
esac
-# and which tagger
+# and which tagger
if [ "$ID3TAGV" = "1" ]; then
TAGGER="$ID3"
TAGGEROPTS="$ID3OPTS"
NEEDCUEREADER=y
fi
-if [ X"$CDSPEEDVALUE" != "X" ] && [ "$DOREAD" = "y"]; then
+if [ X"$CDSPEEDVALUE" != "X" ] && [ "$DOREAD" = "y" ]; then
case "$CDROMREADERSYNTAX" in
cdparanoia|debug) CDROMREADEROPTS="$CDPARANOIAOPTS -S $CDSPEEDVALUE" ;;
### FIXME ### translate "cue2discid" from python to bash
# Make sure a buncha things exist
for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $MP3ENCODER \
$OGGENCODER $FLACENCODER $SPEEXENCODER $MPPENCODER \
+ $AACENCODER \
${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \
${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
checkexec "$X"
done
-# 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=""
do_discid # Get ABCDETEMPDIR created and status file initialized
;;
musicbrainz)
- do_musicbrainz
+ do_musicbrainz id
;;
esac
if checkstatus onetrack ; then ONETRACK=y ; fi
if [ "$ONETRACK" = "y" ]; then
- # Reuse the CUEFILE in case we created it in a previous run
+ # Reuse the CUEFILE in case we created it (now or in a previous run)
if CUEFILE=$(checkstatus cuefile); then
IMPORTCUESHEET=y
fi
fi
# Don't proceed with the rest of the loop if we can't encode
if [ "$ABORT" ]; then continue; fi
+ ## FIXME ## Add here
+ ## run_command tagtrack-$OUTPUT-$1 $METAFLAC $METAFLACOPTS ${IMPORTCUESHEET:+--import-cuesheet-from="$ABCDETEMPDIR/$CUEFILE"} --import-tags-from=- "$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER"
# Set TRACKNUM, TRACKNAME
if [ -e "$CDDBDATA" ]; then
if [ "$ONETRACK" = "y" ]; then
else
TRACKNUM=$UTRACKNUM
CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
- do_getcddbinfo TRACKNAME
+ getcddbinfo TRACKNAME
splitvarious
fi
fi
# Go through it again and make sure there's no distmp3 stragglers, otherwise
# we'll delete the files they're working on
+# Do NOT play ball if there is no ball to play (so ABORT if needed)
## FIXME ## Check also for files which are encoded using PIPEs.
-if [ "$DOENCODE" = "y" -a "$USEPIPES" != "y" ]; then
+if [ "$DOENCODE" = "y" ] && [ "$USEPIPES" != "y" ] && [ ! "$ABORT" ]; then
PROCEED=
until [ $PROCEED ]
do
HCoop / clinton / abcde.git / blobdiff