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-25 14:52:17 +08:00
parent c6eb52b457
commit 68c849066f
No known key found for this signature in database
1 changed files with 21 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,4 @@
use std::{
cmp::Ordering,
collections::BTreeMap,
ops::{Deref, DerefMut},
path::{Path, PathBuf},
};
use std::{cmp::Ordering, collections::BTreeMap, ops::{Deref, DerefMut}, path::{Path, PathBuf}};
use anyhow::Result;
use config::{manager::SortBy, MANAGER};
@ -13,14 +8,18 @@ use tokio::fs;
use super::File;
pub struct Files {
items: IndexMap<PathBuf, File>,
pub sort: FilesSort,
items: IndexMap<PathBuf, File>,
pub sort: FilesSort,
pub show_hidden: bool,
}
impl Default for Files {
fn default() -> Self {
Self { items: Default::default(), sort: Default::default(), show_hidden: MANAGER.show_hidden }
Self {
items: Default::default(),
sort: Default::default(),
show_hidden: MANAGER.show_hidden,
}
}
}
@ -123,21 +122,13 @@ impl Files {
if promote != Ordering::Equal {
promote
} else {
if reverse {
b.cmp(&a)
} else {
a.cmp(&b)
}
if reverse { b.cmp(&a) } else { a.cmp(&b) }
}
}
#[inline]
fn promote(a: &File, b: &File, dir_first: bool) -> Ordering {
if dir_first {
b.meta.is_dir().cmp(&a.meta.is_dir())
} else {
Ordering::Equal
}
if dir_first { b.meta.is_dir().cmp(&a.meta.is_dir()) } else { Ordering::Equal }
}
let reverse = self.sort.reverse;
@ -172,27 +163,27 @@ impl Files {
impl Deref for Files {
type Target = IndexMap<PathBuf, File>;
fn deref(&self) -> &Self::Target {
&self.items
}
fn deref(&self) -> &Self::Target { &self.items }
}
impl DerefMut for Files {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.items
}
fn deref_mut(&mut self) -> &mut Self::Target { &mut self.items }
}
#[derive(PartialEq)]
pub struct FilesSort {
pub by: SortBy,
pub reverse: bool,
pub by: SortBy,
pub reverse: bool,
pub dir_first: bool,
}
impl Default for FilesSort {
fn default() -> Self {
Self { by: MANAGER.sort_by, reverse: MANAGER.sort_reverse, dir_first: MANAGER.sort_dir_first }
Self {
by: MANAGER.sort_by,
reverse: MANAGER.sort_reverse,
dir_first: MANAGER.sort_dir_first,
}
}
}
@ -217,12 +208,8 @@ impl FilesOp {
}
#[inline]
pub fn read_empty(path: &Path) -> Self {
Self::Read(path.to_path_buf(), BTreeMap::new())
}
pub fn read_empty(path: &Path) -> Self { Self::Read(path.to_path_buf(), BTreeMap::new()) }
#[inline]
pub fn search_empty(path: &Path) -> Self {
Self::Search(path.to_path_buf(), BTreeMap::new())
}
pub fn search_empty(path: &Path) -> Self { Self::Search(path.to_path_buf(), BTreeMap::new()) }
}