Creating two functions from check_audiostream

check.sh

@@ -302,52 +302,80 @@ check_audiostream() {
 	MPV=$(whereis mpv|cut -d' ' -f2)
 	if [ -x $MPLAYER ]
 	then
-		tmpfile=$(mktemp -t check_audiostream.XXXXXXXXX)
-		
-		sz="$2"
-		if [ -z "$sz" ]
-		then
-			sz="128kb"
-		fi
-		if [ "$verbose" -gt 1 ]
-		then
-			logdate INFO "$tc_name: Running mplayer on '$1' for $sz" 3
-		fi
+		check_audiostream_mplayer "$1" "$2"
+	elif [ -x $MPV ]
+	then
+		check_audiostream_mpv "$1" "$2"
+	else
+		fail "Unable to find mplayer nor mpv"
+	fi
+}
+
+check_audiostream_mplayer() {
+	# Uses mplayer to fetch 128Kb of stream
+	# $1 Stream URL
+	# $2 size
+	tmpfile=$(mktemp -t check_audiostream.XXXXXXXXX)
+	sz="$2"
+	if [ -z "$sz" ]
+	then
+		sz="128"
+	fi
 
-		$MPLAYER -endpos $sz -ao pcm:file=$tmpfile "$1" 1>/dev/null 2>/dev/null
-		res=$?
-		bytes=$(du $tmpfile | cut -f1)
-		rm $tmpfile 2>/dev/null
+	sz_kb="${sz}kb"
+	expt_sz="`expr $sz \* 8`"
 
-		if [ "$bytes" -lt 1024 ]
-		then
-			fail "mplayer retrieved ${bytes}B of stream instead of expected $sz"
-			return
-		fi
-		if [ "$res" -eq 0 ]
-		then
-			success "mplayer retrieved $sz of stream on $1"
-		else
-			fail "mplayer failed to retrieve stream on $1"
-		fi
-	elif [ -x $MPV ]
+	if [ "$verbose" -gt 1 ]
 	then
-		if [ "$verbose" -gt 1 ]
-		then
-			logdate INFO "$tc_name: Running mpv on '$1' for $sz" 3
-		fi
-		tmpfile=$(mktemp -t check_audiostream.XXXXXXXXX)
-		$MPV --vo=null --ao=null --o=$tmpfile --of=wav --length 1 "$1" &> /dev/null
-		bytes=$(du $tmpfile | cut -f1)
-		rm $tmpfile 2>/dev/null
+		logdate INFO "$tc_name: Running mplayer on '$1' for $sz" 3
+	fi
 
-		if [ "$bytes" -ge 1 ]
-		then
-			success "mpv read successfully $1"
-		else
-			fail "mpv could not read $1"
-		fi
+	$MPLAYER -endpos $sz_kb -ao pcm:file=$tmpfile "$1" 1>/dev/null 2>/dev/null
+	res=$?
+	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"
+		return
+	fi
+	echo "$bytes / $sz"
+	if [ "$res" -eq 0 ]
+	then
+		success "mplayer retrieved $sz of stream on $1"
+	else
+		fail "mplayer failed to retrieve stream on $1"
+	fi
+}
+
+check_audiostream_mpv() {
+	# Uses mpv to fetch 128Kb of stream
+	# $1 Stream URL
+	# $2 size
+
+	tmpfile=$(mktemp -t check_audiostream.XXXXXXXXX)
+	sz="$2"
+	if [ -z "$sz" ]
+	then
+		sz="128kb"
+	fi
 
+	if [ "$verbose" -gt 1 ]
+	then
+		logdate INFO "$tc_name: Running mpv on '$1' for $sz" 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
+
+	if [ "$bytes" -ge 1 ]
+	then
+		success "mpv read successfully $1"
+	else
+		fail "mpv could not read $1"
 	fi
 }