thePR0M3TH3AN/Marlin
1
0
Fork 0
mirror of https://github.com/PR0M3TH3AN/Marlin.git synced 2025-09-08 07:08:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #81 from PR0M3TH3AN/codex/wrap-handle--from_path-with-cfg-attribute

Browse Source 
Fix RemoveTracker path handling for Windows
This commit is contained in:
thePR0M3TH3AN
2025-05-24 21:59:06 -04:00
committed by GitHub
parent 7e37db3b61 2dc9421e5f
commit 1efa4d5317
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libmarlin/src/watcher.rs
View File

@@ -92,20 +92,23 @@ struct RemoveTracker {
impl RemoveTracker {
fn record(&mut self, path: &PathBuf) {
#[cfg(not(windows))]
if let Ok(h) = Handle::from_path(path) {
self.map.insert(h.ino(), (path.clone(), Instant::now()));
} else {
// fall back to hashing path if inode not available
use std::collections::hash_map::DefaultHasher;
use std::hash::{Hash, Hasher};
let mut hasher = DefaultHasher::new();
path.hash(&mut hasher);
self.map
.insert(hasher.finish(), (path.clone(), Instant::now()));
return;
}
// fall back to hashing path if inode not available or on Windows
use std::collections::hash_map::DefaultHasher;
use std::hash::{Hash, Hasher};
let mut hasher = DefaultHasher::new();
path.hash(&mut hasher);
self.map
.insert(hasher.finish(), (path.clone(), Instant::now()));
}
fn match_create(&mut self, path: &PathBuf, window: Duration) -> Option<PathBuf> {
#[cfg(not(windows))]
if let Ok(h) = Handle::from_path(path) {
if let Some((old, ts)) = self.map.remove(&h.ino()) {
if Instant::now().duration_since(ts) <= window {
@@ -115,6 +118,19 @@ impl RemoveTracker {
}
}
}
// fall back to hashing path when handle not available or on Windows
use std::collections::hash_map::DefaultHasher;
use std::hash::{Hash, Hasher};
let mut hasher = DefaultHasher::new();
path.hash(&mut hasher);
if let Some((old, ts)) = self.map.remove(&hasher.finish()) {
if Instant::now().duration_since(ts) <= window {
return Some(old);
} else {
return None;
}
}
None
}