From fa3fd8d8a4d5a6af3b311c7e7d5bf89cc3e28295 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 5 Jun 2023 15:05:03 +0800 Subject: [PATCH] =?UTF-8?q?Windows=E3=80=81MacOS=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E5=AD=97=E4=BD=93=E5=88=97=E8=A1=A8=E6=94=B9?= =?UTF-8?q?=E7=94=A8=E5=8E=9F=E7=94=9F=E6=96=B9=E5=BC=8F=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-config/main/webpack.config.base.js | 1 + package-lock.json | 35 ++++++++++++++++++++++-- package.json | 6 +++- publish/changeLog.md | 7 ++++- src/main/utils/fontManage.ts | 12 +++++++- 5 files changed, 56 insertions(+), 5 deletions(-) diff --git a/build-config/main/webpack.config.base.js b/build-config/main/webpack.config.base.js index d0191e39..bfd839c6 100644 --- a/build-config/main/webpack.config.base.js +++ b/build-config/main/webpack.config.base.js @@ -15,6 +15,7 @@ module.exports = { externals: { 'font-list': 'font-list', 'better-sqlite3': 'better-sqlite3', + 'electron-font-manager': 'electron-font-manager', bufferutil: 'bufferutil', 'utf-8-validate': 'utf-8-validate', 'qrc_decode.node': isDev ? path.join(__dirname, '../../build/Release/qrc_decode.node') : path.join('../build/Release/qrc_decode.node'), diff --git a/package-lock.json b/package-lock.json index 85ff4b21..7843b150 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "lx-music-desktop", - "version": "2.3.0-beta.7", + "version": "2.3.0-beta.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "lx-music-desktop", - "version": "2.3.0-beta.7", + "version": "2.3.0-beta.8", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { @@ -15,6 +15,7 @@ "bufferutil": "^4.0.7", "comlink": "~4.3.1", "crypto-js": "^4.1.1", + "electron-font-manager": "github:lyswhut/electron-font-manager#60348260de557753c870cc671c56da6f58fd0ef7", "electron-log": "^4.4.8", "electron-store": "^8.1.0", "font-list": "^1.5.0", @@ -7435,6 +7436,21 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, + "node_modules/electron-font-manager": { + "version": "0.0.1", + "resolved": "git+ssh://git@github.com/lyswhut/electron-font-manager.git#60348260de557753c870cc671c56da6f58fd0ef7", + "integrity": "sha512-yg8SGhIXxkqjGlG6LA3KlHhlpjttTRVypV6zsv9cceFoN7tzYk78CqgZXOzR3SMcUU8Z1TRQi+vy4EryK1/Z0g==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^6.1.0" + } + }, + "node_modules/electron-font-manager/node_modules/node-addon-api": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", + "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==" + }, "node_modules/electron-is-accelerator": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz", @@ -23992,6 +24008,21 @@ } } }, + "electron-font-manager": { + "version": "git+ssh://git@github.com/lyswhut/electron-font-manager.git#60348260de557753c870cc671c56da6f58fd0ef7", + "integrity": "sha512-yg8SGhIXxkqjGlG6LA3KlHhlpjttTRVypV6zsv9cceFoN7tzYk78CqgZXOzR3SMcUU8Z1TRQi+vy4EryK1/Z0g==", + "from": "electron-font-manager@github:lyswhut/electron-font-manager#60348260de557753c870cc671c56da6f58fd0ef7", + "requires": { + "node-addon-api": "^6.1.0" + }, + "dependencies": { + "node-addon-api": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", + "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==" + } + } + }, "electron-is-accelerator": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz", diff --git a/package.json b/package.json index 3524c2b1..1b38886f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "2.3.0-beta.7", + "version": "2.3.0-beta.8", "description": "一个免费的音乐查找助手", "main": "./dist/main.js", "productName": "lx-music-desktop", @@ -97,6 +97,9 @@ "node_modules/better-sqlite3/lib", "node_modules/better-sqlite3/package.json", "node_modules/better-sqlite3/build/Release/better_sqlite3.node", + "node_modules/electron-font-manager/index.js", + "node_modules/electron-font-manager/package.json", + "node_modules/electron-font-manager/build/Release/font_manager.node", "node_modules/node-gyp-build", "node_modules/bufferutil", "node_modules/utf-8-validate", @@ -281,6 +284,7 @@ "bufferutil": "^4.0.7", "comlink": "~4.3.1", "crypto-js": "^4.1.1", + "electron-font-manager": "github:lyswhut/electron-font-manager#60348260de557753c870cc671c56da6f58fd0ef7", "electron-log": "^4.4.8", "electron-store": "^8.1.0", "font-list": "^1.5.0", diff --git a/publish/changeLog.md b/publish/changeLog.md index 54f9f93b..fc986b62 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,8 +1,12 @@ ### 新增 -- 新增音效设置（实验性功能），支持10段均衡器设置、内置的一些环境混响音效、音调升降调节、3D立体环绕音效（由于升降调需要实时处理音频数据，这会导致额外的CPU占用） +- 新增音效设置（实验性功能），支持10段均衡器设置、内置的一些环境混响音效、音调升降调节、3D立体环绕音效（由于升降调需要实时处理音频数据，这会导致额外的CPU占用，已知问题：如果CPU资源不够时将处理导致任务堆积而出现声音异常，这时需要暂停播放一段时间等堆积的任务处理完毕再播放） - 播放速率设置面板新增是否音调补偿设置，在调整播放速率后，可以选择是否启用音调补偿，默认启用 +### 优化 + +- Windows、MacOS平台下的字体列表改用原生方式获取，现在Windows平台下能显示当前已安装的更多类型字体了（注：MacOS平台未测，可用性未知） + ### 修复 - 修复列表名翻译显示 @@ -10,6 +14,7 @@ - 修复下载时出现302错误的问题 - 修复播放某些在线音频会没有声音的问题 - 修复改变播放速率时会导致歌词报错的问题 +- 修复tx热门评论昵称被错误切割的问题 (#1397, By: @helloplhm-qwq, @Folltoshe) ### 其他 diff --git a/src/main/utils/fontManage.ts b/src/main/utils/fontManage.ts index 9c12d9aa..588ef610 100644 --- a/src/main/utils/fontManage.ts +++ b/src/main/utils/fontManage.ts @@ -3,8 +3,18 @@ // exports.getAvailableFontFamilies = getAvailableFontFamilies +import { getFonts as getFontsByCommand } from 'font-list' +import { getAvailableFontFamilies } from 'electron-font-manager' -import { getFonts } from 'font-list' + +const getFonts = async() => { + switch (process.platform) { + case 'win32': + case 'darwin': + return getAvailableFontFamilies() + default: return getFontsByCommand() + } +} export { getFonts,