Try to fix windows shell open calls

Issue #80
openscopeproject · Sep 17, 2023 · 44e964b · 44e964b
1 parent 5d2e9fd
commit 44e964b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
@@ -106,6 +106,9 @@ pub async fn remove_file(path: String) {
 
 #[tauri::command]
 pub async fn shell_open(path: String) -> Result<(), String> {
+    #[cfg(target_os = "windows")]
+    let path = path.replace('/', "\\");
+
     if let Err(e) = opener::open(path) {
         return Err(e.to_string());
     }

diff --git a/src/components/tables/filetreetable.tsx b/src/components/tables/filetreetable.tsx
@@ -289,7 +289,11 @@ export function FileTreeTable(props: FileTreeTableProps) {
     const onRowDoubleClick = useCallback((row: FileDirEntry) => {
         if (TAURI) {
             if (props.downloadDir === undefined || props.downloadDir === "") return;
-            let path = `${props.downloadDir}/${row.fullpath}`;
+            let path = props.downloadDir;
+            if (!path.endsWith("/") && !path.endsWith("\\")) {
+                path = path + "/";
+            }
+            path = path + row.fullpath + (isDirEntry(row) ? "/" : "");
             path = pathMapFromServer(path, serverConfig);
             invoke("shell_open", { path }).catch((e) => {
                 notifications.show({

diff --git a/src/trutil.ts b/src/trutil.ts
@@ -98,9 +98,7 @@ export function reorderElements<T>(list: T[], startIndex: number, endIndex: numb
 }
 
 function normalizePath(path: string) {
-    let p = path.replace(/\\/g, "/");
-    if (p.match(/^[a-zA-Z]:\//) != null) p = p.toLowerCase();
-    return p;
+    return path.replace(/\\/g, "/");
 }
 
 export function pathMapFromServer(path: string, config: ServerConfig) {