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: precache n-1 and n+1 pages (#349)

Browse source
This commit is contained in:
Hanaasagi 2023-11-08 20:44:31 +08:00 • committed by GitHub
parent 7c49d9c57a
commit a0ba853718
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
yazi-core/src/tab/folder.rs
View file

@ -43,22 +43,38 @@ impl Folder {
self.prev(Default::default()); self.prev(Default::default());
if self.page == old { if self.page == old {
emit!(Pages(self.page)); // Force update self.set_page(true); // Force update
} }
true true
} }
pub fn set_page(&mut self, force: bool) -> bool { pub fn set_page(&mut self, force: bool) {
let limit = MANAGER.layout.folder_height(); let limit = MANAGER.layout.folder_height();
let new = if limit == 0 { 0 } else { self.cursor / limit }; if limit == 0 {
return;
}
let new = self.cursor / limit;
if !force && self.page == new { if !force && self.page == new {
return false; return;
}
// Current page
emit!(Pages(new));
// Next page
let max_page = (self.files.len() + limit - 1) / limit;
if new < max_page && new + 1 != self.page {
emit!(Pages(new + 1));
}
// Previous page
if new > 1 && new - 1 != self.page {
emit!(Pages(new - 1));
} }
self.page = new; self.page = new;
emit!(Pages(new));
true
} }
pub fn next(&mut self, step: Step) -> bool { pub fn next(&mut self, step: Step) -> bool {
@ -115,11 +131,11 @@ impl Folder {
#[inline] #[inline]
pub fn hovered(&self) -> Option<&File> { self.files.get(self.cursor) } pub fn hovered(&self) -> Option<&File> { self.files.get(self.cursor) }
pub fn paginate(&self) -> &[File] { pub fn paginate(&self, page: usize) -> &[File] {
let len = self.files.len(); let len = self.files.len();
let limit = MANAGER.layout.folder_height(); let limit = MANAGER.layout.folder_height();
let start = (self.page * limit).min(len.saturating_sub(1)); let start = (page * limit).min(len.saturating_sub(1));
let end = (start + limit).min(len); let end = (start + limit).min(len);
&self.files[start..end] &self.files[start..end]
} }

6
yazi-fm/src/app.rs
View file

@ -143,10 +143,8 @@ impl App {
} }
} }
Event::Pages(page) => { Event::Pages(page) => {
if manager.current().page == page { let targets = self.cx.manager.current().paginate(page);
let targets = self.cx.manager.current().paginate(); tasks.precache_mime(targets, &self.cx.manager.mimetype);
tasks.precache_mime(targets, &self.cx.manager.mimetype);
}
} }
Event::Mimetype(mimes) => { Event::Mimetype(mimes) => {
if manager.update_mimetype(mimes, tasks) { if manager.update_mimetype(mimes, tasks) {