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

.circleci/config.yml

@@ -7,19 +7,21 @@ jobs:
     steps:
       - checkout
       - run:
-          name: Update NPM
+          name: Update Package Managers
-          command: "sudo npm install -g npm"
+          command: sudo npm update -g npm yarn
       - restore_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
+          name: Restore Yarn Package Cache
-      - run:
+          keys:
-          name: Update yarn
+            - yarn-packages-{{ checksum "yarn.lock" }}
-          command: sudo npm upgrade -g yarn
       - run:
           name: Install Dependencies
-          command: yarn install
+          command: yarn install --immutable
-      - run:
+      - save_cache:
-          name: Update Dependencies
+          name: Save Yarn Package Cache
-          command: yarn upgrade
+          key: yarn-packages-{{ checksum "yarn.lock" }}
+          paths:
+            - .yarn/cache
+            - .yarn/unplugged
       - run:
           name: Install system build dependencies
           command: |
@@ -28,11 +30,6 @@ jobs:
             sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
-
-      - save_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
-          paths:
-            - ./node_modules
       - run:
           name: Generate Builds (Linux)
           command: yarn dist -l -p never

.gitignore

@@ -1,9 +1,5 @@
 # Building
 dist
-*.lock
-yarn*
-package-lock.json
-.yarnclean
 build
 
 # Misc
@@ -314,5 +310,3 @@ src/renderer/workbox-962786f2.js.map
 #Mac certs
 *.p12
 keys.sh
-
-.yarnrc.yml

.yarnrc.yml

@@ -0,0 +1,2 @@
+nodeLinker: node-modules
+yarnPath: .yarn/releases/yarn-3.1.1.cjs

package.json

@@ -8,17 +8,17 @@
   "main": "./build/index.js",
   "author": "Cider Collective <cryptofyre@cider.sh> (https://cider.sh)",
   "repository": "https://github.com/ciderapp/Cider.git",
+  "packageManager": "yarn@3.1.1",
   "bugs": {
     "url": "https://github.com/ciderapp/Cider/issues?q=is%3Aopen+is%3Aissue+label%3Abug"
   },
   "homepage": "https://cider.sh/",
   "buildResources": "resources",
-  "packageManager": "yarn@3.1.1",
   "scripts": {
     "build": "tsc",
     "watch": "tsc --watch",
     "start": "run-script-os",
-    "start:win32": "npm run build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
+    "start:win32": "npm run build && set ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
     "start:linux": "npm run build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
     "start:darwin": "npm run build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
     "pack": "electron-builder --dir",

src/i18n/en_US.jsonc

@@ -124,7 +124,9 @@
   "term.videos": "Videos", 
   "term.menu": "Menu",
   "term.check": "Check",
-
+  "term.aboutArtist": "About {{artistName}}", // e.g. 'About Doja Cat'
+  "term.updateCider": "Update Cider",
+ 
   // Home
   "home.title": "Home",
   "home.recentlyPlayed": "Recently Played",

src/i18n/ja_JP.jsonc

@@ -116,6 +116,9 @@
   "term.tracks": "曲", // Assume x amount of tracks. e.g. 50 tracks 
   "term.videos": "ビデオ", 
   "term.menu": "メニュー",
+  "term.check": "確認",
+  "term.aboutArtist": "{{artistName}}について", // e.g. 'About Doja Cat'
+  "term.updateCider": "Cider 更新",
 
   // Home
   "home.title": "ホーム",
@@ -181,6 +184,11 @@
   "action.removeTracks": "${self.selectedItems.length}曲が「次はこちら」から削除",
   "action.import": "インポート",
   "action.export": "エクスポート",
+  "action.showAlbum": "すべて見る",
+  "action.tray.minimize": "最小化",
+  "action.tray.quit": "終了",
+  "action.tray.show": "表示",
+  "action.update": "アップデート",
 
   // Settings - Audio
   "settings.header.audio": "オーディオ",
@@ -249,10 +257,7 @@
   "settings.header.experimental": "試験的な機能",
   "settings.header.experimental.description": "開発中の実験的な機能は不完全で不安定である可能性があります",
   "settings.option.experimental.compactUI": "コンパクトインターフェース", // Toggle
-  "settings.option.experimental.closeButtonBehaviour": "「閉じる」ボタンの動作", // Dropdown
+  "settings.option.experimental.close_button_hide": "「閉じる」ボタンでアプリを隠します", // Dropdown
-  "settings.option.experimental.closeButtonBehaviour.quit": "アプリを終了する",
-  "settings.option.experimental.closeButtonBehaviour.minimizeTaskbar": "タスクバーに最小化する",
-  "settings.option.experimental.closeButtonBehaviour.minimizeTray": "トレイに最小化する",
   // Refer to term.disabled & term.enabled
   
   // Spatialization Menu

src/i18n/pt_BR.jsonc

@@ -3,7 +3,13 @@
   "app.name": "Cider",
 
   "date.format": "${d} ${m}, ${y}",
-  
+
+   // i18n Info
+   "i18n.languageName": "Português ( brasileiro )",        // name of language in native language
+   "i18n.languageNameEnglish": "Portuguese (Brazil)", // name of language in English
+   "i18n.category": "main", // main = real language, fun = fun community languages
+   "i18n.authors": "", // Authors, if you contribute to this file feel free to add your name seperated with a space
+
   // Dialogs
   "dialog.cancel": "Cancelar",
   "dialog.ok": "OK",

src/i18n/zh_CN.jsonc

@@ -116,6 +116,9 @@
   "term.tracks": "首歌曲", // Assume x amount of tracks. e.g. 50 tracks 
   "term.videos": "视频", 
   "term.menu": "菜单",
+  "term.check": "检查",
+  "term.aboutArtist": "关于{{artistName}}", // e.g. 'About Doja Cat'
+  "term.updateCider": "更新 Cider",
 
   // Home
   "home.title": "主页",
@@ -183,6 +186,12 @@
   "action.removeTracks": "从队列中移除 ${self.selectedItems.length} 首歌曲",
   "action.import": "导入",
   "action.export": "导出",
+  "action.showAlbum": "显示专辑",
+  "action.tray.minimize": "最小化",
+  "action.tray.quit": "退出",
+  "action.tray.show": "显示",
+  "action.update": "更新",
+  
 
   // Settings - Audio
   "settings.header.audio": "音频",
@@ -251,10 +260,7 @@
   "settings.header.experimental": "实验性功能",
   "settings.header.experimental.description": "调整Cider的实验性功能",
   "settings.option.experimental.compactUI": "紧凑型 UI", // Toggle
-  "settings.option.experimental.closeButtonBehaviour": "点击关闭按钮时",
+  "settings.option.experimental.close_button_hide": "点击关闭按钮时仅隐藏窗口",
-  "settings.option.experimental.closeButtonBehaviour.quit": "退出 Cider",
-  "settings.option.experimental.closeButtonBehaviour.minimizeTaskbar": "最小化到任务栏",
-  "settings.option.experimental.closeButtonBehaviour.minimizeTray": "最小化到系统托盘",
   // Refer to term.disabled & term.enabled
   
   // Spatialization Menu

src/i18n/zh_TW.jsonc

@@ -116,7 +116,9 @@
   "term.tracks": "首歌曲", // Assume x amount of tracks. e.g. 50 tracks 
   "term.videos": "影片", 
   "term.menu": "選單",
-
+  "term.check": "檢查",
+  "term.aboutArtist": "關於{{artistName}}", // e.g. 'About Doja Cat'
+  "term.updateCider": "更新 Cider",
   
   // Home
   "home.title": "主頁",
@@ -182,6 +184,12 @@
   "action.removeTracks": "從待播清單刪除 ${self.selectedItems.length} 首歌曲",
   "action.import": "導入",
   "action.export": "導出",
+  "action.showAlbum": "顯示專輯",
+  "action.tray.minimize": "最小化",
+  "action.tray.quit": "退出",
+  "action.tray.show": "顯示",
+  "action.update": "更新",
+
   
   // Settings - Audio
   "settings.header.audio": "音訊",
@@ -251,9 +259,7 @@
   "settings.header.experimental.description": "調整 Cider 的實驗性功能",
   "settings.option.experimental.compactUI": "緊凑型 UI", // Toggle
   "settings.option.experimental.closeButtonBehaviour": "關閉按鈕行為", // Dropdown
-  "settings.option.experimental.closeButtonBehaviour.quit": "退出 Cider",
+  "settings.option.experimental.close_button_hide": "關閉按鈕會隱藏 Cider",
-  "settings.option.experimental.closeButtonBehaviour.minimizeTaskbar": "最小化到工作列",
-  "settings.option.experimental.closeButtonBehaviour.minimizeTray": "最小化到系統匣",
   // Refer to term.disabled & term.enabled
   
   // Spatialization Menu

src/renderer/index.js

@@ -340,6 +340,15 @@ const app = new Vue({
         },
     },
     methods: {
+        stringTemplateParser(expression, valueObj) {
+            const templateMatcher = /{{\s?([^{}\s]*)\s?}}/g;
+            let text = expression.replace(templateMatcher, (substring, value, index) => {
+                value = valueObj[value];
+                return value;
+            });
+            return text
+            // stringTemplateParser('my name is {{name}} and age is {{age}}', {name: 'Tom', age:100})
+        },
         setLz(lang) {
             if(lang == "") {
                 lang = this.cfg.general.language

src/renderer/views/components/add-to-playlist.ejs

@@ -12,12 +12,8 @@
                         <div class="icon"><%- include("../svg/plus.svg") %></div>
                         <div class="name">{{app.getLz('action.createPlaylist')}}</div>
                     </button>
-                    <button class="playlist-item" 
+                    <sidebar-playlist :playlist-select="playlistSelect" v-for="item in $root.getPlaylistFolderChildren('p.playlistsroot')" :item="item">
-                    :class="{ focused: playlist.id == focused }"
+                    </sidebar-playlist>
-                    @click="addToPlaylist(playlist.id)" style="width:100%;" v-for="playlist in playlistSorted" v-if="playlist.attributes.canEdit && playlist.type != 'library-playlist-folders'">
-                        <div class="icon"><%- include("../svg/playlist.svg") %></div>
-                        <div class="name">{{ playlist.attributes.name }}</div>
-                    </button>
                 </div>
                 <div class="modal-search">
                     <div class="search-input-container" style="width:100%;margin: 16px 0;">

src/renderer/views/components/equalizer.ejs

@@ -20,7 +20,7 @@
                 <div class="inputs-container">
                     <div class="input-container mini">
                         {{$root.cfg.audio.equalizer.vibrantBass}}
-                        <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="-20" max="20" step="1" v-model="$root.cfg.audio.equalizer.vibrantBass" @change="changeVibrantBass()">
+                        <input tabindex="0" type="range" class="eq-slider mini" orient="vertical" min="-15" max="15" step="1" v-model="$root.cfg.audio.equalizer.vibrantBass" @change="changeVibrantBass()">
                         Vibrant Bass
                     </div>
                     <div class="input-container mini">

src/renderer/views/pages/artist.ejs

@@ -115,7 +115,7 @@
                     </template>
                     <div class="row">
                         <div class="col" v-if="data.attributes.artistBio">
-                            <h3>{{ app.getLz('term.about') }} {{ data.attributes.name }}</h3>
+                            <h3>{{ $root.stringTemplateParser($root.getLz('term.aboutArtist'), {"artistName": data.attributes.name}) }}</h3> 
                             <p v-html="data.attributes.artistBio"></p>
                         </div>
                         <div class="col">

src/renderer/views/pages/settings.ejs

@@ -606,7 +606,7 @@
                 </div>
                 <div class="md-option-line">
                     <div class="md-option-segment">
-                        {{$root.getLz('action.update')}} {{$root.getLz('app.name')}}
+                        {{$root.getLz('term.updateCider')}} 
                     </div>
                     <div class="md-option-segment md-option-segment_auto">
                         <button class="md-btn" @click="app.checkForUpdate()">