fix: task manager not re-rendering after progress update (#633)

yazi-adaptor/src/kitty.rs

@@ -357,7 +357,7 @@ impl Kitty {
 
 	async fn encode(img: DynamicImage) -> Result<Vec<u8>> {
 		fn output(raw: &[u8], format: u8, size: (u32, u32)) -> Result<Vec<u8>> {
-			let b64 = general_purpose::STANDARD.encode(raw).chars().collect::<Vec<_>>();
+			let b64: Vec<_> = general_purpose::STANDARD.encode(raw).chars().collect();
 
 			let mut it = b64.chunks(4096).peekable();
 			let mut buf = Vec::with_capacity(b64.len() + it.len() * 50);

yazi-adaptor/src/kitty_old.rs

@@ -35,7 +35,7 @@ impl KittyOld {
 
 	async fn encode(img: DynamicImage) -> Result<Vec<u8>> {
 		fn output(raw: &[u8], format: u8, size: (u32, u32)) -> Result<Vec<u8>> {
-			let b64 = general_purpose::STANDARD.encode(raw).chars().collect::<Vec<_>>();
+			let b64: Vec<_> = general_purpose::STANDARD.encode(raw).chars().collect();
 
 			let mut it = b64.chunks(4096).peekable();
 			let mut buf = Vec::with_capacity(b64.len() + it.len() * 50);

yazi-config/preset/yazi.toml

@@ -4,10 +4,10 @@
 
 [manager]
 ratio          = [ 1, 4, 3 ]
-sort_by        = "modified"
-sort_sensitive = true
-sort_reverse   = true
-sort_dir_first = true
+sort_by        = "alphabetical"
+sort_sensitive = false
+sort_reverse   = false
+sort_dir_first = false
 linemode       = "none"
 show_hidden    = false
 show_symlink   = true

yazi-config/src/theme/filetype.rs

@@ -97,7 +97,7 @@ impl Filetype {
 					}
 					.into(),
 				})
-				.collect::<Vec<_>>(),
+				.collect(),
 		)
 	}
 }

yazi-config/src/theme/icon.rs

@@ -35,7 +35,7 @@ impl Icon {
 					text:  r.text,
 					style: StyleShadow { fg: r.fg, ..Default::default() }.into(),
 				})
-				.collect::<Vec<_>>(),
+				.collect(),
 		)
 	}
 }

yazi-core/src/input/snap.rs

@@ -72,7 +72,7 @@ impl InputSnap {
 	#[inline]
 	pub(super) fn find_window(s: &str, offset: usize, limit: usize) -> Range<usize> {
 		let mut width = 0;
-		let v = s
+		let v: Vec<_> = s
 			.chars()
 			.enumerate()
 			.skip(offset)
@@ -80,7 +80,7 @@ impl InputSnap {
 				width += c.width().unwrap_or(0);
 				if width < limit { Some(i) } else { None }
 			})
-			.collect::<Vec<_>>();
+			.collect();
 
 		if v.is_empty() {
 			return 0..0;

yazi-core/src/tasks/commands/arrow.rs

@@ -12,30 +12,21 @@ impl From<Cmd> for Opt {
 	}
 }
 
+impl From<isize> for Opt {
+	fn from(step: isize) -> Self { Self { step } }
+}
+
 impl Tasks {
-	#[allow(clippy::should_implement_trait)]
-	fn next(&mut self) {
-		let limit = Self::limit().min(self.len());
-
-		let old = self.cursor;
-		self.cursor = limit.saturating_sub(1).min(self.cursor + 1);
-
-		render!(old != self.cursor);
-	}
-
-	fn prev(&mut self) {
-		let old = self.cursor;
-		self.cursor = self.cursor.saturating_sub(1);
-
-		render!(old != self.cursor);
-	}
-
 	pub fn arrow(&mut self, opt: impl Into<Opt>) {
-		let opt = opt.into() as Opt;
-		if opt.step > 0 {
-			self.next();
+		let old = self.cursor;
+		if opt.into().step > 0 {
+			self.cursor += 1;
 		} else {
-			self.prev();
+			self.cursor = self.cursor.saturating_sub(1);
 		}
+
+		let max = Self::limit().min(self.summaries.len());
+		self.cursor = self.cursor.min(max.saturating_sub(1));
+		render!(self.cursor != old);
 	}
 }

yazi-core/src/tasks/commands/toggle.rs

@@ -14,6 +14,12 @@ impl From<()> for Opt {
 impl Tasks {
 	pub fn toggle(&mut self, _: impl Into<Opt>) {
 		self.visible = !self.visible;
+
+		if self.visible {
+			self.summaries = self.paginate();
+			self.arrow(0);
+		}
+
 		render!();
 	}
 }

yazi-core/src/tasks/mod.rs

@@ -5,5 +5,6 @@ mod tasks;
 pub use progress::*;
 pub use tasks::*;
 
+pub const TASKS_BORDER: u16 = 2;
 pub const TASKS_PADDING: u16 = 2;
 pub const TASKS_PERCENT: u16 = 80;

yazi-core/src/tasks/tasks.rs

@@ -7,15 +7,16 @@ use yazi_plugin::ValueSendable;
 use yazi_scheduler::{Scheduler, TaskSummary};
 use yazi_shared::{emit, event::Cmd, fs::{File, Url}, term::Term, Layer, MIME_DIR};
 
-use super::{TasksProgress, TASKS_PADDING, TASKS_PERCENT};
+use super::{TasksProgress, TASKS_BORDER, TASKS_PADDING, TASKS_PERCENT};
 use crate::{folder::Files, input::Input};
 
 pub struct Tasks {
 	pub(super) scheduler: Arc<Scheduler>,
 
-	pub visible:  bool,
-	pub cursor:   usize,
-	pub progress: TasksProgress,
+	pub visible:   bool,
+	pub cursor:    usize,
+	pub progress:  TasksProgress,
+	pub summaries: Vec<TaskSummary>,
 }
 
 impl Tasks {
@@ -25,6 +26,7 @@ impl Tasks {
 			visible:   false,
 			cursor:    0,
 			progress:  Default::default(),
+			summaries: Default::default(),
 		};
 
 		let running = tasks.scheduler.running.clone();
@@ -46,7 +48,7 @@ impl Tasks {
 
 	#[inline]
 	pub fn limit() -> usize {
-		(Term::size().rows * TASKS_PERCENT / 100).saturating_sub(TASKS_PADDING) as usize
+		(Term::size().rows * TASKS_PERCENT / 100).saturating_sub(TASKS_BORDER + TASKS_PADDING) as usize
 	}
 
 	pub fn paginate(&self) -> Vec<TaskSummary> {

yazi-fm/src/app/commands/update_progress.rs

@@ -1,6 +1,6 @@
 use ratatui::backend::Backend;
 use yazi_core::tasks::TasksProgress;
-use yazi_shared::event::Cmd;
+use yazi_shared::{event::Cmd, render};
 
 use crate::{app::App, components::Progress, lives::Lives};
 
@@ -22,7 +22,23 @@ impl App {
 			return;
 		};
 
-		self.cx.tasks.progress = opt.progress;
+		// Update the progress of all tasks.
+		let tasks = &mut self.cx.tasks;
+		tasks.progress = opt.progress;
+
+		// If the task manager is visible, update the summaries with a complete render.
+		if tasks.visible {
+			let new = tasks.paginate();
+			if new.len() != tasks.summaries.len()
+				|| new.iter().zip(&tasks.summaries).any(|(a, b)| a.name != b.name)
+			{
+				tasks.summaries = new;
+				tasks.arrow(0);
+				return render!();
+			}
+		}
+
+		// Otherwise, only partially update the progress.
 		let Some(term) = &mut self.term else {
 			return;
 		};

yazi-fm/src/completion/completion.rs

@@ -15,7 +15,7 @@ impl<'a> Completion<'a> {
 
 impl<'a> Widget for Completion<'a> {
 	fn render(self, rect: Rect, buf: &mut Buffer) {
-		let items = self
+		let items: Vec<_> = self
 			.cx
 			.completion
 			.window()
@@ -37,7 +37,7 @@ impl<'a> Widget for Completion<'a> {
 
 				item
 			})
-			.collect::<Vec<_>>();
+			.collect();
 
 		let input_area = self.cx.area(&self.cx.input.position);
 		let mut area = Position::sticky(input_area, Offset {

yazi-fm/src/help/bindings.rs

@@ -19,18 +19,18 @@ impl Widget for Bindings<'_> {
 		}
 
 		// On
-		let col1 =
-			bindings.iter().map(|c| ListItem::new(c.on()).style(THEME.help.on)).collect::<Vec<_>>();
+		let col1: Vec<_> =
+			bindings.iter().map(|c| ListItem::new(c.on()).style(THEME.help.on)).collect();
 
 		// Exec
-		let col2 =
-			bindings.iter().map(|c| ListItem::new(c.exec()).style(THEME.help.exec)).collect::<Vec<_>>();
+		let col2: Vec<_> =
+			bindings.iter().map(|c| ListItem::new(c.exec()).style(THEME.help.exec)).collect();
 
 		// Desc
-		let col3 = bindings
+		let col3: Vec<_> = bindings
 			.iter()
 			.map(|c| ListItem::new(c.desc.as_deref().unwrap_or("-")).style(THEME.help.desc))
-			.collect::<Vec<_>>();
+			.collect();
 
 		let chunks = layout::Layout::horizontal([
 			Constraint::Ratio(2, 10),

yazi-fm/src/select/select.rs

@@ -16,7 +16,7 @@ impl<'a> Widget for Select<'a> {
 		let select = &self.cx.select;
 		let area = self.cx.area(&select.position);
 
-		let items = select
+		let items: Vec<_> = select
 			.window()
 			.iter()
 			.enumerate()
@@ -27,7 +27,7 @@ impl<'a> Widget for Select<'a> {
 
 				ListItem::new(format!(" {v}")).style(THEME.select.active)
 			})
-			.collect::<Vec<_>>();
+			.collect();
 
 		widgets::Clear.render(area, buf);
 		List::new(items)

yazi-fm/src/tasks/layout.rs

@@ -43,8 +43,9 @@ impl<'a> Widget for Layout<'a> {
 
 		let tasks = &self.cx.tasks;
 		let items = tasks
-			.paginate()
+			.summaries
 			.iter()
+			.take(area.height.saturating_sub(2) as usize)
 			.enumerate()
 			.map(|(i, v)| {
 				let mut item = ListItem::new(v.name.clone());

yazi-fm/src/widgets/clear.rs

@@ -34,8 +34,8 @@ impl Widget for Clear {
 
 		ADAPTOR.image_erase(r).ok();
 		COLLISION.store(true, Ordering::Relaxed);
-		for x in r.left()..r.right() {
-			for y in r.top()..r.bottom() {
+		for x in area.left()..area.right() {
+			for y in area.top()..area.bottom() {
 				buf.get_mut(x, y).set_skip(true);
 			}
 		}