return "file deleted" instead of raising an exception (#301)

Author: samuelcolvin

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos, windows]
-        rust-version: [stable, '1.63.0']
+        rust-version: [stable, '1.72']
         python-version:
           - '3.8'
           - '3.9'
@@ -27,9 +27,9 @@ jobs:
           - 'pypy3.9'
           - 'pypy3.10'
         exclude:
-          - rust-version: '1.63.0'
+          - rust-version: '1.72'
             os: macos
-          - rust-version: '1.63.0'
+          - rust-version: '1.72'
             os: windows
 
     runs-on: ${{ matrix.os }}-latest

Cargo.lock

@@ -25,7 +25,7 @@ rust-version = "1.63"
 
 [dependencies]
 crossbeam-channel = "0.5.12"
-notify = "6.1.1"
+notify = {git = "https://github.com/samuelcolvin/notify.git", branch = "keep-io-error"}
 pyo3 = { version = "0.22.2", features = ["extension-module", "generate-import-lib"] }
 
 [lib]

Cargo.toml

@@ -181,6 +181,21 @@ impl RustNotify {
                 }
             }
             Err(e) => {
+                if debug {
+                    eprintln!("raw-error={:?} error.kind={:?} error.paths={:?}", e, e.kind, e.paths);
+                }
+                // see https://github.com/samuelcolvin/watchfiles/issues/282
+                // if we have IO errors from files not found, we return "file deleted", rather than the error
+                if let NotifyErrorKind::Io(io_error) = &e.kind {
+                    if io_error.kind() == IOErrorKind::NotFound {
+                        changes_clone.lock().unwrap().extend(
+                            e.paths
+                                .iter()
+                                .map(|p| (CHANGE_DELETED, p.to_string_lossy().to_string())),
+                        );
+                        return;
+                    }
+                }
                 *error_clone.lock().unwrap() = Some(format!("error in underlying watcher: {}", e));
             }
         };

src/lib.rs

@@ -161,7 +161,7 @@ def test_does_not_exist(tmp_path: Path):
 @skip_unless_linux
 def test_does_not_exist_message(tmp_path: Path):
     p = tmp_path / 'missing'
-    with pytest.raises(FileNotFoundError, match='No such file or directory'):
+    with pytest.raises(FileNotFoundError, match='(No such file or directory|No path was found.)'):
         RustNotify([str(p)], False, False, 0, True, False)