attempt at fixing the graph writing logic for windows

Author: ljeub-pometry

raphtory-graphql/src/data.rs

@@ -21,6 +21,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
+use std::ffi::OsStr;
 use tokio::fs;
 use tracing::warn;
 use walkdir::WalkDir;
@@ -282,28 +283,17 @@ impl Data {
     /// Serializes a graph to disk, overwriting any existing data in its folder.
     fn encode_graph_to_disk(graph: GraphWithVectors) -> Result<(), GraphError> {
         let folder_path = graph.folder.get_base_path();
+        let bak_name = "_".to_string() +  folder_path.file_name().and_then(|n| n.to_str()).unwrap_or("");
+        let bak_path = folder_path.with_file_name(bak_name);
 
-        // Create a backup of the existing folder
+        // Write to backup path first
+        graph.graph.encode(&bak_path)?;
+        
         if folder_path.exists() {
-            let bak_path = folder_path.with_extension("bak");
-
-            // Remove any old backups
-            if bak_path.exists() {
-                std::fs::remove_dir_all(&bak_path)?;
-            }
-
-            std::fs::rename(&folder_path, &bak_path)?;
-        }
-
-        // Serialize the graph to the original folder path
-        graph.graph.encode(&folder_path)?;
-
-        // Delete the backup on success
-        let bak_path = folder_path.with_extension("bak");
-
-        if bak_path.exists() {
-            std::fs::remove_dir_all(&bak_path)?;
+            // delete old data
+            std::fs::remove_dir_all(folder_path)?;
         }
+        std::fs::rename(&bak_path, folder_path)?;
 
         Ok(())
     }

raphtory-graphql/src/paths.rs

@@ -125,8 +125,12 @@ pub(crate) fn valid_path(
                 }
                 full_path.push(component);
                 //check if the path with the component is a graph
-                if namespace && full_path.join(META_PATH).exists() {
-                    return Err(InvalidPathReason::ParentIsGraph(user_facing_path));
+                if full_path.join(META_PATH).exists() {
+                    if namespace {
+                        return Err(InvalidPathReason::ParentIsGraph(user_facing_path));
+                    } else if component.to_str().ok_or(InvalidPathReason::NonUTFCharacters)?.starts_with("_") {
+                        return Err(InvalidPathReason::GraphNamePrefix)
+                    }
                 }
                 //check for symlinks
                 if full_path.is_symlink() {

raphtory/src/errors.rs

@@ -54,6 +54,8 @@ pub enum InvalidPathReason {
     PathNotParsable(PathBuf),
     #[error("The path to the graph contains a subpath to an existing graph: {0}")]
     ParentIsGraph(PathBuf),
+    #[error("Graph name cannot start with _")]
+    GraphNamePrefix,
     #[error("The path provided does not exists as a namespace: {0}")]
     NamespaceDoesNotExist(String),
     #[error("The path provided contains non-UTF8 characters.")]