Merge remote-tracking branch 'origin/develop' into develop

package.json

@@ -39,7 +39,7 @@
     "@sentry/electron": "^3.0.7",
     "@sentry/integrations": "^6.19.6",
     "adm-zip": "0.4.10",
-    "airtunes2": "git+https://github.com/vapormusic/node_airtunes2.git",
+    "airtunes2": "git+https://github.com/vapormusic/node_airtunes2.git#hap",
     "castv2-client": "^1.2.0",
     "chokidar": "^3.5.3",
     "discord-rpc": "^4.0.1",
@@ -109,9 +109,9 @@
     }
   ],
   "build": {
-    "electronVersion": "18.1.0",
+    "electronVersion": "18.2.0",
     "electronDownload": {
-      "version": "18.1.0+wvcus",
+      "version": "18.2.0+wvcus",
       "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
     },
     "appId": "cider",

src/i18n/hu_HU.json

@@ -406,6 +406,7 @@
   "settings.option.lyrics.enableMusixmatchKaraoke": "Karaoke mód bekapcsolása (Csak MusixMatch)",
   "settings.option.lyrics.musixmatchPreferredLanguage": "MusixMatch fordítás nyelve",
   "settings.option.lyrics.enableYoutubeLyrics": "YouTube dalszövegek engedélyezése a zenei videóknál",
+  "settings.option.lyrics.enableQQLyrics": "QQLyrics dalszövegek engedélyezése",
   "settings.header.connectivity": "Csatlakozások",
   "settings.header.connectivity.description": "A Cider csatlakozás beállításainak módosítása.",
   "settings.option.connectivity.playbackNotifications": "Lejátszási értesítések",

src/i18n/zh_CN.json

@@ -22,6 +22,7 @@
   "term.login": "登录",
   "term.about": "关于",
   "term.privateSession": "私人聆听",
+  "term.lyrics": "歌词",
   "term.queue": "待播清单",
   "term.history": "历史记录",
   "term.miniplayer": "迷你播放器",
@@ -115,7 +116,11 @@
   "term.contributors": "贡献者",
   "term.equalizer": "均衡器",
   "term.reset": "重置",
-  "term.tracks": "首歌曲",
+  "term.track": {
+    "one": "首歌曲",
+    "other": "首歌曲"
+  },
+  "term.tracks": "歌曲",
   "term.videos": "音乐视频",
   "term.menu": "菜单",
   "term.check": "检查",
@@ -161,6 +166,9 @@
   "podcast.episodes": "单集",
   "podcast.playEpisode": "播放单集",
   "podcast.website": "Podcast 网站",
+  "action.edit": "编辑",
+  "action.done": "完成",
+  "action.editTracklist": "编辑歌曲清单",
   "action.addToLibrary": "加入资料库",
   "action.addToLibrary.success": "成功加入资料库",
   "action.addToLibrary.error": "加入资料库的过程发生了错误",
@@ -187,6 +195,7 @@
   "action.startRadio": "开始电台",
   "action.goToArtist": "前往艺人",
   "action.goToAlbum": "前往专辑",
+  "action.showInAppleMusic": "显示于 Apple Music",
   "action.moveToTop": "移到顶部",
   "action.share": "分享歌曲",
   "action.rename": "重命名",
@@ -203,11 +212,19 @@
   "action.showAlbum": "显示专辑",
   "action.tray.minimize": "最小化",
   "action.tray.quit": "退出",
-
   "action.update": "更新",
   "action.copy": "复制",
   "action.newpreset": "新建默认...",
   "action.deletepreset": "删除默认",
+  "action.open": "打开",
+  "action.cast.chromecast": "Chromecast",
+  "action.cast.todevices": "投射到设备",
+  "action.cast.stop": "停止投射到所有设备",
+  "action.cast.airplay": "AirPlay",
+  "action.cast.airplay.underdevelopment": "AirPlay 仍处于开发阶段中，敬请期待。",
+  "action.cast.scan": "搜索",
+  "action.cast.scanning": "搜索中...",
+  "action.createNew": "添加...",
   "settings.header.general": "通用",
   "settings.header.general.description": "调整 Cider 的通用设置",
   "settings.option.audio.volumeStep": "音量改变量",
@@ -218,6 +235,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider 将还原你在这台电脑上的最后一次操作。",
   "settings.option.general.resumebehavior.history": "历史",
   "settings.option.general.resumebehavior.history.description": "Cider 将跨设备将你的整个 Apple Music 历史记录中的最后一首歌曲排队入列。",
+  "settings.option.general.resumetabs": "启动时打开的选项页面",
+  "settings.option.general.resumetabs.description": "你可以选择启动 Cider 时要默认打开的页面。",
+  "settings.option.general.resumetabs.dynamic": "动态",
+  "settings.option.general.resumetabs.dynamic.description": "Cider 将自动打开你上次停留的页面。",
   "settings.option.general.language": "语言",
   "settings.option.general.language.main": "语言",
   "settings.option.general.language.fun": "恶搞语言",
@@ -229,6 +250,8 @@
   "settings.option.general.updateCider.branch.develop": "测试(Develop)",
   "settings.option.general.customizeSidebar": "自定义侧边栏的功能",
   "settings.option.general.customizeSidebar.customize": "自定义",
+  "settings.option.general.keybindings": "快捷操作键",
+  "settings.option.general.keybindings.open": "打开",
   "settings.notyf.updateCider.update-not-available": "没有可用的更新",
   "settings.notyf.updateCider.update-downloaded": "更新已成功下载，重启后进行更新",
   "settings.notyf.updateCider.update-error": "更新时，发生错误",
@@ -256,6 +279,13 @@
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "改变模拟温暖模组处理的强度。",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "温和",
   "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "温暖",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer": "Cider 音乐气氛实现器™️",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "以最先进的音频置为蓝本，实现不同的音乐气氛。",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode": "Cider 音乐气氛™️模式",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "更改气氛实现器模块的操作模式。",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural1": "自然（标准）",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural2": "自然（高）",
+  "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural3": "自然（增强）",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider 数码增强音频处理™️",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "通过人类的听力心理学模型和 AAC 编码特色的即时算法，强化 256 kbps AAC 音频的感知音频质量。",
   "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "数码增强音频处理设置",
@@ -274,6 +304,7 @@
   "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "标准",
   "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "发烧友",
   "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "音频空间无法与 CAP 相容，请关闭 CAP 在进行操作。",
+  "settings.option.visual.uiscale": "UI界面大小",
   "settings.header.visual": "外观",
   "settings.header.visual.description": "调整 Cider 的外观",
   "settings.option.visual.windowBackgroundStyle": "窗口背景样式",
@@ -327,14 +358,16 @@
   "settings.option.lyrics.enableMusixmatchKaraoke": "启用卡拉 OK 模式（仅 Musixmatch）",
   "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatch 歌词语言偏好",
   "settings.option.lyrics.enableYoutubeLyrics": "播放 MV 时使用 YouTube 歌词",
+  "settings.option.lyrics.enableQQLyrics": "启用 QQ 音乐的歌词",
   "settings.header.connectivity": "外部连接",
   "settings.header.connectivity.description": "调整 Cider 与外部应用的交互设置",
   "settings.option.connectivity.discordRPC": "Discord 动态",
   "settings.option.connectivity.playbackNotifications": "歌曲播放通知",
-  "settings.header.connectivity.discordRPC.cider": "显示正在使用 'Cider'",
+  "settings.option.connectivity.discordRPC.clientName": "应用程序名称",
-  "settings.header.connectivity.discordRPC.appleMusic": "显示正在使用 'Apple Music'",
   "settings.option.connectivity.discordRPC.clearOnPause": "暂停时清除 Discord 动态",
   "settings.option.connectivity.discordRPC.hideButtons": "隐藏 Discord 动态上的按钮",
+  "settings.option.connectivity.discordRPC.detailsFormat": "详细信息格式",
+  "settings.option.connectivity.discordRPC.stateFormat": "动态格式",
   "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling 记录",
   "settings.option.connectivity.lastfmScrobble.delay": "LastFM Scrobble 延迟 (%)",
   "settings.option.connectivity.lastfmScrobble.nowPlaying": "打开 LastFM 正在播放",

src/i18n/zh_TW.json

@@ -151,6 +151,9 @@
   "podcast.episodes": "單集",
   "podcast.playEpisode": "播放單集",
   "podcast.website": "Podcast 網站",
+  "action.edit": "編輯",
+  "action.done": "完成",
+  "action.editTracklist": "編輯歌曲清單",
   "action.addToLibrary": "加入到資料庫",
   "action.addToLibrary.success": "成功加入資料庫",
   "action.addToLibrary.error": "加入資料庫時，發生錯誤",
@@ -215,6 +218,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider 將還原你在這台電腦上的最後一次操作。",
   "settings.option.general.resumebehavior.history": "歷史",
   "settings.option.general.resumebehavior.history.description": "Cider 將跨裝置將你的整個 Apple Music 歷史記錄中的最後一首歌曲排隊入列。",
+  "settings.option.general.resumetabs": "啟動時打開的選項頁面",
+  "settings.option.general.resumetabs.description": "你可以選擇啟動 Cider 時要預設打開的頁面。",
+  "settings.option.general.resumetabs.dynamic": "自動",
+  "settings.option.general.resumetabs.dynamic.description": "Cider 將自動打開你上次停留的頁面。",
   "settings.option.general.language.main": "語言",
   "settings.option.general.language.fun": "特殊語言",
   "settings.option.general.language.unsorted": "未分類",
@@ -345,8 +352,8 @@
   "settings.option.connectivity.discordRPC.hideButtons": "隱藏 Discord 動態上的按鈕",
   "settings.option.connectivity.discordRPC.detailsFormat": "詳細資訊格式",
   "settings.option.connectivity.discordRPC.stateFormat": "狀態格式",
-  "settings.option.connectivity.lastfmScrobble": "Last.FM Scrobbling 記錄",
+  "settings.option.connectivity.lastfmScrobble": "Last.FM 音樂記錄",
-  "settings.option.connectivity.lastfmScrobble.delay": "Last.FM Scrobble 延遲 (%)",
+  "settings.option.connectivity.lastfmScrobble.delay": "Last.FM 歌曲追蹤延遲 (%)",
   "settings.option.connectivity.lastfmScrobble.nowPlaying": "開啟 Last.FM 正在聆聽",
   "settings.option.connectivity.lastfmScrobble.removeFeatured": "從歌名中移除客串藝人 (Last.FM)",
   "settings.option.connectivity.lastfmScrobble.filterLoop": "不記錄單曲循環 (Last.FM)",

src/main/base/app.ts

@@ -212,7 +212,6 @@ export class AppEvents {
      * Handles the creation of a new instance of the app
      */
     private InstanceHandler() {
-
         // Detects of an existing instance is running (So if the lock has been achieved, no existing instance has been found)
         const gotTheLock = app.requestSingleInstanceLock()
 

src/main/base/browserwindow.ts

@@ -37,6 +37,7 @@ export class BrowserWindow {
             platform: process.platform,
             dev: app.isPackaged,
             osRelease: os.release(),
+            updatable: !process.windowsStore || !process.mas,
             components: [
                 "pages/podcasts",
                 "pages/apple-account-settings",
@@ -95,6 +96,7 @@ export class BrowserWindow {
                 "components/fullscreen",
                 "components/miniplayer",
                 "components/castmenu",
+                "components/airplay-modal",
                 "components/artist-chip",
                 "components/hello-world",
                 "components/inline-collection-list",
@@ -897,6 +899,10 @@ export class BrowserWindow {
             event.returnValue = process.platform;
         });
 
+        ipcMain.on("get-port", (event) => {
+            event.returnValue = this.clientPort;
+        });
+
         ipcMain.on("is-dev", (event) => {
             event.returnValue = this.devMode;
         });
@@ -1209,16 +1215,27 @@ export class BrowserWindow {
             shell.openPath(app.getPath('userData'));
         });
 
+        
+        //#region Cider Connect
         ipcMain.on('cc-auth', (_event) => {
             shell.openExternal(String(utils.getStoreValue('cc_authURL')));
         });
 
-        ipcMain.on('cc-logout', (_event) => {
+        ipcMain.on('cc-logout', (_event) => { //Make sure to update the default store
             utils.setStoreValue('connectUser', {
-                auth: null
+                "auth": null,
+                "sync": {
+                    themes: false,
+                    plugins: false,
+                    settings: false,
+                }
             });
             utils.getWindow().reload();
         });
+
+        ipcMain.on('cc-push', (_event) => {
+            utils.pushStoreToConnect();
+        })
         /* *********************************************************************************************
          * Window Events
          * **********************************************************************************************/

src/main/base/store.ts

@@ -1,7 +1,7 @@
 import * as ElectronStore from 'electron-store';
 import * as electron from "electron";
 import {app} from "electron";
-
+import fetch from "electron-fetch";
 export class Store {
     static cfg: ElectronStore;
 
@@ -212,6 +212,11 @@ export class Store {
         },
         "connectUser": {
             "auth": null,
+            "sync": {
+                themes: false,
+                plugins: false,
+                settings: false,
+            }
         },
     }
     private migrations: any = {
@@ -261,6 +266,7 @@ export class Store {
         return target
     }
 
+    
     /**
      * IPC Handler
      */
@@ -282,4 +288,42 @@ export class Store {
         })
     }
     
+    
+    static pushToCloud(): void {
+        if (Store.cfg.get('connectUser.auth') === null) return;
+        var syncData = Object();
+        if (Store.cfg.get('connectUser.sync.themes')) {
+            syncData.push({
+                themes: Store.cfg.store.themes
+            })
+        }
+        if (Store.cfg.get('connectUser.sync.plugins')) {
+            syncData.push({
+                plugins: Store.cfg.store.plugins
+            })
+        }
+    
+        if (Store.cfg.get('connectUser.sync.settings')) {
+            syncData.push({
+                general: Store.cfg.get('general'),
+                home: Store.cfg.get('home'),
+                libraryPrefs: Store.cfg.get('libraryPrefs'),
+                advanced: Store.cfg.get('advanced'),
+            })
+        }
+        let postBody = {
+            id: Store.cfg.get('connectUser.id'),
+            app: electron.app.getName(),
+            version: electron.app.isPackaged ? electron.app.getVersion() : 'dev',
+            syncData: syncData
+        }
+
+        fetch('https://connect.cidercollective.dev/api/v1/setttings/set', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(postBody)
+        })
+    }
 }

src/main/base/utils.ts

@@ -80,6 +80,7 @@ export class utils {
         return Store.cfg.store
     }
 
+
     /**
      * Get the store instance
      * @returns {Store}
@@ -97,6 +98,18 @@ export class utils {
         Store.cfg.set(key, value)
     }
 
+    /**
+     * Pushes Store to Connect
+     * @return Function
+     */
+    static pushStoreToConnect(): Function {
+        return Store.pushToCloud
+    }
+
+
+
+
+
     /**
      * Gets the browser window
      */
@@ -198,4 +211,6 @@ export class utils {
         autoUpdater.logger = log
         await autoUpdater.checkForUpdatesAndNotify()
     }
+
+
 }

src/main/plugins/chromecast.ts

@@ -28,7 +28,7 @@ export default class ChromecastPlugin {
     // private GCstream = new Stream.PassThrough(),
     private connectedHosts: any = {};
     private connectedPlayer: any;
-    // private port = false;
+    private ciderPort :any = 9000;
     // private server = false;
     // private  bufcount = 0;
     // private bufcount2 = 0;
@@ -148,7 +148,7 @@ export default class ChromecastPlugin {
             }
             let media = {
                 // Here you can plug an URL to any mp4, webm, mp3 or jpg file with the proper contentType.
-                contentId: 'http://' + this.getIp() + ':9000/audio.wav',
+                contentId: 'http://' + this.getIp() + ':'+ this.ciderPort +'/audio.wav',
                 contentType: 'audio/wav',
                 streamType: 'LIVE', // or LIVE
 
@@ -361,4 +361,12 @@ export default class ChromecastPlugin {
 
     }
 
+    onRendererReady(): void {
+        this._win.webContents.executeJavaScript(
+            `ipcRenderer.sendSync('get-port')`
+        ).then((result: any) => { 
+            this.ciderPort = result;       
+        });
+    }
+
 }

src/main/plugins/raop.ts

@@ -89,9 +89,9 @@ export default class RAOP {
 `;
 
     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.replace(".local","") && item.port == port && item.addresses == addresses) === -1) {
             this.castDevices.push({
-                name: host,
+                name: host.replace(".local",""),
                 host: addresses ? addresses[0] : '',
                 port: port,
                 addresses: addresses,
@@ -152,9 +152,23 @@ export default class RAOP {
                 this._win.webContents.executeJavaScript(`console.log(
                     "${service.name} ${service.host}:${service.port} ${service.addresses}"
                 )`);
-                this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);}
+                this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
+             }
             });
             
+            // const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay'));
+            // browser2.on('ready', browser2.discover);
+
+            // browser2.on('update', (service: any) => {
+            //      if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {
+            //         // console.log(service.txt)
+            //     this._win.webContents.executeJavaScript(`console.log(
+            //         "${service.name} ${service.host}:${service.port} ${service.addresses}"
+            //     )`);
+            //     this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
+            //  }
+            // });
+    
         });
 
 
@@ -178,6 +192,15 @@ export default class RAOP {
                         this._win.webContents.setAudioMuted(true);
                         this._win.webContents.executeJavaScript(`CiderAudio.sendAudio()`).catch((err: any) => console.error(err));
                     }
+                    if (status == "need_password"){
+                        this._win.webContents.executeJavaScript(`app.setAirPlayCodeUI()`)
+                    }
+                    if (status == "pair_success"){
+                        this._win.webContents.executeJavaScript(`app.sendAirPlaySuccess()`)
+                    }
+                    if (status == "pair_failed"){
+                        this._win.webContents.executeJavaScript(`app.sendAirPlayFailed()`)
+                    }
                     if (status == 'stopped') {
                         this.airtunes.stopAll(() => {
                             console.log('end');
@@ -210,6 +233,12 @@ export default class RAOP {
 
         });
 
+        electron.ipcMain.on('setAirPlayPasscode', (event, passcode) => {
+            if (this.device){
+                this.device.setPasscode(passcode)
+            }
+        })
+
         electron.ipcMain.on('writeWAV', (event, leftbuffer, rightbuffer) => {
             if (this.airtunes != null) {
                 if (this.worker == null) {

src/renderer/assets/feather/heart-fill.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-heart"><path d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"></path></svg>

src/renderer/less/elements.css

@@ -371,6 +371,11 @@
   filter: contrast(0);
   background-repeat: no-repeat;
 }
+.heart-icon {
+  position: absolute;
+  filter: contrast(0);
+  background-repeat: no-repeat;
+}
 @keyframes load-bar {
   10% {
     box-shadow: inset 0 -4px 0;

src/renderer/less/elements.less

@@ -456,6 +456,13 @@
     background-repeat: no-repeat;
   }
 
+  .heart-icon {
+    position: absolute;
+    right:0;
+    filter: contrast(0);
+    background-repeat: no-repeat;
+  }
+
   /* CSS.gg
   */
   @keyframes load-bar {

src/renderer/less/helpers.less

@@ -70,10 +70,11 @@
 
 .spatialproperties-panel {
   .modal-window {
+    &:not(.airplay-modal){
     height    : 700px;
     max-height: 700px;
     width     : 800px;
-    max-width : 800px;
+    max-width : 800px;}
     overflow  : hidden;
 
     .info-header {

src/renderer/main/vueapp.js

@@ -207,6 +207,7 @@ const app = new Vue({
             showPlaylist: false,
             castMenu: false,
             moreInfo: false,
+            airplayPW: false,
         },
         socialBadges: {
             badgeMap: {},
@@ -3830,6 +3831,15 @@ const app = new Vue({
 
             // tracks are found in relationship.data
         },
+        setAirPlayCodeUI() {
+            this.modals.airplayPW = true
+        },
+        sendAirPlaySuccess(){
+            notyf.success('Device paired successfully!');
+        },
+        sendAirPlayFailed(){
+            notyf.error('Device paring failed!');
+        },
         windowFocus(val) {
             if (val) {
                 document.querySelectorAll(".animated-artwork-video").forEach(el => {
@@ -4009,7 +4019,8 @@ const app = new Vue({
                 }
             }
 
-            if (app.mk.nowPlayingItem._container["attributes"] && app.mk.nowPlayingItem._container.name != "station") {
+            const nowPlayingContainer = app.mk.nowPlayingItem._container;
+            if (nowPlayingContainer && nowPlayingContainer["attributes"] && nowPlayingContainer.name != "station") {
                 menus.normal.items.find(x => x.id == "showInMusic").hidden = false
             }
 

src/renderer/style.css

@@ -7936,6 +7936,15 @@ fieldset:disabled .btn {
   filter: contrast(0);
   background-repeat: no-repeat;
 }
+.cd-mediaitem-list-item .playIcon{
+  width: 44px;
+  margin-left: 11px;
+}
+.cd-mediaitem-list-item .heart-icon {
+  position: absolute;
+  filter: contrast(0);
+  background-repeat: no-repeat;
+}
 @keyframes load-bar {
   10% {
     box-shadow: inset 0 -4px 0;

src/renderer/style.less

@@ -1207,6 +1207,14 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.cl
       background-repeat: no-repeat;
       margin-left: 3px;
     }
+
+    .heart-icon {
+      height: 9px;
+      width: 13px;
+      filter: contrast(0);
+      background-repeat: no-repeat;
+      margin-left: 3px;
+    }
   }
 
   .lossless-icon {

src/renderer/views/app/panels.ejs

@@ -28,6 +28,9 @@
 <transition name="modal">
     <castmenu v-if="modals.castMenu"></castmenu>
 </transition>
+<transition name="modal">
+    <airplay-modal v-if="modals.airplayPW"></airplay-modal>
+</transition>
 <transition name="modal">
     <plugin-menu v-if="modals.pluginMenu"></plugin-menu>
 </transition>

src/renderer/views/components/airplay-modal.ejs

@@ -0,0 +1,42 @@
+<script type="text/x-template" id="airplay-modal">
+<div class="spatialproperties-panel castmenu modal-fullscreen airplay-modal" @click.self="close()" @contextmenu.self="close()">
+    <div class="modal-window airplay-modal">
+        <div class="modal-header">
+            <div class="modal-title">{{'Enter password'}}</div>
+            <button class="close-btn" @click="close()"></button>
+        </div>
+    <div class="modal-content" style="overflow-y: overlay; padding: 3%">
+        <input type="text" v-model="passcode"/>
+    </div>
+    <div class="md-footer">
+        <div class="row">
+            <div class="col" >
+                <button style="width:100%" @click="enterPassword()" class="md-btn md-btn-block md-btn-primary">{{'OK'}}</button>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
+</script>
+<script>
+    Vue.component('airplay-modal', {
+        template: '#airplay-modal',
+        data: function () {
+            return {
+                passcode: '',
+            }
+        },
+        mounted() {
+        },
+        methods: {
+            close() {
+                this.$root.modals.airplayPW = false
+            },
+            enterPassword() {
+                console.log('Entered passCode: ', this.passcode)
+                ipcRenderer.send("setAirPlayPasscode",this.passcode)
+                this.close()
+            }
+        }
+    });
+</script>

src/renderer/views/components/castmenu.ejs

@@ -37,7 +37,7 @@
         <div class="md-option-container" style="margin-top: 12px;margin-bottom: 12px;">
             <div class="md-option-line">
                 <div class="md-option-segment">
-                    {{true ? 'Homepods only for now! (NO PASSWORD PLEASE!)' : 'Please add FFmpeg location in Settings -> Advanced'}}
+                    {{'EXPERIMENTAL!!! Supports Homepods / Apple TVs / Shairport for now, AirPlay on Samsung/LG/Sony devices will be added later'}}
                     <!-- {{$root.getLz('action.cast.airplay.underdevelopment')}} -->
                     <template v-if="true" v-for="(device) in devices.airplay">
                         <div class="md-option-line" style="cursor: pointer" @click="setAirPlayCast(device)">

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

@@ -23,7 +23,7 @@
                     <button @click="addToLibrary()" v-if="!addedToLibrary && (showIndex == false ||(showIndex == true && showIndexPlaylist != false))">
                         <div class="svg-icon addIcon" :style="{'--color': 'var(--keyColor)', '--url': 'url(./assets/feather/plus.svg)'}"></div>
                     </button>
-                    <button v-else-if='!(showArtwork == true && (showIndex == false ||(showIndex == true && showIndexPlaylist != false)))' @click="playTrack()" style="width: 44px;margin-left: -5px;">
+                    <button v-else-if='!(showArtwork == true && (showIndex == false ||(showIndex == true && showIndexPlaylist != false)))' @click="playTrack()">
                         <div class="svg-icon playIcon" :style="{'--color': 'var(--keyColor)', '--url': 'url(./assets/feather/play.svg)'}"></div>
                     </button>
                 </div>
@@ -65,6 +65,9 @@
                     </template>
                 </div>
             </div>
+            <div class="heart-icon" v-if="isLoved">
+                <div class="svg-icon" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}"></div>
+            </div>
             <div class="explicit-icon" v-if="item.attributes && item.attributes.contentRating == 'explicit'"></div>
             <template v-if="showMetaData == true" @dblclick="route()">
                 <div class="metainfo">
@@ -98,7 +101,8 @@
                 displayDuration: true,
                 addClasses: {},
                 itemId: 0,
-                isLibrary: false
+                isLibrary: false,
+                isLoved: null
             }
         },
         props: {
@@ -121,6 +125,9 @@
             } else {
                 this.itemId = this.item.id;
             }
+            if (this.item.attributes.playParams) {
+                this.getHeartStatus();
+            }
             let duration = this.item.attributes.durationInMillis ?? 0
             if (duration == 0 || !this.showDuration) {
                 this.displayDuration = false
@@ -323,6 +330,7 @@
                                 "hidden": false,
                                 "disabled": true,
                                 "action": function () {
+                                    self.isLoved = true
                                     app.love(self.item)
                                 }
                             },
@@ -333,6 +341,7 @@
                                 "name": this.app.getLz('action.unlove'),
                                 "hidden": true,
                                 "action": function () {
+                                    self.isLoved = false
                                     app.unlove(self.item)
                                 }
                             },
@@ -499,6 +508,19 @@
             visibilityChanged: function (isVisible, entry) {
                 this.isVisible = isVisible
             },
+            async getHeartStatus() {
+                try {
+                    await app.getRating(this.item).then(res => {
+                        if (res == 1) {
+                            this.isLoved = true
+                        } else {
+                            this.isLoved = false
+                        }
+                    })
+                } catch (err) {
+                    console.log(err)
+                }
+            },
             addToLibrary() {
                 let item = this.item
                 if (item.attributes.playParams.id) {

src/renderer/views/components/queue.ejs

@@ -13,12 +13,11 @@
         </div>
         <div class="queue-body" v-if="page == 'queue'">
             <draggable v-model="queueItems" @start="drag=true" @end="drag=false;move()">
-                <template v-for="(queueItem, position) in queueItems">
+                <template v-for="(queueItem, position) in displayQueueItems">
-                    <div v-if="position <= queuePosition" style="display: none;">{{ position }}</div>
                     <div class="cd-queue-item"
                          :class="{selected: selectedItems.includes(position)}"
                          @click="select($event, position)"
-                         @dblclick="playQueueItem(position)" v-else :key="position"
+                         @dblclick="playQueueItem(position)" :key="position"
                          @contextmenu="selected = position;queueContext($event, queueItem.item, position)">
                         <div class="row">
                             <div class="col-auto flex-center">
@@ -61,6 +60,13 @@
                 app: this.$root
             }
         },
+        computed: {
+            displayQueueItems() {
+                const displayLimit = 50;
+                const lastDisplayPosition = Math.min(displayLimit + this.queuePosition, this.queueItems.length);
+                return this.queueItems.slice(this.queuePosition, lastDisplayPosition);
+            }
+        },
         mounted() {
             this.updateQueue()
         },

winget.json

@@ -1,7 +1,7 @@
 {
-    "electronVersion": "18.0.4",
+    "electronVersion": "18.2.0",
     "electronDownload": {
-        "version": "18.0.4+wvcus",
+        "version": "18.2.0+wvcus",
         "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
     },
     "appId": "cider",