noth/nite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stop stream

Browse source
This commit is contained in:
Borodinov Ilya 2024-05-13 22:43:12 +03:00
parent 5fad11ec7b
commit fad33758fe
Signed by: noth
GPG key ID: 75503B2EF596D1BD
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
crates/util/src/fs.rs
View file

@ -1,7 +1,6 @@
use std::path::Path;
use crate::ResultExt;
use futures::TryStreamExt;
use tokio::fs;
use tokio_stream::{wrappers::ReadDirStream, StreamExt};
@ -10,25 +9,20 @@ pub async fn remove_matching<F>(dir: &Path, predicate: F) -> std::io::Result<()>
where
F: Fn(&Path) -> bool,
{
ReadDirStream::new(fs::read_dir(dir).await?)
.try_filter_map(move |entry| {
let predicate = |e| predicate(e);
async move {
let path = entry.path();
if predicate(path.as_path()) {
if let Ok(metadata) = fs::metadata(&path).await {
if metadata.is_file() {
fs::remove_file(&path).await?;
} else {
fs::remove_dir_all(&path).await?;
}
}
Ok(Some(()))
let mut entries = fs::read_dir(dir).await?;
while let Some(entry) = entries.next_entry().await? {
let entry_path = entry.path();
if predicate(entry_path.as_path()) {
if let Ok(metadata) = fs::metadata(&entry_path).await {
if metadata.is_file() {
fs::remove_file(&entry_path).await?;
} else {
Ok(None)
fs::remove_dir_all(&entry_path).await?;
}
}
})
.try_collect::<()>()
.await
}
}
Ok(())
}