Sync I don't commit now is the conflict of tomorrow (#477)

* Added update check if using MSS or MAS builds. need help implementing

* fix locale / allow pl to show before list loading is fully done

* oops

* Also copy blockmap for partial download

`[2022-02-15 17:28:30.126] [error] Cannot download differentially, fallback to full download: Error: Cannot download "https://478-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-Setup-1.1.428.exe.blockmap", status 404: Not Found
    at ClientRequest.<anonymous> (C:\Program Files\Cider\resources\app.asar\node_modules\builder-util-runtime\src\httpExecutor.ts:288:11)
    at ClientRequest.emit (node:events:394:28)
    at ClientRequest.emit (node:domain:475:12)
    at SimpleURLLoaderWrapper.<anonymous> (node:electron/js2c/browser_init:105:6829)
    at SimpleURLLoaderWrapper.emit (node:events:394:28)
    at SimpleURLLoaderWrapper.emit (node:domain:475:12)`

* more lang fix

* Removed Discord clear on pause

* Linux frame

* fix #459

* Fix

* exposed --songProgressColor and --songProgressBackground

* revert

* Revert "revert"

This reverts commit 24313b53cf.

* ok?

* Revert "ok?"

This reverts commit 9218ccc887.

* ok

* fix adding/remove mvs from library

* Created audio controls menu

* Added start-renderer command for easier testing

* shitty floats shitty shitty

* LastFM can be unique and have its own call

* Revert "LastFM can be unique and have its own call"

This reverts commit d36e1b19f6.

* Revert "Merge branch 'develop' into develop"

This reverts commit 5fa345e6c8, reversing
changes made to a02b633f49.

* Revert "Revert "LastFM can be unique and have its own call""

This reverts commit f156083d48.

* Revert "Merge branch 'ciderapp:develop' into develop"

This reverts commit 20fd0c05da, reversing
changes made to 4937e29fcf.

* lastfm changes

* i hate lastfm

like really really
hate
it

* Revert "Merge remote-tracking branch 'origin/develop' into develop"

This reverts commit 5b360e74fa, reversing
changes made to 548688341d.

* Revert "Revert "Merge remote-tracking branch 'origin/develop' into develop""

This reverts commit 0fb6802ff3.

* Revert "Merge branch 'develop' of https://github.com/ciderapp/Cider into develop"

This reverts commit bd3a2b6172, reversing
changes made to 0fb6802ff3.

* volume step i18n

* and git can go in the bin too

* Added OpenAppData button in settings and updated layout/translations

* change in translation README.md

* margin: 0 on song-progress

* fix np navigation on some songs

* enables native linux chrome

* replay wip

* replay, added this year

* fix for library status

* added attributes.playparams.id

* replay banner

* changed colors

* fancy animations

* more fancy

* some changes

* add play button in library-songs page

* fix

* improve drag on topbar

* Generating top genres, made buttons nicer on replay

* changes to replay graphs

* Revert "Merge branch 'innolab' into develop"

This reverts commit b740f76e3c, reversing
changes made to a5746f08fa.

* added force-video to mediaitem-square

* Update zh_TW.jsonc (#468)

Update TW language.

Co-authored-by: Maikiwi <stella@mai.kiwi>

* Update zh_TW.jsonc

* frontend plugins first iteration

* trans prep

* macOS transparency

* fix playlist on listen now

* fix #474

* ok

* back button & media keys improvement

* ok

Co-authored-by: child_duckling <19170969+quacksire@users.noreply.github.com>
Co-authored-by: vapormusic <vietanhfat@gmail.com>
Co-authored-by: JYW0803 <74043061+JYW0803@users.noreply.github.com>
Co-authored-by: Core <64542347+coredev-uk@users.noreply.github.com>
Co-authored-by: booploops <49113086+booploops@users.noreply.github.com>
Co-authored-by: 宥叡 <46503943+jay900604@users.noreply.github.com>

src/i18n/zh_TW.jsonc

@@ -108,6 +108,7 @@
   "term.fullscreenView": "全螢幕顯示",
   "term.defaultView": "預設顯示",
   "term.audioSettings": "音訊設定",
+  "term.audioControls": "音訊控制",
   "term.spacializedAudioSetting": "空間音訊設定",
   "term.clearAll": "清空",
   "term.recentStations": "最近收聽的廣播",
@@ -209,6 +210,7 @@
   "action.copy": "複製",
   "action.newpreset": "新增預設",  // Equalizer Preset
   "action.deletepreset": "刪除預設",  // Equalizer Preset
+  "action.open": "開啟",
 
   // Settings - General
   "settings.header.general": "一般",
@@ -230,7 +232,7 @@
   "settings.header.audio": "音訊",
   "settings.header.audio.description": "調整 Cider 的音訊設定",
   "settings.option.audio.volumeStep": "音量改變量",
-  "settings.option.audio.maxVolume": "最高音量",
+  "settings.option.audio.maxVolume": "最大音量",
   "settings.option.audio.quality": "音訊品質", // Dropdown
   "settings.header.audio.quality.hireslossless": "高品質無損壓縮",
   "settings.header.audio.quality.hireslossless.description": "（高達 24-bit/192 kHz）",
@@ -314,13 +316,17 @@
   "settings.option.connectivity.lastfmScrobble.filterLoop": "不記錄單曲循環 (LastFM)", 
   // Refer to term.connect for the connect button
   
+  // Settings - Debug
+  "settings.header.debug": "除錯",
+  "settings.option.debug.copy_log": "複製執行紀錄檔至剪貼簿",
+  "settings.option.debug.openAppData": "打開 Cider 資料夾",
+  
   // Settings - Experimental
   "settings.header.experimental": "實驗性功能",
   "settings.header.experimental.description": "調整 Cider 的實驗性功能",
   "settings.option.experimental.compactUI": "使用緊密的介面設計", // Toggle
   "settings.option.experimental.closeButtonBehaviour": "關閉按鈕操作", // Dropdown
   "settings.option.experimental.close_button_hide": "關閉按鈕將 Cider 隱藏至系統列",
-  "settings.option.experimental.copy_log": "複製執行紀錄檔至剪貼簿",
   "settings.option.experimental.inline_playlists": "將播放列表做為行内元素顯示",
   
   // Refer to term.disabled & term.enabled

src/main/base/browserwindow.ts

@@ -91,14 +91,15 @@ export class BrowserWindow {
         minHeight: 390,
         frame: false,
         title: "Cider",
-        vibrancy: "fullscreen-ui",
+        vibrancy: "dark",
         transparent: process.platform === "darwin",
-        hasShadow: false,
+        hasShadow: true,
         show: false,
-        backgroundColor: "#1E1E1E",
+        // backgroundColor: "#1E1E1E",
         titleBarStyle: 'hidden',
         trafficLightPosition: {x: 15, y: 20},
         webPreferences: {
+            experimentalFeatures: true,
             nodeIntegration: true,
             sandbox: true,
             allowRunningInsecureContent: true,
@@ -129,8 +130,12 @@ export class BrowserWindow {
         switch(process.platform) {
             default:
 
+            break;
+            case "win32":
+                this.options.backgroundColor = "#1E1E1E";
             break;
             case "linux":
+                this.options.backgroundColor = "#1E1E1E";
                 this.options.autoHideMenuBar = true
                 this.options.frame = true
             break;

src/main/base/plugins.ts

@@ -32,6 +32,7 @@ export class Plugins {
         
         if (fs.existsSync(this.userPluginsPath)) {
             fs.readdirSync(this.userPluginsPath).forEach(file => {
+                // Plugins V1
                 if (file.endsWith('.ts') || file.endsWith('.js')) {
                     if (!electron.app.isPackaged) {
                         const plugin = require(path.join(this.userPluginsPath, file)).default;
@@ -50,7 +51,24 @@ export class Plugins {
                             plugins[file] = new plugin(electron.app, utils.getStore());
                         }
                     }
-                   
+                }
+                // Plugins V2
+                else if (fs.lstatSync(path.join(this.userPluginsPath, file)).isDirectory()) {
+                    const pluginPath = path.join(this.userPluginsPath, file);
+                    if (fs.existsSync(path.join(pluginPath, 'package.json'))) {
+                        const plugin = require(path.join(pluginPath, "index.js"));
+                        if (plugins[plugin.name] || plugin.name in plugins) {
+                            console.log(`[${plugin.name}] Plugin already loaded / Duplicate Class Name`);
+                        } else {
+                            const pluginEnv = {
+                                app: electron.app,
+                                store: utils.getStore(),
+                                utils: utils,
+                                dir: pluginPath
+                            }
+                            plugins[plugin.name] = new plugin(pluginEnv);
+                        }
+                    }
                 }
             });
         }

src/main/base/wsapi.ts

@@ -183,6 +183,9 @@ export class wsapi {
                         break;
                     case "next":
                         this._win.webContents.executeJavaScript(`if (MusicKit.getInstance().queue.nextPlayableItemIndex != -1 && MusicKit.getInstance().queue.nextPlayableItemIndex != null) {
+                            try {
+                                app.prevButtonBackIndicator = false;
+                            } catch (e) { }
                              MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.nextPlayableItemIndex);}`);
                         response.message = "Next";
                         break;

src/preload/cider-preload.js

@@ -136,6 +136,9 @@ const MusicKitInterop = {
 	},
 
 	next: () => {
+		try {
+			app.prevButtonBackIndicator = false;
+		} catch (e) { }
 		if (MusicKit.getInstance().queue.nextPlayableItemIndex != -1 && MusicKit.getInstance().queue.nextPlayableItemIndex != null) 
 		MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.nextPlayableItemIndex);
 	//	MusicKit.getInstance().skipToNextItem().then(r => console.log(`[MusicKitInterop.next] Skipping to Next ${r}`));

src/renderer/index.js

@@ -250,7 +250,8 @@ const app = new Vue({
                 items: {},
                 headerItems: {}
             }
-        }
+        },
+        pauseButtonTimer : null
     },
     watch: {
         cfg: {
@@ -452,7 +453,7 @@ const app = new Vue({
             history.forward()
         },
         getHTMLStyle() {
-            document.querySelector("html").style.background = "#222";
+            // document.querySelector("html").style.background = "#222";
             document.querySelector("body").classList.add("notransparency")
         },
         resetState() {
@@ -813,6 +814,8 @@ const app = new Vue({
                 this.page = "home"
             }
 
+            this.mediaKeyFixes()
+
             setTimeout(() => {
                 this.getSocialBadges()
                 this.getBrowsePage();
@@ -1319,6 +1322,14 @@ const app = new Vue({
                     extend: "offers,editorialVideo",
                     "views": "appears-on,more-by-artist,related-videos,other-versions,you-might-also-like,video-extras,audio-extras",
                 }
+                if (kind.includes("playlist")){
+                    params["include"] = "tracks";
+                }
+                if (kind.includes("album")){
+                    params["include[albums]"] = "artists"
+                    params["fields[artists]"] = "name,url"
+                    params["fields[albums]"] = "artistName,artistUrl,artwork,contentRating,editorialArtwork,name,playParams,releaseDate,url"
+                }
 
                 if (this.cfg.advanced.experiments.includes('inline-playlists')) {
                     let showModal = kind.toString().includes("album") || kind.toString().includes("playlist")
@@ -1347,8 +1358,11 @@ const app = new Vue({
         prevButton() {
             if (!app.prevButtonBackIndicator && app.mk.nowPlayingItem && app.mk.currentPlaybackTime > 2) {
                 app.prevButtonBackIndicator = true;
+                try{clearTimeout(app.pauseButtonTimer)} catch (e){ }
                 app.mk.seekToTime(0);
+                app.pauseButtonTimer = setTimeout(() => {app.prevButtonBackIndicator = false},3000);
             } else {
+                try{clearTimeout(app.pauseButtonTimer)} catch (e){ }
                 app.prevButtonBackIndicator = false;
                 app.skipToPreviousItem()
             }
@@ -3245,8 +3259,8 @@ const app = new Vue({
         },
         async getRating(item) {
             let type = item.type.slice(-1) === "s" ? item.type : item.type + "s"
-            let id = item.attributes.playParams.catalogId ? item.attributes.playParams.catalogId : item.id
+            let id = item.attributes?.playParams?.catalogId ? item.attributes.playParams.catalogId : (item.attributes?.playParams?.id ?? item.id)
-            if (item.id.startsWith("i.")) {
+            if (item.id != null && (item.id.toString()).startsWith("i.")) {
                 if (!type.startsWith("library-")) {
                     type = "library-" + type
                 }
@@ -3262,8 +3276,8 @@ const app = new Vue({
         },
         love(item) {
             let type = item.type.slice(-1) === "s" ? item.type : item.type + "s"
-            let id = item.attributes.playParams.catalogId ? item.attributes.playParams.catalogId : item.id
+            let id = item.attributes?.playParams?.catalogId ? item.attributes.playParams.catalogId : (item.attributes?.playParams?.id ?? item.id)
-            if (item.id.startsWith("i.")) {
+            if (item.id != null && (item.id.toString()).startsWith("i.")) {
                 if (!type.startsWith("library-")) {
                     type = "library-" + type
                 }
@@ -3283,8 +3297,8 @@ const app = new Vue({
         },
         dislike(item) {
             let type = item.type.slice(-1) === "s" ? item.type : item.type + "s"
-            let id = item.attributes.playParams.catalogId ? item.attributes.playParams.catalogId : item.id
+            let id = item.attributes?.playParams?.catalogId ? item.attributes.playParams.catalogId : (item.attributes?.playParams?.id ?? item.id)
-            if (item.id.startsWith("i.")) {
+            if (item.id != null && (item.id.toString()).startsWith("i.")) {
                 if (!type.startsWith("library-")) {
                     type = "library-" + type
                 }
@@ -3732,6 +3746,7 @@ const app = new Vue({
             }          
         },
         skipToNextItem(){
+            app.prevButtonBackIndicator = false;
             // app.mk.skipToNextItem() is buggy somehow so use this
             if (this.mk.queue.nextPlayableItemIndex != -1 && this.mk.queue.nextPlayableItemIndex != null) 
             this.mk.changeToMediaAtIndex(this.mk.queue.nextPlayableItemIndex);
@@ -3740,6 +3755,10 @@ const app = new Vue({
             // app.mk.skipToPreviousItem() is buggy somehow so use this
             if (this.mk.queue.previousPlayableItemIndex != -1 && this.mk.queue.previousPlayableItemIndex != null)
             this.mk.changeToMediaAtIndex(this.mk.queue.previousPlayableItemIndex);
+        },
+        mediaKeyFixes(){
+            navigator.mediaSession.setActionHandler('previoustrack', function() { app.prevButton() });
+            navigator.mediaSession.setActionHandler('nexttrack', function() { app.skipToNextItem() });
         }
     }
 })
@@ -3849,7 +3868,7 @@ function fallbackinitMusicKit() {
             },
             sourceType: 24,
             suppressErrorDialog: true
-        });
+        })
         setTimeout(() => {
             app.init()
         }, 1000)

src/renderer/less/macos.less

@@ -0,0 +1,17 @@
+body[platform="darwin"] {
+    html {
+        background: transparent!important;
+    }
+
+    &.notransparency::before {
+        display: none;
+    }
+    #app {
+        &.simplebg {
+            background: transparent;
+        }
+        &::before {
+            display: none;
+        }
+    }
+}

src/renderer/less/pages.less

@@ -924,6 +924,30 @@
     }
   }
 
+  .replay-playlist-container {
+    .cd-mediaitem-square {
+      height: 230px;
+      width: 230px;
+      .info-rect {
+        display: none;
+      }
+    }
+  }
+
+  .replay-video {
+    max-height: 300px;
+    max-width: 800px;
+    margin: 0 auto;
+
+    .mediaitem-artwork {
+      max-height: 300px;
+    max-width: 800px;
+    }
+
+    .mediaitem-artwork .animatedartwork-view-box .animated video {
+      object-fit: cover;
+    }
+  }
   .top-genres-container {
 
     .genre-name {

src/renderer/style.less

@@ -3110,5 +3110,6 @@ body[platform='darwin'] {
 }
 
 
+@import url("less/macos.less");
 @import url("less/linux.less");
 @import url("less/compact.less");

src/renderer/views/components/mediaitem-list-item.ejs

@@ -474,7 +474,7 @@
                         menus.normal.headerItems.find(x => x.id == 'dislike').hidden = true
                     }
                 } catch (err) {
-
+                    console.log(err)
                 }
             },
             visibilityChanged: function (isVisible, entry) {

src/renderer/views/components/mediaitem-square.ejs

@@ -12,6 +12,7 @@
                             :size="size"
                             shadow="subtle"
                             :bgcolor="getBgColor()"
+                            :video-priority="forceVideo"
                             :type="item.type"></mediaitem-artwork>
                 </div>
                 <button class="menu-btn" v-if="!nomenu.includes(item.type)"
@@ -57,6 +58,10 @@
                 type: String,
                 default: '190'
             },
+            forceVideo: {
+                type: Boolean,
+                default: false
+            },
             'contextExt': {type: Object, required: false},
         },
         data: function () {

src/renderer/views/pages/replay.ejs

@@ -12,6 +12,12 @@
         <transition name="replaycard">
         <div class="replay-viewport" v-if="loaded.id != -1">
             <!-- Stats -->
+            <div class="replay-video" v-if="false">
+                <mediaitem-artwork 
+            :url="loaded.playlist.attributes.editorialVideo.motionWideVideo21x9.previewFrame.url" 
+            :video="loaded.playlist.attributes.editorialVideo.motionWideVideo21x9.video" 
+            :video-priority="true"></mediaitem-artwork>
+            </div>
             <h1 class="replay-header">{{ loaded.attributes.year }} Replay</h1>
             <hr>
             <div class="row">
@@ -21,8 +27,8 @@
                     <h4>{{ loaded.attributes.uniqueArtistCount }} Unique Artists</h4>
                     <h4>{{ loaded.attributes.uniqueSongCount }} Unique Songs</h4>
                 </div>
-                <div class="col-auto">
+                <div class="col-auto replay-playlist-container">
-                    <mediaitem-square kind="card" :item="loaded.relationships.playlist.data[0]"></mediaitem-square>
+                    <mediaitem-square kind="card" :force-video="true" :item="loaded.playlist"></mediaitem-square>
                 </div>
             </div>
             <!--            Top Artists-->
@@ -136,8 +142,11 @@
             async getReplayYear(year = new Date().getFullYear()) {
                 this.loaded.id = -1
                 let response = await app.mk.api.v3.music(`/v1/me/music-summaries/year-${year}?extend=inLibrary&views=top-artists%2Ctop-albums%2Ctop-songs&include[music-summaries]=playlist&include[playlists]=tracks&includeOnly=playlist%2Ctracks%2Csong%2Cartist%2Calbum`)
-                console.warn(response.data.data[0])
+                let replayData = response.data.data[0]
-                this.loaded = response.data.data[0]
+                // extended playlist
+                let playlist = await app.mk.api.v3.music(replayData.relationships.playlist.data[0].href, {extend: "editorialArtwork,editorialVideo"})
+                replayData.playlist = playlist.data.data[0]
+                this.loaded = replayData
             }
         }
     });