Merge branch 'ciderapp:main' into amaru-dev-1

src/renderer/main/vueapp.js

@@ -1134,28 +1134,31 @@ const app = new Vue({
                 }
             })
         },
-        async refreshPlaylists(localOnly = false) {
+        async refreshPlaylists(localOnly = false, useCachedPlaylists = true) {
             let self = this
             let trackMap = this.cfg.advanced.playlistTrackMapping
             let newListing = []
             let trackMapping = {}
-            const cachedPlaylist = await CiderCache.getCache("library-playlists")
-            const cachedTrackMapping = await CiderCache.getCache("library-playlists-tracks")
+            
+            if (useCachedPlaylists) {
+                const cachedPlaylist = await CiderCache.getCache("library-playlists")
+                const cachedTrackMapping = await CiderCache.getCache("library-playlists-tracks")
 
-            if (cachedPlaylist) {
-                console.debug("using cached playlists")
-                this.playlists.listing = cachedPlaylist
-                self.sortPlaylists()
-            } else {
-                console.debug("playlist has no cache")
-            }
+                if (cachedPlaylist) {
+                    console.debug("using cached playlists")
+                    this.playlists.listing = cachedPlaylist
+                    self.sortPlaylists()
+                } else {
+                    console.debug("playlist has no cache")
+                }
 
-            if (cachedTrackMapping) {
-                console.debug("using cached track mapping")
-                this.playlists.trackMapping = cachedTrackMapping
-            }
-            if (localOnly) {
-                return
+                if (cachedTrackMapping) {
+                    console.debug("using cached track mapping")
+                    this.playlists.trackMapping = cachedTrackMapping
+                }
+                if (localOnly) {
+                    return
+                }
             }
 
             this.library.backgroundNotification.message = "Building playlist cache..."
@@ -1260,7 +1263,7 @@ const app = new Vue({
                 }
             }
             ).then(res => {
-                self.refreshPlaylists()
+                self.refreshPlaylists(false, false)
             })
         },
         async editPlaylist(id, name = app.getLz('term.newPlaylist')) {
@@ -1275,7 +1278,7 @@ const app = new Vue({
                 }
             }
             ).then(res => {
-                self.refreshPlaylists()
+                self.refreshPlaylists(false, false)
             })
         },
         copyToClipboard(str) {
@@ -1319,7 +1322,7 @@ const app = new Vue({
                 })
                 self.sortPlaylists()
                 setTimeout(() => {
-                    app.refreshPlaylists()
+                    app.refreshPlaylists(false, false)
                 }, 8000)
             })
         },
@@ -1336,6 +1339,9 @@ const app = new Vue({
                     if (found) {
                         self.playlists.listing.splice(self.playlists.listing.indexOf(found), 1)
                     }
+                    setTimeout(() => {
+                        app.refreshPlaylists(false, false);
+                    }, 8000);
                 })
             }
         },
@@ -2581,7 +2587,7 @@ const app = new Vue({
                 })
                 self.sortPlaylists()
                 setTimeout(() => {
-                    app.refreshPlaylists()
+                    app.refreshPlaylists(false, false)
                 }, 13000)
             })
         },

src/renderer/views/components/lyrics-view.ejs

@@ -1,6 +1,6 @@
 <script type="text/x-template" id="lyrics-view">
     <div ref="lyricsview" class="md-body lyric-body">
-        <template v-if="lyrics && lyrics != [] && lyrics.length > 0">
+        <template v-if="lyrics && lyrics != [] && lyrics.length > 0 && !qqInstrumental(lyrics)">
             <template v-for="(lyric, index) in lyrics" v-if="lyric && lyric.line && lyric.line != 'lrcInstrumental'">
                 <h3 class="lyric-line" @click="seekTo(lyric.startTime)" :class="{unsynced : lyric.startTime == 9999999}"
                     v-bind:line-index="index.toString()">
@@ -183,6 +183,14 @@
                 }
                 else return []
             },
+            qqInstrumental(lyrics) {
+                for(lyric of lyrics){
+                    if (lyric.line.includes("纯音乐") && lyric.line.includes("欣赏")){
+                        return true
+                    }
+                }
+                return false
+            },
             checkIfScrollIsStatic : setInterval(() => {
             try {
                 if (position === this.$refs.lyricsview.scrollTop) {

src/renderer/views/pages/installed-themes.ejs

@@ -28,7 +28,7 @@
         <div class="gh-content">
             <div class="repos-list">
                 <div class="repo-header">
-                    <h4>Available</h4>
+                    <h4>{{$root.getLz('settings.option.visual.theme.github.available')}}</h4>
                 </div>
                 <ul class="list-group list-group-flush">
                     <template v-for="theme in themes">
@@ -85,7 +85,7 @@
 
             <div class="style-editor-container">
                 <div class="repo-header">
-                    <h4>Applied</h4>
+                    <h4>{{ $root.getLz("settings.option.visual.theme.github.applied") }} </h4>
                 </div>
                 <stylestack-editor ref="stackEditor"  v-if="themes.length != 0" :themes="themes"/>
             </div>

src/renderer/views/pages/themes-github.ejs

@@ -12,7 +12,7 @@
                 </div>
                 <div class="col-auto flex-center">
                     <button class="md-btn md-btn-small md-btn-block" @click="$root.checkForThemeUpdates()">
-                        Check for updates
+                        {{ $root.getLz('settings.option.visual.theme.checkForUpdates') }}
                     </button>
                 </div>
                 <div class="col-auto nopadding flex-center">