rtsp web radios not displayed in playlist

[vale-max]

Hi @rern
if I add an rtsp radio the playlist is not displayed and this error comes out in system log:

May 26 17:24:00 rAudio nginx[472]: 2021/05/26 17:24:00 [error] 472#472: *571 FastCGI sent in stderr: "PHP message: PHP Fatal error:  Uncaught TypeError: Unsupported operand types: int + string in /srv/http/mpdplaylist.php:236
May 26 17:24:00 rAudio nginx[472]: Stack trace:
May 26 17:24:00 rAudio nginx[472]: #0 /srv/http/mpdplaylist.php(13): htmlPlaylist()
May 26 17:24:00 rAudio nginx[472]: #1 {main}
May 26 17:24:00 rAudio nginx[472]:   thrown in /srv/http/mpdplaylist.php on line 236" while reading response header from upstream, client: 192.168.20.244, server: localhost, request: "POST /mpdplaylist.php HTTP/1.1", upstream: "fastcgi://unix:/run/php-fpm/php-fpm.sock:", host: "raudio.lan", referrer: "http://raudio.lan/"

[vale-max]

temporarily, I solved this way:

diff mpdplaylist.php_orig mpdplaylist.php
193c193
<               if ( substr( $file, 0, 4 ) !== 'http' || substr( $file, 7, 3 ) === '192' ) {
---
>               if ( substr( $file, 3, 4 ) !== 'p://' || substr( $file, 7, 3 ) === '192' ) {
309c309
<               if ( substr( $each->file, 0, 4 ) === 'http' ) {
---
>               if ( substr( $each->file, 3, 4 ) === 'p://' ) {
334c334
<                       if ( substr( $each->file, 0, 4 ) === 'http' ) {
---
>                       if ( substr( $each->file, 3, 4 ) === 'p://' ) {

[vale-max]

Hi @rern
I had some time so I did a nicer job, and added the protocols known to MPD.
I also fixed status.sh as it was throwing errors if the protocol was not known or it was all capital

diff --git a/srv/http/bash/status.sh b/srv/http/bash/status.sh
index b31312e..32f45cf 100644
--- a/srv/http/bash/status.sh
+++ b/srv/http/bash/status.sh
@@ -16,6 +16,8 @@ playlists=$( ls /srv/http/data/playlists | wc -l )
 relays=$( [[ -e $dirsystem/relays ]] && echo true || echo false )
 relayson=$( [[ -e  $dirtmp/relaystimer ]] && echo true || echo false )
 updateaddons=$( [[ -e /srv/http/data/addons/update ]] && echo true || echo false )
+stream_protos=("http" "rtsp" "rtp:" "srtp" "rtmp")
+
 if [[ -e $dirtmp/nosound ]]; then
 	volume=false
 else
@@ -203,6 +205,7 @@ if (( $playlistlength  == 0 )); then
 fi
 
 fileheader=${file:0:4}
+fileheader=${fileheader,,}
 if [[ $fileheader == cdda ]]; then
 	ext=CD
 	discid=$( cat $dirtmp/audiocd 2> /dev/null )
@@ -224,7 +227,7 @@ if [[ $fileheader == cdda ]]; then
 , "discid"    : "'$discid'"
 , "Time"      : '$Time'
 , "Title"     : "'$Title'"'
-elif [[ $fileheader == http ]]; then
+elif [[ " ${stream_protos[@]} " =~ " $fileheader " ]]; then
 	gatewaynet=$( ip route | awk '/default/ {print $3}' | cut -d. -f1-2 )
 	urlnet=$( echo $file | sed 's|.*//\(.*\):.*|\1|' | cut -d. -f1-2 )
 	if systemctl -q is-active upmpdcli && [[ $gatewaynet == $urlnet ]]; then # internal ip
@@ -418,7 +421,7 @@ if grep -q '"cover": false,' /srv/http/data/system/display; then
 	exit
 fi
 
-if [[ $fileheader != cdda && $fileheader != http ]]; then
+if [[ $fileheader != cdda && ! " ${stream_protos[@]} " =~ " $fileheader " ]]; then
 	args="\
 $Artist$Album
 $( dirname "$file0")"
diff --git a/srv/http/mpdplaylist.php b/srv/http/mpdplaylist.php
index 5aa2977..4b5063c 100644
--- a/srv/http/mpdplaylist.php
+++ b/srv/http/mpdplaylist.php
@@ -4,6 +4,7 @@ include '/srv/http/indexbar.php';
 $cmd = $_POST[ 'cmd' ] ?? $argv[ 1 ];
 $dirplaylists = '/srv/http/data/playlists/';
 $dirtmp = '/srv/http/data/shm';
+$stream_protos=array("http","rtsp","rtp:","srtp","rtmp");
 
 // current, delete, edit, get, list, load, save
 switch( $cmd ) {
@@ -174,6 +175,7 @@ case 'save':
 
 //-------------------------------------------------------------------------------------
 function htmlPlaylist( $lists, $plname = '' ) {
+	global $stream_protos;
 	$count = count( $lists );
 	if ( !$count ) exit( '-1' );
 	
@@ -190,7 +192,7 @@ function htmlPlaylist( $lists, $plname = '' ) {
 		$sec = 0;
 		$i++;
 		$file = $list->file;
-		if ( substr( $file, 0, 4 ) !== 'http' || substr( $file, 7, 3 ) === '192' ) {
+		if ( ! in_array ( strtolower(substr ( $file,0,4)) , $stream_protos ) || substr( $file, 7, 3 ) === '192' ) {
 			$sec = HMS2Second( $list->Time );
 			$track = preg_replace( '/^#*0*/', '', $list->Track );
 			$li2 = $i.' • ';
@@ -270,6 +272,7 @@ function htmlPlaylist( $lists, $plname = '' ) {
 	return [ 'html' => $html, 'counthtml' => $counthtml, 'playlistlength' => $count ];
 }
 function playlist() { // current playlist
+	global $stream_protos;
 	$f = [ 'album', 'albumartist', 'artist', 'file', 'time', 'title', 'track' ];
 	$format = '%'.implode( '%^^%', $f ).'%';
 	exec( 'mpc playlist -f '.$format, $lists ); // avoid json literal issue with escape double quotes
@@ -306,7 +309,7 @@ function playlist() { // current playlist
 			if ( $key !== 'file' ) $key = ucfirst( $key ); // mpd protocol keys
 			$each->$key = $val;
 		}
-		if ( substr( $each->file, 0, 4 ) === 'http' ) {
+		if ( in_array ( strtolower(substr ( $each->file,0,4)) , $stream_protos ) ) {
 			$radiofile = '/srv/http/data/webradios/'.str_replace( '/', '|', $each->file );
 			$name = file( $radiofile, FILE_IGNORE_NEW_LINES )[ 0 ];
 			$each->Name = explode( '^^', $name )[ 0 ];
@@ -317,6 +320,7 @@ function playlist() { // current playlist
 }
 function playlistInfo( $index = '' ) { // mpd protocol
 	// 2nd sleep: varied with length, 1000track/0.1s
+	global $stream_protos;
 	exec( '{ sleep 0.05'
 		.'; echo playlistinfo '.$index
 		.'; sleep $( awk "BEGIN { printf \"%.1f\n\", $( mpc playlist | wc -l ) / 10000 + 0.1 }" ); }'
@@ -331,7 +335,7 @@ function playlistInfo( $index = '' ) { // mpd protocol
 	$each = ( object )[];
 	foreach( $lists as $line ) {
 		if ( $line === '---' ) {
-			if ( substr( $each->file, 0, 4 ) === 'http' ) {
+			if ( in_array ( strtolower(substr ( $each->file,0,4)) , $stream_protos ) ) {
 				$urlname = str_replace( '/', '|', $each->file );
 				$name = file( '/srv/http/data/webradios/'.$urlname, FILE_IGNORE_NEW_LINES )[ 0 ];
 				$each->Name = explode( '^^', $name )[ 0 ];

[rern]

Done.

[vale-max]

Thanks

[vale-max]

@rern what is the purpose of checking if the address begins for 192 in mpdplaylist.php?
It makes the playlist display fail if I set up a webradio pointing to the IP of my other rAudio acting as DAB radio streaming server.