refactor: Encode file path to handle special characters

Zettlr · May 8, 2024 · b5e0021 · b5e0021
1 parent 7498aae
commit b5e0021
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/source/app/service-providers/fsal/index.ts b/source/app/service-providers/fsal/index.ts
@@ -462,16 +462,17 @@ export default class FSAL extends ProviderContract {
     // Encode the file path to handle special characters
     let encodedPath = encodeURI(absPath)
 
-    if (await this.isDir(absPath)) {
-      throw new Error(`[FSAL] Cannot load file ${absPath} as it is a directory`)
+    if (await this.isDir(encodedPath)) {
+      throw new Error(`[FSAL] Cannot load file ${encodedPath} as it is a directory`)
     }
 
-    if (!await this.isFile(absPath)) {
-      throw new Error(`[FSAL] Cannot load file ${absPath}: Not found`)
+    if (!await this.isFile(encodedPath)) {
+      throw new Error(`[FSAL] Cannot load file ${encodedPath}: Not found`)
     }
 
-    if (hasMdOrCodeExt(absPath)) {
-      const content = await fs.readFile(absPath, { encoding: 'utf-8' })
+    if (hasMdOrCodeExt(encodedPath)) {
+      // Decode the URI before reading the file
+      const content = await fs.readFile(decodeURI(encodedPath), { encoding: 'utf-8' })
       return content
     }
 
@@ -493,11 +494,11 @@ export default class FSAL extends ProviderContract {
     // Encode the file path to handle special characters
     let encodedPath = encodeURI(absPath)
 
-    if (await this.isDir(absPath)) {
+    if (await this.isDir(encodedPath)) {
       throw new Error(`[FSAL] Cannot load file ${absPath} as it is a directory`)
     }
 
-    if (!await this.isFile(absPath)) {
+    if (!await this.isFile(encodedPath)) {
       throw new Error(`[FSAL] Cannot load file ${absPath}: Not found`)
     }