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

..

Browse source
This commit is contained in:
sxyazi 2023-08-28 13:57:06 +08:00
parent ab27c7a069
commit 0967a701f9
No known key found for this signature in database
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/status/left.rs
View file

@ -35,7 +35,7 @@ impl<'a> Widget for Left<'a> {
if let Some(h) = &manager.hovered { if let Some(h) = &manager.hovered {
// Length // Length
if let Some(len) = h.length { if let Some(len) = h.length() {
spans.push(Span::styled(format!(" {} ", readable_size(len)), body.bg().fg(**primary))); spans.push(Span::styled(format!(" {} ", readable_size(len)), body.bg().fg(**primary)));
spans.push(Span::styled(&separator.closing, body.fg())); spans.push(Span::styled(&separator.closing, body.fg()));
} }

6
core/src/files/file.rs
View file

@ -7,7 +7,7 @@ use tokio::fs;
pub struct File { pub struct File {
pub(super) path: PathBuf, pub(super) path: PathBuf,
pub(super) meta: Metadata, pub(super) meta: Metadata,
pub length: Option<u64>, pub(super) length: Option<u64>,
pub link_to: Option<PathBuf>, pub link_to: Option<PathBuf>,
pub is_link: bool, pub is_link: bool,
pub is_hidden: bool, pub is_hidden: bool,
@ -55,4 +55,8 @@ impl File {
#[inline] #[inline]
pub fn is_dir(&self) -> bool { self.meta.is_dir() } pub fn is_dir(&self) -> bool { self.meta.is_dir() }
// --- Length
#[inline]
pub fn length(&self) -> Option<u64> { self.length }
} }

2
core/src/files/sorter.rs
View file

@ -45,7 +45,7 @@ impl FilesSorter {
}), }),
SortBy::Natural => self.sort_naturally(items), SortBy::Natural => self.sort_naturally(items),
SortBy::Size => items.sort_unstable_by(|a, b| { SortBy::Size => items.sort_unstable_by(|a, b| {
self.cmp(a.length.unwrap_or(0), b.length.unwrap_or(0), self.promote(a, b)) self.cmp(a.length().unwrap_or(0), b.length().unwrap_or(0), self.promote(a, b))
}), }),
} }
true true

2
core/src/tasks/tasks.rs
View file

@ -217,7 +217,7 @@ impl Tasks {
} }
let targets: Vec<_> = let targets: Vec<_> =
targets.iter().filter(|f| f.is_dir() && f.length.is_none()).map(|f| f.path()).collect(); targets.iter().filter(|f| f.is_dir() && f.length().is_none()).map(|f| f.path()).collect();
if !targets.is_empty() { if !targets.is_empty() {
self.scheduler.precache_size(targets); self.scheduler.precache_size(targets);