mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix a race condition in refresher

Browse source
This commit is contained in:
三咲雅 misaki masa 2026-07-22 03:11:13 +08:00
parent 34393c29ea
commit 1b2e10fb0a
No known key found for this signature in database
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
yazi-watcher/src/refresher.rs
View file

@ -1,6 +1,6 @@
use std::{io, ops::Deref, time::{Duration, Instant}}; use std::{io, ops::Deref, time::{Duration, Instant}};
use hashbrown::HashMap; use hashbrown::{HashMap, hash_map::RawEntryMut};
use indexmap::IndexSet; use indexmap::IndexSet;
use tokio::sync::mpsc; use tokio::sync::mpsc;
use yazi_fs::{Entries, FilesOp, file::{File, FileCov}}; use yazi_fs::{Entries, FilesOp, file::{File, FileCov}};
@ -55,9 +55,17 @@ impl Refresher {
} }
} }
Op::Refresh(files) => { Op::Refresh(files) => {
for file in files { for file in files.into_iter().map(|file| file.0) {
let entry = let entry = match entries.raw_entry_mut().from_key(&file.url) {
entries.get_or_insert_with(file.0, |file| Entry { file, ..Default::default() }); RawEntryMut::Occupied(mut oe) => {
oe.get_mut().file = file;
oe.into_mut()
}
RawEntryMut::Vacant(ve) => {
ve.insert(file.url.to_owned(), Entry { file, ..Default::default() }).1
}
};
(entry.dirty, entry.report) = (true, true); (entry.dirty, entry.report) = (true, true);
self.spawn(entry); self.spawn(entry);
} }
@ -98,6 +106,7 @@ impl Refresher {
} }
entry.busy = None; entry.busy = None;
self.spawn(entry); // A new request may have arrived while this entry was busy.
} }
} }
} }