Clean up file change tracking since I wrote it when I was sleepy

This commit is contained in:
Lucien Greathouse 2018-05-12 01:13:18 -07:00
parent 4000a40cad
commit b2f85cd665
4 changed files with 70 additions and 29 deletions

View file

@ -1,32 +1,54 @@
use std::sync::mpsc::{channel, Receiver, Sender};
use std::sync::mpsc::{channel, Sender};
use std::time::Duration;
use std::thread;
use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher, watcher};
use partition::Partition;
use vfs_session::FileChange;
use file_route::FileRoute;
pub struct PartitionWatcher {
pub watcher: RecommendedWatcher,
pub partition: Partition,
}
impl PartitionWatcher {
pub fn start_new(partition: Partition, tx: Sender<(String, DebouncedEvent)>) -> PartitionWatcher {
pub fn start_new(partition: Partition, tx: Sender<FileChange>) -> PartitionWatcher {
let (watch_tx, watch_rx) = channel();
let mut watcher = watcher(watch_tx, Duration::from_millis(100)).unwrap();
watcher.watch(&partition.path, RecursiveMode::Recursive).unwrap();
let partition_name = partition.name.clone();
thread::spawn(move || {
loop {
match watch_rx.recv() {
// TODO: Transform DebouncedEvent to some sort of FileChange object
Ok(event) => match tx.send((partition_name.clone(), event)) {
Ok(_) => {},
Err(_) => break,
Ok(event) => {
let file_change = match event {
DebouncedEvent::Create(path) => {
let route = FileRoute::from_path(&path, &partition).unwrap();
FileChange::Created(route)
},
DebouncedEvent::Write(path) => {
let route = FileRoute::from_path(&path, &partition).unwrap();
FileChange::Updated(route)
},
DebouncedEvent::Remove(path) => {
let route = FileRoute::from_path(&path, &partition).unwrap();
FileChange::Deleted(route)
},
DebouncedEvent::Rename(from_path, to_path) => {
let from_route = FileRoute::from_path(&from_path, &partition).unwrap();
let to_route = FileRoute::from_path(&to_path, &partition).unwrap();
FileChange::Moved(from_route, to_route)
},
_ => continue,
};
match tx.send(file_change) {
Ok(_) => {},
Err(_) => break,
}
},
Err(_) => break,
};
@ -34,7 +56,6 @@ impl PartitionWatcher {
});
PartitionWatcher {
partition,
watcher,
}
}