Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-12-30 19:39:09 +00:00
Code Issues Projects Releases Wiki Activity

Added icons for --long view

Browse Source
This commit is contained in:
Alex Soderman 2018-04-01 18:28:31 -04:00
parent c448b3747f
commit 5991bd4ab7
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/options/view.rs
View File

@ -40,6 +40,7 @@ impl Mode {
table: Some(TableOptions::deduce(matches)?), table: Some(TableOptions::deduce(matches)?),
header: matches.has(&flags::HEADER)?, header: matches.has(&flags::HEADER)?,
xattr: xattr::ENABLED && matches.has(&flags::EXTENDED)?, xattr: xattr::ENABLED && matches.has(&flags::EXTENDED)?,
icons: matches.has(&flags::ICONS)?,
}) })
} }
}; };
@ -59,6 +60,7 @@ impl Mode {
table: None, table: None,
header: false, header: false,
xattr: xattr::ENABLED && matches.has(&flags::EXTENDED)?, xattr: xattr::ENABLED && matches.has(&flags::EXTENDED)?,
icons: matches.has(&flags::ICONS)?,
}; };
Ok(Mode::Details(details)) Ok(Mode::Details(details))
@ -83,6 +85,7 @@ impl Mode {
table: None, table: None,
header: false, header: false,
xattr: xattr::ENABLED && matches.has(&flags::EXTENDED)?, xattr: xattr::ENABLED && matches.has(&flags::EXTENDED)?,
icons: matches.has(&flags::ICONS)?,
}; };
Ok(Mode::Details(details)) Ok(Mode::Details(details))

29
src/output/details.rs
View File

@ -64,7 +64,7 @@ use std::io::{Write, Error as IOError, Result as IOResult};
use std::path::PathBuf; use std::path::PathBuf;
use std::vec::IntoIter as VecIntoIter; use std::vec::IntoIter as VecIntoIter;
use ansi_term::Style; use ansi_term::{ANSIGenericString, Style};
use fs::{Dir, File}; use fs::{Dir, File};
use fs::dir_action::RecurseOptions; use fs::dir_action::RecurseOptions;
@ -77,6 +77,7 @@ use output::cell::TextCell;
use output::tree::{TreeTrunk, TreeParams, TreeDepth}; use output::tree::{TreeTrunk, TreeParams, TreeDepth};
use output::file_name::FileStyle; use output::file_name::FileStyle;
use output::table::{Table, Options as TableOptions, Row as TableRow}; use output::table::{Table, Options as TableOptions, Row as TableRow};
use output::icons::painted_icon;
use scoped_threadpool::Pool; use scoped_threadpool::Pool;
@ -105,6 +106,9 @@ pub struct Options {
/// Whether to show each file's extended attributes. /// Whether to show each file's extended attributes.
pub xattr: bool, pub xattr: bool,
/// Enables --icons mode
pub icons: bool,
} }
@ -132,6 +136,7 @@ struct Egg<'a> {
errors: Vec<(IOError, Option<PathBuf>)>, errors: Vec<(IOError, Option<PathBuf>)>,
dir: Option<Dir>, dir: Option<Dir>,
file: &'a File<'a>, file: &'a File<'a>,
icon: Option<String>,
} }
impl<'a> AsRef<File<'a>> for Egg<'a> { impl<'a> AsRef<File<'a>> for Egg<'a> {
@ -195,7 +200,7 @@ impl<'a> Render<'a> {
let table = table.as_ref(); let table = table.as_ref();
for file in src { for file in src {
let file_eggs = file_eggs.clone(); let file_eggs = Arc::clone(&file_eggs);
scoped.execute(move || { scoped.execute(move || {
let mut errors = Vec::new(); let mut errors = Vec::new();
@ -256,7 +261,11 @@ impl<'a> Render<'a> {
} }
}; };
let egg = Egg { table_row, xattrs, errors, dir, file }; let icon = if self.opts.icons {
Some(painted_icon(&file, &self.style))
} else { None };
let egg = Egg { table_row, xattrs, errors, dir, file, icon };
file_eggs.lock().unwrap().push(egg); file_eggs.lock().unwrap().push(egg);
}); });
} }
@ -272,12 +281,20 @@ impl<'a> Render<'a> {
t.add_widths(row); t.add_widths(row);
} }
let mut name_cell = TextCell::default();
if let Some(icon) = egg.icon {
name_cell.push(ANSIGenericString::from(icon), 2)
}
name_cell.append(self.style.for_file(&egg.file, self.colours)
.with_link_paths()
.paint()
.promote());
let row = Row { let row = Row {
tree: tree_params, tree: tree_params,
cells: egg.table_row, cells: egg.table_row,
name: self.style.for_file(&egg.file, self.colours) name: name_cell,
.with_link_paths()
.paint().promote(),
}; };
rows.push(row); rows.push(row);