add --exlude option

Author: o2sh

Diff for: src/info.rs

@@ -305,11 +305,12 @@ impl Info {
         no_merges: bool,
         color_blocks_flag: bool,
         author_nb: usize,
+        ignored_directories: Vec<&str>,
     ) -> Result<Info> {
+        let is_root_directory = dir == ".";
         let repo = Repository::discover(&dir).map_err(|_| Error::NotGitRepo)?;
         let workdir = repo.workdir().ok_or(Error::BareGitRepo)?;
         let workdir_str = workdir.to_str().unwrap();
-
         let config = Info::get_configuration(&repo)?;
         let current_commit_info = Info::get_current_commit_info(&repo)?;
         let authors = Info::get_authors(workdir_str, no_merges, author_nb);
@@ -321,7 +322,8 @@ impl Info {
         let last_change = Info::get_last_change(workdir_str)?;
         let creation_date = Info::get_creation_time(workdir_str)?;
         let project_license = Info::get_project_license(workdir_str)?;
-        let (languages_stats, number_of_lines) = Language::get_language_stats(workdir_str)?;
+        let (languages_stats, number_of_lines) =
+            Language::get_language_stats(workdir_str, ignored_directories, is_root_directory)?;
         let dominant_language = Language::get_dominant_language(languages_stats.clone());
 
         Ok(Info {

Diff for: src/language.rs

@@ -352,8 +352,12 @@ impl Language {
         }
     }
 
-    pub fn get_language_stats(dir: &str) -> Result<(Vec<(Language, f64)>, usize)> {
-        let tokei_langs = project_languages(&dir);
+    pub fn get_language_stats(
+        dir: &str,
+        exclude: Vec<&str>,
+        is_root: bool,
+    ) -> Result<(Vec<(Language, f64)>, usize)> {
+        let tokei_langs = project_languages(&dir, exclude, is_root);
         let languages_stat =
             Language::get_languages_stat(&tokei_langs).ok_or(Error::SourceCodeNotFound)?;
         let mut stat_vec: Vec<(_, _)> = languages_stat.into_iter().collect();
@@ -375,7 +379,7 @@ fn get_total_loc(languages: &tokei::Languages) -> usize {
         .fold(0, |sum, val| sum + val.code)
 }
 
-fn project_languages(dir: &str) -> tokei::Languages {
+fn project_languages(dir: &str, exclude: Vec<&str>, is_root: bool) -> tokei::Languages {
     use tokei::Config;
 
     let mut languages = tokei::Languages::new();
@@ -384,7 +388,10 @@ fn project_languages(dir: &str) -> tokei::Languages {
         types: Some(required_languages),
         ..Config::default()
     };
-    languages.get_statistics(&[&dir], &[".git", "target"], &tokei_config);
+
+    let d = if is_root { "." } else { dir };
+    languages.get_statistics(&[&d], &exclude, &tokei_config);
+
     languages
 }
 

Diff for: src/main.rs

@@ -224,8 +224,22 @@ fn main() -> Result<()> {
                 .default_value("3")
                 .help("Number of authors to be shown."),
         )
+        .arg(
+            Arg::with_name("exclude")
+            .short("e")
+            .long("exclude")
+            .multiple(true)
+            .takes_value(true)
+            .help("Ignore all files & directories matching the pattern.")
+        )
         .get_matches();
 
+    let ignored_directories: Vec<&str> = if let Some(user_ignored) = matches.values_of("exclude") {
+        user_ignored.map(|s| s as &str).collect()
+    } else {
+        Vec::new()
+    };
+
     if matches.is_present("languages") {
         let iterator = Language::iter().filter(|x| *x != Language::Unknown);
 
@@ -288,6 +302,7 @@ fn main() -> Result<()> {
     } else {
         None
     };
+
     let image_backend = if custom_image.is_some() {
         if let Some(backend_name) = matches.value_of("image-backend") {
             #[cfg(target_os = "linux")]
@@ -330,6 +345,7 @@ fn main() -> Result<()> {
         no_merges,
         color_blocks_flag,
         author_number,
+        ignored_directories,
     )?;
 
     print!("{}", info);