FsZip: do not attempt to open folder 'foo.zip' as an archive

warpdesign · Mar 9, 2023 · 44918e7 · 44918e7
1 parent 644fa21
commit 44918e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/services/plugins/FsLocal.ts b/src/services/plugins/FsLocal.ts
@@ -486,7 +486,7 @@ export class LocalApi implements FsApi {
 
 export function FolderExists(path: string): boolean {
     try {
-        return fs.existsSync(path) && fs.lstatSync(path).isDirectory()
+        return fs.existsSync(path) && fs.statSync(path).isDirectory()
     } catch (err) {
         return false
     }
@@ -501,8 +501,9 @@ export const FsLocal: Fs = {
         readonly: false,
         indirect: false,
     },
-    canread(basePath: string): boolean {
-        return !!basePath.match(localStart)
+    canread(basePath: string, subDir: string): boolean {
+        const fullPath = path.join(basePath, subDir)
+        return !!basePath.match(localStart) && FolderExists(fullPath)
     },
     serverpart(str: string): string {
         return 'local'

diff --git a/src/utils/initFS.ts b/src/utils/initFS.ts
@@ -14,7 +14,7 @@ export default function initFS() {
     } else {
         // TODO: there should be an easy way to automatically register new FS
         registerFs(FsWsl)
-        registerFs(FsZip)
         registerFs(FsLocal)
+        registerFs(FsZip)
     }
 }