diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 8d2dc287..3a64df6a 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -548,6 +548,7 @@ "settings.option.connectivity.lastfmScrobble.filterLoop": "Filter looped track (Last.fm)", "settings.option.connectivity.lastfmScrobble.filterLoop.description": "Prevent looped tracks from being scrobbled or displayed in the Now Playing list on Last.fm.", "settings.option.connectivity.lastfmScrobble.filterTypes": "Filter Media Types (Last.fm)", + "settings.option.connectivity.lastfmScrobble.filterTypes.description": "Prevent tracks of the selected media types from being scrobbled or displayed in the Now Playing list on Last.fm.", "settings.option.connectivity.lastfmScrobble.manualToken": "Enter Last.fm Token Manually", "settings.option.connectivity.lastfmScrobble.manualToken.link": "Click here to get a Last.fm token", "settings.notyf.connectivity.lastfmScrobble.connectError": "Last.fm Connection Timed Out", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 8d2dc287..3a64df6a 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -548,6 +548,7 @@ "settings.option.connectivity.lastfmScrobble.filterLoop": "Filter looped track (Last.fm)", "settings.option.connectivity.lastfmScrobble.filterLoop.description": "Prevent looped tracks from being scrobbled or displayed in the Now Playing list on Last.fm.", "settings.option.connectivity.lastfmScrobble.filterTypes": "Filter Media Types (Last.fm)", + "settings.option.connectivity.lastfmScrobble.filterTypes.description": "Prevent tracks of the selected media types from being scrobbled or displayed in the Now Playing list on Last.fm.", "settings.option.connectivity.lastfmScrobble.manualToken": "Enter Last.fm Token Manually", "settings.option.connectivity.lastfmScrobble.manualToken.link": "Click here to get a Last.fm token", "settings.notyf.connectivity.lastfmScrobble.connectError": "Last.fm Connection Timed Out", diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index cf4beadd..3e06e7d2 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -1350,7 +1350,7 @@ export class BrowserWindow { .then(async (buffer) => { const metadata = await mm.parseBuffer(buffer, "audio/x-m4a"); let SoundCheckTag = metadata.native.iTunes[1].value; - console.log("sc", SoundCheckTag); + console.debug("sc", SoundCheckTag); BrowserWindow.win.webContents.send("SoundCheckTag", SoundCheckTag); }) .catch((err) => { diff --git a/src/main/plugins/lastfm.ts b/src/main/plugins/lastfm.ts index b9d4cc2a..bfceeea3 100644 --- a/src/main/plugins/lastfm.ts +++ b/src/main/plugins/lastfm.ts @@ -170,7 +170,7 @@ export default class lastfm { return; } - if (!this._authenticated || !attributes || this._utils.getStoreValue("connectivity.lastfm.filter_types")[attributes.playParams.kind] || (this._utils.getStoreValue("connectivity.lastfm.filter_loop") && this._scrobbleCache.track === attributes.lfmTrack.name)) return; + if (!this._authenticated || !attributes || this._utils.getStoreValue("connectivity.lastfm.filter_types")[attributes.playParams.kind] || this._utils.getStoreValue("connectivity.lastfm.filter_types")[attributes.type] || (this._utils.getStoreValue("connectivity.lastfm.filter_loop") && this._scrobbleCache.track === attributes.lfmTrack.name)) return; // Scrobble const scrobble = { @@ -210,7 +210,9 @@ export default class lastfm { return; } - if (!this._authenticated || !attributes || this._utils.getStoreValue("connectivity.lastfm.filter_types")[attributes.playParams.kind] || (this._utils.getStoreValue("connectivity.lastfm.filter_loop") && this._nowPlayingCache.track === attributes.lfmTrack.name)) return; + if (!this._authenticated || !attributes || this._utils.getStoreValue("connectivity.lastfm.filter_types")[attributes.playParams.kind] || this._utils.getStoreValue("connectivity.lastfm.filter_types")[attributes.type] || (this._utils.getStoreValue("connectivity.lastfm.filter_loop") && this._nowPlayingCache.track === attributes.lfmTrack.name)) return; + + console.log(this._utils.getStoreValue("connectivity.lastfm.filter_types")); const nowPlaying = { artist: attributes.lfmTrack.artist.name, diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts index cdca5b52..9140ce8e 100644 --- a/src/main/plugins/raop.ts +++ b/src/main/plugins/raop.ts @@ -159,7 +159,7 @@ export default class RAOP { electron.ipcMain.on("getAirplayDevice", (event, data) => { this.castDevices = []; - console.log("scan for airplay devices"); + console.debug("scan for airplay devices"); const browser = this.mdns.createBrowser(this.mdns.tcp("raop")); browser.on("ready", browser.discover); @@ -168,7 +168,7 @@ export default class RAOP { if (service.addresses && service.fullname && service.fullname.includes("_raop._tcp")) { // console.log(service.txt) this._win.webContents.executeJavaScript(`console.log( - "${service.name} ${service.host}:${service.port} ${service.addresses} ${service.fullname}" + "${service.name} ${service.host}:${service.port} ${service.addresses} ${service.fullname}" )`); let itemname = service.fullname.substring(service.fullname.indexOf("@") + 1, service.fullname.indexOf("._raop._tcp")); this.ondeviceup(itemname, service.host, service.port, service.addresses, service.txt); diff --git a/src/renderer/views/components/settings-window.ejs b/src/renderer/views/components/settings-window.ejs index f4b6ec89..d569b7e9 100644 --- a/src/renderer/views/components/settings-window.ejs +++ b/src/renderer/views/components/settings-window.ejs @@ -1118,11 +1118,12 @@
{{$root.getLz('settings.option.connectivity.lastfmScrobble.filterTypes')}} + {{$root.getLz('settings.option.connectivity.lastfmScrobble.filterTypes.description')}}