Merge pull request #2038 from rern/UPDATE

Update

Author: rern

install.sh

@@ -67,10 +67,10 @@ $dirbash/cmd.sh cachebust
 
 installfinish
 
-# 20260212
+# 20260216
 if [[ -e /mnt/SD ]]; then
 	mv -f /mnt/{SD,USB} /mnt/MPD &> /dev/null
-	ignoreMntDirs
+	echo -e 'NVME\nSATA\nSD\nUSB' >> /mnt/MPD/.mpdignore
 	sed -i 's|/mnt/USB|/mnt/MPD/USB|' /etc/udevil/udevil.conf
 	systemctl restart devmon@http
 fi

srv/http/assets/js/system.js

@@ -538,9 +538,9 @@ var UTIL          = {
 				, cancel     : SWITCH.cancel
 				, ok         : () => {
 					var infoval = _INFO.val();
-					if ( ! shareddata && [ 'data', 'NVME', 'SATA', 'SD', 'USB' ].includes( infoval.NAME ) ) {
-						var type = infoval.NAME == 'data' ? LABEL_ICON( 'Shared Data', 'networks' ) : LABEL_ICON( 'Server rAudio', 'nfsserver' );
-						_INFO.warning( SW.icon, SW.title, 'Name <c>'+ infoval.NAME +'</c> reserved for '+ type, () => {
+					var name    = infoval.NAME;
+					if ( ! shareddata && [ 'data', 'NVME', 'SATA', 'SD', 'USB' ].includes( name ) ) {
+						_INFO.warning( SW.icon, SW.title, 'Name <c>'+ name +'</c> reserved for '+ ICON( 'networks' ) +' Shared Data', () => {
 							UTIL.mount[ 'PROTOCOL' in values ? 'mount' : 'rServer' ]( infoval );
 						} );
 						return

srv/http/bash/common.sh

@@ -347,20 +347,6 @@ getVar() { # var=value
 grepr() {
 	grep --color --exclude-dir plugin -Inr "$@" /srv
 }
-ignoreMntDirs() {
-	local dir mpdignore
-	for dir in NVME SATA SD USB; do
-		mpdignore=/mnt/MPD/$dir/.mpdignore
-		if [[ $1 == restore ]]; then
-			for dir in NVME SATA SD USB; do
-				sed -i "\|$dir| d" $mpdignore
-			done
-			[[ ! -s $mpdignore ]] && rm $mpdignore
-		else
-			echo $dir >> $mpdignore
-		fi
-	done
-}
 inOutputConf() {
 	local file
 	file=$dirmpdconf/output.conf
@@ -561,6 +547,7 @@ sharedDataLink() {
 	chown -h http:http $dirdata/{audiocd,bookmarks,lyrics,webradio} $dirsystem/{display,order}.json
 	chown -h mpd:audio $dirdata/{mpd,playlists} $dirmpd/mpd.db
 	appendSortUnique $dirnas/.mpdignore data
+	echo -e 'NVME\nSATA\nSD\nUSB' >> /mnt/MPD/.mpdignore
 	[[ $1 == rserver && -e $dirshareddata/source ]] && return
 # --------------------------------------------------------------------
 	readarray -t source <<< $( < $dirshareddata/source )
@@ -578,6 +565,9 @@ sharedDataReset() {
 	mv -f $dirbackup/{display,order}.json $dirsystem
 	mv -f $dirbackup/* $dirdata
 	rm -rf $dirbackup
+	mpdignore=/mnt/MPD/.mpdignore
+	ignore=$( grep -Ev '^data$|^NVME$|^SATA$|^SD$|^USB$' $mpdignore )
+	[[ $ignore ]] && echo "$ignore" > $mpdignore || rm $mpdignore
 	dirPermissions
 }
 snapclientIP() {

srv/http/bash/settings/features.sh

@@ -210,7 +210,6 @@ nfsserver )
 	$dirbash/cmd.sh mpcremove
 	systemctl stop mpd
 	if [[ $ON ]]; then
-		ignoreMntDirs
 		for d in NVME SATA SD USB; do
 			[[ -e /mnt/MPD/$d ]] && ln -s /mnt/MPD/$d $dirnas
 		done
@@ -247,7 +246,6 @@ CMD ACTION PATHMPD"
 		cp -rL $dirmpd $dirshared
 		rm -rf $dirnas/data
 		rm -f $dirnas/{NVME,SATA,SD,USB}
-		ignoreMntDirs restore
 		systemctl disable --now nfs-server
 		> /etc/exports
 		rm $filesharedip

srv/http/bash/settings/system-mount.sh

@@ -37,7 +37,6 @@ fstabSet "$mountpoint" "${source// /\\040} ${mountpoint// /\\040} $PROTOCOL ${op
 if [[ $SHAREDDATA ]]; then
 	mpc -q clear
 	systemctl stop mpd
-	ignoreMntDirs
 	mkdir -p $dirbackup $dirshareddata
 	if [[ ! -e $dirshareddata/mpd ]]; then
 		rescan=1

srv/http/bash/settings/system.sh

@@ -407,7 +407,6 @@ shareddatadisable )  # server rAudio / other server
 	$dirbash/cmd.sh mpcremove
 	systemctl stop mpd
 	sed -i "/$( ipAddress )/ d" $filesharedip
-	ignoreMntDirs restore
 	if ! grep -q "$dirnas " /etc/fstab; then # other server
 		fstab=$( grep -v $dirshareddata /etc/fstab )
 		readarray -t source <<< $( awk '{print $2}' $dirshareddata/source )

srv/http/settings/features.php

@@ -285,11 +285,9 @@
 	· On enable:
 		· 1st time: Library will be rescanned to a new database.
 		· Previously enabled: Database from previous will be used.
+		· $B->microsd SD and $B->usbdrive USB moved to $B->networks NAS
 	· IP address - This rAudio must be set to static / fixed.
 	· Password - If changed, must be the same on all clients.
-	· In $T->library
-		· $B->microsd SD and $B->usbdrive USB will be hidden.
-		· $B->usbdrive USB items will be displayed in $B->networks NAS instead.
 	
  • <wh>Clients:</wh>
 	· $T->system$L->shareddata <tab><i class="i-rserver"></i> rAudio</tab>

srv/http/settings/system.php

@@ -374,7 +374,7 @@ function hrefList( $list ) {
 			<gr>(<c>SOURCE</c> will be arranged accordingly.)</gr>
 			
 Note:
- · $B->microsd SD and $B->usbdrive USB : Hidden while enabled
+ · Enabled: $B->microsd SD and $B->usbdrive USB - Hidden
 
 EOF
 	]