Merge pull request #9 from giovannimirarchi420/fix/include-filters

woelper · web-flow · commit 219269a2efa3 · 2024-07-22T21:39:09.000+02:00
Improved handling of multiple patterns in include_filters (dircpy issue #8)
diff --git a/src/lib.rs b/src/lib.rs
@@ -275,10 +275,12 @@ impl CopyBuilder {
                     }
                 }
 
-                for f in &self.include_filters {
-                    if !entry.path().to_string_lossy().contains(f) {
-                        continue 'files;
-                    }
+                if !self
+                    .include_filters
+                    .iter()
+                    .any(|f| entry.path().to_string_lossy().contains(f))
+                {
+                    continue 'files;
                 }
 
                 // File is not present: copy it in any case

Original file line number	Diff line number	Diff line change
`@@ -275,10 +275,12 @@ impl CopyBuilder {`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`
`278`		`- for f in &self.include_filters {`
`279`		`- if !entry.path().to_string_lossy().contains(f) {`
`280`		`- continue 'files;`
`281`		`- }`
	`278`	`+ if !self`
	`279`	`+ .include_filters`
	`280`	`+ .iter()`
	`281`	`+ .any(\|f\| entry.path().to_string_lossy().contains(f))`
	`282`	`+ {`
	`283`	`+ continue 'files;`
`282`	`284`	`}`
`283`	`285`
`284`	`286`	`// File is not present: copy it in any case`