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

refactor(utils/fs): hoist ignore conditional

This commit is contained in:
Adam Avramov 2023-09-03 09:07:37 +03:00 committed by Bergmann89
parent 97065cc291
commit 3d838ef8e6
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/utils/fs.rs
View File

@ -115,6 +115,14 @@ pub fn copy_files_except_ext(
.metadata() .metadata()
.with_context(|| format!("Failed to read {:?}", entry.path()))?; .with_context(|| format!("Failed to read {:?}", entry.path()))?;
// Check if it is in the blacklist
if let Some(ignore) = ignore {
let path = entry.path();
if ignore.matched(&path, path.is_dir()).is_ignore() {
continue;
}
}
// 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.path() == to.to_path_buf() {
@ -127,13 +135,6 @@ pub fn copy_files_except_ext(
} }
} }
if let Some(ignore) = ignore {
let path = entry.path();
if ignore.matched(&path, path.is_dir()).is_ignore() {
continue;
}
}
// check if output dir already exists // check if output dir already exists
if !to.join(entry.file_name()).exists() { if !to.join(entry.file_name()).exists() {
fs::create_dir(&to.join(entry.file_name()))?; fs::create_dir(&to.join(entry.file_name()))?;
@ -147,14 +148,6 @@ pub fn copy_files_except_ext(
ignore, ignore,
)?; )?;
} else if metadata.is_file() { } else if metadata.is_file() {
// Check if it is in the blacklist
if let Some(ignore) = ignore {
let path = entry.path();
if ignore.matched(&path, path.is_dir()).is_ignore() {
continue;
}
}
debug!( debug!(
"creating path for file: {:?}", "creating path for file: {:?}",
&to.join( &to.join(