Merge branch 'master' into ocaml_support

Author: o2sh

Cargo.lock

@@ -12,13 +12,16 @@ exclude = ["assets/*.png"]
 colored= "1.8.0"
 git2 = {version = "0.7.5", default-features = false}
 tokei = "10.0"
-license = "0.8.1"
+askalono = "0.3.0"
 bytecount = "0.5.1"
 clap = "2.33.0"
 strum = "0.16.0"
 strum_macros = "0.16.0"
 image = "0.22.3"
 
+[build-dependencies]
+askalono = "0.3.0"
+
 [target.'cfg(windows)'.dependencies]
 ansi_term = "0.12"
 

Cargo.toml

@@ -16,6 +16,8 @@ pub enum Error {
     ReferenceInfoError,
     /// Image probably doesn't exist or has wrong format
     ImageLoadError,
+    /// Could not initialize the license detector
+    LicenseDetectorError,
 }
 
 impl std::fmt::Debug for Error {
@@ -29,6 +31,7 @@ impl std::fmt::Debug for Error {
             Error::BareGitRepo => "Unable to run onefetch on bare git repos",
             Error::ReferenceInfoError => "Error while retrieving reference information",
             Error::ImageLoadError => "Could not load the specified image",
+            Error::LicenseDetectorError => "Could not initialize the license detector",
         };
         write!(f, "{}", content)
     }

resources/licenses/cache.bin.gz

@@ -6,7 +6,7 @@ use std::process::Command;
 use colored::{Color, ColoredString, Colorize};
 use git2::Repository;
 use image::DynamicImage;
-use license;
+use license::Detector;
 
 use crate::image_backends;
 use crate::language::Language;
@@ -581,6 +581,8 @@ impl Info {
     }
 
     fn get_project_license(dir: &str) -> Result<String> {
+        let detector = Detector::new()?;
+
         let output = fs::read_dir(dir)
             .map_err(|_| Error::ReadDirectory)?
             .filter_map(std::result::Result::ok)
@@ -596,9 +598,9 @@ impl Info {
                 }, // TODO: multiple prefixes, like COPYING?
             )
             .filter_map(|entry| {
-                license::from_text_ext(&fs::read_to_string(entry).unwrap_or_else(|_| "".into()))
+                let contents = fs::read_to_string(entry).unwrap_or_default();
+                detector.analyze(&contents)
             })
-            .map(|license| license.name().to_string())
             .collect::<Vec<_>>()
             .join(", ");
 

src/error.rs

@@ -11,7 +11,9 @@ pub enum Language {
     C,
     Clojure,
     CoffeeScript,
+    #[strum(serialize = "c++")]
     Cpp,
+    #[strum(serialize = "c#")]
     Csharp,
     CSS,
     D,
@@ -20,6 +22,7 @@ pub enum Language {
     Elm,
     Erlang,
     Forth,
+    #[strum(serialize = "fortran")]
     FortranModern,
     FSharp,
     Go,
@@ -34,8 +37,9 @@ pub enum Language {
     Lua,
     Markdown,
     Nim,
-    OCaml,
+    #[strum(serialize = "objective-c")]
     ObjectiveC,
+    OCaml,
     Perl,
     Php,
     Prolog,
@@ -86,9 +90,9 @@ impl std::fmt::Display for Language {
             Language::Lisp => write!(f, "Lisp"),
             Language::Lua => write!(f, "Lua"),
             Language::Markdown => write!(f, "Markdown"),
-            Language::Nim => write!(f, "Nim"),
-            Language::OCaml => write!(f, "OCaml"),
+            Language::Nim => write!(f, "Nim"),       
             Language::ObjectiveC => write!(f, "Objective-C"),
+            Language::OCaml => write!(f, "OCaml"),
             Language::PureScript => write!(f, "PureScript"),
             Language::Python => write!(f, "Python"),
             Language::R => write!(f, "R"),
@@ -142,9 +146,9 @@ impl From<tokei::LanguageType> for Language {
             tokei::LanguageType::Lisp => Language::Lisp,
             tokei::LanguageType::Lua => Language::Lua,
             tokei::LanguageType::Markdown => Language::Markdown,
-            tokei::LanguageType::Nim => Language::Nim,
-            tokei::LanguageType::OCaml => Language::OCaml,
+            tokei::LanguageType::Nim => Language::Nim,            
             tokei::LanguageType::ObjectiveC => Language::ObjectiveC,
+            tokei::LanguageType::OCaml => Language::OCaml,
             tokei::LanguageType::Prolog => Language::Prolog,
             tokei::LanguageType::Perl => Language::Perl,
             tokei::LanguageType::Php => Language::Php,
@@ -197,9 +201,9 @@ impl Language {
             Language::Lisp => include_str!("../resources/lisp.ascii"),
             Language::Lua => include_str!("../resources/lua.ascii"),
             Language::Markdown => include_str!("../resources/markdown.ascii"),
-            Language::Nim => include_str!("../resources/nim.ascii"),
-            Language::OCaml => include_str!("../resources/ocaml.ascii"),
+            Language::Nim => include_str!("../resources/nim.ascii"),            
             Language::ObjectiveC => include_str!("../resources/objectivec.ascii"),
+            Language::OCaml => include_str!("../resources/ocaml.ascii"),
             Language::Perl => include_str!("../resources/perl.ascii"),
             Language::Php => include_str!("../resources/php.ascii"),
             Language::Prolog => include_str!("../resources/prolog.ascii"),
@@ -263,9 +267,9 @@ impl Language {
             Language::Lisp => vec![Color::Yellow],
             Language::Lua => vec![Color::Blue],
             Language::Markdown => vec![Color::BrightWhite, Color::BrightRed],
-            Language::Nim => vec![Color::Yellow, Color::BrightWhite],
-            Language::OCaml => vec![Color::Yellow],
+            Language::Nim => vec![Color::Yellow, Color::BrightWhite],            
             Language::ObjectiveC => vec![Color::BrightBlue, Color::Blue],
+            Language::OCaml => vec![Color::Yellow],
             Language::Perl => vec![Color::BrightBlue],
             Language::Php => vec![Color::BrightWhite],
             Language::Prolog => vec![Color::Blue, Color::Red],
@@ -372,8 +376,8 @@ fn get_all_language_types() -> Vec<tokei::LanguageType> {
         tokei::LanguageType::Lua,
         tokei::LanguageType::Markdown,
         tokei::LanguageType::Nim,
-        tokei::LanguageType::OCaml,
         tokei::LanguageType::ObjectiveC,
+        tokei::LanguageType::OCaml,        
         tokei::LanguageType::Perl,
         tokei::LanguageType::Php,
         tokei::LanguageType::Prolog,

src/info.rs

@@ -0,0 +1,26 @@
+use askalono::{Store, TextData};
+
+use crate::Error;
+
+type Result<T> = std::result::Result<T, Error>;
+
+static CACHE_DATA: &[u8] = include_bytes!("../resources/licenses/cache.bin.gz");
+
+pub struct Detector {
+    store: Store,
+}
+
+impl Detector {
+    pub fn new() -> Result<Self> {
+        Store::from_cache(CACHE_DATA)
+            .map(|store| Self { store })
+            .map_err(|_| Error::LicenseDetectorError)
+    }
+
+    pub fn analyze(&self, text: &str) -> Option<String> {
+        self.store
+            .analyze(&TextData::from(text))
+            .ok()
+            .map(|license| license.name)
+    }
+}

src/language.rs

@@ -1,8 +1,8 @@
 extern crate bytecount;
 
+extern crate askalono;
 extern crate colored;
 extern crate git2;
-extern crate license;
 extern crate tokei;
 #[macro_use]
 extern crate clap;
@@ -33,6 +33,7 @@ mod error;
 mod image_backends;
 mod info;
 mod language;
+mod license;
 
 use ascii_art::AsciiArt;
 use commit_info::CommitInfo;
@@ -93,6 +94,11 @@ fn main() -> Result<()> {
         return Err(Error::GitNotInstalled);
     }
 
+    let possible_languages: Vec<String> = Language::iter()
+        .filter(|language| *language != Language::Unknown)
+        .map(|language| language.to_string().to_lowercase())
+        .collect();
+
     let matches = App::new(crate_name!())
         .version(crate_version!())
         .author("o2sh <[email protected]>")
@@ -109,8 +115,14 @@ fn main() -> Result<()> {
                 .short("a")
                 .long("ascii_language")
                 .takes_value(true)
-                .default_value("")
-                .help("Overrides showing the dominant language ascii logo"),
+                .possible_values(
+                    &possible_languages
+                        .iter()
+                        .map(|l| l.as_str())
+                        .collect::<Vec<&str>>(),
+                )
+                .case_insensitive(true)
+                .help("Overrides showing the dominant language ascii logo."),
         )
         .arg(
             Arg::with_name("disable_field")
@@ -179,7 +191,8 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
                 .long("image")
                 .takes_value(true)
                 .help("Sets a custom image to use instead of the ascii logo"),
-        ).arg(
+        )
+        .arg(
             Arg::with_name("no-merges")
                 .short("m")
                 .long("no-merges")
@@ -197,9 +210,11 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
     }
 
     let dir = String::from(matches.value_of("directory").unwrap());
-    let custom_logo: Language =
-        Language::from_str(&matches.value_of("ascii_language").unwrap().to_lowercase())
-            .unwrap_or(Language::Unknown);
+    let custom_logo: Language = if let Some(ascii_language) = matches.value_of("ascii_language") {
+        Language::from_str(&ascii_language.to_lowercase()).unwrap()
+    } else {
+        Language::Unknown
+    };
     let mut disable_fields = InfoFieldOn {
         ..Default::default()
     };