okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ciderapp:develop' into develop

Browse source
This commit is contained in:
occune 2022-04-24 19:04:06 +03:00 • committed by GitHub
commit 65a3a652d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -76,7 +76,7 @@
"@types/express": "^4.17.13", "@types/express": "^4.17.13",
"@types/qrcode-terminal": "^0.12.0", "@types/qrcode-terminal": "^0.12.0",
"@types/ws": "^8.5.3", "@types/ws": "^8.5.3",
"electron": "git+https://github.com/castlabs/electron-releases.git", "electron": "git+https://github.com/castlabs/electron-releases.git#18-x-y",
"electron-builder": "^23.0.3", "electron-builder": "^23.0.3",
"electron-builder-notarize-pkg": "^1.2.0", "electron-builder-notarize-pkg": "^1.2.0",
"electron-webpack": "^2.8.2", "electron-webpack": "^2.8.2",

10
src/main/plugins/raop.ts
View file

@ -88,13 +88,14 @@ export default class RAOP {
`; `;
private ondeviceup(name: any, host: any, port: any, addresses: any) { private ondeviceup(name: any, host: any, port: any, addresses: any, text: any) {
if (this.castDevices.findIndex((item: any) => item.name === host && item.port === port && item.addresses === addresses) === -1) { if (this.castDevices.findIndex((item: any) => item.name === host && item.port === port && item.addresses === addresses) === -1) {
this.castDevices.push({ this.castDevices.push({
name: host, name: host,
host: addresses ? addresses[0] : '', host: addresses ? addresses[0] : '',
port: port, port: port,
addresses: addresses addresses: addresses,
txt: text
}); });
if (this.devices.indexOf(host) === -1) { if (this.devices.indexOf(host) === -1) {
this.devices.push(host); this.devices.push(host);
@ -146,10 +147,11 @@ export default class RAOP {
browser.on('update', (service: any) => { browser.on('update', (service: any) => {
if (service.addresses && service.fullname && service.fullname.includes('_raop._tcp')) { if (service.addresses && service.fullname && service.fullname.includes('_raop._tcp')) {
console.log(service.txt)
this._win.webContents.executeJavaScript(`console.log( this._win.webContents.executeJavaScript(`console.log(
"${service.name} ${service.host}:${service.port} ${service.addresses}" "${service.name} ${service.host}:${service.port} ${service.addresses}"
)`);} )`);
this.ondeviceup(service.name, service.host, service.port, service.addresses); this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);}
}); });
}); });

6
src/renderer/views/pages/cider-playlist.ejs
View file

@ -9,11 +9,7 @@
</template> </template>
<template v-if="app.playlists.loadingState == 1"> <template v-if="app.playlists.loadingState == 1">
<div class="playlist-display" <div class="playlist-display"
@mouseover.self="minClass(false)" @mouseover.self="minClass(false)">
:style="{
'--bgColor': (data.attributes.artwork != null && data.attributes.artwork['bgColor'] != null) ? ('#' + data.attributes.artwork.bgColor) : '',
'--textColor': (data.attributes.artwork != null && data.attributes.artwork['textColor1'] != null) ? ('#' + data.attributes.artwork.textColor1) : ''
}">
<div class="playlistInfo"> <div class="playlistInfo">
<div class="row"> <div class="row">
<div class="col-auto flex-center" @mouseover="minClass(false)"> <div class="col-auto flex-center" @mouseover="minClass(false)">