Merge pull request #1668 from rern/UPDATE

Update

install.sh

@@ -21,16 +21,6 @@ if [[ -e $file ]] && ! grep -q {CONFIG} $file; then
 	systemctl daemon-reload
 fi
 
-# 202402226
-file=/etc/default/camilladsp
-if [[ -e $file ]] && grep -qs /etc/ $file; then
-	sed -i 's|/etc/|/srv/http/data/|' $file
-	mv -f /{etc,srv/http/data}/camilladsp/configs/*
-fi
-
-file=$dirsystem/autoplay.conf
-grep -qs ^cd $file && sed -i '/^cd/ d' $file
-
 #-------------------------------------------------------------------------------
 installstart "$1"
 

srv/http/assets/js/main.js

@@ -1657,7 +1657,7 @@ $( '#button-pl-librandom' ).on( 'click', function() {
 			, message    : 'Randomly add and play continuously.'
 			, list       : '<div class="menu">'
 						  +'<a class="sub cmd"><i class="i-music"></i>Songs</a><i class="i-play-plus submenu cmd play"></i>'
-						  +'<a class="sub cmd album"><i class="i-album"></i>Abums</a><i class="i-play-plus submenu cmd album"></i>'
+						  +'<a class="sub cmd album"><i class="i-album"></i>Albums</a><i class="i-play-plus submenu cmd album"></i>'
 						  +'</div>'
 			, values     : [ true ]
 			, beforeshow : () => {

srv/http/bash/bluealsa-dbus.py

@@ -15,6 +15,8 @@
 
 AGENT_INTERFACE = 'org.bluez.Agent1'
 path = '/test/autoagent'
+filesink = '/srv/http/data/shm/bluetoothsink'
+statuspush = '/srv/http/bash/status-push.sh'
 
 def property_changed( interface, changed, invalidated, path ):
     for name, value in changed.items():
@@ -28,13 +30,12 @@ def property_changed( interface, changed, invalidated, path ):
         if name == 'Player':
             with open( '/srv/http/data/shm/bluetoothdest', 'w' ) as f: f.write( value )
         elif name == 'Position' or name == 'Track':
-            os.system( '/srv/http/bash/status-push.sh' )
+            os.system( statuspush )
         elif name == 'Status':
-            with open( '/srv/http/data/shm/player' ) as f: player = f.read().rstrip()
-            if value == 'playing' and player != 'bluetooth':
-                f.write( 'bluetooth' )
-                os.system( "/srv/http/bash/cmd.sh playerstart" )
-            os.system( '/srv/http/bash/status-push.sh' )
+            if value == 'playing' and not os.path.isfile( filesink ):
+                open( filesink, 'a' )
+                os.system( '/srv/http/bash/cmd.sh playerstart' )
+            os.system( statuspush )
 
 if __name__ == '__main__':
     dbus.mainloop.glib.DBusGMainLoop( set_as_default=True )

srv/http/bash/cmd.sh

@@ -44,7 +44,12 @@ plAddRandom() {
 }
 playerStart() {
 	local player service
-	player=$( < $dirshm/player )
+	if [[ -e $dirshm/bluetoothsink ]]; then
+		player=bluetooth
+		echo bluetooth > $dirshm/player
+	else
+		player=$( < $dirshm/player )
+	fi
 	radioStop
 	mpc -q stop
 	case $player in
@@ -72,7 +77,7 @@ playerStop() {
 			shairportStop
 			;;
 		bluetooth )
-			rm -f $dirshm/bluetoothdest
+			rm -f $dirshm/{bluetoothdest,bluetoothsink}
 			systemctl restart bluetooth
 			;;
 		mpd )

srv/http/bash/settings/features.sh

@@ -361,7 +361,7 @@ snapclient )
 			statePlay && systemctl start snapclient
 		fi
 	else
-		systemctl stop snapclient
+		$dirbash/snapcast.sh stop
 		[[ $snapserver ]] && rm -f $dirsystem/snapclientserver
 	fi
 	pushRefresh

srv/http/bash/settings/pkgstatus.sh

@@ -82,7 +82,7 @@ $sharedip"
 		;;
 	snapserver )
 		PKG=snapcast
-		fileconf=/etc/default/snapserver
+		fileconf=/etc/snapserver.conf
 		;;
 	spotifyd )
 		skip+='|No.*specified|no usable credentials'

srv/http/bash/snapcast.sh

@@ -15,7 +15,7 @@ fileclientip=$dirshm/clientip
 
 if [[ $1 == start ]]; then
 	systemctl start snapclient
-	serverip=$( timeout 0.2 snapclient | awk '/Connected to/ {print $NF}' )
+	serverip=$( timeout 1 snapclient | awk '/Connected to/ {print $NF}' )
 	if [[ $serverip ]]; then
 		echo $serverip > $dirshm/serverip
 		echo snapcast > $dirshm/player

srv/http/bash/status-push.sh

@@ -49,7 +49,7 @@ if [[ -e $dirshm/clientip ]]; then
 	[[ ! $status ]] && status=$( $dirbash/status.sh ) # $statusradio
 	status=$( sed -E -e '1,/^, "single" *:/ d;/^, "icon" *:/ d; /^, "login" *:/ d; /^}/ d
 					' -e '/^, "stationcover"|^, "coverart"/ s|(" *: *")|\1http://'$serverip'|' <<< $status )
-	data='{ "channel": "mpdplayer", "data": { ${status:1} }'
+	data='{ "channel": "mpdplayer", "data": { '${status:1}' } }'
 	clientip=$( < $dirshm/clientip )
 	for ip in $clientip; do
 		ipOnline $ip && websocat ws://$ip:8080 <<< $( tr -d '\n' <<< $data )

srv/http/bash/status.sh

@@ -136,10 +136,10 @@ $( $dirbash/status-bluetooth.sh )"
 		serverip=$( < $dirshm/serverip )
 		serverstatus=$( sshCommand $serverip $dirbash/status.sh snapclient )
 ########
-		status+=$( sed -E  -e 's|^(, "stationcover" *: ")(.+")|\1http://'$serverip'\2|
+		status+=$'\n'$( sed -E  -e '1,3d; $d
+						 ' -e 's|^(, "stationcover" *: ")(.+")|\1http://'$serverip'\2|
 						 ' -e 's|^(, "coverart" *: ")(.+")|\1http://'$serverip'\2|
 						 ' -e 's|^, *"icon".*|, "icon" : "snapcast"|
-						 ' -e '1d; $d
 						 ' <<< $serverstatus )
 		;;
 	spotify )
@@ -451,7 +451,7 @@ if [[ ! $sampling ]]; then
 	fi
 	if [[ $bitdepth == dsd ]]; then
 		sampling="${samplerate^^} •"
-	else
+	elif [[ $samplerate ]]; then
 		[[ $bitdepth == 'N/A' && ( $ext == WAV || $ext == AIFF ) ]] && bitdepth=$(( bitrate / samplerate / 2 ))
 		sample="$( calc 1 $samplerate/1000 ) kHz"
 		if [[ $bitdepth && ! $ext =~ ^(AAC|MP3|OGG|Radio)$ ]]; then