Use new io + path + fs libraries (LOTS OF CHANGES)
Exa now uses the new IO, Path, and Filesystem libraries that have been out for a while now.
Unfortunately, the new libraries don't *entirely* cover the range of the old libraries just yet: in particular, to become more cross-platform, the data in `UnstableFileStat` isn't available in the Unix `MetadataExt` yet. Much of this is contained in rust-lang/rfcs#1044 (which is due to be implemented in rust-lang/rust#14711), but it's not *entirely* there yet.
As such, this commits a serious loss of functionality: no symlink viewing, no hard links or blocks, or users or groups. Also, some of the code could now be optimised. I just wanted to commit this to sort out most of the 'teething problems' of having a different path system in advance.
Here's an example problem that took ages to fix for you, just because you read this far: when I first got exa to compile, it worked mostly fine, except calling `exa` by itself didn't list the current directory. I traced where the command-line options were being generated, to where files and directories were sorted, to where the threads were spawned... and the problem turned out to be that it was using the full path as the file name, rather than just the last component, and these paths happened to begin with `.`, so it thought they were dotfiles.
2015-04-23 12:00:34 +00:00
|
|
|
use std::io;
|
|
|
|
use std::fs;
|
|
|
|
use std::path::{Path, PathBuf};
|
2015-08-25 10:27:08 +00:00
|
|
|
use std::slice::Iter as SliceIter;
|
Use new io + path + fs libraries (LOTS OF CHANGES)
Exa now uses the new IO, Path, and Filesystem libraries that have been out for a while now.
Unfortunately, the new libraries don't *entirely* cover the range of the old libraries just yet: in particular, to become more cross-platform, the data in `UnstableFileStat` isn't available in the Unix `MetadataExt` yet. Much of this is contained in rust-lang/rfcs#1044 (which is due to be implemented in rust-lang/rust#14711), but it's not *entirely* there yet.
As such, this commits a serious loss of functionality: no symlink viewing, no hard links or blocks, or users or groups. Also, some of the code could now be optimised. I just wanted to commit this to sort out most of the 'teething problems' of having a different path system in advance.
Here's an example problem that took ages to fix for you, just because you read this far: when I first got exa to compile, it worked mostly fine, except calling `exa` by itself didn't list the current directory. I traced where the command-line options were being generated, to where files and directories were sorted, to where the threads were spawned... and the problem turned out to be that it was using the full path as the file name, rather than just the last component, and these paths happened to begin with `.`, so it thought they were dotfiles.
2015-04-23 12:00:34 +00:00
|
|
|
|
2015-06-08 20:33:39 +00:00
|
|
|
use feature::Git;
|
|
|
|
use file::{File, fields};
|
|
|
|
|
|
|
|
|
2015-01-24 12:38:05 +00:00
|
|
|
/// A **Dir** provides a cached list of the file paths in a directory that's
|
|
|
|
/// being listed.
|
|
|
|
///
|
|
|
|
/// This object gets passed to the Files themselves, in order for them to
|
|
|
|
/// check the existence of surrounding files, then highlight themselves
|
|
|
|
/// accordingly. (See `File#get_source_files`)
|
2014-11-26 07:40:52 +00:00
|
|
|
pub struct Dir {
|
Use new io + path + fs libraries (LOTS OF CHANGES)
Exa now uses the new IO, Path, and Filesystem libraries that have been out for a while now.
Unfortunately, the new libraries don't *entirely* cover the range of the old libraries just yet: in particular, to become more cross-platform, the data in `UnstableFileStat` isn't available in the Unix `MetadataExt` yet. Much of this is contained in rust-lang/rfcs#1044 (which is due to be implemented in rust-lang/rust#14711), but it's not *entirely* there yet.
As such, this commits a serious loss of functionality: no symlink viewing, no hard links or blocks, or users or groups. Also, some of the code could now be optimised. I just wanted to commit this to sort out most of the 'teething problems' of having a different path system in advance.
Here's an example problem that took ages to fix for you, just because you read this far: when I first got exa to compile, it worked mostly fine, except calling `exa` by itself didn't list the current directory. I traced where the command-line options were being generated, to where files and directories were sorted, to where the threads were spawned... and the problem turned out to be that it was using the full path as the file name, rather than just the last component, and these paths happened to begin with `.`, so it thought they were dotfiles.
2015-04-23 12:00:34 +00:00
|
|
|
contents: Vec<PathBuf>,
|
Parallelise the details view!
This commit removes the threadpool in `main.rs` that stats each command-line argument separately, and replaces it with a *scoped* threadpool in `options/details.rs` that builds the table in parallel! Running this on my machine halves the execution time when tree-ing my entire home directory (which isn't exactly a common occurrence, but it's the only way to give exa a large running time)
The statting will be added back in parallel at a later stage. This was facilitated by the previous changes to recursion that made it easier to deal with.
There's a lot of large sweeping architectural changes. Here's a smattering of them:
- In `main.rs`, the files are now passed around as vectors of files rather than array slices of files. This is because `File`s aren't `Clone`, and the `Vec` is necessary to give away ownership of the files at the appropriate point.
- In the details view, files are now sorted *all* the time, rather than obeying the command-line order. As they're run in parallel, they have no guaranteed order anyway, so we *have* to sort them again. (I'm not sure if this should be the intended behaviour or not!) This means that the `Details` struct has to have the filter *all* the time, not only while recursing, so it's been moved out of the `recurse` field.
- We use `scoped_threadpool` over `threadpool`, a recent addition. It's only safely used on Nightly, which we're using anyway, so that's OK!
- Removed a bunch of out-of-date comments.
This also fixes #77, mainly by accident :)
2015-09-02 22:19:10 +00:00
|
|
|
pub path: PathBuf,
|
2015-01-27 15:01:17 +00:00
|
|
|
git: Option<Git>,
|
2014-06-16 23:27:05 +00:00
|
|
|
}
|
|
|
|
|
2014-11-26 07:40:52 +00:00
|
|
|
impl Dir {
|
2015-03-26 00:37:12 +00:00
|
|
|
|
2015-01-24 12:38:05 +00:00
|
|
|
/// Create a new Dir object filled with all the files in the directory
|
|
|
|
/// pointed to by the given path. Fails if the directory can't be read, or
|
2015-08-26 11:19:23 +00:00
|
|
|
/// isn't actually a directory, or if there's an IO error that occurs
|
|
|
|
/// while scanning.
|
2015-09-03 09:51:59 +00:00
|
|
|
pub fn read_dir(path: &Path, git: bool) -> io::Result<Dir> {
|
2015-08-26 11:19:23 +00:00
|
|
|
let reader = try!(fs::read_dir(path));
|
|
|
|
let contents = try!(reader.map(|e| e.map(|e| e.path())).collect());
|
|
|
|
|
|
|
|
Ok(Dir {
|
|
|
|
contents: contents,
|
Use new io + path + fs libraries (LOTS OF CHANGES)
Exa now uses the new IO, Path, and Filesystem libraries that have been out for a while now.
Unfortunately, the new libraries don't *entirely* cover the range of the old libraries just yet: in particular, to become more cross-platform, the data in `UnstableFileStat` isn't available in the Unix `MetadataExt` yet. Much of this is contained in rust-lang/rfcs#1044 (which is due to be implemented in rust-lang/rust#14711), but it's not *entirely* there yet.
As such, this commits a serious loss of functionality: no symlink viewing, no hard links or blocks, or users or groups. Also, some of the code could now be optimised. I just wanted to commit this to sort out most of the 'teething problems' of having a different path system in advance.
Here's an example problem that took ages to fix for you, just because you read this far: when I first got exa to compile, it worked mostly fine, except calling `exa` by itself didn't list the current directory. I traced where the command-line options were being generated, to where files and directories were sorted, to where the threads were spawned... and the problem turned out to be that it was using the full path as the file name, rather than just the last component, and these paths happened to begin with `.`, so it thought they were dotfiles.
2015-04-23 12:00:34 +00:00
|
|
|
path: path.to_path_buf(),
|
2015-08-03 17:44:33 +00:00
|
|
|
git: if git { Git::scan(path).ok() } else { None },
|
2014-06-20 20:07:53 +00:00
|
|
|
})
|
2014-06-16 23:27:05 +00:00
|
|
|
}
|
|
|
|
|
2015-08-26 11:19:23 +00:00
|
|
|
/// Produce an iterator of IO results of trying to read all the files in
|
|
|
|
/// this directory.
|
2015-08-26 08:35:11 +00:00
|
|
|
pub fn files<'dir>(&'dir self) -> Files<'dir> {
|
2015-08-25 10:27:08 +00:00
|
|
|
Files {
|
|
|
|
inner: self.contents.iter(),
|
|
|
|
dir: &self,
|
2014-06-20 20:07:53 +00:00
|
|
|
}
|
2014-06-16 23:27:05 +00:00
|
|
|
}
|
|
|
|
|
2015-01-24 12:38:05 +00:00
|
|
|
/// Whether this directory contains a file with the given path.
|
2014-06-16 23:27:05 +00:00
|
|
|
pub fn contains(&self, path: &Path) -> bool {
|
Use new io + path + fs libraries (LOTS OF CHANGES)
Exa now uses the new IO, Path, and Filesystem libraries that have been out for a while now.
Unfortunately, the new libraries don't *entirely* cover the range of the old libraries just yet: in particular, to become more cross-platform, the data in `UnstableFileStat` isn't available in the Unix `MetadataExt` yet. Much of this is contained in rust-lang/rfcs#1044 (which is due to be implemented in rust-lang/rust#14711), but it's not *entirely* there yet.
As such, this commits a serious loss of functionality: no symlink viewing, no hard links or blocks, or users or groups. Also, some of the code could now be optimised. I just wanted to commit this to sort out most of the 'teething problems' of having a different path system in advance.
Here's an example problem that took ages to fix for you, just because you read this far: when I first got exa to compile, it worked mostly fine, except calling `exa` by itself didn't list the current directory. I traced where the command-line options were being generated, to where files and directories were sorted, to where the threads were spawned... and the problem turned out to be that it was using the full path as the file name, rather than just the last component, and these paths happened to begin with `.`, so it thought they were dotfiles.
2015-04-23 12:00:34 +00:00
|
|
|
self.contents.iter().any(|ref p| p.as_path() == path)
|
2014-06-16 23:27:05 +00:00
|
|
|
}
|
2015-01-26 17:26:11 +00:00
|
|
|
|
|
|
|
/// Append a path onto the path specified by this directory.
|
Use new io + path + fs libraries (LOTS OF CHANGES)
Exa now uses the new IO, Path, and Filesystem libraries that have been out for a while now.
Unfortunately, the new libraries don't *entirely* cover the range of the old libraries just yet: in particular, to become more cross-platform, the data in `UnstableFileStat` isn't available in the Unix `MetadataExt` yet. Much of this is contained in rust-lang/rfcs#1044 (which is due to be implemented in rust-lang/rust#14711), but it's not *entirely* there yet.
As such, this commits a serious loss of functionality: no symlink viewing, no hard links or blocks, or users or groups. Also, some of the code could now be optimised. I just wanted to commit this to sort out most of the 'teething problems' of having a different path system in advance.
Here's an example problem that took ages to fix for you, just because you read this far: when I first got exa to compile, it worked mostly fine, except calling `exa` by itself didn't list the current directory. I traced where the command-line options were being generated, to where files and directories were sorted, to where the threads were spawned... and the problem turned out to be that it was using the full path as the file name, rather than just the last component, and these paths happened to begin with `.`, so it thought they were dotfiles.
2015-04-23 12:00:34 +00:00
|
|
|
pub fn join(&self, child: &Path) -> PathBuf {
|
2015-01-26 17:26:11 +00:00
|
|
|
self.path.join(child)
|
|
|
|
}
|
2015-01-27 15:01:17 +00:00
|
|
|
|
|
|
|
/// Return whether there's a Git repository on or above this directory.
|
|
|
|
pub fn has_git_repo(&self) -> bool {
|
|
|
|
self.git.is_some()
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Get a string describing the Git status of the given file.
|
2015-05-12 02:33:40 +00:00
|
|
|
pub fn git_status(&self, path: &Path, prefix_lookup: bool) -> fields::Git {
|
2015-01-28 10:43:19 +00:00
|
|
|
match (&self.git, prefix_lookup) {
|
2015-05-11 22:28:01 +00:00
|
|
|
(&Some(ref git), false) => git.status(path),
|
|
|
|
(&Some(ref git), true) => git.dir_status(path),
|
2015-05-12 02:33:40 +00:00
|
|
|
(&None, _) => fields::Git::empty()
|
2015-01-27 15:01:17 +00:00
|
|
|
}
|
|
|
|
}
|
2014-06-16 23:27:05 +00:00
|
|
|
}
|
2015-08-25 10:27:08 +00:00
|
|
|
|
|
|
|
|
|
|
|
pub struct Files<'dir> {
|
|
|
|
inner: SliceIter<'dir, PathBuf>,
|
|
|
|
dir: &'dir Dir,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'dir> Iterator for Files<'dir> {
|
2015-08-25 14:04:15 +00:00
|
|
|
type Item = Result<File<'dir>, (PathBuf, io::Error)>;
|
2015-08-25 10:27:08 +00:00
|
|
|
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
2015-08-26 08:35:11 +00:00
|
|
|
self.inner.next().map(|path| File::from_path(path, Some(self.dir)).map_err(|t| (path.clone(), t)))
|
2015-08-25 10:27:08 +00:00
|
|
|
}
|
|
|
|
}
|