16366cf9f2
https://github.com/zed-industries/zed/issues/30972 brought up another case where our context is not enough to track the actual source of the issue: we get a general top-level error without inner error. The reason for this was `.ok_or_else(|| anyhow!("failed to read HEAD SHA"))?; ` on the top level. The PR finally reworks the way we use anyhow to reduce such issues (or at least make it simpler to bubble them up later in a fix). On top of that, uses a few more anyhow methods for better readability. * `.ok_or_else(|| anyhow!("..."))`, `map_err` and other similar error conversion/option reporting cases are replaced with `context` and `with_context` calls * in addition to that, various `anyhow!("failed to do ...")` are stripped with `.context("Doing ...")` messages instead to remove the parasitic `failed to` text * `anyhow::ensure!` is used instead of `if ... { return Err(...); }` calls * `anyhow::bail!` is used instead of `return Err(anyhow!(...));` Release Notes: - N/A
70 lines
1.8 KiB
Rust
70 lines
1.8 KiB
Rust
use crate::Watcher;
|
|
use anyhow::{Context as _, Result};
|
|
use collections::{BTreeMap, Bound};
|
|
use fsevent::EventStream;
|
|
use parking_lot::Mutex;
|
|
use std::{
|
|
path::{Path, PathBuf},
|
|
sync::Weak,
|
|
time::Duration,
|
|
};
|
|
|
|
pub struct MacWatcher {
|
|
events_tx: smol::channel::Sender<Vec<fsevent::Event>>,
|
|
handles: Weak<Mutex<BTreeMap<PathBuf, fsevent::Handle>>>,
|
|
latency: Duration,
|
|
}
|
|
|
|
impl MacWatcher {
|
|
pub fn new(
|
|
events_tx: smol::channel::Sender<Vec<fsevent::Event>>,
|
|
handles: Weak<Mutex<BTreeMap<PathBuf, fsevent::Handle>>>,
|
|
latency: Duration,
|
|
) -> Self {
|
|
Self {
|
|
events_tx,
|
|
handles,
|
|
latency,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Watcher for MacWatcher {
|
|
fn add(&self, path: &Path) -> Result<()> {
|
|
let handles = self
|
|
.handles
|
|
.upgrade()
|
|
.context("unable to watch path, receiver dropped")?;
|
|
let mut handles = handles.lock();
|
|
|
|
// Return early if an ancestor of this path was already being watched.
|
|
if let Some((watched_path, _)) = handles
|
|
.range::<Path, _>((Bound::Unbounded, Bound::Included(path)))
|
|
.next_back()
|
|
{
|
|
if path.starts_with(watched_path) {
|
|
return Ok(());
|
|
}
|
|
}
|
|
|
|
let (stream, handle) = EventStream::new(&[path], self.latency);
|
|
let tx = self.events_tx.clone();
|
|
std::thread::spawn(move || {
|
|
stream.run(move |events| smol::block_on(tx.send(events)).is_ok());
|
|
});
|
|
handles.insert(path.into(), handle);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn remove(&self, path: &Path) -> anyhow::Result<()> {
|
|
let handles = self
|
|
.handles
|
|
.upgrade()
|
|
.context("unable to remove path, receiver dropped")?;
|
|
|
|
let mut handles = handles.lock();
|
|
handles.remove(path);
|
|
Ok(())
|
|
}
|
|
}
|