reorganize watcher modules for more consistency

crates/gitbutler-watcher/src/debouncer/mod.rs

@@ -108,10 +108,11 @@ use notify::{
 };
 use parking_lot::Mutex;
 
-use crate::{
-    debouncer_cache::{FileIdCache, FileIdMap},
-    debouncer_event::DebouncedEvent,
-};
+pub(crate) mod cache;
+mod event;
+
+use cache::{FileIdCache, FileIdMap};
+use event::DebouncedEvent;
 
 /// The set of requirements for watcher debounce event handling functions.
 ///

crates/gitbutler-watcher/src/file_monitor.rs

@@ -2,8 +2,8 @@ use std::collections::HashSet;
 use std::path::Path;
 use std::time::Duration;
 
+use crate::debouncer::cache::FileIdMap;
 use crate::debouncer::Debouncer;
-use crate::debouncer_cache::FileIdMap;
 use crate::{debouncer::new_debouncer, events::InternalEvent};
 use anyhow::{anyhow, Context, Result};
 use gitbutler_core::ops::OPLOG_FILE_NAME;

crates/gitbutler-watcher/src/lib.rs

@@ -19,8 +19,6 @@ use tokio::{
 use tokio_util::sync::CancellationToken;
 
 mod debouncer;
-mod debouncer_cache;
-mod debouncer_event;
 mod file_monitor;
 mod handler;