From 87302331b71e1b8d7adc5563f09f3a9f19e2473d Mon Sep 17 00:00:00 2001 From: yazninja Date: Thu, 27 Jan 2022 11:23:03 +0800 Subject: [PATCH 1/2] add marquee back --- src/renderer/index.js | 11 +---------- src/renderer/style.less | 23 ++++++++++++++++------- src/renderer/views/main.ejs | 9 +++++---- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index 13168409..231f2a55 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -3401,6 +3401,7 @@ const app = new Vue({ let element = document.querySelector(selector); var overflowX = element.offsetWidth < element.scrollWidth, overflowY = element.offsetHeight < element.scrollHeight; + element.setAttribute('data-value', '\xa0\xa0\xa0\xa0' + element.textContent); return (overflowX || overflowY); } catch (e) { return false} }, @@ -3409,16 +3410,6 @@ const app = new Vue({ this.webremoteurl = await ipcRenderer.invoke('showQR','') //this.modals.qrcode = true; - }, - checkMarquee() { - if(isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-artist') == true) { - document.getElementsByClassName('song-artist')[0].classList.add('marquee'); - document.getElementsByClassName('song-artist')[1].classList.add('marquee-after'); - } - if(isElementOverflowing('#app-main > div.app-chrome > div.app-chrome--center > div > div > div.playback-info > div.song-name') == true) { - document.getElementsByClassName('song-name')[0].classList.add('marquee'); - document.getElementsByClassName('song-name')[1].classList.add('marquee-after'); - } } } diff --git a/src/renderer/style.less b/src/renderer/style.less index 3c81ca02..eb7ce734 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1111,6 +1111,9 @@ input[type=range].web-slider::-webkit-slider-runnable-track { &.song-name{ overflow: unset ; } + &::after{ + content: attr(data-value); + } } @@ -1166,11 +1169,11 @@ input[type=range].web-slider::-webkit-slider-runnable-track { @keyframes marquee { from { - transform: translateX(100%); + transform: translateX(0); } to { - transform: translateX(-100%); + transform: translateX(-140%); } } @@ -1249,24 +1252,30 @@ input[type=range].web-slider::-webkit-slider-runnable-track { display: flex; position: relative; } -.app-chrome .app-chrome-item > .app-playback-controls .song-artist-album { +.app-chrome .app-chrome-item > .app-playback-controls > div >.song-artist-album { font-weight: 400; font-size: 12px; text-align: center; /*height: 1.2em; line-height: 1.2em;*/ - z-index: 1; align-items: center; justify-content: center; width: 80%; max-width: 340px; overflow: hidden; - - .song-artist-normal { - height: inherit; + .song-artist-album-content{ + font-weight: 400; + font-size: 12px; + text-align: center; + width:100%; + + &.song-artist-normal { + height: inherit; + } } + &.song-artist-marquee { > marquee { diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 5b2f56dd..28ffb73e 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -86,17 +86,17 @@
-
{{ mk.nowPlayingItem["attributes"]["name"] }}
- -
+
@@ -110,6 +110,7 @@ (mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
+
Date: Wed, 26 Jan 2022 20:20:10 -0800 Subject: [PATCH 2/2] added limit for browse/listen now requests, will now only request every 2 minutes --- src/renderer/index.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/renderer/index.js b/src/renderer/index.js index 161cae2c..cc562782 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -1988,6 +1988,10 @@ const app = new Vue({ this.library.albums.meta = response.data.meta }, async getListenNow(attempt = 0) { + if (this.listennow.timestamp > Date.now() - 120000) { + return + } + if (attempt > 3) { return } @@ -2018,6 +2022,7 @@ const app = new Vue({ includeResponseMeta: !0, reload: !0 })).data; + this.listennow.timestamp = Date.now() console.log(this.listennow) } catch (e) { console.log(e) @@ -2025,6 +2030,9 @@ const app = new Vue({ } }, async getBrowsePage(attempt = 0) { + if (this.browsepage.timestamp > Date.now() - 120000) { + return + } if (attempt > 3) { return } @@ -2041,6 +2049,7 @@ const app = new Vue({ "art[url]": "f" }); this.browsepage = browse.data.data[0]; + this.browsepage.timestamp = Date.now() console.log(this.browsepage) } catch (e) { console.log(e)