fix: a race condition in concurrent directory loading on a slow device (#3271)

Author: sxyazi

.github/workflows/validate-form.yml

@@ -15,9 +15,9 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Setup Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
-          node-js: 20
+          node-version: 20
 
       - name: Install Dependencies
         run: |

Cargo.lock

@@ -23,8 +23,8 @@ lto           = false
 ansi-to-tui         = "7.0.0"
 anyhow              = "1.0.100"
 base64              = "0.22.1"
-bitflags            = { version = "2.9.4", features = [ "serde" ] }
-clap                = { version = "4.5.49", features = [ "derive" ] }
+bitflags            = { version = "2.10.0", features = [ "serde" ] }
+clap                = { version = "4.5.50", features = [ "derive" ] }
 core-foundation-sys = "0.8.7"
 crossterm           = { version = "0.29.0", features = [ "event-stream" ] }
 dirs                = "6.0.0"

Cargo.toml

@@ -6,10 +6,12 @@ use yazi_fs::File;
 use yazi_shared::{Id, Source, event::Cmd, url::UrlBuf};
 
 pub struct Ctx<'a> {
-	pub core:   &'a mut Core,
-	pub tab:    usize,
-	pub level:  usize,
-	pub source: Source,
+	pub core:      &'a mut Core,
+	pub tab:       usize,
+	pub level:     usize,
+	pub source:    Source,
+	#[cfg(debug_assertions)]
+	pub backtrace: Vec<&'static str>,
 }
 
 impl Deref for Ctx<'_> {
@@ -36,19 +38,40 @@ impl<'a> Ctx<'a> {
 			core.mgr.tabs.cursor
 		};
 
-		Ok(Self { core, tab, level: 0, source: cmd.source })
+		Ok(Self {
+			core,
+			tab,
+			level: 0,
+			source: cmd.source,
+			#[cfg(debug_assertions)]
+			backtrace: vec![],
+		})
 	}
 
 	#[inline]
 	pub fn renew<'b>(cx: &'a mut Ctx<'b>) -> Self {
 		let tab = cx.core.mgr.tabs.cursor;
-		Self { core: cx.core, tab, level: cx.level, source: cx.source }
+		Self {
+			core: cx.core,
+			tab,
+			level: cx.level,
+			source: cx.source,
+			#[cfg(debug_assertions)]
+			backtrace: vec![],
+		}
 	}
 
 	#[inline]
 	pub fn active(core: &'a mut Core) -> Self {
 		let tab = core.mgr.tabs.cursor;
-		Self { core, tab, level: 0, source: Source::Unknown }
+		Self {
+			core,
+			tab,
+			level: 0,
+			source: Source::Unknown,
+			#[cfg(debug_assertions)]
+			backtrace: vec![],
+		}
 	}
 }
 

yazi-actor/src/context.rs

@@ -30,6 +30,9 @@ impl Actor for Peek {
 		if !cx.tab().preview.same_file(&hovered, &mime) {
 			cx.tab_mut().preview.reset();
 		}
+		if !cx.tab().preview.same_folder(&hovered.url) {
+			cx.tab_mut().preview.folder_lock = None;
+		}
 
 		if matches!(opt.only_if, Some(u) if u != hovered.url) {
 			succ!();
@@ -45,7 +48,7 @@ impl Actor for Peek {
 		}
 
 		if hovered.is_dir() {
-			cx.tab_mut().preview.go_folder(hovered, folder.map(|(_, cha)| cha), opt.force);
+			cx.tab_mut().preview.go_folder(hovered, folder.map(|(_, cha)| cha), mime, opt.force);
 		} else {
 			cx.tab_mut().preview.go(hovered, mime, opt.force);
 		}