#
# $Id$
-VERSION='2.5.5-UNRELEASED'
+VERSION='2.6'
usage ()
{
# eyeD3 --comment syntax is also different in < and >= 0.7.0
run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \
--comment="$COMMENTOUTPUT" -A "$DALBUM" \
- -a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
+ -a "$TRACKARTIST" -t "$TRACKNAME" ${CDYEAR:+-Y "$CDYEAR"} \
-G "$GENREID" -n "${TRACKNUM:-$1}" \
${TRACKNUM:+-N "$TRACKS"} \
${ENCODING:+--encoding="$ENCODING"} \
exit 1
fi
CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
- echo -n "Edit selected CDDB data? [y/n] (" >&2
+ echo -n "Edit selected CDDB data " >&2
if [ "$INTERACTIVE" = "y" ]; then
if [ "$UNKNOWNDISK" = "y" ]; then
- echo -n "y): " >&2
+ echo -n "[Y/n]? " >&2
read EDITCDDB
[ "$EDITCDDB" != "n" ] && EDITCDDB=y
else
- echo -n "n): " >&2
+ echo -n "[y/N]? " >&2
read EDITCDDB
fi
else
- echo "n): n" >&2
+ echo "[y/N]? " >&2
EDITCDDB=n
fi
if [ "$EDITCDDB" = "y" ]; then
# We used to use EXTRAVERBOSE=y to turn on more debug output. Now
# that's changed to a number to allow for more control. Deal with
# EXTRAVERBOSE=y/n, set it to 1/0 for backwards compatibility.
-case "$EXTRAVERBOSE"x in
- "*y*"x|"*Y*"x)
+echo "Looking at EXTRAVERBOSE ($EXTRAVERBOSE)"
+case "$EXTRAVERBOSE" in
+ *y*|*Y*)
EXTRAVERBOSE=1
;;
- "*n*"x|"*N*")
+ *n*|*N*)
EXTRAVERBOSE=0
;;
esac
# Parse command line options
-#while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPq:r:Rs:S:t:T:vVxw:W: opt ; do
-while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:UvVxX:w:W:z opt ; do
+while getopts 1a:bc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:UvVxX:w:W:z opt ; do
case "$opt" in
1) ONETRACK=y ;;
a) ACTIONS="$OPTARG" ;;
A) EXPACTIONS="$OPTARG" ;;
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" ;;
X) CUE2DISCID="$OPTARG" ;;
w) COMMENT="$OPTARG" ;;
W) if echo $OPTARG | grep "[[:digit:]]" > /dev/null 2>&1 ; then
- STARTTRACKNUMBER="${OPTARG}01"
+ STARTTRACKNUMBER="${OPTARG}$(printf %02d ${STARTTRACKNUMBER:-01})"
STARTTRACKNUMBERTAG="y"
COMMENT="CD${OPTARG}"
DISCNUMBER="${OPTARG}"