mirror of
https://github.com/Llewellynvdm/exa.git
synced 2024-11-22 03:55:11 +00:00
Restore more
This commit is contained in:
parent
0e8a4582d0
commit
e9d0af0343
@ -20,6 +20,7 @@ use crate::fs::fields as f;
|
||||
/// information queried at least once, so it makes sense to do all this at the
|
||||
/// start and hold on to all the information.
|
||||
pub struct File<'dir> {
|
||||
|
||||
/// The filename portion of this file’s path, including the extension.
|
||||
///
|
||||
/// This is used to compare against certain filenames (such as checking if
|
||||
@ -75,7 +76,7 @@ impl<'dir> File<'dir> {
|
||||
let ext = File::ext(&path);
|
||||
|
||||
debug!("Statting file {:?}", &path);
|
||||
let metadata = std::fs::symlink_metadata(&path)?;
|
||||
let metadata = std::fs::symlink_metadata(&path)?;
|
||||
let is_all_all = false;
|
||||
|
||||
Ok(File { path, parent_dir, metadata, ext, name, is_all_all })
|
||||
@ -209,6 +210,7 @@ impl<'dir> File<'dir> {
|
||||
self.metadata.file_type().is_socket()
|
||||
}
|
||||
|
||||
|
||||
/// Re-prefixes the path pointed to by this file, if it’s a symlink, to
|
||||
/// make it an absolute path that can be accessed from whichever
|
||||
/// directory exa is being run from.
|
||||
|
@ -380,6 +380,7 @@ pub enum GitIgnore {
|
||||
// > .gitignore, .git/info/exclude and even your global gitignore globs,
|
||||
// > usually found in $XDG_CONFIG_HOME/git/ignore.
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
mod test_ignores {
|
||||
use super::*;
|
||||
|
@ -724,4 +724,4 @@ mod matches_test {
|
||||
|
||||
assert_eq!(flags.has(&COUNT).unwrap(), false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -31,6 +31,7 @@ pub struct Options {
|
||||
/// Extra columns to display in the table.
|
||||
#[derive(PartialEq, Debug, Copy, Clone)]
|
||||
pub struct Columns {
|
||||
|
||||
/// At least one of these timestamps will be shown.
|
||||
pub time_types: TimeTypes,
|
||||
|
||||
@ -49,7 +50,6 @@ pub struct Columns {
|
||||
}
|
||||
|
||||
impl Columns {
|
||||
|
||||
pub fn collect(&self, actually_enable_git: bool) -> Vec<Column> {
|
||||
let mut columns = Vec::with_capacity(4);
|
||||
|
||||
@ -253,6 +253,7 @@ impl TimeType {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// Fields for which of a file’s time fields should be displayed in the
|
||||
/// columns output.
|
||||
///
|
||||
|
Loading…
Reference in New Issue
Block a user