leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use walkdir create in another place instead of custom code

Browse source
This commit is contained in:
Igor Katson 2024-09-13 13:04:37 +01:00
parent dedee2ef08
commit a38385f3b5
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
1 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/librqbit/src/create_torrent_file.rs
View file

@ -20,28 +20,13 @@ pub struct CreateTorrentOptions<'a> {
}
fn walk_dir_find_paths(dir: &Path, out: &mut Vec<Cow<'_, Path>>) -> anyhow::Result<()> {
let mut stack = vec![Cow::Borrowed(dir)];
while let Some(dir) = stack.pop() {
let rd = std::fs::read_dir(&dir).with_context(|| format!("error reading {:?}", dir))?;
for element in rd {
let element =
element.with_context(|| format!("error reading DirEntry from {:?}", dir))?;
let ft = element.file_type().with_context(|| {
format!(
"error determining filetype of DirEntry {:?} while reading {:?}",
element.file_name(),
dir
)
})?;
let full_path = Cow::Owned(dir.join(element.file_name()));
if ft.is_dir() {
stack.push(full_path);
} else {
out.push(full_path);
}
}
}
out.extend(
walkdir::WalkDir::new(dir)
.into_iter()
.filter_map(|e| e.ok())
.filter(|e| e.file_type().is_file())
.map(|e| e.path().to_owned().into()),
);
Ok(())
}