Merge pull request #954 from rern/UPDATE

Update

install.sh

@@ -20,41 +20,10 @@ if grep -q 'format: *$' $file; then
 	sed -i "s/format: *$/format: $format/" $file
 fi
 
-# 20220527
-if [[ $( pacman -Q camilladsp 2> /dev/null ) == 'camilladsp 0.6.3-1' ]]; then
-	systemctl stop camilladsp camillagui
-	pacman -R --noconfirm camillagui
-	pacman -Sy --noconfirm camilladsp camillagui-backend python-pycamilladsp python-pycamilladsp-plot
-	rm -rf /srv/http/settings/camillagui/build
-	mkdir /srv/http/settings/camillagui/build
-	ln -sf /srv/http/assets/fonts /srv/http/settings/camillagui/build
-fi
-if grep -q 'force user = mpd' /etc/samba/smb.conf; then
-	sed -i 's/\(force user = \).*/\1http/' /etc/samba/smb.conf
-	systemctl try-restart smb
-fi
-
 . /srv/http/bash/addons.sh
 
 installstart "$1"
 
 getinstallzip
 
-# 20220522
-if [[ -e /srv/http/bash/features.sh ]]; then
-	echo 'PATH+=:/srv/http/bash:/srv/http/bash/settings:/opt/vc/bin' > /root/.profile
-	rm -f /srv/http/bash/{features*,networks*,player*,relays.*,relays-data*,system*}
-fi
-
-# 20220528
-chmod +x /srv/http/bash/cmd.sh
-/srv/http/bash/cmd.sh dirpermissions
-
-udevadm control --reload-rules
-udevadm trigger
-
-systemctl daemon-reload
-systemctl try-restart bluetooth
-systemctl restart mpd
-
 installfinish

srv/http/assets/css/info.css

@@ -355,7 +355,7 @@ hr {
 }
 #infoTab a.active {
 	background: var( --cga );
-	border-radius: 5px 5px 0 0;
+	border-radius: 6px 6px 0 0;
 }
 #infoContent {
 	padding: 20px 10px 10px 10px;

srv/http/assets/js/context.js

@@ -1,5 +1,6 @@
 function addReplace( cmd, command, title, msg ) {
 	if ( cmd === 'addplay' || cmd === 'replaceplay' || cmd === 'replace' ) $( '#stop' ).click();
+	console.log(command);
 	bash( command, function() {
 		if ( !G.display.playbackswitch ) return
 
@@ -361,7 +362,8 @@ function webRadioCoverart() {
 			if ( coverart !== G.coverdefault ) {
 				var imagefilenoext = coverart.slice( 0, -15 );
 			} else {
-				var url = G.list.li.find( '.lipath' ).text().replace( /.*(http.*:)/, '$1' );
+				var pathsplit = G.list.li.find( '.lipath' ).text().split( '//' );
+				var url = pathsplit[ 0 ].replace( /.*\//, '' ) +'//'+ pathsplit[ 1 ];
 				var imagefilenoext = '/data/webradiosimg/'+ url.replace( /\//g, '|' );
 			}
 			imageReplace( '/srv/http'+ imagefilenoext, 'webradio' );
@@ -403,7 +405,8 @@ var htmlwebradio = `\
 function webRadioEdit() {
 	var name = G.list.name;
 	var img = G.list.li.find( 'img' ).attr( 'src' ) || G.coverdefault;
-	var url = G.list.path.replace( /.*(http.*:)/, '$1' )
+	var pathsplit = G.list.path.split( '//' );
+	var url = pathsplit[ 0 ].replace( /.*\//, '' ) +'//'+ pathsplit[ 1 ];
 	var charset = G.list.li.data( 'charset' );
 	info( {
 		  icon         : 'webradio'
@@ -680,7 +683,11 @@ $( '.contextmenu a, .contextmenu .submenu' ).click( function() {
 	}
 
 	// replaceplay|replace|addplay|add //////////////////////////////////////////
-	var path = G.mode !== 'webradio' ? G.list.path : G.list.path.replace( /.*(http.*:)/, '$1' );
+	var path = G.list.path;
+	if ( G.mode === 'webradio' ) {
+		var pathsplit = path.split( '//' );
+		path = pathsplit[ 0 ].replace( /.*\//, '' ) +'//'+ pathsplit[ 1 ];
+	}
 	var mpccmd;
 	// must keep order otherwise replaceplay -> play, addplay -> play
 	var mode = cmd.replace( /replaceplay|replace|addplay|add/, '' );

srv/http/assets/js/function.js

@@ -685,12 +685,18 @@ function infoLibrary( page1 ) {
 		, messagealign : 'left'
 		, checkbox     : checkbox
 		, checkcolumn  : page1 ? 1 : ''
+		, noreload     : !$( '#infoOverlay' ).hasClass( 'hide' )
 		, values       : values
 		, checkchanged : 1
 		, beforeshow   : function() {
 			var active1 = page1 ? 'class="active"' : '';
 			var active2 = page1 ? '' : 'class="active"';
-			$( '#infoContent' ).before( '<div id="infoTab"><a '+ active1 +' style="width: 50%">Show</a><a '+ active2 +' style="width: 50%">Options</a></div>' );
+			var htmltab = '<a '+ active1 +' style="width: 50%">Show</a><a '+ active2 +' style="width: 50%">Options</a>';
+			if ( !$( '#infoTab' ).length ) {
+				$( '#infoContent' ).before( '<div id="infoTab">'+ htmltab +'</div>' );
+			} else {
+				$( '#infoTab' ).html( htmltab );
+			}
 			$( '#infoTab a' ).click( function() {
 				if ( !$( this ).hasClass( 'active' ) ) page1 ? infoLibrary() : infoLibrary( 1 );
 			} );
@@ -972,7 +978,6 @@ function renderLibrary() {
 	$( '#lib-path' ).css( 'max-width', '' );
 	$( '#lib-title, #lib-path>i, #button-lib-search' ).removeClass( 'hide' );
 	$( '#lib-path .lipath' ).empty()
-	$( '#button-lib-back' ).toggleClass( 'back-left', G.display.backonleft );
 	$( '#lib-breadcrumbs, #lib-search, #lib-index, #button-lib-back' ).addClass( 'hide' );
 	$( '#lib-search-close' ).empty();
 	$( '#lib-search-input' ).val( '' );
@@ -1012,7 +1017,9 @@ function renderLibraryCounts() {
 function renderLibraryList( data ) {
 	G.librarylist = 1;
 	$( '#lib-title, #lib-mode-list, .menu' ).addClass( 'hide' );
-	$( '#button-lib-back' ).toggleClass( 'hide', data.modetitle === 'search' );
+	$( '#button-lib-back' )
+		.toggleClass( 'back-left', G.display.backonleft )
+		.toggleClass( 'hide', data.modetitle === 'search' );
 	$( '#lib-path .lipath' ).text( data.path );
 	if ( 'count' in data && G.mode !== 'latest' ) {
 		$( '#lib-path' ).css( 'max-width', 40 );

srv/http/assets/js/passive.js

@@ -257,6 +257,7 @@ function psCoverart( data ) {
 	bannerHide();
 }
 function psDisplay( data ) {
+	console.log(data)
 	if ( 'submenu' in data ) {
 		G.display[ data.submenu ] = data.value;
 		displaySubMenu();
@@ -293,6 +294,7 @@ function psDisplay( data ) {
 				}, 'json' );
 			}
 		}
+		$( '#button-lib-back' ).toggleClass( 'back-left', G.display.backonleft );
 	}
 }
 function psEqualizer( data ) {

srv/http/bash/settings/system.sh

@@ -319,7 +319,7 @@ dtparam=audio=on"
 	pushReboot 'Audio I²S module' i2saudio
 	;;
 journalctl )
-	filebootlog=$dirdata/tmp/bootlog
+	filebootlog=/tmp/bootlog
 	if [[ -e $filebootlog ]]; then
 		journal=$( cat $filebootlog )
 	else

srv/http/mpdplaylist.php

@@ -166,10 +166,11 @@ function htmlPlaylist( $lists, $plname = '' ) {
 					.'</li>';
 			$countupnp++;
 		} else {
-			if ( substr( $file, 0, 4 ) === 'http' ) { // webradio
+			if ( str_contains( $file, '://' ) ) { // webradio
 				$urlname = str_replace( '/', '|', $file );
 				$fileradio = '/srv/http/data/webradios/'.$urlname;
-				$stationname = file_exists( $fileradio ) ? exec( 'head -1 "'.$fileradio.'"' ) : '';
+				if ( !file_exists( $fileradio ) ) $fileradio = exec( 'find /srv/http/data/webradios -name "'.$urlname.'" | head -1' );
+				$stationname = $fileradio ? exec( 'head -1 "'.$fileradio.'"' ) : '';
 			} else {
 				$urlname = str_replace( '#', '%23', $list->urlname );
 				$stationname = '';

srv/http/settings/camillagui/build/camillagui.css

@@ -126,6 +126,7 @@ body {
 	padding: 20px 0;
 	text-align: right;
 	background: #000000;
+	z-index: 1;
 }
 #divhelp a {
 	color: var( --cml );

srv/http/settings/camillagui/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><title>CamillaDSP</title><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no,viewport-fit=cover"><link rel="icon" href="./icon.png?v=1655539916"><script defer="defer" src="./static/js/main.js?v=1655539916"></script><link href="./static/css/main.css?v=1655539916" rel="stylesheet"></head><body style="display:none"><div id="root"></div><link rel="stylesheet" href="./colors.css?v=1655539916"><link rel="stylesheet" href="./camillagui.css?v=1655539916"></body></html>
+<!doctype html><html lang="en"><head><title>CamillaDSP</title><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no,viewport-fit=cover"><link rel="icon" href="./icon.png?v=1655697564"><script defer="defer" src="./static/js/main.js?v=1655697564"></script><link href="./static/css/main.css?v=1655697564" rel="stylesheet"></head><body style="display:none"><div id="root"></div><link rel="stylesheet" href="./colors.css?v=1655697564"><link rel="stylesheet" href="./camillagui.css?v=1655697564"></body></html>