修复程序目录路径存在 `#` 或 `%` 时,自定义源、托盘等图标异常的问题(#1997)

pull/2077/head
lyswhut 2024-08-04 10:48:31 +08:00
parent 80e36688e8
commit b982dd90e4
3 changed files with 6 additions and 6 deletions

View File

@ -14,6 +14,7 @@
- 修复 OpenAPI 的 `lyricLineAllText` 在切换到无歌词的音乐时内容没有更新的问题(#1925
- 修复切换音源时可能出现切换死循环的问题
- 尝试修复某些情况下播放音频时,处于播放状态但是进度条不走的问题
- 修复程序目录路径存在 `#``%` 时,自定义源、托盘等图标异常的问题(#1997
### 变更

View File

@ -10,7 +10,7 @@ import { createAppEvent, createDislikeEvent, createListEvent } from '@main/event
import { isMac, log } from '@common/utils'
import createWorkers from './worker'
import { migrateDBData } from './utils/migrate'
import { encodePath, openDirInExplorer } from '@common/utils/electron'
import { openDirInExplorer } from '@common/utils/electron'
export const initGlobalData = () => {
const envParams = parseEnvParams()
@ -69,7 +69,7 @@ export const initGlobalData = () => {
global.staticPath =
process.env.NODE_ENV !== 'production'
? webpackStaticPath
: path.join(encodePath(__dirname), 'static')
: path.join(__dirname, 'static')
}
export const initSingleInstanceHandle = () => {

View File

@ -3,7 +3,6 @@ import { BrowserWindow } from 'electron'
import fs from 'fs'
import path from 'node:path'
import { openDevTools as handleOpenDevTools } from '@main/utils'
import { encodePath } from '@common/utils/electron'
import USER_API_RENDERER_EVENT_NAME from './rendererEvent/name'
import { getScript } from './utils'
@ -58,15 +57,15 @@ const winEvent = () => {
export const createWindow = async(userApi: LX.UserApi.UserApiInfo) => {
await closeWindow()
dir ??= process.env.NODE_ENV !== 'production' ? webpackUserApiPath : path.join(encodePath(__dirname), 'userApi')
dir ??= process.env.NODE_ENV !== 'production' ? webpackUserApiPath : path.join(__dirname, 'userApi')
if (!html) {
// eslint-disable-next-line require-atomic-updates
html = await fs.promises.readFile(path.join(dir, 'renderer/user-api.html'), 'utf8')
}
const preloadUrl = process.env.NODE_ENV !== 'production'
? `${path.join(encodePath(__dirname), '../dist/user-api-preload.js')}`
: `${path.join(encodePath(__dirname), 'user-api-preload.js')}`
? `${path.join(__dirname, '../dist/user-api-preload.js')}`
: `${path.join(__dirname, 'user-api-preload.js')}`
// console.log(preloadUrl)
/**