Merge branch 'mplayer_alt' of maxime-alves/shcheck into master

check.sh

@@ -120,7 +120,7 @@ TC_INIT() {
 }
 
 TC_END() {
-	
+
 	if [ "$tc_fail" -gt 0 ]
 	then
 		if [ "$verbose" -gt 1 ]
@@ -269,10 +269,10 @@ check_html_title() {
 	echo '<?xml version="1.0"?>
 <xsl:stylesheet version="1.0"
 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:output method = "text"/>
-        <xsl:template match="/">
-                <xsl:value-of select="/html/head/title"/>
-        </xsl:template>
+		<xsl:output method = "text"/>
+		<xsl:template match="/">
+				<xsl:value-of select="/html/head/title"/>
+		</xsl:template>
 </xsl:stylesheet>' > $tmpxsl
 
 	tmphtml=$(mktemp -t html.XXXXXXXXX)
@@ -298,33 +298,56 @@ check_audiostream() {
 	# 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="128kb"
-	fi
-	if [ "$verbose" -gt 1 ]
-	then
-		logdate INFO "$tc_name: Running mplayer on '$1' for $sz" 3
-	fi
+	MPLAYER=$(whereis mplayer|cut -d' ' -f2)
+	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
 
-	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
+		$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
 
-	if [ "$bytes" -lt 1024 ]
-	then
-		fail "mplayer retrieved ${bytes}B of stream instead of expected $sz"
-		return
-	fi
-	if [ "$res" -eq 0 ]
+		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 ]
 	then
-		success "mplayer retrieved $sz of stream on $1"
-	else
-		fail "mplayer failed to retrieve stream on $1"
+		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
+
+		if [ "$bytes" -ge 1 ]
+		then
+			success "mpv read successfully $1"
+		else
+			fail "mpv could not read $1"
+		fi
+
 	fi
 }
 
@@ -557,9 +580,9 @@ check_ssh_key() {
 }
 
 check_mpc() {
-    # check_mpc [$host [$port] ]
-    # tests if you can contact an MPD server in a client way
-    # returns the current state of the server
+	# check_mpc [$host [$port] ]
+	# tests if you can contact an MPD server in a client way
+	# returns the current state of the server
 
 	host=$1
 	port=$2
@@ -574,10 +597,10 @@ check_mpc() {
 		port=6600
 	fi
 
-    if echo "status" | nc -w 1 "$host" "$port" | head -1 | grep "^OK MPD"
-    then
-        success "MPD server can be contacted on $host:$port"
-        status=$(echo "status" | nc -w 1 "$host" "$port" | grep "^state:"|cut -d: -f2)
-        success "It's state is : $status"
-    fi
+	if echo "status" | nc -w 1 "$host" "$port" | head -1 | grep "^OK MPD"
+	then
+		success "MPD server can be contacted on $host:$port"
+		status=$(echo "status" | nc -w 1 "$host" "$port" | grep "^state:"|cut -d: -f2)
+		success "It's state is : $status"
+	fi
 }