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

Signed-off-by: Luke-zhang-04 <[email protected]>

Author: Luke-zhang-04

.gitignore

@@ -1,7 +1,7 @@
 /target
 **/*.rs.bk
 /stage
-/snap/.snapcraft
+/snap/snapcraft.yaml
 *.snap
 /parts
 /prime

resources/bash.ascii

@@ -1,21 +1,21 @@
-{0}                ':h:'
-{0}             ':ba:sh:,
-{0}          ;bash,      ':ba;
-{0}      ':bash:'            ':shb:'
-{0}   ,bash;                    ,ash,
+{0}                ;sh:'
+{0}             :ba:sh:,ba;
+{0}          ;sh,         ':ba;
+{0}      ':ba                ':sh;
+{0}   ,sh'                      ,ash,
 {0} ,s:'                           ':h;
 {0}'ba                              ,aoOk,
 {0}:b,                           ;hkABASH:
 {0}:b,                        ;oOBASHBASH:
 {0}:b,                    ':bBASHBASHBASH:
 {0}:b,                 ':AKBBBASHBASHBASH:
 {0}:b,               ;okNBBB$BASHBASHBASH:
-{0}:b,               oABASH$:$BBBBASHBASH:
-{0}:b,               oBASH$:::$BBBASHBASH:
-{0}:b,               oBAS$::$BASHBASHBASH:
-{0};b;               oBASHB$::$BBBASHBASH;
-{0} :ba'             oBAS$:::$HHBASHBASHa
-{0}  ':sh;           oBASH$:$BASHBASHBA'
+{0}:b,               oABASH$ $BBBBASHBASH:
+{0}:b,               oBASH$   $BBBASHBASH:
+{0}:b,               oBAS$  $BASHBAS  ASH:
+{0};b;               oBASHB$  $BBB  HBASH;
+{0} :ba'             oBAS$   $HH  SHBASHa
+{0}  ':sh;           oBASH$ $BASHBASHBA'
 {0}     ':ba:        oBASHB$BASHBAS:'
 {0}         ;shh:,   oBASHBASHBA;
 {0}            ,:ba;o0ABN0Aa,

snap/snapcraft.yaml

@@ -10,6 +10,7 @@ use {
 
 pub struct Cli {
     pub path: String,
+    pub ascii_input: Option<String>,
     pub ascii_language: Language,
     pub ascii_colors: Vec<String>,
     pub disabled_fields: info_fields::InfoFieldOn,
@@ -74,6 +75,25 @@ impl Cli {
                         .collect::<Vec<&str>>()
                 ),
         )
+        .arg(
+            Arg::with_name("ascii-input")
+                .long("ascii")
+                .value_name("STRING")
+                .takes_value(true)
+                .max_values(1)
+                .help("Takes a non-empty STRING as input to replace the ASCII logo.")
+                .long_help("Takes a non-empty STRING as input to replace the ASCII logo. \
+                It is possible to pass a generated STRING by command substitution. \
+                Example: onefetch --ascii \"$(fortune | cowsay -W 25)\"")
+                .validator(
+                    |t| {
+                        if t.is_empty() {
+                            return Err(String::from("must not be empty"));
+                        }
+                        Ok(())
+                    },
+                ),
+        )
         .arg(
             Arg::with_name("ascii-colors")
                 .short("c")
@@ -184,6 +204,9 @@ impl Cli {
         };
 
         let path = String::from(matches.value_of("input").unwrap());
+
+        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()
         } else {
@@ -212,6 +235,7 @@ impl Cli {
 
         Ok(Cli {
             path,
+            ascii_input,
             ascii_language,
             ascii_colors,
             disabled_fields,

src/onefetch/cli.rs

@@ -270,8 +270,12 @@ impl std::fmt::Display for Info {
                 panic!("No image backend found")
             }
         } else {
-            let mut logo_lines =
-                AsciiArt::new(self.get_ascii(), self.colors(), !self.config.no_bold);
+            let mut logo_lines = if let Some(custom_ascii) = &self.config.ascii_input {
+                AsciiArt::new(custom_ascii, Vec::new(), !self.config.no_bold)
+            } else {
+                AsciiArt::new(self.get_ascii(), self.colors(), !self.config.no_bold)
+            };
+
             loop {
                 match (logo_lines.next(), info_lines.next()) {
                     (Some(logo_line), Some(info_line)) => {

src/onefetch/info.rs

@@ -189,7 +189,7 @@ define_languages! {
     { Forth, "forth.ascii", "Forth", define_colors!( [Color::Red] ) },
     { FortranModern, "f90.ascii", "Fortran", define_colors!( [Color::White, Color::Green, Color::Cyan, Color::Yellow, Color::Red] ), "fortran" },
     { FSharp, "fsharp.ascii", "F#", define_colors!( [Color::Cyan, Color::Cyan] ), "f#" },
-    { Go, "go.ascii", "Go", define_colors!( [Color::White] ) },
+    { Go, "go.ascii", "Go", define_colors!( [Color::Cyan, Color::White, Color::Yellow] : [Color::TrueColor{ r:116, g:205, b:221 }, Color::TrueColor{ r:255, g:255, b:255 }, Color::TrueColor{ r:246, g:210, b:162 }] ) },
     { Groovy, "groovy.ascii", "Groovy", define_colors!( [Color::Cyan, Color::White] ) },
     { Haskell, "haskell.ascii", "Haskell", define_colors!( [Color::Cyan, Color::Magenta, Color::Blue] ) },
     { Html, "html.ascii", "HTML", define_colors!( [Color::Red, Color::White] ) },
@@ -251,7 +251,7 @@ define_languages! {
     { Vue, "vue.ascii", "Vue", define_colors!( [Color::Green, Color::Blue] ) },
     { Xml, "xml.ascii", "XML", define_colors!( [Color::Yellow, Color::White, Color::Green] ) },
     { Zig, "zig.ascii", "Zig", define_colors!( [Color::Yellow] ) },
-    { Zsh, "zsh.ascii", "Z-shell", define_colors!( [Color::White] ), "zsh" },
+    { Zsh, "zsh.ascii", "Z-shell", define_colors!( [Color::White] ) },
 }
 
 impl Language {