Merge branch 'master' of github.com:o2sh/onefetch

Author: Phundrak

Diff for: CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.1.0] - 2019-11-10
+
+<img src="https://user-images.githubusercontent.com/13710835/66691603-23fc7b00-ec87-11e9-9280-8afb5b5a4cab.png" alt="logo" height="100px">
+
+**Contributors:**
+@CephalonRho @ebroto @Phundrak 
+
+**Language**
+* Added support for Org @Phundrak 
+
+**New feature:**
+* Add --no-color-blocks flag #153 
+* Add suport for SIXEL image_backend @CephalonRho 
+
+**Misc**
+* Update to askalono 0.4.0 and use a more strict confidence threshold
+
 ## [2.0.1] - 2019-11-06
 
 <img src="https://user-images.githubusercontent.com/13710835/66691603-23fc7b00-ec87-11e9-9280-8afb5b5a4cab.png" alt="logo" height="100px">

Diff for: CONTRIBUTORS

@@ -122,3 +122,48 @@ Sam Tebbs <[email protected]>
 Taha <[email protected]>
 Vipul-Bajaj <[email protected]>
 Willy Chen <[email protected]>
+Ossama Hjaji <[email protected]>
+Spenser Black <[email protected]>
+ZapAnton <[email protected]>
+CephalonRho <[email protected]>
+Andrew Pritchard <[email protected]>
+Cody Metz <[email protected]>
+ktsuench <[email protected]>
+Kloenk <[email protected]>
+Pablo Diego <[email protected]>
+xynxynxyn <[email protected]>
+eman0n <[email protected]>
+Eduardo Broto <[email protected]>
+GooseDB <[email protected]>
+JoshBrudnak <[email protected]>
+cnsumner <[email protected]>
+rockisch <[email protected]>
+vypxl <[email protected]>
+zxey <[email protected]>
+Aleksei Pirogov <[email protected]>
+Francesco Dipi <[email protected]>
+Julian Kaindl <[email protected]>
+Kasra Ferdowsifard <[email protected]>
+Nikos Filippakis <[email protected]>
+Rob Warner <[email protected]>
+Ryan Troxler <[email protected]>
+Vinh Nguyen <[email protected]>
+Vinícius Estevam <[email protected]>
+A. Nackov <[email protected]>
+Abhishek C. Sharma <[email protected]>
+Alan Pope <[email protected]>
+Amirali Esmaeili <[email protected]>
+Arvid Boivie <[email protected]>
+Bojan Djurdjevic <[email protected]>
+ImgBotApp <[email protected]>
+Jadi <[email protected]>
+Josh Stone <[email protected]>
+Kent Tsuenchy <[email protected]>
+Kitlith <[email protected]>
+Lucien Cartier-Tilet <[email protected]>
+Mads Johansen <[email protected]>
+Quint Daenen <[email protected]>
+Sam Tebbs <[email protected]>
+Taha <[email protected]>
+Vipul-Bajaj <[email protected]>
+Willy Chen <[email protected]>

Diff for: Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "onefetch"
 description = "Git repository summary on your terminal"
-version = "2.0.1"
+version = "2.1.0"
 authors = ["o2sh <[email protected]>"]
 readme = "README.md"
 license = "MIT"
@@ -12,7 +12,7 @@ exclude = ["assets/*.png"]
 colored= "1.8.0"
 git2 = {version = "0.7.5", default-features = false}
 tokei = "10.0"
-askalono = { git = "https://github.com/amzn/askalono.git", rev = "39f6e228775e17266bcba46f48b26b01bbfb7698" }
+askalono = "0.4.0"
 bytecount = "0.5.1"
 clap = "2.33.0"
 strum = "0.16.0"

Diff for: Cargo.toml

@@ -1,6 +1,6 @@
 <p align="center">
   <img src="https://raw.githubusercontent.com/o2sh/onefetch/master/assets/onefetch.png" height="130px"></h3><br><br>
-  <a href="https://crates.io/crates/onefetch"><img src="https://img.shields.io/badge/crates.io-2.0.1-orange.svg" alt="cargo"></a>
+  <a href="https://crates.io/crates/onefetch"><img src="https://img.shields.io/badge/crates.io-2.1.0-orange.svg" alt="cargo"></a>
   <a href="https://travis-ci.org/o2sh/onefetch"><img src="https://travis-ci.org/o2sh/onefetch.svg?branch=master" alt="Build Status"></a>
   <a href="./LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-blue.svg"></a>
 </p>

Diff for: README.md

@@ -45,6 +45,7 @@ pub enum Language {
     #[strum(serialize = "objective-c")]
     ObjectiveC,
     OCaml,
+    #[strum(serialize = "org-mode")]
     Org,
     Perl,
     Php,

Diff for: src/language.rs

@@ -5,6 +5,7 @@ use crate::Error;
 type Result<T> = std::result::Result<T, Error>;
 
 static CACHE_DATA: &[u8] = include_bytes!("../resources/licenses/cache.bin.zstd");
+const MIN_THRESHOLD: f32 = 0.8;
 
 pub struct Detector {
     store: Store,
@@ -20,7 +21,7 @@ impl Detector {
     pub fn analyze(&self, text: &str) -> Option<String> {
         let matched = self.store.analyze(&TextData::from(text));
 
-        if matched.score > 0. {
+        if matched.score >= MIN_THRESHOLD {
             Some(matched.name.into())
         } else {
             None