View | Details | Raw Unified | Return to bug 44789
Collapse All | Expand All

(-)cddb-tool (-10 / +10 lines)
Lines 30-38 Link Here
30
LOOKUP_ERR=13      # problem connecting to cddb server
30
LOOKUP_ERR=13      # problem connecting to cddb server
31
EMPTY_QUERY_RESPONSE=14	# query response = "", (probably no net connection)
31
EMPTY_QUERY_RESPONSE=14	# query response = "", (probably no net connection)
32
32
33
# assume a reasonable default if $WGET is undefined
33
# assume a reasonable default if $FETCH is undefined
34
if [ "$WGET" = "" ]; then
34
if [ "$FETCH" = "" ]; then
35
	WGET=wget
35
	FETCH=fetch
36
fi
36
fi
37
37
38
usage() {
38
usage() {
Lines 74-81 Link Here
74
  read server user host disc-id genre
74
  read server user host disc-id genre
75
	CDDB file is dumped to stdout. File will contain an extra
75
	CDDB file is dumped to stdout. File will contain an extra
76
	#CATEGORY= line, which leaves it a valid CDDB file but which will
76
	#CATEGORY= line, which leaves it a valid CDDB file but which will
77
	be recognized by parse and send commands. Uses wget, so if you
77
	be recognized by parse and send commands. Uses fetch, so if you
78
	need to use a proxy then just configure wget to do so. user and
78
	need to use a proxy then just configure fetch to do so. user and
79
	host will be used for identifying ourselves to the CDDB server.
79
	host will be used for identifying ourselves to the CDDB server.
80
  help  
80
  help  
81
	Display this.
81
	Display this.
Lines 119-125 Link Here
119
	echo '#'
119
	echo '#'
120
	echo '# Track frame offsets:'
120
	echo '# Track frame offsets:'
121
	NUMTRACKS=$2
121
	NUMTRACKS=$2
122
	for x in $(seq 3 $(expr $NUMTRACKS + 2))
122
	for x in $(jot $NUMTRACKS 3 $(expr $NUMTRACKS + 2))
123
	do
123
	do
124
		printf "#\t$(echo "$DISCID" | cut -f$x -d' ')\n"
124
		printf "#\t$(echo "$DISCID" | cut -f$x -d' ')\n"
125
	done
125
	done
Lines 135-147 Link Here
135
	echo DISCID="$DISCNUM"
135
	echo DISCID="$DISCNUM"
136
	echo "DTITLE=Unknown Artist / Unknown Album"
136
	echo "DTITLE=Unknown Artist / Unknown Album"
137
	# TTITLE0 -- TTITLEn
137
	# TTITLE0 -- TTITLEn
138
	for x in $(seq 1 $NUMTRACKS)
138
	for x in $(jot $NUMTRACKS)
139
	do
139
	do
140
		echo "TTITLE$(expr $x - 1)=Track $x"
140
		echo "TTITLE$(expr $x - 1)=Track $x"
141
	done
141
	done
142
	echo "EXTD="
142
	echo "EXTD="
143
	# EXTT0 -- EXTTn
143
	# EXTT0 -- EXTTn
144
	for x in $(seq 1 $NUMTRACKS)
144
	for x in $(jot $NUMTRACKS)
145
	do
145
	do
146
		echo "EXTT$(expr $x - 1)="
146
		echo "EXTT$(expr $x - 1)="
147
	done
147
	done
Lines 164-170 Link Here
164
	shift 3
164
	shift 3
165
	TRACKINFO="$@"
165
	TRACKINFO="$@"
166
	TRACKINFOPLUS=$(echo $TRACKINFO | tr ' ' '+')
166
	TRACKINFOPLUS=$(echo $TRACKINFO | tr ' ' '+')
167
	RESULTS=$($WGET -q -O - "$SERVER?cmd=cddb+query+$TRACKINFOPLUS\&hello=$HELLOINFO\&proto=3") || exit $LOOKUP_ERR
167
	RESULTS=$($FETCH -q -o - "$SERVER?cmd=cddb+query+$TRACKINFOPLUS\&hello=$HELLOINFO\&proto=3") || exit $LOOKUP_ERR
168
	echo $RESULTS | tr '\r' '\n' | tr -s '\n' | sed 's/^ //g'
168
	echo $RESULTS | tr '\r' '\n' | tr -s '\n' | sed 's/^ //g'
169
	;;
169
	;;
170
170
Lines 175-181 Link Here
175
	CATEGORY="$4"
175
	CATEGORY="$4"
176
	DISCID="$5"
176
	DISCID="$5"
177
	HELLOINFO="$USER+$HOST+$NAME+$VERSION"
177
	HELLOINFO="$USER+$HOST+$NAME+$VERSION"
178
	$WGET -q -O - $CDDBDATA "$SERVER?cmd=cddb+read+$CATEGORY+$DISCID\&hello=$HELLOINFO\&proto=3" 2>/dev/null
178
	$FETCH -q -o - $CDDBDATA "$SERVER?cmd=cddb+read+$CATEGORY+$DISCID\&hello=$HELLOINFO\&proto=3" 2>/dev/null
179
	;;
179
	;;
180
180
181
	help) help ;;
181
	help) help ;;

Return to bug 44789