Check audiostream bugfix & enhancement

check.sh

@@ -295,39 +295,47 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 }
 
 check_audiostream() {
-	# Uses mplayer to fetch 128Kb of stream
+	# Uses one of mplayer or mpv to retrieve a small amount of stream
+	# and attempt to decode it.
 	# $1 Stream URL
-	# $2 size
-	MPLAYER=$(whereis mplayer|cut -d' ' -f2)
-	MPV=$(whereis mpv|cut -d' ' -f2)
+
+	MPLAYER="`which mplayer`"
+	MPV="`which mpv`"
 	if [ -x $MPLAYER ]
 	then
-		check_audiostream_mplayer "$1" "$2"
+		check_audiostream_mplayer "$1"
 	elif [ -x $MPV ]
 	then
-		check_audiostream_mpv "$1" "$2"
+		check_audiostream_mpv "$1"
 	else
 		fail "Unable to find mplayer nor mpv"
 	fi
 }
 
 check_audiostream_mplayer() {
-	# Uses mplayer to fetch 128Kb of stream
+	# Uses mplayer to fetch 128Kb (by default) of stream
 	# $1 Stream URL
-	# $2 size
+	# $2 size in kb without the kb suffix
+	# $3 mplayer path
+
 	tmpfile=$(mktemp -t check_audiostream.XXXXXXXXX)
 	sz="$2"
 	if [ -z "$sz" ]
 	then
 		sz="128"
 	fi
+	MPLAYER="$3"
+	if [ -z "$MPLAYER" ]
+	then
+		MPLAYER="`which mplayer`"
+	fi
 
 	sz_kb="${sz}kb"
 	expt_sz="`expr $sz \* 8`"
 
 	if [ "$verbose" -gt 1 ]
 	then
-		logdate INFO "$tc_name: Running mplayer on '$1' for $sz" 3
+		logdate INFO "$tc_name: Running mplayer on '$1' for $sz_kb" 3
 	fi
 
 	$MPLAYER -endpos $sz_kb -ao pcm:file=$tmpfile "$1" 1>/dev/null 2>/dev/null
@@ -335,14 +343,11 @@ check_audiostream_mplayer() {
 	bytes=$(du $tmpfile | cut -f1)
 	rm $tmpfile 2>/dev/null
 
-
-	logdate INFO "$bytes $sz" 3
 	if [ "$bytes" -lt $expt_sz ]
 	then
-		fail "mplayer retrieved ${bytes}B of stream instead of expected $sz"
+		fail "mplayer retrieved ${bytes}B of stream instead of expected $sz_kb"
 		return
 	fi
-	echo "$bytes / $sz"
 	if [ "$res" -eq 0 ]
 	then
 		success "mplayer retrieved $sz of stream on $1"
@@ -352,30 +357,44 @@ check_audiostream_mplayer() {
 }
 
 check_audiostream_mpv() {
-	# Uses mpv to fetch 128Kb of stream
+	# Uses mpv to fetch 4s of audio stream
 	# $1 Stream URL
-	# $2 size
+	# $2 time of stream to fetch
+	# $3 mpv path
 
-	tmpfile=$(mktemp -t check_audiostream.XXXXXXXXX)
-	sz="$2"
-	if [ -z "$sz" ]
+	time="$2"
+	if [ -z "$time" ]
+	then
+		time="4"
+	fi
+	MPV="$3"
+	if [ -z "$MPV" ]
 	then
-		sz="128kb"
+		MPV="`which mpv`"
 	fi
 
+
 	if [ "$verbose" -gt 1 ]
 	then
-		logdate INFO "$tc_name: Running mpv on '$1' for $sz" 3
+		logdate INFO "$tc_name: Running mpv on '$1' for ${time}s" 3
 	fi
-	$MPV --vo=null --ao=null --o=$tmpfile --of=wav --length 1 "$1" &> /dev/null
-	bytes=$(du $tmpfile | cut -f1)
-	rm $tmpfile 2>/dev/null
+	start_time=`date "+%s"`
+	$MPV --vo=null --ao=null --o=/dev/null --of=wav --length $time "$1" 1> /dev/null 2>/dev/null
+	res=$?
+	stop_time=`date "+%s"`
+	run_time=`expr $stop_time - $start_time`
 
-	if [ "$bytes" -ge 1 ]
+	if [ $run_time -lt $time ]
+	then
+		fail "mpv stopped running ${run_time} after launch but ${time}s should be received"
+		return
+	fi
+	
+	if [ $res -eq 0 ]
 	then
-		success "mpv read successfully $1"
+		success "mpv retrieved ${time}s of stream on $1"
 	else
-		fail "mpv could not read $1"
+		fail "mpv failed to retrieve ${time}s of stream on $1"
 	fi
 }