use appdata when no xdg-data-dirs

franciscoBSalgueiro · Dec 17, 2023 · ecc83ad · ecc83ad
1 parent 11f8b4a
commit ecc83ad
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 22 deletions.
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -78,6 +78,7 @@ const REQUIRED_DIRS: &[(BaseDirectory, &str)] = &[
     (BaseDirectory::AppData, "db"),
     (BaseDirectory::AppData, "presets"),
     (BaseDirectory::AppData, "puzzles"),
+    (BaseDirectory::AppData, "documents"),
     (BaseDirectory::Document, "EnCroissant"),
 ];
 
@@ -177,11 +178,12 @@ fn main() {
                     &app.env(),
                     path,
                     Some(*dir),
-                )
-                .unwrap();
-                if !Path::new(&path).exists() {
-                    create_dir_all(&path).unwrap();
-                }
+                );
+                if let Ok(path) = path {
+                    if !Path::new(&path).exists() {
+                        create_dir_all(&path).unwrap();
+                    }
+                };
             }
 
             for (dir, path) in REQUIRED_FILES.iter() {
@@ -243,7 +245,6 @@ fn is_bmi2_compatible() -> bool {
     false
 }
 
-
 #[tauri::command]
 #[specta::specta]
 async fn is_menu_visisble(window: tauri::Window) -> bool {

diff --git a/src/components/common/OpenFolderButton.tsx b/src/components/common/OpenFolderButton.tsx
@@ -15,8 +15,13 @@ function OpenFolderButton({
       const path = await resolve(await appDataDir(), folder);
       open(path);
     } else if (base === "Document") {
-      const path = await resolve(await documentDir(), folder);
-      open(path);
+      try {
+        const path = await resolve(await documentDir(), folder);
+        open(path);
+      } catch {
+        const path = await resolve(await appDataDir(), "documents");
+        open(path);
+      }
     }
   }
   return (

diff --git a/src/components/files/Modals.tsx b/src/components/files/Modals.tsx
@@ -144,20 +144,37 @@ export function EditModal({
       filename + ".pgn"
     );
 
-    await renameFile(
-      "EnCroissant/" + metadata.name + ".pgn",
-      "EnCroissant/" + filename + ".pgn",
-      {
-        dir: BaseDirectory.Document,
-      }
-    );
-    await renameFile(
-      "EnCroissant/" + metadata.name + ".info",
-      "EnCroissant/" + filename + ".info",
-      {
-        dir: BaseDirectory.Document,
-      }
-    );
+    try {
+      await renameFile(
+        "EnCroissant/" + metadata.name + ".pgn",
+        "EnCroissant/" + filename + ".pgn",
+        {
+          dir: BaseDirectory.Document,
+        }
+      );
+      await renameFile(
+        "EnCroissant/" + metadata.name + ".info",
+        "EnCroissant/" + filename + ".info",
+        {
+          dir: BaseDirectory.Document,
+        }
+      );
+    } catch {
+      await renameFile(
+        "documents/" + metadata.name + ".pgn",
+        "documents/" + filename + ".pgn",
+        {
+          dir: BaseDirectory.AppData,
+        }
+      );
+      await renameFile(
+        "documents/" + metadata.name + ".info",
+        "documents/" + filename + ".info",
+        {
+          dir: BaseDirectory.AppData,
+        }
+      );
+    }
 
     setFiles((files) =>
       [