diff --git a/publish/changeLog.md b/publish/changeLog.md index 4b87c622..068a3203 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -14,6 +14,7 @@ - 修复 OpenAPI 的 `lyricLineAllText` 在切换到无歌词的音乐时内容没有更新的问题(#1925) - 修复切换音源时可能出现切换死循环的问题 - 尝试修复某些情况下播放音频时,处于播放状态但是进度条不走的问题 +- 修复程序目录路径存在 `#` 或 `%` 时,自定义源、托盘等图标异常的问题(#1997) ### 变更 diff --git a/src/main/app.ts b/src/main/app.ts index 51ac087f..5be425b3 100644 --- a/src/main/app.ts +++ b/src/main/app.ts @@ -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 = () => { diff --git a/src/main/modules/userApi/main.ts b/src/main/modules/userApi/main.ts index 1282f619..2ea35096 100644 --- a/src/main/modules/userApi/main.ts +++ b/src/main/modules/userApi/main.ts @@ -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) /**