2016-04-18 17:39:32 +00:00
|
|
|
use std::io::{Write, Result as IOResult};
|
|
|
|
|
2015-12-20 06:56:57 +00:00
|
|
|
use term_grid as grid;
|
|
|
|
|
2016-04-16 17:59:25 +00:00
|
|
|
use fs::File;
|
2015-12-17 02:27:44 +00:00
|
|
|
use output::DisplayWidth;
|
2015-12-20 06:56:57 +00:00
|
|
|
use output::colours::Colours;
|
Print the parent path for passed-in files
This commit changes all the views to accommodate printing each path's prefix, if it has one.
Previously, each file was stripped of its ancestry, leaving only its file name to be displayed. So running "exa /usr/bin/*" would display only filenames, while running "ls /usr/bin/*" would display each file prefixed with "/usr/bin/". But running "ls /usr/bin/" -- without the glob -- would run ls on just the directory, printing out the file names with no prefix or anything.
This functionality turned out to be useful in quite a few situations: firstly, if the user passes in files from different directories, it would be hard to tell where they came from (especially if they have the same name, such as find | xargs). Secondly, this also applied when following symlinks, making it unclear exactly which file a symlink would be pointing to.
The reason that it did it this way beforehand was that I didn't think of these use-cases, rather than for any technical reason; this new method should not have any drawbacks save making the output slightly wider in a few cases. Compatibility with ls is also a big plus.
Fixes #104, and relates to #88 and #92.
2016-04-11 18:10:55 +00:00
|
|
|
use super::filename;
|
2015-02-05 14:39:56 +00:00
|
|
|
|
|
|
|
|
2015-04-03 22:14:49 +00:00
|
|
|
#[derive(PartialEq, Debug, Copy, Clone)]
|
2015-02-05 14:39:56 +00:00
|
|
|
pub struct Grid {
|
|
|
|
pub across: bool,
|
|
|
|
pub console_width: usize,
|
2015-05-09 22:57:18 +00:00
|
|
|
pub colours: Colours,
|
2015-02-05 14:39:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Grid {
|
2016-04-18 17:39:32 +00:00
|
|
|
pub fn view<W: Write>(&self, files: &[File], w: &mut W) -> IOResult<()> {
|
2015-06-23 09:54:57 +00:00
|
|
|
let direction = if self.across { grid::Direction::LeftToRight }
|
|
|
|
else { grid::Direction::TopToBottom };
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-06-23 09:54:57 +00:00
|
|
|
let mut grid = grid::Grid::new(grid::GridOptions {
|
2015-07-15 19:53:16 +00:00
|
|
|
direction: direction,
|
|
|
|
filling: grid::Filling::Spaces(2),
|
2015-06-23 09:54:57 +00:00
|
|
|
});
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-06-23 09:54:57 +00:00
|
|
|
grid.reserve(files.len());
|
2015-02-05 14:39:56 +00:00
|
|
|
|
2015-06-23 09:54:57 +00:00
|
|
|
for file in files.iter() {
|
Print the parent path for passed-in files
This commit changes all the views to accommodate printing each path's prefix, if it has one.
Previously, each file was stripped of its ancestry, leaving only its file name to be displayed. So running "exa /usr/bin/*" would display only filenames, while running "ls /usr/bin/*" would display each file prefixed with "/usr/bin/". But running "ls /usr/bin/" -- without the glob -- would run ls on just the directory, printing out the file names with no prefix or anything.
This functionality turned out to be useful in quite a few situations: firstly, if the user passes in files from different directories, it would be hard to tell where they came from (especially if they have the same name, such as find | xargs). Secondly, this also applied when following symlinks, making it unclear exactly which file a symlink would be pointing to.
The reason that it did it this way beforehand was that I didn't think of these use-cases, rather than for any technical reason; this new method should not have any drawbacks save making the output slightly wider in a few cases. Compatibility with ls is also a big plus.
Fixes #104, and relates to #88 and #92.
2016-04-11 18:10:55 +00:00
|
|
|
let mut width = DisplayWidth::from(&*file.name);
|
|
|
|
|
|
|
|
if file.dir.is_none() {
|
|
|
|
if let Some(ref parent) = file.path.parent() {
|
|
|
|
width = width + 1 + DisplayWidth::from(parent.to_string_lossy().as_ref());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-23 09:54:57 +00:00
|
|
|
grid.add(grid::Cell {
|
Print the parent path for passed-in files
This commit changes all the views to accommodate printing each path's prefix, if it has one.
Previously, each file was stripped of its ancestry, leaving only its file name to be displayed. So running "exa /usr/bin/*" would display only filenames, while running "ls /usr/bin/*" would display each file prefixed with "/usr/bin/". But running "ls /usr/bin/" -- without the glob -- would run ls on just the directory, printing out the file names with no prefix or anything.
This functionality turned out to be useful in quite a few situations: firstly, if the user passes in files from different directories, it would be hard to tell where they came from (especially if they have the same name, such as find | xargs). Secondly, this also applied when following symlinks, making it unclear exactly which file a symlink would be pointing to.
The reason that it did it this way beforehand was that I didn't think of these use-cases, rather than for any technical reason; this new method should not have any drawbacks save making the output slightly wider in a few cases. Compatibility with ls is also a big plus.
Fixes #104, and relates to #88 and #92.
2016-04-11 18:10:55 +00:00
|
|
|
contents: filename(file, &self.colours, false).strings().to_string(),
|
|
|
|
width: *width,
|
2015-06-23 09:54:57 +00:00
|
|
|
});
|
2015-02-05 14:39:56 +00:00
|
|
|
}
|
|
|
|
|
2015-06-23 09:54:57 +00:00
|
|
|
if let Some(display) = grid.fit_into_width(self.console_width) {
|
2016-04-18 17:39:32 +00:00
|
|
|
write!(w, "{}", display)
|
2015-02-05 14:39:56 +00:00
|
|
|
}
|
|
|
|
else {
|
2015-06-23 09:54:57 +00:00
|
|
|
// File names too long for a grid - drop down to just listing them!
|
|
|
|
for file in files.iter() {
|
2017-03-26 16:35:50 +00:00
|
|
|
writeln!(w, "{}", filename(file, &self.colours, false).strings())?;
|
2015-06-23 09:54:57 +00:00
|
|
|
}
|
2016-04-18 17:39:32 +00:00
|
|
|
Ok(())
|
2015-02-05 14:39:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|