fix: allow return value of fs::canonicalize on fs scope, closes #4130 (…

…#4188)
tauri-apps · May 21, 2022 · 78f2565 · 78f2565
1 parent 72700ec
commit 78f2565
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.changes/fix-fs-scope-windows.md b/.changes/fix-fs-scope-windows.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Allow the canonical, absolute form of a path for the filesystem scope on Windows if `std::fs::canonicalize` returns a path, fallback to `\\?\$PATH`.
diff --git a/core/tauri/src/scope/fs.rs b/core/tauri/src/scope/fs.rs
@@ -69,7 +69,11 @@ fn push_pattern<P: AsRef<Path>>(list: &mut HashSet<Pattern>, pattern: P) -> crat
   list.insert(Pattern::new(&path.to_string_lossy())?);
   #[cfg(windows)]
   {
-    list.insert(Pattern::new(&format!("\\\\?\\{}", path.display()))?);
+    if let Ok(p) = std::fs::canonicalize(&path) {
+      list.insert(Pattern::new(&p.to_string_lossy())?);
+    } else {
+      list.insert(Pattern::new(&format!("\\\\?\\{}", path.display()))?);
+    }
   }
   Ok(())
 }