Merge pull request #152 from ebroto/bugfix/isc-license-not-recognised

Use a newer version of askalono so ISC is detected

Cargo.toml

@@ -12,16 +12,13 @@ exclude = ["assets/*.png"]
 colored= "1.8.0"
 git2 = {version = "0.7.5", default-features = false}
 tokei = "10.0"
-askalono = "0.3.0"
+askalono = { git = "https://github.com/amzn/askalono.git", rev = "39f6e228775e17266bcba46f48b26b01bbfb7698" }
 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"
 

src/info.rs

@@ -583,7 +583,7 @@ impl Info {
     fn get_project_license(dir: &str) -> Result<String> {
         let detector = Detector::new()?;
 
-        let output = fs::read_dir(dir)
+        let mut output = fs::read_dir(dir)
             .map_err(|_| Error::ReadDirectory)?
             .filter_map(std::result::Result::ok)
             .map(|entry| entry.path())
@@ -601,8 +601,11 @@ impl Info {
                 let contents = fs::read_to_string(entry).unwrap_or_default();
                 detector.analyze(&contents)
             })
-            .collect::<Vec<_>>()
-            .join(", ");
+            .collect::<Vec<_>>();
+
+        output.sort();
+        output.dedup();
+        let output = output.join(", ");
 
         if output == "" {
             Ok("??".into())

src/license.rs

@@ -4,7 +4,7 @@ use crate::Error;
 
 type Result<T> = std::result::Result<T, Error>;
 
-static CACHE_DATA: &[u8] = include_bytes!("../resources/licenses/cache.bin.gz");
+static CACHE_DATA: &[u8] = include_bytes!("../resources/licenses/cache.bin.zstd");
 
 pub struct Detector {
     store: Store,
@@ -18,9 +18,12 @@ impl Detector {
     }
 
     pub fn analyze(&self, text: &str) -> Option<String> {
-        self.store
-            .analyze(&TextData::from(text))
-            .ok()
-            .map(|license| license.name)
+        let matched = self.store.analyze(&TextData::from(text));
+
+        if matched.score > 0. {
+            Some(matched.name.into())
+        } else {
+            None
+        }
     }
 }