Merge pull request #89 from taozhiyu/main

fix: error desktop path
LokerL · Mar 16, 2023 · fde0d05 · fde0d05
2 parents 8e3496a + 15da2e2
commit fde0d05
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/electron/main/index.ts b/electron/main/index.ts
@@ -160,3 +160,8 @@ ipcMain.on("openDevTools", async (event, arg) => {
     win.webContents.openDevTools({ mode: "undocked", activate: true });
   }
 });
+
+// Get desktop path
+ipcMain.on("getDesktopPath", async (event) => {
+  event.returnValue = app.getPath("desktop");
+});
diff --git a/src/global/initLocalStore.ts b/src/global/initLocalStore.ts
@@ -1,7 +1,6 @@
 const Store = require("electron-store");
 const store = new Store();
-const homeDir = require("os").homedir();
-const desktopDir = require("path").resolve(homeDir, "Desktop");
+const { ipcRenderer } = require("electron");
 export default function initStore() {
   if (!store.has("FormConfig.默认")) {
     store.set("FormConfig.默认", {
@@ -14,7 +13,7 @@ export default function initStore() {
     });
   }
   if (!store.has("savePath")) {
-    store.set("savePath", desktopDir);
+    store.set("savePath", ipcRenderer.sendSync("getDesktopPath"));
   }
   if (!store.has("audition")) {
     store.set(

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "ignoreDeprecations": "5.0",
     "target": "esnext",
     "module": "esnext",
     "moduleResolution": "node",