f Canonicalize paths on Windows

Author: tnull

lightning-persister/src/fs_store.rs

@@ -66,17 +66,35 @@ impl FilesystemStore {
 			outer_lock.retain(|_, v| Arc::strong_count(&v) > 1);
 		}
 	}
+
+	fn get_dest_dir_path(&self, namespace: &str, sub_namespace: &str) -> std::io::Result<PathBuf> {
+		let mut dest_dir_path = {
+			#[cfg(target_os = "windows")]
+			{
+				let data_dir = self.data_dir.clone();
+				fs::create_dir_all(data_dir.clone())?;
+				fs::canonicalize(data_dir)?
+			}
+			#[cfg(not(target_os = "windows"))]
+			{
+				self.data_dir.clone()
+			}
+		};
+
+		dest_dir_path.push(namespace);
+		if !sub_namespace.is_empty() {
+			dest_dir_path.push(sub_namespace);
+		}
+
+		Ok(dest_dir_path)
+	}
 }
 
 impl KVStore for FilesystemStore {
 	fn read(&self, namespace: &str, sub_namespace: &str, key: &str) -> std::io::Result<Vec<u8>> {
 		check_namespace_key_validity(namespace, sub_namespace, Some(key), "read")?;
 
-		let mut dest_file_path = self.data_dir.clone();
-		dest_file_path.push(namespace);
-		if !sub_namespace.is_empty() {
-			dest_file_path.push(sub_namespace);
-		}
+		let mut dest_file_path = self.get_dest_dir_path(namespace, sub_namespace)?;
 		dest_file_path.push(key);
 
 		let mut buf = Vec::new();
@@ -99,11 +117,7 @@ impl KVStore for FilesystemStore {
 	fn write(&self, namespace: &str, sub_namespace: &str, key: &str, buf: &[u8]) -> std::io::Result<()> {
 		check_namespace_key_validity(namespace, sub_namespace, Some(key), "write")?;
 
-		let mut dest_file_path = self.data_dir.clone();
-		dest_file_path.push(namespace);
-		if !sub_namespace.is_empty() {
-			dest_file_path.push(sub_namespace);
-		}
+		let mut dest_file_path = self.get_dest_dir_path(namespace, sub_namespace)?;
 		dest_file_path.push(key);
 
 		let parent_directory = dest_file_path
@@ -190,11 +204,7 @@ impl KVStore for FilesystemStore {
 	fn remove(&self, namespace: &str, sub_namespace: &str, key: &str, lazy: bool) -> std::io::Result<()> {
 		check_namespace_key_validity(namespace, sub_namespace, Some(key), "remove")?;
 
-		let mut dest_file_path = self.data_dir.clone();
-		dest_file_path.push(namespace);
-		if !sub_namespace.is_empty() {
-			dest_file_path.push(sub_namespace);
-		}
+		let mut dest_file_path = self.get_dest_dir_path(namespace, sub_namespace)?;
 		dest_file_path.push(key);
 
 		if !dest_file_path.is_file() {
@@ -283,12 +293,7 @@ impl KVStore for FilesystemStore {
 	fn list(&self, namespace: &str, sub_namespace: &str) -> std::io::Result<Vec<String>> {
 		check_namespace_key_validity(namespace, sub_namespace, None, "list")?;
 
-		let mut prefixed_dest = self.data_dir.clone();
-		prefixed_dest.push(namespace);
-		if !sub_namespace.is_empty() {
-			prefixed_dest.push(sub_namespace);
-		}
-
+		let prefixed_dest = self.get_dest_dir_path(namespace, sub_namespace)?;
 		let mut keys = Vec::new();
 
 		if !Path::new(&prefixed_dest).exists() {