djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
jb-alvarado 2022-03-01 21:08:14 +01:00
parent 67bfa3af15
commit 9d02bb8afd
1 changed files with 26 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/utils/folder.rs
View File

@ -8,8 +8,6 @@ use std::{
mpsc::Receiver, mpsc::Receiver,
{Arc, Mutex}, {Arc, Mutex},
}, },
thread::sleep,
time::Duration,
}; };
use walkdir::WalkDir; use walkdir::WalkDir;
@ -79,7 +77,7 @@ impl Iterator for Source {
let current_file = self.nodes.lock().unwrap()[self.index].clone(); let current_file = self.nodes.lock().unwrap()[self.index].clone();
let mut media = Media::new(self.index, current_file); let mut media = Media::new(self.index, current_file);
media.add_probe(); media.add_probe();
media.add_filter(&self.config, false, false); media.add_filter(&self.config);
self.index += 1; self.index += 1;
Some(media) Some(media)
@ -95,7 +93,7 @@ impl Iterator for Source {
let current_file = self.nodes.lock().unwrap()[0].clone(); let current_file = self.nodes.lock().unwrap()[0].clone();
let mut media = Media::new(self.index, current_file); let mut media = Media::new(self.index, current_file);
media.add_probe(); media.add_probe();
media.add_filter(&self.config, false, false); media.add_filter(&self.config);
self.index = 1; self.index = 1;
Some(media) Some(media)
@ -107,48 +105,31 @@ fn file_extension(filename: &Path) -> Option<&str> {
filename.extension().and_then(OsStr::to_str) filename.extension().and_then(OsStr::to_str)
} }
pub async fn watch_folder( pub async fn watch_folder(receiver: Receiver<notify::DebouncedEvent>, sources: Arc<Mutex<Vec<String>>>) {
receiver: Receiver<notify::DebouncedEvent>, while let Ok(res) = receiver.recv() {
stop: Arc<Mutex<bool>>, match res {
sources: Arc<Mutex<Vec<String>>>, Create(new_path) => {
) { sources.lock().unwrap().push(new_path.display().to_string());
info!("Create new file: {:?}", new_path);
debug!("Monitor folder...");
loop {
if *stop.lock().unwrap() {
break;
}
match receiver.recv() {
Ok(event) => match event {
Create(new_path) => {
sources.lock().unwrap().push(new_path.display().to_string());
info!("Create new file: {:?}", new_path);
}
Remove(old_path) => {
sources
.lock()
.unwrap()
.retain(|x| x != &old_path.display().to_string());
info!("Remove file: {:?}", old_path);
}
Rename(old_path, new_path) => {
let i = sources
.lock()
.unwrap()
.iter()
.position(|x| *x == old_path.display().to_string())
.unwrap();
sources.lock().unwrap()[i] = new_path.display().to_string();
info!("Rename file: {:?} to {:?}", old_path, new_path);
}
_ => (),
},
Err(e) => {
error!("Monitor error: {:?}", e);
} }
Remove(old_path) => {
sources
.lock()
.unwrap()
.retain(|x| x != &old_path.display().to_string());
info!("Remove file: {:?}", old_path);
}
Rename(old_path, new_path) => {
let i = sources
.lock()
.unwrap()
.iter()
.position(|x| *x == old_path.display().to_string())
.unwrap();
sources.lock().unwrap()[i] = new_path.display().to_string();
info!("Rename file: {:?} to {:?}", old_path, new_path);
}
_ => (),
} }
sleep(Duration::from_secs(2));
} }
} }