Merge pull request #1201 from rern/UPDATE

Update
rern · Jan 23, 2023 · 5a02830 · 5a02830
2 parents 66a6e31 + 30a7b37
commit 5a02830
Show file tree

Hide file tree

Showing 48 changed files with 453 additions and 723 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Audio player for
 - Control via GUI
 	- Remote with any browsers
 	- Android - [rAudio app](https://play.google.com/store/apps/details?id=com.raudio)
-	- Local screen if connected (Not applicable on Raspberry Pi `1` or `Zero`)
+	- Local screen
 - Share data and files between multiple rAudios
 	- Server rAudio : clients (Easy setup with server IP address only)
 	- File server : clients
@@ -52,7 +52,7 @@ Audio player for
 	- HTTP (no metadata)
 	- SnapSever - `MPD snapcast`
 	- Web Radio
-	- DAB Radio
+	- DAB Radio (Addon)
 - Digital Signal Processors
 	- DSP - `camilladsp`
 	- Equalizer - `alsaequal`
@@ -75,6 +75,9 @@ Audio player for
 	- [Spectrum OLED](https://github.com/rern/rAudio-1/raw/main/srv/http/assets/img/mpdoled.jpg) (128x64)
 	- [TFT 3.5" LCD](https://github.com/rern/rAudio-1/raw/main/srv/http/assets/img/lcd.jpg) (320x420)
 	- VU LED (7 LEDs+Rs)
+- Not applicable on Raspberry Pi `1` or `Zero`:
+	- RTL-SDR (for DAB radio)
+	- TFT 3.5" LCD (for GUI on local screen)
 
 ### Default root password
 - `ros`

diff --git a/install.sh b/install.sh
@@ -4,6 +4,13 @@ alias=r1
 
 . /srv/http/bash/addons.sh
 
+# 20130122
+if [[ -e $dircamilladsp/configs/default_config.yml ]]; then
+	mv $dircamilladsp/{configs/,}default_config.yml
+	rm $dircamilladsp/configs/active_config.yml
+	ln -s $dircamilladsp/{configs/camilladsp,active_config}.yml
+fi
+
 # 20230117
 file=/etc/systemd/system/spotifyd.service
 ! grep -q ^User $file && sed -i '/CPUAffinity/ a\User=root' $file
@@ -41,7 +48,7 @@ fi
 
 rm -rf /srv/http/data/tmp
 
-sed -i 's/5000/5005/' /srv/http/settings/camillagui/config/camillagui.yml
+sed -i 's/5000/5005/' /srv/http/settings/camillagui/config/camillagui.yml &> /dev/null
 
 if [[ -e "$dirwebradio/https:||stream.radioparadise.com|world-etc-flac" ]]; then
 	echo -e "$bar Update Radio Paradise station arts ..."
@@ -57,72 +64,16 @@ if grep -q shairport.sh /etc/shairport-sync.conf; then
 	systemctl try-restart shairport-sync
 fi
 
-# 20221123
-grep -q calc $dirbash/xinitrc && restartbrowser=1
-
-mv /etc/udev/rules.d/ntfs{3,}.rules &> /dev/null
-file=/etc/udev/rules.d/ntfs.rules
-if [[ ! -e $file ]]; then
-	cat << 'EOF' > $file
-ACTION=="add", \
-SUBSYSTEM=="block", \
-ENV{ID_FS_TYPE}=="ntfs", \
-ENV{ID_FS_TYPE}="ntfs3", \
-RUN+="/srv/http/bash/settings/system.sh usbconnect"
-
-ACTION=="remove", \
-SUBSYSTEM=="block", \
-ENV{ID_FS_TYPE}=="ntfs", \
-ENV{ID_FS_TYPE}="ntfs3", \
-RUN+="/srv/http/bash/settings/system.sh usbremove"
-EOF
-	udevadm control --reload-rules
-	udevadm trigger
-fi
-
-# 20221122
-sed -i '/shairport-sync/ d' /etc/pacman.conf
-veropenssl=$( pacman -Q openssl | cut -d' ' -f2 | cut -c 1 )
-vershairport=$( pacman -Q shairport-sync | cut -d' ' -f2 | cut -c 1 )
-[[ $veropenssl == 3 && $vershairport != 4 ]]  && pacman -Sy --noconfirm shairport-sync
-
-[[ -e $dirsystem/loginset ]] && mv -f $dirsystem/login{set,}
-
-[[ ! -e $dirdata/mpdconf ]] && backup=1
-
-sed -i '/interfaces/ d' /etc/samba/smb.conf
-systemctl try-restart smb 
-
-file=/etc/systemd/system/bluetooth.service.d/override.conf
-if grep -q bluetooth$ $file; then
-	sed -i 's/bluetooth$/&start/' $file
-	systemctl daemon-reload
-fi
-
-if [[ -L $dirmpd  && ! -e /mnt/MPD/.mpdignore ]]; then
-	echo "\
-SD
-USB" > /mnt/MPD/.mpdignore
-fi
-
 #-------------------------------------------------------------------------------
 installstart "$1"
 
 rm -rf /srv/http/assets/{css,fonts,js}
-[[ -e $dirmpdconf ]] && mv $dirmpdconf /tmp
 
 getinstallzip
 
-if [[ -e /tmp/mpdconf ]]; then
-	rm -rf $dirmpdconf
-	mv /tmp/mpdconf $dirdata
-fi
 chmod +x $dirsettings/system.sh
 $dirsettings/system.sh dirpermissions
 [[ -e $dirsystem/color ]] && $dirbash/cmd.sh color
 
 installfinish
 #-------------------------------------------------------------------------------
-
-# 20221123
-[[ $restartbrowser ]] && systemctl try-restart localbrowser
diff --git a/.../settings/camillagui/build/camillagui.css → srv/http/assets/css/camillagui.css b/.../settings/camillagui/build/camillagui.css → srv/http/assets/css/camillagui.css
@@ -1,18 +1,18 @@
 @font-face {
 	font-family: Lato;
-	src: url( './fonts/Lato-Regular.woff2' ) format( 'woff2' );
+	src: url( '../fonts/Lato-Regular.woff2' ) format( 'woff2' );
 	font-weight: normal;
 	font-style: normal;
 }
 @font-face {
 	font-family: Lato;
-	src: url( './fonts/Lato-Light.woff2' ) format( 'woff2' );
+	src: url( '../fonts/Lato-Light.woff2' ) format( 'woff2' );
 	font-weight: 300;
 	font-style: normal;
 }
 @font-face {
 	font-family: Inconsolata;
-	src: url('./fonts/Inconsolata.woff2') format('woff2');
+	src: url('../fonts/Inconsolata.woff2') format('woff2');
 	font-weight: normal;
 	font-style: normal;
 }
@@ -374,7 +374,10 @@ input[data-tip='Mixer name, must be unique'] {
 	left: -290px;
 	width: 270px;
 	height: 36px;
-	background: none;
+	background: #000;
+	border-top: 10px solid #000;
+	margin-top: -10px;
+	box-shadow: 0px 4px 10px #000;
 }
 #button-compactview {
 	display: none;
@@ -414,15 +417,6 @@ input[data-tip='Mixer name, must be unique'] {
 	display: block;
 	color: var( --cg60 );
 }
-#diveqhelp {
-	font-size: 16px;
-	line-height: 22px;
-	letter-spacing: 0;
-	color: var( --cg60 );
-}
-#compactview #diveqhelp {
-	padding: 0 50px;
-}
 /* Compact view button ------------------- */
 #compactview .box,
 #mainpanel .box {
@@ -473,7 +467,6 @@ input[data-tip='Mixer name, must be unique'] {
 }
 /* volume + status ------------------------------------------------------------ */
 #mainpanel {
-	position: fixed;
 	display: block;
 	float: left;
 	width: 270px !important;
@@ -520,8 +513,7 @@ input[data-tip='Mixer name, must be unique'] {
 .dblabel i:last-of-type {
 	width: 51px;
 }
-#log,
-#eqhelp {
+#log {
 	position: absolute;
 	top: -26px;
 	right: 0;
@@ -532,10 +524,7 @@ input[data-tip='Mixer name, must be unique'] {
 	color: var( --cg60 );
 	text-shadow: none;
 }
-#eqhelp {
-	left: auto;
-}
-#compactview #eqhelp {
+#compactview {
 	right: 5px;
 }
 #status pre {
@@ -584,6 +573,7 @@ input[data-tip='Mixer name, must be unique'] {
 /* Panels ----------------------------------------------------------------- */
 .configtabs {
 	display: block;
+	float: none;
 	width: 410px;
 	max-width: 100vw;
 	margin-left: 300px !important;
@@ -902,7 +892,6 @@ textarea:focus-visible {
 .head svg,
 .resetzoom,
 #applyauto,
-#eqhelp,
 #log,
 #logo {
 	cursor: pointer;

diff --git a/srv/http/assets/css/common.css b/srv/http/assets/css/common.css
@@ -40,7 +40,10 @@
 .fa-arrow-right::before     { content: '\F603' }
 .fa-artist::before          { content: '\F556' }
 .fa-audiocd::before         { content: '\F538' }
+.fa-audio::before           { content: '\F516' }
+.fa-autoplay::before        { content: '\F503' }
 .fa-backspace::before       { content: '\F608' }
+.fa-backup::before          { content: '\F543' }
 .fa-bars::before            { content: '\F51C' }
 .fa-bio::before             { content: '\F51D' }
 .fa-bookmark::before        { content: '\F550' }
@@ -85,10 +88,14 @@
 .fa-globe::before           { content: '\F575' }
 .fa-gpiopins::before        { content: '\F572' }
 .fa-guide::before           { content: '\F579' }
+.fa-hddsleep::before        { content: '\F553' }
 .fa-hdmi::after             { content: '\F58B' }
 .fa-help::before            { content: '\F560' }
 .fa-hide::before            { content: '\F575' }
-.fa-i2saudio::before        { content: '\F571' }
+.fa-hostapd::before         { content: '\F554' }
+.fa-hostname::before        { content: '\F590' }
+.fa-httpd::before           { content: '\F55D' }
+.fa-i2smodule::before       { content: '\F571' }
 .fa-info-circle::before     { content: '\F561' }
 .fa-input::before           { content: '\F529' }
 .fa-jigsaw::before          { content: '\F50D' }
@@ -102,18 +109,23 @@
 .fa-library::before         { content: '\F506' }
 .fa-libupdate::before       { content: '\F506'; animation: blinkopaque 1.5s linear infinite; }
 .fa-link::before            { content: '\F56B' }
+.fa-localbrowser::before    { content: '\F584' }
 .fa-lock::before            { content: '\F574' }
+.fa-login::before           { content: '\F574' }
 .fa-lyrics::before          { content: '\F54B' }
+.fa-lyricsembedded::before  { content: '\F54B' }
 .fa-microsd::before         { content: '\F543' }
 .fa-minus::before           { content: '\F518' }
 .fa-minus-circle::before    { content: '\F563' }
 .fa-mpd::before             { content: '\F582' }
 .fa-mpdoled::before         { content: '\F57A' }
+.fa-multiraudio::before     { content: '\F53B' }
 .fa-music::before           { content: '\F54A' }
 .fa-mute::before            { content: '\F517' }
 .fa-nas::before             { content: '\F551' }
 .fa-networks::before        { content: '\F551' }
 .fa-next::before            { content: '\F505' }
+.fa-nfsserver::before       { content: '\F551' }
 .fa-off::before             { content: '\F520' }
 .fa-output::before          { content: '\F52A' }
 .fa-pause::before           { content: '\F504' }
@@ -130,14 +142,14 @@
 .fa-plus-circle::before     { content: '\F564' }
 .fa-plus-o::before          { content: '\F530' }
 .fa-power::before           { content: '\F520' }
+.fa-powerbutton::before     { content: '\F520' }
 .fa-previous::before        { content: '\F501' }
 .fa-radiofrance::before     { content: '\F586' }
 .fa-radioparadise::before   { content: '\F593'; position: absolute; color: var( --cgl ); }
 .fa-radioparadise::after    { content: '\F594'; position: relative; }
 .fa-random::before          { content: '\F512' }
 .fa-raudio::before          { content: '\F590' }
 .fa-raudio-nobg::before     { content: '\F500' }
-.fa-raudiobox::before       { content: '\F53B' }
 .fa-rserver::before         { content: '\F53C' }
 .fa-reboot::before          { content: '\F521' }
 .fa-redo::before            { content: '\F524' }
@@ -150,49 +162,60 @@
 .fa-replace::before         { content: '\F531' }
 .fa-reset::before           { content: '\F527' }
 .fa-restore::before         { content: '\F544' }
+.fa-rotaryencoder::before   { content: '\F516' }
 .fa-save::before            { content: '\F542' }
 .fa-save-circle::before     { content: '\F546' }
 .fa-save-plus::before       { content: '\F545' }
 .fa-screenoff::before       { content: '\F547' }
 .fa-scale-dn::before        { content: '\F591' }
 .fa-scale-up::before        { content: '\F592' }
+.fa-scrobble::before        { content: '\F585' }
 .fa-sd::before              { content: '\F543' }
 .fa-search::before          { content: '\F56A' }
 .fa-set0::before            { content: '\F515' }
 .fa-settings::before        { content: '\F509' }
+.fa-shareddata::before      { content: '\F551' }
+.fa-shairport-sync::before  { content: '\F580' }
 .fa-shift::before           { content: '\F606' }
 .fa-shuffle::before         { content: '\F513' }
 .fa-single::before          { content: '\F514' }
 .fa-sliders::before         { content: '\F50B' }
+.fa-smb::before             { content: '\F551' }
 .fa-snapcast::before        { content: '\F587' }
 .fa-snapclient::before      { content: '\F587' }
+.fa-snapserver::before      { content: '\F587' }
 .fa-song::before            { content: '\F54A' }
 .fa-soundprofile::before    { content: '\F576' }
 .fa-source::before          { content: '\F529' }
 .fa-spotify::before         { content: '\F588' }
+.fa-spotifyd::before        { content: '\F588' }
 .fa-star::before            { content: '\F550' }
 .fa-status::before          { content: '\F50A' }
 .fa-stop::before            { content: '\F502' }
 .fa-stoptimer::before       { content: '\F570' }
-.fa-stopwatch::before       { content: '\F570' }
 .fa-system::before          { content: '\F590' }
 .fa-tag::before             { content: '\F55B' }
 .fa-times::before           { content: '\F51A' }
+.fa-timezone::before        { content: '\F575' }
 .fa-title::before           { content: '\F54A' }
 .fa-track::before           { content: '\F54C' }
 .fa-undo::before            { content: '\F523' }
 .fa-update::before          { content: '\F526' }
+.fa-upmpdcli::before        { content: '\F581' }
 .fa-upnp::before            { content: '\F581' }
 .fa-usb::before             { content: '\F553' }
+.fa-usbautoupdate::before   { content: '\F536' }
 .fa-usbdrive::before        { content: '\F553' }
 .fa-volume::before          { content: '\F516' }
+.fa-vuled::before           { content: '\F52B' }
 .fa-warning::before         { content: '\F562' }
 .fa-webradio::before        { content: '\F55D' }
 .fa-wifi::before            { content: '\F597' }
 .fa-wifi1::before           { content: '\F598'; position: absolute; }
 .fa-wifi1::after            { content: '\F599'; color: var( --cga ); }
 .fa-wifi2::before           { content: '\F59A'; position: absolute; }
 .fa-wifi2::after            { content: '\F59B'; color: var( --cga ); }
+.fa-wlan::before            { content: '\F597' }
 
 html {
 	height  : 100%;

diff --git a/srv/http/assets/css/settings.css b/srv/http/assets/css/settings.css
@@ -223,6 +223,7 @@ heading .disabled {
 
 #bar-bottom {
 	position: fixed;
+	left: 0;
 	bottom: 0;
 	width: 100%;
 	height: 40px;