feat: support opening markdown smb files on Windows

purocean · Jan 23, 2025 · d9fca0b · d9fca0b
1 parent 554a569
commit d9fca0b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/server/file.ts b/src/main/server/file.ts
@@ -71,7 +71,9 @@ function getExcludeRegex () {
 }
 
 function withRepo<T> (repo = 'main', callback: (repoPath: string, ...targetPath: string[]) => Promise<T>, ...target: string[]): Promise<T> {
-  const repoPath = repo.startsWith(ROOT_REPO_NAME_PREFIX)
+  const isRootRepo = repo.startsWith(ROOT_REPO_NAME_PREFIX)
+
+  const repoPath = isRootRepo
     ? repo.substring(ROOT_REPO_NAME_PREFIX.length)
     : repository.getPath(repo)
 
@@ -80,7 +82,9 @@ function withRepo<T> (repo = 'main', callback: (repoPath: string, ...targetPath:
   }
 
   return callback(repoPath, ...target.map(x => {
-    const targetPath = path.join(repoPath, x)
+    const targetPath = isRootRepo
+      ? x.replace(/^\//, repoPath) // replace first / to repoPath for case of `\\127.0.0.1/test/a.md`
+      : path.join(repoPath, x)
 
     if (!targetPath.startsWith(repoPath)) {
       throw new Error('Path error.')

diff --git a/src/renderer/services/document.ts b/src/renderer/services/document.ts
@@ -887,7 +887,7 @@ export async function switchDocByPath (path: string): Promise<void> {
 
     let root = '/'
     if (isWindows) {
-      const regMatch = path.match(/^([a-zA-Z]:\\)/)
+      const regMatch = path.match(/^([a-zA-Z]:\\|\\\\)/)
       if (regMatch) {
         root = regMatch[1]
         path = path.replace(root, '/')