X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/bb73d1254b83764c5eca1422afa21335909bdf24..dc30789b610d7ac082fa8e5a6d6de912b148b906:/cddb-tool diff --git a/cddb-tool b/cddb-tool index 4e6c81b..e0df3b1 100755 --- a/cddb-tool +++ b/cddb-tool @@ -38,13 +38,13 @@ if [ "$HTTPGET" = "" ]; then 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 @@ -208,7 +208,7 @@ 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 + 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' ;; @@ -220,7 +220,7 @@ 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 @@ -229,7 +229,7 @@ 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