Skip to content

fix vfs #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 24, 2025
Merged

fix vfs #165

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e1aacc
vfs: fix directory async
nick1udwig Sep 24, 2025
820debd
Format Rust code using rustfmt
github-actions[bot] Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/vfs/directory/directory_async.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::{parse_response, vfs_request, DirEntry, FileType, VfsAction, VfsError, VfsResponse};
use super::{vfs_request, DirEntry, FileType, VfsAction, VfsError, VfsResponse};
use crate::hyperapp;

pub struct DirectoryAsync {
Expand All @@ -10,16 +10,16 @@ impl DirectoryAsync {
pub async fn read(&self) -> Result<Vec<DirEntry>, VfsError> {
let request = vfs_request(&self.path, VfsAction::ReadDir).expects_response(self.timeout);

let resp_bytes = hyperapp::send_rmp::<Vec<u8>>(request)
let response = hyperapp::send::<VfsResponse>(request)
.await
.map_err(|_| VfsError::SendError(crate::SendErrorKind::Timeout))?;

match parse_response(&resp_bytes)? {
match response {
VfsResponse::ReadDir(entries) => Ok(entries),
VfsResponse::Err(e) => Err(e),
_ => Err(VfsError::ParseError {
error: "unexpected response".to_string(),
path: self.path.clone(),
path: self.path.to_string(),
}),
}
}
Expand All @@ -34,11 +34,11 @@ pub async fn open_dir_async(
if !create {
let request = vfs_request(path, VfsAction::Metadata).expects_response(timeout);

let resp_bytes = hyperapp::send_rmp::<Vec<u8>>(request)
let response = hyperapp::send::<VfsResponse>(request)
.await
.map_err(|_| VfsError::SendError(crate::SendErrorKind::Timeout))?;

match parse_response(&resp_bytes)? {
match response {
VfsResponse::Metadata(m) => {
if m.file_type != FileType::Directory {
return Err(VfsError::IOError(
Expand All @@ -63,11 +63,11 @@ pub async fn open_dir_async(

let request = vfs_request(path, VfsAction::CreateDirAll).expects_response(timeout);

let resp_bytes = hyperapp::send_rmp::<Vec<u8>>(request)
let response = hyperapp::send::<VfsResponse>(request)
.await
.map_err(|_| VfsError::SendError(crate::SendErrorKind::Timeout))?;

match parse_response(&resp_bytes)? {
match response {
VfsResponse::Ok => Ok(DirectoryAsync {
path: path.to_string(),
timeout,
Expand All @@ -85,11 +85,11 @@ pub async fn remove_dir_async(path: &str, timeout: Option<u64>) -> Result<(), Vf

let request = vfs_request(path, VfsAction::RemoveDir).expects_response(timeout);

let resp_bytes = hyperapp::send_rmp::<Vec<u8>>(request)
let response = hyperapp::send::<VfsResponse>(request)
.await
.map_err(|_| VfsError::SendError(crate::SendErrorKind::Timeout))?;

match parse_response(&resp_bytes)? {
match response {
VfsResponse::Ok => Ok(()),
VfsResponse::Err(e) => Err(e),
_ => Err(VfsError::ParseError {
Expand Down