From b982dd90e4f889ca5b91b818d0059cc91d9c8c29 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sun, 4 Aug 2024 10:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A8=8B=E5=BA=8F=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E8=B7=AF=E5=BE=84=E5=AD=98=E5=9C=A8=20`#`=20=E6=88=96?=
 =?UTF-8?q?=20`%`=20=E6=97=B6=EF=BC=8C=E8=87=AA=E5=AE=9A=E4=B9=89=E6=BA=90?=
 =?UTF-8?q?=E3=80=81=E6=89=98=E7=9B=98=E7=AD=89=E5=9B=BE=E6=A0=87=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=88#1997=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md             | 1 +
 src/main/app.ts                  | 4 ++--
 src/main/modules/userApi/main.ts | 7 +++----
 3 files changed, 6 insertions(+), 6 deletions(-)

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)
 
   /**