Merge pull request #45 from kinode-dao/bp/vfs-removals

vfs: add remove_file, remove_dir, remove_path

Author: dr-frmr

src/vfs/directory.rs

@@ -67,3 +67,28 @@ pub fn open_dir(path: &str, create: bool) -> anyhow::Result<Directory> {
         _ => Err(anyhow::anyhow!("vfs: unexpected message: {:?}", message)),
     }
 }
+
+/// Removes a dir at path, errors if path not found or path is not a directory.
+pub fn remove_dir(path: &str) -> anyhow::Result<()> {
+    let request = VfsRequest {
+        path: path.to_string(),
+        action: VfsAction::RemoveDir,
+    };
+
+    let message = Request::new()
+        .target(("our", "vfs", "distro", "sys"))
+        .body(serde_json::to_vec(&request)?)
+        .send_and_await_response(5)?;
+
+    match message {
+        Ok(Message::Response { body, .. }) => {
+            let response = serde_json::from_slice::<VfsResponse>(&body)?;
+            match response {
+                VfsResponse::Ok => Ok(()),
+                VfsResponse::Err(e) => Err(e.into()),
+                _ => Err(anyhow::anyhow!("vfs: unexpected response: {:?}", response)),
+            }
+        }
+        _ => Err(anyhow::anyhow!("vfs: unexpected message: {:?}", message)),
+    }
+}

src/vfs/file.rs

@@ -418,3 +418,28 @@ pub fn create_file(path: &str) -> anyhow::Result<File> {
         _ => Err(anyhow::anyhow!("vfs: unexpected message: {:?}", message)),
     }
 }
+
+/// Removes a file at path, errors if path not found or path is not a file.
+pub fn remove_file(path: &str) -> anyhow::Result<()> {
+    let request = VfsRequest {
+        path: path.to_string(),
+        action: VfsAction::RemoveFile,
+    };
+
+    let message = Request::new()
+        .target(("our", "vfs", "distro", "sys"))
+        .body(serde_json::to_vec(&request)?)
+        .send_and_await_response(5)?;
+
+    match message {
+        Ok(Message::Response { body, .. }) => {
+            let response = serde_json::from_slice::<VfsResponse>(&body)?;
+            match response {
+                VfsResponse::Ok => Ok(()),
+                VfsResponse::Err(e) => Err(e.into()),
+                _ => Err(anyhow::anyhow!("vfs: unexpected response: {:?}", response)),
+            }
+        }
+        _ => Err(anyhow::anyhow!("vfs: unexpected message: {:?}", message)),
+    }
+}

src/vfs/mod.rs

@@ -149,3 +149,16 @@ pub fn metadata(path: &str) -> anyhow::Result<FileMetadata> {
         _ => Err(anyhow::anyhow!("vfs: unexpected message: {:?}", message)),
     }
 }
+
+/// Removes a path, if it's either a directory or a file.
+pub fn remove_path(path: &str) -> anyhow::Result<()> {
+    let meta = metadata(path)?;
+    match meta.file_type {
+        FileType::Directory => remove_dir(path),
+        FileType::File => remove_file(path),
+        _ => Err(anyhow::anyhow!(
+            "vfs: path is not a file or directory: {}",
+            path
+        )),
+    }
+}