Skip to content

Simplify get_file_metadata logic #157

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
panhania merged 2 commits into from
Oct 2, 2025
Merged

Simplify get_file_metadata logic #157

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33a86d7
Simplify `get_file_metadata` logic.
panhania Oct 1, 2025
a244618
Reduce nesting in `get_file_metadata` walk.
panhania Oct 1, 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
208 changes: 77 additions & 131 deletions crates/rrg/src/action/get_file_metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,84 +88,27 @@ where
continue
}
};
let file_type = metadata.file_type();

#[cfg(target_family = "unix")]
let ext_attrs = match ospect::fs::ext_attrs(path) {
Ok(ext_attrs) => ext_attrs.filter_map(|ext_attr| match ext_attr {
Ok(ext_attr) => Some(ext_attr),
Err(error) => {
log::error! {
"failed to read an extended attribute for '{}': {error}",
path.display(),
};

None
}
}).collect(),
Err(error) => {
log::error! {
"failed to list extended attributes for '{}': {error}",
path.display(),
};

Vec::default()
}
};

let symlink = if file_type.is_symlink() {
match std::fs::read_link(path) {
Ok(symlink) => Some(symlink),
Err(error) => {
log::error! {
"failed to read symlink target for '{}': {error}",
path.display(),
};

None
}
}
} else {
None
};

let path_canon = if args.path_canon {
match path.canonicalize() {
Ok(path_canon) => Some(path_canon),
Err(error) => {
log::error! {
"failed to canonicalize path '{}': {error}",
path.display(),
};

None
}
}
} else {
None
};

let digest_ = digest(&path, &metadata, &args);
let file_type = metadata.file_type();

session.reply(Item {
let entry = crate::fs::Entry {
path: path.clone(),
path_canon,
metadata,
#[cfg(target_family = "unix")]
ext_attrs,
symlink,
digest: digest_,
})?;
};
let entries = std::iter::once(Ok(entry)).chain(|| -> _ {
if !file_type.is_dir() || args.max_depth == 0 {
return None
}

if file_type.is_dir() && args.max_depth > 0 {
let entries = match crate::fs::walk_dir(&path) {
Ok(entries) => entries,
Err(error) => {
log::error! {
"failed to start recursive walk for '{}': {error}",
path.display(),
};
continue

return None
}
};

Expand All @@ -176,90 +119,93 @@ where
args.path_pruning_regex,
};

for entry in entries
let entries = entries
.with_max_depth(args.max_depth)
.prune(|entry| {
let path_bytes = entry.path.as_os_str().as_encoded_bytes();
args.path_pruning_regex.is_match(&path_bytes)
})
{
let entry = match entry {
Ok(entry) => entry,
});

Some(entries)
}().into_iter().flatten());

for entry in entries {
let entry = match entry {
Ok(entry) => entry,
Err(error) => {
log::error!("failed to read directory entry: {error}");
continue
}
};

#[cfg(target_family = "unix")]
let ext_attrs = match ospect::fs::ext_attrs(&entry.path) {
Ok(ext_attrs) => ext_attrs.filter_map(|ext_attr| match ext_attr {
Ok(ext_attr) => Some(ext_attr),
Err(error) => {
log::error!("failed to read directory entry: {error}");
continue
log::error! {
"failed to read an extended attribute for '{}': {error}",
entry.path.display()
};

None
}
};
}).collect(),
Err(error) => {
log::error! {
"failed to list extended attributes for '{}': {error}",
entry.path.display()
};

#[cfg(target_family = "unix")]
let ext_attrs = match ospect::fs::ext_attrs(&entry.path) {
Ok(ext_attrs) => ext_attrs.filter_map(|ext_attr| match ext_attr {
Ok(ext_attr) => Some(ext_attr),
Err(error) => {
log::error! {
"failed to read an extended attribute for '{}': {error}",
entry.path.display()
};

None
}
}).collect(),
Vec::default()
}
};

let symlink = if entry.metadata.is_symlink() {
match std::fs::read_link(&entry.path) {
Ok(symlink) => Some(symlink),
Err(error) => {
log::error! {
"failed to list extended attributes for '{}': {error}",
"failed to read symlink target for '{}': {error}",
entry.path.display()
};

Vec::default()
None
}
};
}
} else {
None
};

let symlink = if entry.metadata.is_symlink() {
match std::fs::read_link(&entry.path) {
Ok(symlink) => Some(symlink),
Err(error) => {
log::error! {
"failed to read symlink target for '{}': {error}",
entry.path.display()
};

None
}
}
} else {
None
};
let path_canon = if args.path_canon {
match entry.path.canonicalize() {
Ok(path_canon) => Some(path_canon),
Err(error) => {
log::error! {
"failed to canonicalize path '{}': {error}",
entry.path.display(),
};

let path_canon = if args.path_canon {
match entry.path.canonicalize() {
Ok(path_canon) => Some(path_canon),
Err(error) => {
log::error! {
"failed to canonicalize path '{}': {error}",
entry.path.display(),
};

None
}
None
}
} else {
None
};
}
} else {
None
};

let digest_ = digest(&entry.path, &entry.metadata, &args);
let digest_ = digest(&entry.path, &entry.metadata, &args);

log::debug!("sending metadata for '{}'", entry.path.display());
log::debug!("sending metadata for '{}'", entry.path.display());

session.reply(Item {
path: entry.path,
path_canon,
metadata: entry.metadata,
#[cfg(target_family = "unix")]
ext_attrs,
symlink,
digest: digest_,
})?;
}
session.reply(Item {
path: entry.path,
path_canon,
metadata: entry.metadata,
#[cfg(target_family = "unix")]
ext_attrs,
symlink,
digest: digest_,
})?;
}
}

Expand Down