Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-12-27 02:12:53 +00:00
Code Issues Projects Releases Wiki Activity

Main code tidy-ups

Browse Source
This commit is contained in:
Benjamin Sago 2015-01-12 20:48:07 +01:00
parent d93bca8779
commit 9729679f05
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/exa.rs
View File

@ -19,7 +19,6 @@ use options::{Options, View};
use ansi_term::Style::Plain; use ansi_term::Style::Plain;
use ansi_term::strip_formatting; use ansi_term::strip_formatting;
use users::OSUsers; use users::OSUsers;
pub mod column; pub mod column;
@ -38,7 +37,7 @@ fn main() {
}; };
} }
fn exa(opts: &Options) { fn exa(options: &Options) {
let mut dirs: Vec<String> = vec![]; let mut dirs: Vec<String> = vec![];
let mut files: Vec<File> = vec![]; let mut files: Vec<File> = vec![];
@ -49,11 +48,11 @@ fn exa(opts: &Options) {
// Separate the user-supplied paths into directories and files. // Separate the user-supplied paths into directories and files.
// Files are shown first, and then each directory is expanded // Files are shown first, and then each directory is expanded
// and listed second. // and listed second.
for file in opts.path_strings() { for file in options.path_strings() {
let path = Path::new(file); let path = Path::new(file);
match fs::stat(&path) { match fs::stat(&path) {
Ok(stat) => { Ok(stat) => {
if !opts.list_dirs && stat.kind == FileType::Directory { if !options.list_dirs && stat.kind == FileType::Directory {
dirs.push(file.clone()); dirs.push(file.clone());
} }
else { else {
@ -71,7 +70,7 @@ fn exa(opts: &Options) {
let mut first = files.is_empty(); let mut first = files.is_empty();
if !files.is_empty() { if !files.is_empty() {
view(opts, files); view(options, files);
} }
for dir_name in dirs.iter() { for dir_name in dirs.iter() {
@ -85,13 +84,13 @@ fn exa(opts: &Options) {
match Dir::readdir(Path::new(dir_name.clone())) { match Dir::readdir(Path::new(dir_name.clone())) {
Ok(dir) => { Ok(dir) => {
let unsorted_files = dir.files(); let unsorted_files = dir.files();
let files: Vec<File> = opts.transform_files(unsorted_files); let files: Vec<File> = options.transform_files(unsorted_files);
if print_dir_names { if print_dir_names {
println!("{}:", dir_name); println!("{}:", dir_name);
} }
view(opts, files); view(options, files);
} }
Err(e) => { Err(e) => {
println!("{}: {}", dir_name, e); println!("{}: {}", dir_name, e);
@ -103,9 +102,9 @@ fn exa(opts: &Options) {
fn view(options: &Options, files: Vec<File>) { fn view(options: &Options, files: Vec<File>) {
match options.view { match options.view {
View::Details(ref cols) => details_view(options, cols, files),
View::Lines => lines_view(files),
View::Grid(across, width) => grid_view(across, width, files), View::Grid(across, width) => grid_view(across, width, files),
View::Details(ref cols) => details_view(cols, files, options.header),
View::Lines => lines_view(files),
} }
} }
@ -203,7 +202,7 @@ fn grid_view(across: bool, console_width: usize, files: Vec<File>) {
} }
} }
fn details_view(options: &Options, columns: &Vec<Column>, files: Vec<File>) { fn details_view(columns: &Vec<Column>, files: Vec<File>, header: bool) {
// The output gets formatted into columns, which looks nicer. To // The output gets formatted into columns, which looks nicer. To
// do this, we have to write the results into a table, instead of // do this, we have to write the results into a table, instead of
// displaying each file immediately, then calculating the maximum // displaying each file immediately, then calculating the maximum
@ -216,7 +215,7 @@ fn details_view(options: &Options, columns: &Vec<Column>, files: Vec<File>) {
.map(|f| columns.iter().map(|c| f.display(c, &mut cache)).collect()) .map(|f| columns.iter().map(|c| f.display(c, &mut cache)).collect())
.collect(); .collect();
if options.header { if header {
table.insert(0, columns.iter().map(|c| Plain.underline().paint(c.header()).to_string()).collect()); table.insert(0, columns.iter().map(|c| Plain.underline().paint(c.header()).to_string()).collect());
} }