Fix: win path bug.

Future-Scholars · Jun 29, 2022 · a754051 · a754051
1 parent fe7e1ee
commit a754051
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/packages/main/index.ts b/packages/main/index.ts
@@ -207,6 +207,7 @@ ipcMain.on("maximize", () => {
 ipcMain.on("close", () => {
   win?.close();
   winPlugin?.close();
+  winCheck?.close();
   // app.quit();
 });
 

diff --git a/packages/preload/repositories/file-repository/backends/webdav-backend.ts b/packages/preload/repositories/file-repository/backends/webdav-backend.ts
@@ -282,7 +282,13 @@ export class WebDavFileBackend implements FileBackend {
         "webdav://"
       );
     } else {
-      sourceMainURL = constructFileURL(entity.mainURL, false, true, "file://");
+      sourceMainURL = constructFileURL(
+        entity.mainURL,
+        false,
+        true,
+        "",
+        "file://"
+      );
     }
     const targetMainURL = constructFileURL(
       targetFileName + "_main" + path.extname(sourceMainURL),

diff --git a/packages/preload/utils/path.ts b/packages/preload/utils/path.ts
@@ -27,18 +27,14 @@ export const constructFileURL = (
     }
   }
 
-  if (os.platform().startsWith("win")) {
-    return outURL;
-  } else {
-    if (withProtocol) {
-      if (outURL.startsWith(protocol)) {
-        return outURL;
-      } else {
-        return protocol + outURL;
-      }
+  if (withProtocol) {
+    if (outURL.startsWith(protocol)) {
+      return outURL;
     } else {
-      return outURL.replace(protocol, "");
+      return protocol + outURL;
     }
+  } else {
+    return outURL.replace(protocol, "");
   }
 };