Mirrors/lsd
2
0
Fork 0
mirror of https://github.com/lsd-rs/lsd synced 2024-12-14 22:22:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Manage symlink into the file ordering

Browse source
This commit is contained in:
Peltoche 2018-11-25 16:37:30 +01:00
parent 1c852cab1c
commit 95306a0b05
No known key found for this signature in database
GPG key ID: CED68D0487156952
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core.rs
View file

@ -1,5 +1,5 @@
use formatter::*; use formatter::*;
use meta::Meta; use meta::{Meta, Type};
use std::cmp::Ordering; use std::cmp::Ordering;
use std::path::Path; use std::path::Path;
use term_grid::{Cell, Direction, Filling, Grid, GridOptions}; use term_grid::{Cell, Direction, Filling, Grid, GridOptions};
@ -190,11 +190,11 @@ impl<'a> Core<'a> {
} }
fn sort_by_meta(a: &Meta, b: &Meta) -> Ordering { fn sort_by_meta(a: &Meta, b: &Meta) -> Ordering {
if a.path.is_dir() == b.path.is_dir() { if a.node_type == Type::Directory && b.node_type != Type::Directory {
a.path.cmp(&b.path)
} else if a.path.is_dir() && b.path.is_file() {
Ordering::Less Ordering::Less
} else { } else if b.node_type == Type::Directory && a.node_type != Type::Directory {
Ordering::Greater Ordering::Greater
} else {
a.path.cmp(&b.path)
} }
} }

2
src/meta.rs
View file

@ -16,7 +16,7 @@ pub enum MetaError {
UnreadableMetadatas { path: String, err: io::Error }, UnreadableMetadatas { path: String, err: io::Error },
} }
#[derive(Debug)] #[derive(Debug, PartialEq)]
pub enum Type { pub enum Type {
SymLink(String), SymLink(String),
File, File,