Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kqueue emit Create Events and watch all files in a directory #372

Merged
merged 2 commits into from Dec 20, 2021
Merged

Kqueue emit Create Events and watch all files in a directory #372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26f95b6
kqueue: watch each file not just the directories
xanderio Dec 7, 2021
b0ed180
kqueue: emit Create event on file creation
xanderio Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
101 changes: 65 additions & 36 deletions src/kqueue.rs
View file
Open in desktop
Expand Up @@ -156,22 +156,58 @@ impl EventLoop {
*/
kqueue::Vnode::Delete => {
remove_watches.push(path.clone());
Event::new(EventKind::Remove(RemoveKind::Any))
Ok(Event::new(EventKind::Remove(RemoveKind::Any)).add_path(path))
}

//data was written to this file
kqueue::Vnode::Write => {
Event::new(EventKind::Modify(ModifyKind::Data(DataChange::Any)))
// a write to a directory means that a new file was created in it, let's
// figure out which file this was
kqueue::Vnode::Write if path.is_dir() => {
// find which file is new in the directory by comparing it with our
// list of known watches
std::fs::read_dir(&path)
.map(|dir| {
dir.filter_map(std::result::Result::ok)
.map(|f| f.path())
.find(|f| !self.watches.contains_key(f))
})
.map(|file| {
if let Some(file) = file {
// watch this new file
add_watches.push(file.clone());

Event::new(EventKind::Create(if file.is_dir() {
CreateKind::Folder
} else if file.is_file() {
CreateKind::File
} else {
CreateKind::Other
}))
.add_path(file)
} else {
Event::new(EventKind::Modify(ModifyKind::Data(
DataChange::Any,
)))
.add_path(path)
}
})
.map_err(Into::into)
}

// data was written to this file
kqueue::Vnode::Write => Ok(Event::new(EventKind::Modify(
ModifyKind::Data(DataChange::Any),
))
.add_path(path)),

/*
Extend and Truncate are just different names for the same
operation, extend is only used on FreeBSD, truncate everwhere
else
*/
kqueue::Vnode::Extend | kqueue::Vnode::Truncate => {
Event::new(EventKind::Modify(ModifyKind::Data(DataChange::Size)))
}
kqueue::Vnode::Extend | kqueue::Vnode::Truncate => Ok(Event::new(
EventKind::Modify(ModifyKind::Data(DataChange::Size)),
)
.add_path(path)),

/*
this kevent has the same problem as the delete kevent. The
Expand All @@ -180,9 +216,10 @@ impl EventLoop {
able of delete. In this case it would somewhat expensive to
keep track and compare ever peace of metadata for every file
*/
kqueue::Vnode::Attrib => {
Event::new(EventKind::Modify(ModifyKind::Metadata(MetadataKind::Any)))
}
kqueue::Vnode::Attrib => Ok(Event::new(EventKind::Modify(
ModifyKind::Metadata(MetadataKind::Any),
))
.add_path(path)),

/*
The link count on a file changed => subdirectory created or
Expand All @@ -205,24 +242,26 @@ impl EventLoop {
// subdirectories.
remove_watches.push(path.clone());
add_watches.push(path.clone());
Event::new(EventKind::Modify(ModifyKind::Any))
Ok(Event::new(EventKind::Modify(ModifyKind::Any)).add_path(path))
}

// Kqueue not provide us with the infomation nessesary to provide
// the new file name to the event.
kqueue::Vnode::Rename => {
remove_watches.push(path.clone());
Event::new(EventKind::Modify(ModifyKind::Name(RenameMode::Any)))
Ok(
Event::new(EventKind::Modify(ModifyKind::Name(RenameMode::Any)))
.add_path(path),
)
}

// Access to the file was revoked via revoke(2) or the underlying file system was unmounted.
kqueue::Vnode::Revoke => {
remove_watches.push(path.clone());
Event::new(EventKind::Remove(RemoveKind::Any))
Ok(Event::new(EventKind::Remove(RemoveKind::Any)).add_path(path))
}
}
.add_path(path);
self.event_handler.handle_event(Ok(event));
};
self.event_handler.handle_event(event);
}
// as we don't add any other EVFILTER to kqueue we should never get here
kqueue::Event { ident: _, data: _ } => unreachable!(),
Expand All @@ -245,11 +284,8 @@ impl EventLoop {
return self.add_single_watch(path, false);
}

for entry in WalkDir::new(path)
.follow_links(true)
.into_iter()
.filter_map(filter_dir)
{
for entry in WalkDir::new(path).follow_links(true).into_iter() {
let entry = entry.map_err(map_walkdir_error)?;
self.add_single_watch(entry.path().to_path_buf(), is_recursive)?;
}
self.kqueue.watch()?;
Expand Down Expand Up @@ -284,12 +320,8 @@ impl EventLoop {
.map_err(|e| Error::io(e).add_path(path.clone()))?;

if is_recursive || remove_recursive {
for entry in WalkDir::new(path)
.follow_links(true)
.into_iter()
.filter_map(filter_dir)
{
let p = entry.path().to_path_buf();
for entry in WalkDir::new(path).follow_links(true).into_iter() {
let p = entry.map_err(map_walkdir_error)?.path().to_path_buf();
self.kqueue
.remove_filename(&p, EventFilter::EVFILT_VNODE)
.map_err(|e| Error::io(e).add_path(p))?;
Expand All @@ -302,16 +334,13 @@ impl EventLoop {
}
}

/// return `DirEntry` when it is a directory
fn filter_dir(e: walkdir::Result<walkdir::DirEntry>) -> Option<walkdir::DirEntry> {
if let Ok(e) = e {
if let Ok(metadata) = e.metadata() {
if metadata.is_dir() {
return Some(e);
}
}
fn map_walkdir_error(e: walkdir::Error) -> Error {
if e.io_error().is_some() {
// save to unwrap otherwise we whouldn't be in this branch
Error::io(e.into_io_error().unwrap())
} else {
Error::generic(&e.to_string())
}
None
}

impl KqueueWatcher {
Expand Down