Merge branch 'dev'

.ncurc.js

@@ -3,6 +3,7 @@ module.exports = {
   reject: [
     'electron',
     'chalk',
+    'del',
   ],
   // target: 'newest',
   // filter: [

CHANGELOG.md

@@ -6,6 +6,22 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [1.22.2](https://github.com/lyswhut/lx-music-desktop/compare/v1.22.1...v1.22.2) - 2022-08-18
+
+### 优化
+
+- 为tx、kw源添加 Flac 24bit 音质显示，注：由于之前没有记录此音质，所以之前收藏的歌曲信息中不包含它
+
+### 修复
+
+- 修复无法批量排序歌曲的问题
+- 修复某些缺失的繁体中文翻译
+- 修复企鹅音乐搜索失效的问题
+
+### 其他
+
+- 降级electron到v15.5.7
+
 ## [1.22.1](https://github.com/lyswhut/lx-music-desktop/compare/v1.22.0...v1.22.1) - 2022-07-09
 
 ### 优化

jsconfig.json

@@ -2,12 +2,16 @@
   "compilerOptions": {
     "baseUrl": "./",
     "paths": {
+      "@/*": ["src/*"],
       "@main/*": ["src/main/*"],
       "@renderer/*": ["src/renderer/*"],
       "@lyric/*": ["src/renderer-lyric/*"],
       "@static/*": ["src/static/*"],
       "@common/*": ["src/common/*"],
-    }
+    },
+  },
+  "vueCompilerOptions": {
+    "experimentalDisableTemplateSupport": true
   },
   "exclude": ["node_modules", "build", "dist"]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "1.22.1",
+  "version": "1.22.2",
   "description": "一个免费的音乐查找助手",
   "main": "./dist/main.js",
   "productName": "lx-music-desktop",
@@ -70,7 +70,7 @@
     "up": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://localhost:1081 npm i"
   },
   "browserslist": [
-    "Electron 17.4.7"
+    "Electron 15.5.7"
   ],
   "engines": {
     "node": ">= 16",
@@ -178,34 +178,34 @@
   },
   "homepage": "https://github.com/lyswhut/lx-music-desktop#readme",
   "devDependencies": {
-    "@babel/core": "^7.18.6",
-    "@babel/eslint-parser": "^7.18.2",
+    "@babel/core": "^7.18.10",
+    "@babel/eslint-parser": "^7.18.9",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-modules-umd": "^7.18.6",
-    "@babel/plugin-transform-runtime": "^7.18.6",
-    "@babel/preset-env": "^7.18.6",
+    "@babel/plugin-transform-runtime": "^7.18.10",
+    "@babel/preset-env": "^7.18.10",
     "babel-loader": "^8.2.5",
     "babel-preset-minify": "^0.5.2",
-    "browserslist": "^4.21.1",
+    "browserslist": "^4.21.3",
     "chalk": "^4.1.2",
     "changelog-parser": "^2.8.1",
     "copy-webpack-plugin": "^11.0.0",
-    "core-js": "^3.23.3",
+    "core-js": "^3.24.1",
     "cross-env": "^7.0.3",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^4.0.0",
     "del": "^6.1.1",
-    "electron": "^17.4.10",
-    "electron-builder": "^23.3.0",
+    "electron": "^15.5.7",
+    "electron-builder": "^23.3.3",
     "electron-debug": "^3.2.0",
     "electron-devtools-installer": "^3.2.0",
-    "electron-to-chromium": "^1.4.184",
-    "electron-updater": "^5.1.0",
-    "eslint": "^8.19.0",
+    "electron-to-chromium": "^1.4.224",
+    "electron-updater": "^5.2.1",
+    "eslint": "^8.22.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-formatter-friendly": "git+https://github.com/lyswhut/eslint-friendly-formatter.git#2170d1320e2fad13615a9dcf229669f0bb473a53",
-    "eslint-plugin-html": "^6.2.0",
+    "eslint-plugin-html": "^7.1.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
@@ -216,8 +216,8 @@
     "less-loader": "^11.0.0",
     "mini-css-extract-plugin": "^2.6.1",
     "node-loader": "^2.0.0",
-    "postcss": "^8.4.14",
-    "postcss-loader": "^7.0.0",
+    "postcss": "^8.4.16",
+    "postcss-loader": "^7.0.1",
     "postcss-pxtorem": "^6.0.0",
     "pug": "^3.0.2",
     "pug-loader": "^2.4.0",
@@ -228,25 +228,26 @@
     "svg-sprite-loader": "^6.0.11",
     "svg-transform-loader": "^2.0.13",
     "svgo-loader": "^3.0.1",
-    "terser-webpack-plugin": "^5.3.3",
+    "terser": "^5.14.2",
+    "terser-webpack-plugin": "^5.3.5",
     "url-loader": "^4.1.1",
     "vue-loader": "^17.0.0",
-    "vue-template-compiler": "^2.7.4",
-    "webpack": "^5.73.0",
+    "vue-template-compiler": "^2.7.8",
+    "webpack": "^5.74.0",
     "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.9.3",
+    "webpack-dev-server": "^4.10.0",
     "webpack-hot-middleware": "git+https://github.com/lyswhut/webpack-hot-middleware.git#329c4375134b89d39da23a56a94db651247c74a1",
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
     "bufferutil": "^4.0.6",
     "crypto-js": "^4.1.1",
     "electron-log": "^4.4.8",
-    "electron-store": "^8.0.2",
+    "electron-store": "^8.1.0",
     "font-list": "git+https://github.com/lyswhut/node-font-list.git#4edbb1933b49a9bac1eedd63a31da16b487fe57d",
     "http-terminator": "^3.2.0",
     "iconv-lite": "^0.6.3",
-    "image-size": "^1.0.1",
+    "image-size": "^1.0.2",
     "koa": "^2.13.4",
     "long": "^5.2.0",
     "mitt": "^3.0.0",
@@ -258,8 +259,8 @@
     "tunnel": "^0.0.6",
     "utf-8-validate": "^5.0.9",
     "vue": "^3.2.37",
-    "vue-i18n": "^9.2.0-beta.36",
-    "vue-router": "^4.1.1",
+    "vue-i18n": "^9.2.2",
+    "vue-router": "^4.1.3",
     "vuex": "^4.0.2"
   },
   "overrides": {

publish/changeLog.md

@@ -1,13 +1,13 @@
 ### 优化
 
-- 歌单列表添加歌单内歌曲数量显示，注：目前只有kw、mg、wy、tx（部分）源支持显示
+- 为tx、kw源添加 Flac 24bit 音质显示，注：由于之前没有记录此音质，所以之前收藏的歌曲信息中不包含它
 
 ### 修复
 
-- 修复处于不支持的源时，歌单、排行榜的右键下载菜单没有禁用的问题
-- 修复若桌面歌词窗口与主窗口重叠时，鼠标划过重叠区域鼠标会闪烁的问题，注：此修复只对未启用“鼠标移入歌词区域时降低歌词透明度”时有效
-- 修复tx源搜索失效的问题
+- 修复无法批量排序歌曲的问题
+- 修复某些缺失的繁体中文翻译
+- 修复企鹅音乐搜索失效的问题
 
 ### 其他
 
-- 升级Electron到 v17.4.10
+- 降级electron到v15.5.7

src/common/defaultSetting.js

@@ -34,8 +34,8 @@ const defaultSetting = {
     isLock: false,
     isAlwaysOnTop: false,
     isAlwaysOnTopLoop: false,
-    width: 380,
-    height: 420,
+    width: 450,
+    height: 300,
     x: null,
     y: null,
     theme: 0,

src/lang/index.js

@@ -32,6 +32,7 @@ langs.forEach(item => {
   langList.push({
     name: item.name,
     locale: item.locale,
+    alternate: item.alternate,
   })
   messages[item.locale] = item.message
 })

src/lang/zh-tw.json

@@ -37,7 +37,7 @@
   "desktop_lyric__unlock": "解鎖歌詞",
   "desktop_lyric__win_top_off": "取消置頂歌詞界面",
   "desktop_lyric__win_top_on": "置頂歌詞界面",
-  "download": "下載管理",
+  "download": "下載",
   "download__all": "全部任務",
   "download__error": "出錯",
   "download__finished": "下載完成",
@@ -91,7 +91,7 @@
   "list_add__btn_title": "把該歌曲添加到 {name}",
   "list_add__multiple_btn_title": "把這些歌曲添加到 {name}",
   "list_add__multiple_title_add": "添加已選的 {num} 首歌曲到...",
-  "list_add__multiple_title_move": "添加移動已選的 {num} 首歌曲到...",
+  "list_add__multiple_title_move": "移動已選的 {num} 首歌曲到...",
   "list_add__title_first_add": "添加",
   "list_add__title_first_move": "移動",
   "list_add__title_last": "到...",
@@ -134,21 +134,21 @@
   "lists__sync": "更新",
   "lists__sync_confirm_tip": "這將會把 {name} 內的歌曲替換成在線列表的歌曲，你確認要更新嗎？",
   "load_list_file_error_detail": "我們已經幫你把舊的列表文件備份到{path}\n它以 JSON 格式存儲，你可以嘗試手動修復並恢復它\n\n錯誤詳情：{detail}",
-  "load_list_file_error_title": "播放列表數據加載錯誤",
+  "load_list_file_error_title": "播放列表數據加載錯誤（建議到GitHub或加群反饋）",
   "loding": "加載中...",
-  "love_list": "收藏列表",
+  "love_list": "收藏",
   "lyric__load_error": "歌詞獲取失敗",
   "lyric__select": "歌詞文本選擇",
   "lyric_menu__align": "歌詞對齊方式",
   "lyric_menu__align_center": "居中",
   "lyric_menu__align_left": "居左",
   "lyric_menu__lrc_size": "字體大小  [ {size} ]",
   "lyric_menu__offset": "歌詞偏移 [ {offset}ms ]",
-  "lyric_menu__offset_add_10": "加快10毫秒（右擊加快5毫秒）",
+  "lyric_menu__offset_add_10": "加快10毫秒",
   "lyric_menu__offset_add_100": "加快100毫秒",
   "lyric_menu__offset_dec_10": "減慢10毫秒",
   "lyric_menu__offset_dec_100": "減慢100毫秒",
-  "lyric_menu__offset_reset": "重置偏移",
+  "lyric_menu__offset_reset": "重置",
   "lyric_menu__size_add": "加大字體（右擊可微調）",
   "lyric_menu__size_dec": "減小字體（右擊可微調）",
   "lyric_menu__size_reset": "重置",
@@ -179,7 +179,6 @@
   "play_timeout_unit": "分鐘",
   "play_timeout_update": "更新定時",
   "player__add_music_to": "添加當前歌曲到...",
-  "player__album": "專輯名：",
   "player__buffering": "緩衝中...",
   "player__desktop_lyric_lock": "右擊鎖定歌詞",
   "player__desktop_lyric_off": "關閉桌面歌詞",
@@ -190,6 +189,7 @@
   "player__geting_url": "歌曲鏈接獲取中...",
   "player__hide_detail_tip": "隱藏詳情頁（界面內右鍵雙擊可快速隱藏詳情頁）",
   "player__loading": "音樂加載中...",
+  "player__music_album": "專輯名：",
   "player__music_name": "歌曲名：",
   "player__music_singer": "藝術家：",
   "player__next": "下一首",
@@ -313,7 +313,7 @@
   "setting__hot_key_local_title": "軟件內快捷鍵",
   "setting__hot_key_player_next": "下一首歌曲",
   "setting__hot_key_player_prev": "上一首歌曲",
-  "setting__hot_key_player_toggle_play": "播放/暫停控制​​",
+  "setting__hot_key_player_toggle_play": "播放/暫停控制",
   "setting__hot_key_player_volume_down": "減少音量",
   "setting__hot_key_player_volume_mute": "靜音切換",
   "setting__hot_key_player_volume_up": "增加音量",

src/main/rendererEvents/playList.js

@@ -23,6 +23,7 @@ const handleSaveList = ({ defaultList, loveList, userList, tempList }) => {
   getStore('playList').set(data)
 }
 mainOn(ipcMainWindowNames.save_playlist, (event, { type, data }) => {
+  data = JSON.parse(data)
   switch (type) {
     case 'myList':
       handleSaveList(data)

src/renderer/components/common/DownloadModal.vue

@@ -3,7 +3,7 @@
   <main :class="$style.main">
     <h2>{{ info.name }}<br/>{{ info.singer }}</h2>
     <base-btn :class="$style.btn" :key="type.type" @click="handleClick(type.type)" v-for="type in types"
-    >{{getTypeName(type.type)}} {{ type.type.toUpperCase() }}{{ type.size && ` - ${type.size.toUpperCase()}` }}</base-btn>
+    >{{getTypeName(type.type)}}{{ type.size && ` - ${type.size.toUpperCase()}` }}</base-btn>
   </main>
 </material-modal>
 </template>
@@ -56,15 +56,16 @@ export default {
     getTypeName(type) {
       switch (type) {
         case 'flac32bit':
+          return this.$t('download__lossless') + ' FLAC Hires'
         case 'flac':
         case 'ape':
         case 'wav':
-          return this.$t('download__lossless')
+          return this.$t('download__lossless') + ' ' + type.toUpperCase()
         case '320k':
-          return this.$t('download__high_quality')
+          return this.$t('download__high_quality') + ' ' + type.toUpperCase()
         case '192k':
         case '128k':
-          return this.$t('download__normal')
+          return this.$t('download__normal') + ' ' + type.toUpperCase()
       }
     },
     checkSource(type) {

src/renderer/components/common/DownloadMultipleModal.vue

@@ -5,7 +5,7 @@
     <base-btn :class="$style.btn" @click="handleClick('128k')">{{$t('download__normal')}} - 128K</base-btn>
     <base-btn :class="$style.btn" @click="handleClick('320k')">{{$t('download__high_quality')}} - 320K</base-btn>
     <base-btn :class="$style.btn" @click="handleClick('flac')">{{$t('download__lossless')}} - FLAC</base-btn>
-    <base-btn :class="$style.btn" @click="handleClick('flac32bit')">{{$t('download__lossless')}} - FLAC 24bit</base-btn>
+    <base-btn :class="$style.btn" @click="handleClick('flac32bit')">{{$t('download__lossless')}} - FLAC Hires</base-btn>
   </main>
 </material-modal>
 </template>

src/renderer/store/modules/list.js

@@ -189,7 +189,7 @@ const mutations = {
           break
       }
     }
-    window.eventHub.emit(eventListNames.listChange, [fromId, toList])
+    window.eventHub.emit(eventListNames.listChange, [fromId, toId])
   },
   listAddMultiple(state, { id, list, addMusicLocationType, isSync }) {
     if (!addMusicLocationType) addMusicLocationType = this.state.setting.list.addMusicLocationType

src/renderer/utils/index.js

@@ -79,14 +79,15 @@ export const b64DecodeUnicode = str => {
 }
 
 const encodeNames = {
+  ' ': ' ',
   '&': '&',
   '&lt;': '<',
   '&gt;': '>',
   '&quot;': '"',
   '&apos;': "'",
   '&#039;': "'",
 }
-export const decodeName = (str = '') => str?.replace(/(?:&amp;|&lt;|&gt;|&quot;|&apos;|&#039;)/gm, s => encodeNames[s]) || ''
+export const decodeName = (str = '') => str?.replace(/(?:&amp;|&lt;|&gt;|&quot;|&apos;|&#039;|&nbsp;)/gm, s => encodeNames[s]) || ''
 
 const easeInOutQuad = (t, b, c, d) => {
   t /= d / 2