github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

完善歌词获取流程

pull/1211/head
lyswhut 2023-02-05 13:28:43 +08:00
parent 32626ef773
commit e6c3815493
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build-config/runner-dev.js
View File

@ -14,6 +14,8 @@ const mainConfig = require('./main/webpack.config.dev')
const rendererConfig = require('./renderer/webpack.config.dev') const rendererConfig = require('./renderer/webpack.config.dev')
const rendererLyricConfig = require('./renderer-lyric/webpack.config.dev') const rendererLyricConfig = require('./renderer-lyric/webpack.config.dev')
const rendererScriptConfig = require('./renderer-scripts/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 electronProcess = null
let manualRestart = false let manualRestart = false
@ -224,6 +226,7 @@ function init() {
function handleFail(name) { function handleFail(name) {
spinners.fail(name, { text: name + ' compile fail!' }) spinners.fail(name, { text: name + ' compile fail!' })
} }
replaceLib({ electronPlatformName: process.platform, arch: Arch[process.arch] })
Promise.all([ Promise.all([
startRenderer().then(() => handleSuccess('renderer')).catch((err) => { startRenderer().then(() => handleSuccess('renderer')).catch((err) => {

2
package.json
View File

@ -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", "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": "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", "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", "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" "up": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://127.0.0.1:1081 npm i"
}, },

2
src/main/modules/winMain/rendererEvent/tx_decodeLyric.ts
View File

@ -26,7 +26,7 @@ const handleDecode = async(lrc: string, tlrc: string, rlrc: string) => {
// const nativeBindingPath = isDev ? path.join(__dirname, '../build/Release/qrc_decode.node') // const nativeBindingPath = isDev ? path.join(__dirname, '../build/Release/qrc_decode.node')
// eslint-disable-next-line @typescript-eslint/no-var-requires // eslint-disable-next-line @typescript-eslint/no-var-requires
const addon = require('qrc_decode.node') const addon = require('qrc_decode.node')
console.log(addon) // console.log(addon)
qrc_decode = addon.qrc_decode qrc_decode = addon.qrc_decode
} }

3
src/renderer/core/music/utils.ts
View File

@ -124,13 +124,14 @@ export const getCachedLyricInfo = async(musicInfo: LX.Music.MusicInfo): Promise<
case 'kw': case 'kw':
case 'mg': case 'mg':
case 'wy': case 'wy':
case 'tx':
break break
default: default:
return lrcInfo return lrcInfo
} }
} else if (lrcInfo.rlyric == null) { } else if (lrcInfo.rlyric == null) {
// 以下源支持 rlyric 重新获取 // 以下源支持 rlyric 重新获取
if (!['wy', 'kg'].includes(musicInfo.source)) return lrcInfo if (!['wy', 'kg', 'tx'].includes(musicInfo.source)) return lrcInfo
} else return lrcInfo } else return lrcInfo
} }
return null return null