mirror of
https://github.com/PR0M3TH3AN/Marlin.git
synced 2025-09-09 07:38:50 +00:00
Merge pull request #81 from PR0M3TH3AN/codex/wrap-handle--from_path-with-cfg-attribute
Fix RemoveTracker path handling for Windows
This commit is contained in:
@@ -92,20 +92,23 @@ struct RemoveTracker {
|
|||||||
|
|
||||||
impl RemoveTracker {
|
impl RemoveTracker {
|
||||||
fn record(&mut self, path: &PathBuf) {
|
fn record(&mut self, path: &PathBuf) {
|
||||||
|
#[cfg(not(windows))]
|
||||||
if let Ok(h) = Handle::from_path(path) {
|
if let Ok(h) = Handle::from_path(path) {
|
||||||
self.map.insert(h.ino(), (path.clone(), Instant::now()));
|
self.map.insert(h.ino(), (path.clone(), Instant::now()));
|
||||||
} else {
|
return;
|
||||||
// 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()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 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> {
|
fn match_create(&mut self, path: &PathBuf, window: Duration) -> Option<PathBuf> {
|
||||||
|
#[cfg(not(windows))]
|
||||||
if let Ok(h) = Handle::from_path(path) {
|
if let Ok(h) = Handle::from_path(path) {
|
||||||
if let Some((old, ts)) = self.map.remove(&h.ino()) {
|
if let Some((old, ts)) = self.map.remove(&h.ino()) {
|
||||||
if Instant::now().duration_since(ts) <= window {
|
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
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user