From e6c38154936e8764b6b0c41e9857764c316895fe Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sun, 5 Feb 2023 13:28:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AD=8C=E8=AF=8D=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-config/runner-dev.js | 3 +++ package.json | 2 +- src/main/modules/winMain/rendererEvent/tx_decodeLyric.ts | 2 +- src/renderer/core/music/utils.ts | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build-config/runner-dev.js b/build-config/runner-dev.js index 4d7a7ce5..79bfd031 100644 --- a/build-config/runner-dev.js +++ b/build-config/runner-dev.js @@ -14,6 +14,8 @@ const mainConfig = require('./main/webpack.config.dev') const rendererConfig = require('./renderer/webpack.config.dev') const rendererLyricConfig = require('./renderer-lyric/webpack.config.dev') const rendererScriptConfig = require('./renderer-scripts/webpack.config.dev') +const { Arch } = require('electron-builder') +const replaceLib = require('./build-before-pack') let electronProcess = null let manualRestart = false @@ -224,6 +226,7 @@ function init() { function handleFail(name) { spinners.fail(name, { text: name + ' compile fail!' }) } + replaceLib({ electronPlatformName: process.platform, arch: Arch[process.arch] }) Promise.all([ startRenderer().then(() => handleSuccess('renderer')).catch((err) => { diff --git a/package.json b/package.json index 729cd0ef..1c50378a 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "build": "npm run clean:electron && npm run build:main && npm run build:renderer && npm run build:renderer-lyric && npm run build:renderer-scripts", "lint": "eslint --ext .ts,.js,.vue -f node_modules/eslint-formatter-friendly src", "lint:fix": "eslint --ext .ts,.js,.vue -f node_modules/eslint-formatter-friendly --fix src", - "postinstall": "electron-builder install-app-deps && node build-config/post-install", + "postinstall": "electron-builder install-app-deps", "dp": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://127.0.0.1:1081 npm run pack", "up": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://127.0.0.1:1081 npm i" }, diff --git a/src/main/modules/winMain/rendererEvent/tx_decodeLyric.ts b/src/main/modules/winMain/rendererEvent/tx_decodeLyric.ts index 2ca5a750..df3d06aa 100644 --- a/src/main/modules/winMain/rendererEvent/tx_decodeLyric.ts +++ b/src/main/modules/winMain/rendererEvent/tx_decodeLyric.ts @@ -26,7 +26,7 @@ const handleDecode = async(lrc: string, tlrc: string, rlrc: string) => { // const nativeBindingPath = isDev ? path.join(__dirname, '../build/Release/qrc_decode.node') // eslint-disable-next-line @typescript-eslint/no-var-requires const addon = require('qrc_decode.node') - console.log(addon) + // console.log(addon) qrc_decode = addon.qrc_decode } diff --git a/src/renderer/core/music/utils.ts b/src/renderer/core/music/utils.ts index b48daf84..e724f6fd 100644 --- a/src/renderer/core/music/utils.ts +++ b/src/renderer/core/music/utils.ts @@ -124,13 +124,14 @@ export const getCachedLyricInfo = async(musicInfo: LX.Music.MusicInfo): Promise< case 'kw': case 'mg': case 'wy': + case 'tx': break default: return lrcInfo } } else if (lrcInfo.rlyric == null) { // 以下源支持 rlyric 重新获取 - if (!['wy', 'kg'].includes(musicInfo.source)) return lrcInfo + if (!['wy', 'kg', 'tx'].includes(musicInfo.source)) return lrcInfo } else return lrcInfo } return null