file: more precise FileEvent::Remove capture

SeaQL · Sep 11, 2023 · efa69e1 · efa69e1
1 parent 485fe7d
commit efa69e1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/sea-streamer-file/src/watcher.rs b/sea-streamer-file/src/watcher.rs
@@ -133,8 +133,10 @@ impl Watchers {
                                 sender.send((fid.clone(), FileEvent::Modify)).ok();
                             }
                             ModifyKind::Metadata(_) => {
-                                // it only shows `Any` on my machine
-                                sender.send((fid.clone(), FileEvent::Remove)).ok();
+                                // we are in a different thread, but blocking here is still undesirable
+                                if std::fs::metadata(fid.path()).is_err() {
+                                    sender.send((fid.clone(), FileEvent::Remove)).ok();
+                                }
                             }
                             _ => (),
                         }
@@ -153,7 +155,7 @@ impl Watchers {
         .map_err(|e| FileErr::WatchError(e.to_string()))?;
 
         watcher
-            .watch(file_id.path().as_ref(), RecursiveMode::Recursive)
+            .watch(file_id.path().as_ref(), RecursiveMode::NonRecursive)
             .map_err(|e| FileErr::WatchError(e.to_string()))?;
 
         Ok(watcher)