remove language::unknown

Author: o2sh

Diff for: resources/unknown.ascii

@@ -15,7 +15,7 @@ use {
 pub struct Cli {
     pub path: String,
     pub ascii_input: Option<String>,
-    pub ascii_language: Language,
+    pub ascii_language: Option<Language>,
     pub ascii_colors: Vec<String>,
     pub disabled_fields: info_fields::InfoFieldOn,
     pub no_bold: bool,
@@ -63,7 +63,6 @@ impl Cli {
                 .help("Which LANGUAGE's ascii art to print.")
                 .possible_values(
                     &Language::iter()
-                        .filter(|language| *language != Language::Unknown)
                         .map(|language| language.into())
                         .collect::<Vec<&str>>()
                     ),
@@ -269,9 +268,9 @@ impl Cli {
         let ascii_input = matches.value_of("ascii-input").map(String::from);
 
         let ascii_language = if let Some(ascii_language) = matches.value_of("ascii-language") {
-            Language::from_str(&ascii_language.to_lowercase()).unwrap()
+            Some(Language::from_str(&ascii_language.to_lowercase()).unwrap())
         } else {
-            Language::Unknown
+            None
         };
 
         let ascii_colors = if let Some(values) = matches.values_of("ascii-colors") {

Diff for: src/onefetch/cli.rs

@@ -75,20 +75,18 @@ impl<W: Write> Printer<W> {
     }
 
     fn get_ascii(&self) -> &str {
-        let language = if let Language::Unknown = self.info.config.ascii_language {
-            &self.info.dominant_language
+        let language = if let Some(ascii_language) = &self.info.config.ascii_language {
+            ascii_language
         } else {
-            &self.info.config.ascii_language
+            &self.info.dominant_language
         };
 
         language.get_ascii_art()
     }
 }
 
 pub fn print_supported_languages() -> Result<()> {
-    let iterator = Language::iter().filter(|x| *x != Language::Unknown);
-
-    for l in iterator {
+    for l in Language::iter() {
         println!("{}", l);
     }
 

Diff for: src/onefetch/cli_utils.rs

@@ -556,15 +556,15 @@ impl Info {
     }
 
     fn get_ascii_colors(
-        ascii_language: &Language,
+        ascii_language: &Option<Language>,
         dominant_language: &Language,
         ascii_colors: &[String],
         true_color: bool,
     ) -> Vec<Color> {
-        let language = if let Language::Unknown = ascii_language {
-            &dominant_language
+        let language = if let Some(ascii_language) = ascii_language {
+            ascii_language
         } else {
-            &ascii_language
+            &dominant_language
         };
 
         let colors = language.get_colors(true_color);

Diff for: src/onefetch/info.rs

@@ -28,14 +28,12 @@ macro_rules! define_languages {
                 $( #[strum(serialize = $serialize)] )?
                 $name ,
             )*
-            Unknown,
         }
 
         impl std::fmt::Display for Language {
             fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
                 match *self {
                     $( Language::$name => write!(f, $display), )*
-                    Language::Unknown => write!(f, "Unknown" ),
                 }
             }
         }
@@ -53,14 +51,12 @@ macro_rules! define_languages {
             pub fn get_ascii_art(&self) -> &str {
                 match *self {
                     $( Language::$name => include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/resources/", $ascii)), )*
-                    Language::Unknown => include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/resources/unknown.ascii")),
                 }
             }
 
             pub fn get_colors(&self, true_color: bool) -> Vec<Color> {
                 let colors = match *self {
                     $( Language::$name => $colors, )*
-                    Language::Unknown => define_colors!( [Color::White] ),
                 };
                 match colors.true_colors {
                   Some( true_colors ) if true_color => true_colors,