actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2355 from johamster/reduce_allocations_when_copying_files 

Reduce allocations in `fs::copy_files_except_ext`
This commit is contained in:
Eric Huss 2024-04-08 21:40:54 +00:00 committed by GitHub
parent 481f6b1531 c144c26dcf
commit 8ae86d4310
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/utils/fs.rs
View File

@ -72,14 +72,12 @@ pub fn create_file(path: &Path) -> Result<File> {
/// Removes all the content of a directory but not the directory itself /// Removes all the content of a directory but not the directory itself
pub fn remove_dir_content(dir: &Path) -> Result<()> { pub fn remove_dir_content(dir: &Path) -> Result<()> {
for item in fs::read_dir(dir)? { for item in fs::read_dir(dir)?.flatten() {
if let Ok(item) = item { let item = item.path();
let item = item.path(); if item.is_dir() {
if item.is_dir() { fs::remove_dir_all(item)?;
fs::remove_dir_all(item)?; } else {
} else { fs::remove_file(item)?;
fs::remove_file(item)?;
}
} }
} }
Ok(()) Ok(())
@ -108,72 +106,41 @@ pub fn copy_files_except_ext(
} }
for entry in fs::read_dir(from)? { for entry in fs::read_dir(from)? {
let entry = entry?; let entry = entry?.path();
let metadata = entry let metadata = entry
.path()
.metadata() .metadata()
.with_context(|| format!("Failed to read {:?}", entry.path()))?; .with_context(|| format!("Failed to read {entry:?}"))?;
let entry_file_name = entry.file_name().unwrap();
let target_file_path = to.join(entry_file_name);
// If the entry is a dir and the recursive option is enabled, call itself // If the entry is a dir and the recursive option is enabled, call itself
if metadata.is_dir() && recursive { if metadata.is_dir() && recursive {
if entry.path() == to.to_path_buf() { if entry == to.as_os_str() {
continue; continue;
} }
if let Some(avoid) = avoid_dir { if let Some(avoid) = avoid_dir {
if entry.path() == *avoid { if entry == *avoid {
continue; continue;
} }
} }
// check if output dir already exists // check if output dir already exists
if !to.join(entry.file_name()).exists() { if !target_file_path.exists() {
fs::create_dir(&to.join(entry.file_name()))?; fs::create_dir(&target_file_path)?;
} }
copy_files_except_ext( copy_files_except_ext(&entry, &target_file_path, true, avoid_dir, ext_blacklist)?;
&from.join(entry.file_name()),
&to.join(entry.file_name()),
true,
avoid_dir,
ext_blacklist,
)?;
} else if metadata.is_file() { } else if metadata.is_file() {
// Check if it is in the blacklist // Check if it is in the blacklist
if let Some(ext) = entry.path().extension() { if let Some(ext) = entry.extension() {
if ext_blacklist.contains(&ext.to_str().unwrap()) { if ext_blacklist.contains(&ext.to_str().unwrap()) {
continue; continue;
} }
} }
debug!( debug!("Copying {entry:?} to {target_file_path:?}");
"creating path for file: {:?}", copy(&entry, &target_file_path)?;
&to.join(
entry
.path()
.file_name()
.expect("a file should have a file name...")
)
);
debug!(
"Copying {:?} to {:?}",
entry.path(),
&to.join(
entry
.path()
.file_name()
.expect("a file should have a file name...")
)
);
copy(
entry.path(),
&to.join(
entry
.path()
.file_name()
.expect("a file should have a file name..."),
),
)?;
} }
} }
Ok(()) Ok(())