Merge pull request #330 from Luke-zhang-04/master

feat: hide logo if terminal size is too wide
o2sh · Nov 29, 2020 · a4698dc · a4698dc
2 parents 940c478 + 2979a77
commit a4698dc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,6 +28,7 @@ askalono = "0.4.3"
 bytecount = "0.6.1"
 clap = "2.33.3"
 strum = { version = "0.20.0", features = ["derive"] }
+term_size = "0.3.2"
 image = "0.23.12"
 regex = "1"
 error-chain = "0.12"

diff --git a/src/onefetch/cli.rs b/src/onefetch/cli.rs
@@ -10,8 +10,11 @@ use {
     image::DynamicImage,
     std::{convert::From, env, str::FromStr},
     strum::IntoEnumIterator,
+    term_size,
 };
 
+const MAX_TERM_WIDTH: usize = 95;
+
 pub struct Cli {
     pub repo_path: String,
     pub ascii_input: Option<String>,
@@ -94,7 +97,7 @@ impl Cli {
                 .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. \
+                     It is possible to pass a generated STRING by command substitution. \n\
                      For example:\n \
                      '--ascii-input \"$(fortune | cowsay -W 25)\"'"
             )
@@ -129,7 +132,7 @@ impl Cli {
                 .help("Changes the text colors (X X X...).")
                 .long_help(
                     "Changes the text colors (X X X...). \
-                     Goes in order of title, ~, underline, subtitle, colon, and info. \
+                     Goes in order of title, ~, underline, subtitle, colon, and info. \n\
                      For example:\n \
                      '--text-colors 9 10 11 12 13 14'"
             )
@@ -218,19 +221,26 @@ impl Cli {
                 .help("Ignore all files & directories matching EXCLUDE."),
             )
         .arg(
-            Arg::with_name("off")
-                .long("off")
-                .help("Only shows the info lines.")
-                .conflicts_with_all(&["image", "ascii-language", "ascii-input"]),
-            ).get_matches();
+            Arg::with_name("hide-logo")
+                .long("hide-logo")
+                .value_name("WHEN")
+                .takes_value(true)
+                .possible_values(&["auto", "always"])
+                .default_value("always")
+                .hide_default_value(true)
+                .help("Specify when to hide the logo (auto, *always*).")
+                .long_help(
+                    "Specify when to hide the logo (auto, *always*). \n\
+                    If set to auto, the logo will be hidden if the terminal's width < 95."
+                )
+        ).get_matches();
 
+        let true_color = cli_utils::is_truecolor_terminal();
         let no_bold = matches.is_present("no-bold");
         let no_merges = matches.is_present("no-merge-commits");
         let no_color_palette = matches.is_present("no-color-palette");
         let print_languages = matches.is_present("languages");
         let print_package_managers = matches.is_present("package-managers");
-        let art_off = matches.is_present("off");
-        let true_color = cli_utils::is_truecolor_terminal();
 
         let fields_to_hide: Vec<String> = if let Some(values) = matches.values_of("disable-fields")
         {
@@ -239,6 +249,18 @@ impl Cli {
             Vec::new()
         };
 
+        let art_off = match matches.value_of("hide-logo") {
+            Some("always") => true,
+            Some("auto") => {
+                if let Some((width, _)) = term_size::dimensions_stdout() {
+                    width < MAX_TERM_WIDTH
+                } else {
+                    false
+                }
+            }
+            _ => unreachable!("other values for --hide-logo are not allowed"),
+        };
+
         let image = if let Some(image_path) = matches.value_of("image") {
             Some(image::open(image_path).chain_err(|| "Could not load the specified image")?)
         } else {