mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-25 16:09:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Update mtime and is_deleted when saving/loading a file

Browse source
This commit is contained in:
Antonio Scandurra 2021-05-12 14:33:51 +02:00
parent 2eff936154
commit ac2168f1bd
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
zed/src/worktree.rs
View file

@ -180,11 +180,14 @@ impl Worktree {
path: &Path,
ctx: &AppContext,
) -> impl Future<Output = Result<History>> {
let abs_path = self.absolutize(path);
let handles = self.handles.clone();
let path = path.to_path_buf();
let abs_path = self.absolutize(&path);
ctx.background_executor().spawn(async move {
let mut file = std::fs::File::open(&abs_path)?;
let mut file = fs::File::open(&abs_path)?;
let mut base_text = String::new();
file.read_to_string(&mut base_text)?;
Self::update_file_handle(&file, &path, &handles)?;
Ok(History::new(Arc::from(base_text)))
})
}
@ -200,20 +203,29 @@ impl Worktree {
let abs_path = self.absolutize(&path);
ctx.background_executor().spawn(async move {
let buffer_size = content.text_summary().bytes.min(10 * 1024);
let file = std::fs::File::create(&abs_path)?;
let mut writer = std::io::BufWriter::with_capacity(buffer_size, file);
let file = fs::File::create(&abs_path)?;
let mut writer = io::BufWriter::with_capacity(buffer_size, &file);
for chunk in content.fragments() {
writer.write(chunk.as_bytes())?;
}
writer.flush()?;
if let Some(handle) = handles.lock().get(path.as_path()).and_then(Weak::upgrade) {
handle.lock().is_deleted = false;
}
Self::update_file_handle(&file, &path, &handles)?;
Ok(())
})
}
fn update_file_handle(
file: &fs::File,
path: &Path,
handles: &Mutex<HashMap<Arc<Path>, Weak<Mutex<FileHandleState>>>>,
) -> Result<()> {
if let Some(handle) = handles.lock().get(path).and_then(Weak::upgrade) {
let mut handle = handle.lock();
handle.mtime = file.metadata()?.modified()?;
handle.is_deleted = false;
}
Ok(())
}
}
impl Entity for Worktree {
@ -1554,10 +1566,10 @@ mod tests {
assert!(non_existent_file.is_deleted());
tree.flush_fs_events(&app).await;
std::fs::rename(dir.path().join("a/file3"), dir.path().join("b/c/file3")).unwrap();
std::fs::remove_file(dir.path().join("b/c/file5")).unwrap();
std::fs::rename(dir.path().join("b/c"), dir.path().join("d")).unwrap();
std::fs::rename(dir.path().join("a/file2"), dir.path().join("a/file2.new")).unwrap();
fs::rename(dir.path().join("a/file3"), dir.path().join("b/c/file3")).unwrap();
fs::remove_file(dir.path().join("b/c/file5")).unwrap();
fs::rename(dir.path().join("b/c"), dir.path().join("d")).unwrap();
fs::rename(dir.path().join("a/file2"), dir.path().join("a/file2.new")).unwrap();
tree.update(&mut app, |tree, ctx| tree.next_scan_complete(ctx))
.await;