|
|
@@ -1,5 +1,9 @@
|
|
|
use std::io::{fs, IoResult};
|
|
|
-use file::File;
|
|
|
+use file::{File, GREY};
|
|
|
+
|
|
|
+#[cfg(feature="git")] use ansi_term::ANSIString;
|
|
|
+#[cfg(feature="git")] use ansi_term::Colour::*;
|
|
|
+#[cfg(feature="git")] use git2;
|
|
|
|
|
|
/// A **Dir** provides a cached list of the file paths in a directory that's
|
|
|
/// being listed.
|
|
|
@@ -8,8 +12,9 @@ use file::File;
|
|
|
/// check the existence of surrounding files, then highlight themselves
|
|
|
/// accordingly. (See `File#get_source_files`)
|
|
|
pub struct Dir {
|
|
|
- pub contents: Vec<Path>,
|
|
|
- pub path: Path,
|
|
|
+ contents: Vec<Path>,
|
|
|
+ path: Path,
|
|
|
+ git: Option<Git>,
|
|
|
}
|
|
|
|
|
|
impl Dir {
|
|
|
@@ -20,6 +25,7 @@ impl Dir {
|
|
|
fs::readdir(&path).map(|paths| Dir {
|
|
|
contents: paths,
|
|
|
path: path.clone(),
|
|
|
+ git: Git::scan(&path).ok(),
|
|
|
})
|
|
|
}
|
|
|
|
|
|
@@ -42,4 +48,106 @@ impl Dir {
|
|
|
pub fn contains(&self, path: &Path) -> bool {
|
|
|
self.contents.contains(path)
|
|
|
}
|
|
|
+
|
|
|
+ /// Append a path onto the path specified by this directory.
|
|
|
+ pub fn join(&self, child: Path) -> Path {
|
|
|
+ self.path.join(child)
|
|
|
+ }
|
|
|
+
|
|
|
+ /// 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.
|
|
|
+ pub fn git_status(&self, path: &Path, prefix_lookup: bool) -> String {
|
|
|
+ match (&self.git, prefix_lookup) {
|
|
|
+ (&Some(ref git), false) => git.status(path),
|
|
|
+ (&Some(ref git), true) => git.dir_status(path),
|
|
|
+ (&None, _) => GREY.paint("--").to_string(),
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+/// Container of Git statuses for all the files in this folder's Git repository.
|
|
|
+#[cfg(feature="git")]
|
|
|
+struct Git {
|
|
|
+ statuses: Vec<(Vec<u8>, git2::Status)>,
|
|
|
+}
|
|
|
+
|
|
|
+#[cfg(feature="git")]
|
|
|
+impl Git {
|
|
|
+
|
|
|
+ /// Discover a Git repository on or above this directory, scanning it for
|
|
|
+ /// the files' statuses if one is found.
|
|
|
+ fn scan(path: &Path) -> Result<Git, git2::Error> {
|
|
|
+ let repo = try!(git2::Repository::discover(path));
|
|
|
+ let statuses = try!(repo.statuses(None)).iter()
|
|
|
+ .map(|e| (e.path_bytes().to_vec(), e.status()))
|
|
|
+ .collect();
|
|
|
+ Ok(Git { statuses: statuses })
|
|
|
+ }
|
|
|
+
|
|
|
+ /// Get the status for the file at the given path, if present.
|
|
|
+ fn status(&self, path: &Path) -> String {
|
|
|
+ let status = self.statuses.iter()
|
|
|
+ .find(|p| p.0 == path.as_vec());
|
|
|
+ match status {
|
|
|
+ Some(&(_, s)) => format!("{}{}", Git::index_status(s), Git::working_tree_status(s)),
|
|
|
+ None => GREY.paint("--").to_string(),
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /// Get the combined status for all the files whose paths begin with the
|
|
|
+ /// path that gets passed in. This is used for getting the status of
|
|
|
+ /// directories, which don't really have an 'official' status.
|
|
|
+ fn dir_status(&self, dir: &Path) -> String {
|
|
|
+ let status = self.statuses.iter()
|
|
|
+ .filter(|p| p.0.starts_with(dir.as_vec()))
|
|
|
+ .fold(git2::Status::empty(), |a, b| a | b.1);
|
|
|
+ match status {
|
|
|
+ s => format!("{}{}", Git::index_status(s), Git::working_tree_status(s)),
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /// The character to display if the file has been modified, but not staged.
|
|
|
+ fn working_tree_status(status: git2::Status) -> ANSIString<'static> {
|
|
|
+ match status {
|
|
|
+ s if s.contains(git2::STATUS_WT_NEW) => Green.paint("A"),
|
|
|
+ s if s.contains(git2::STATUS_WT_MODIFIED) => Blue.paint("M"),
|
|
|
+ s if s.contains(git2::STATUS_WT_DELETED) => Red.paint("D"),
|
|
|
+ s if s.contains(git2::STATUS_WT_RENAMED) => Yellow.paint("R"),
|
|
|
+ s if s.contains(git2::STATUS_WT_TYPECHANGE) => Purple.paint("T"),
|
|
|
+ _ => GREY.paint("-"),
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /// The character to display if the file has been modified, and the change
|
|
|
+ /// has been staged.
|
|
|
+ fn index_status(status: git2::Status) -> ANSIString<'static> {
|
|
|
+ match status {
|
|
|
+ s if s.contains(git2::STATUS_INDEX_NEW) => Green.paint("A"),
|
|
|
+ s if s.contains(git2::STATUS_INDEX_MODIFIED) => Blue.paint("M"),
|
|
|
+ s if s.contains(git2::STATUS_INDEX_DELETED) => Red.paint("D"),
|
|
|
+ s if s.contains(git2::STATUS_INDEX_RENAMED) => Yellow.paint("R"),
|
|
|
+ s if s.contains(git2::STATUS_INDEX_TYPECHANGE) => Purple.paint("T"),
|
|
|
+ _ => GREY.paint("-"),
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+#[cfg(not(feature="git"))]
|
|
|
+struct Git;
|
|
|
+
|
|
|
+#[cfg(not(feature="git"))]
|
|
|
+impl Git {
|
|
|
+ fn scan(_: &Path) -> Result<Git, ()> {
|
|
|
+ // Don't do anything without Git support
|
|
|
+ Err(())
|
|
|
+ }
|
|
|
+
|
|
|
+ fn status(&self, _: &Path) -> String {
|
|
|
+ // The Err above means that this should never happen
|
|
|
+ panic!("Tried to access a Git repo without Git support!");
|
|
|
+ }
|
|
|
}
|
Ben S