-#!/bin/sh
+#!/bin/bash
# Copyright (C) 1999 Nathaniel Smith <njs@uclink4.berkeley.edu>
# Copyright (C) 1999, 2000, 2001 Robert Woodcock <rcw@debian.org>
# 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 recieved a copy of the GNU General Public License
+# 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Copyright for this work is to expire January 1, 2010, after which it
# shall be public domain.
# - Submitted via: line is created by template, when it really should be in send.
# Oh well.
-VERSION=0.4.6
+VERSION=0.4.7
NAME=cddb-tool
#return codes
HTTPGETOPTS=${HTTPGETOPTS:="-q -o -"}
elif [ X"$(uname)" = X"NetBSD" ] ; then
HTTPGET=ftp
- HTTPGETOPTS=${HTTPGETOPTS:="-q -o -"}
+ HTTPGETOPTS=${HTTPGETOPTS:="-a -V -o - "}
elif [ X"$(uname)" = X"Darwin" ] ; then
HTTPGET=curl
HTTPGETOPTS=${HTTPGETOPTS:="-f -s"}
else
HTTPGET=wget
- HTTPGETOPTS=${HTTPGETOPTS:="-q -O -"}
+ HTTPGETOPTS=${HTTPGETOPTS:="-q -nv -e timestamping=off -O -"}
fi
fi
ADDRESS="$2"
DISCID=$(grep ^DISCID= "$FILE" | cut -f2 -d= | tr -d \[:cntrl:\])
CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d= | tr -d \[:cntrl:\])
- grep -v "^#CATEGORY=" "$FILE" | mail -s "cddb $CDDBGENRE $DISCID" "$ADDRESS"
+ grep -v "^#CATEGORY=" "$FILE" | iconv -t utf-8 | mail -a "Content-Type: text/plain; charset=utf-8" -s "cddb $CDDBGENRE $DISCID" "$ADDRESS"
;;
query) # cddb-tool query serverurl proto user host discid...
shift 4
TRACKINFO="$@"
TRACKINFOPLUS=$(echo $TRACKINFO | tr ' ' '+')
- RESULTS=$($HTTPGET "$SERVER?cmd=cddb+query+$TRACKINFOPLUS\&hello=$HELLOINFO\&proto=$PROTO") || exit $LOOKUP_ERR
- echo $RESULTS | tr '\r' '\n' | tr -s '\n' | sed 's/^ //g'
+ RESULTS=$($HTTPGET "$SERVER?cmd=cddb+query+$TRACKINFOPLUS&hello=$HELLOINFO&proto=$PROTO") || exit $LOOKUP_ERR
+ echo "$RESULTS" | tr '\r' '\n' | tr -s '\n' | sed 's/^ //g'
;;
read) # cddb-tool read serverurl proto user host genre discnumber
CATEGORY="$5"
DISCID="$6"
HELLOINFO="$USER+$HOST+$NAME+$VERSION"
- $HTTPGET $CDDBDATA "$SERVER?cmd=cddb+read+$CATEGORY+$DISCID\&hello=$HELLOINFO\&proto=$PROTO" 2>/dev/null
+ $HTTPGET $CDDBDATA "$SERVER?cmd=cddb+read+$CATEGORY+$DISCID&hello=$HELLOINFO&proto=$PROTO" 2>/dev/null
;;
stat) # cddb-tool stat serverurl user host proto
HOST="$3"
PROTO="$4"
HELLOINFO="$USER+$HOST+$NAME+$VERSION"
- $HTTPGET $CDDBDATA "$SERVER?cmd=stat&hello=$HELLOINFO\&proto=$PROTO" 2>/dev/null
+ $HTTPGET $CDDBDATA "$SERVER?cmd=stat&hello=$HELLOINFO&proto=$PROTO" 2>/dev/null
;;
help) # help