Mirrors/lsd
2
0
Fork 0
mirror of https://github.com/lsd-rs/lsd synced 2025-03-04 23:17:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactored classic mode

Browse source
This commit is contained in:
Sebastian Zivota 2019-01-29 18:16:55 +01:00 • committed by Pierre Peltier
parent 1b7eec351c
commit e1138bbec3
2 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/core.rs
View file

@ -21,23 +21,15 @@ impl Core {
let mut inner_flags = flags;
let color_theme = if flags.classic_mode {
color::Theme::NoColor
} else {
match (tty_available, flags.color) {
(_, WhenFlag::Never) | (false, WhenFlag::Auto) => color::Theme::NoColor,
_ => color::Theme::Default,
}
let color_theme = match (tty_available, flags.color) {
(_, WhenFlag::Never) | (false, WhenFlag::Auto) => color::Theme::NoColor,
_ => color::Theme::Default,
};
let icon_theme = if flags.classic_mode {
icon::Theme::NoIcon
} else {
match (tty_available, flags.icon, flags.icon_theme) {
(_, WhenFlag::Never, _) | (false, WhenFlag::Auto, _) => icon::Theme::NoIcon,
(_, _, IconTheme::Fancy) => icon::Theme::Fancy,
(_, _, IconTheme::Unicode) => icon::Theme::Unicode,
}
let icon_theme = match (tty_available, flags.icon, flags.icon_theme) {
(_, WhenFlag::Never, _) | (false, WhenFlag::Auto, _) => icon::Theme::NoIcon,
(_, _, IconTheme::Fancy) => icon::Theme::Fancy,
(_, _, IconTheme::Unicode) => icon::Theme::Unicode,
};
if !tty_available {

29
src/flags.rs
View file

@ -2,7 +2,6 @@ use clap::{ArgMatches, Error, ErrorKind};
#[derive(Clone, Debug, Copy)]
pub struct Flags {
pub classic_mode: bool,
pub display_all: bool,
pub display_long: bool,
pub display_online: bool,
@ -21,7 +20,7 @@ pub struct Flags {
impl Flags {
pub fn from_matches(matches: &ArgMatches) -> Result<Self, Error> {
let classic_mode: bool = matches.is_present("classic");
let classic_mode = matches.is_present("classic");
let color_inputs: Vec<&str> = matches.values_of("color").unwrap().collect();
let icon_inputs: Vec<&str> = matches.values_of("icon").unwrap().collect();
let icon_theme_inputs: Vec<&str> = matches.values_of("icon-theme").unwrap().collect();
@ -61,7 +60,6 @@ impl Flags {
};
Ok(Self {
classic_mode,
display_all: matches.is_present("all"),
display_long: matches.is_present("long"),
display_online: matches.is_present("oneline"),
@ -72,11 +70,27 @@ impl Flags {
sort_by,
sort_order,
// Take only the last value
date: DateFlag::from(date_inputs[date_inputs.len() - 1]),
color: WhenFlag::from(color_inputs[color_inputs.len() - 1]),
icon: WhenFlag::from(icon_inputs[icon_inputs.len() - 1]),
date: if classic_mode {
DateFlag::Date
} else {
DateFlag::from(date_inputs[date_inputs.len() - 1])
},
color: if classic_mode {
WhenFlag::Never
} else {
WhenFlag::from(color_inputs[color_inputs.len() - 1])
},
icon: if classic_mode {
WhenFlag::Never
} else {
WhenFlag::from(icon_inputs[icon_inputs.len() - 1])
},
icon_theme: IconTheme::from(icon_theme_inputs[icon_theme_inputs.len() - 1]),
directory_order: DirOrderFlag::from(dir_order_inputs[dir_order_inputs.len() - 1]),
directory_order: if classic_mode {
DirOrderFlag::None
} else {
DirOrderFlag::from(dir_order_inputs[dir_order_inputs.len() - 1])
},
})
}
}
@ -84,7 +98,6 @@ impl Flags {
impl Default for Flags {
fn default() -> Self {
Self {
classic_mode: false,
display_all: false,
display_long: false,
display_online: false,