Skip to content

fix(services/fs): make content-length mandatory in list() responses #7072

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

Open
PiyushXCoder wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(services/fs): make content-length mandatory in list() responses #7072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions core/services/fs/src/lister.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,20 @@ impl oio::List for FsLister<tokio::fs::ReadDir> {
async fn next(&mut self) -> Result<Option<oio::Entry>> {
// since list should return path itself, we return it first
if let Some(path) = self.current_path.take() {
let e = oio::Entry::new(path.as_str(), Metadata::new(EntryMode::DIR));
let metadata = tokio::fs::metadata(self.root.join(&path))
.await
.map_err(new_std_io_error)?;
let e = oio::Entry::new(
path.as_str(),
Metadata::new(EntryMode::DIR).with_content_length(metadata.len()),
);
return Ok(Some(e));
}

let Some(de) = self.rd.next_entry().await.map_err(new_std_io_error)? else {
return Ok(None);
};
let metadata = de.metadata().await.map_err(new_std_io_error)?;

let entry_path = de.path();
let rel_path = normalize_path(
Expand All @@ -70,11 +77,20 @@ impl oio::List for FsLister<tokio::fs::ReadDir> {
let ft = de.file_type().await.map_err(new_std_io_error)?;
let entry = if ft.is_dir() {
// Make sure we are returning the correct path.
oio::Entry::new(&format!("{rel_path}/"), Metadata::new(EntryMode::DIR))
oio::Entry::new(
&format!("{rel_path}/"),
Metadata::new(EntryMode::DIR).with_content_length(metadata.len()),
)
} else if ft.is_file() {
oio::Entry::new(&rel_path, Metadata::new(EntryMode::FILE))
oio::Entry::new(
&rel_path,
Metadata::new(EntryMode::FILE).with_content_length(metadata.len()),
)
} else {
oio::Entry::new(&rel_path, Metadata::new(EntryMode::Unknown))
oio::Entry::new(
&rel_path,
Metadata::new(EntryMode::Unknown).with_content_length(metadata.len()),
)
};
Ok(Some(entry))
}
Expand Down
Loading