release v1.3.0 (#20)

- Resolves #14

## Proposed Changes

  - `--stdin` command line option for reading ASCII art from stdin
  - option for setting spacing between art and info block
  - fixed odd looking uptime of only days and minutes are there

## Tested on
- [ ] Linux; Distro(s):
- [x] MacOS

Author: minomy13

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nerdfetch-rs"
-version = "1.2.2"
+version = "1.3.0"
 authors = ["minomy13 <mail@minomy13.com>"]
 edition = "2024"
 description = "A minimal, fast system fetch tool - rewritten in Rust for speed, clarity, and configurability."

README.md

@@ -33,6 +33,10 @@ This project is a Rust-based reimagining with a similar aesthetic and minimalist
 
 <br>ASCII arts by [Hayley Jane Wakenshaw](https://asciiart.website/art/1652) and an [unknown artist](https://emojicombos.com/pokemon-ascii-art).
 
+## Command line options
+
+- `--stdin` - read ASCII art from stdin, e.g. `cat art.txt | nerdfetch-rs --stdin`
+
 ## Config
 
 You can find the config file at `$HOME/.config/nerdfetch-rs.toml`. As the suffix might suggest, it is in TOML format.

src/config.rs

@@ -1,4 +1,4 @@
-mod default;
+pub mod default;
 pub mod schema;
 
 use crate::config::schema::Config;
@@ -17,8 +17,8 @@ macro_rules! conf_unwrap_or {
     };
 
     ($conf:ident, $or:expr, $name:ident) => {
-        if let Some($name) = $conf.$name {
-            $name
+        if let Some($name) = &$conf.$name {
+            $name.to_owned()
         } else { $or }
     }
 }

src/config/default.rs

@@ -1,20 +1,7 @@
-use crate::config::schema::{Color, Theme};
-
-impl Default for Theme {
-    fn default() -> Self {
-        Self {
-            ascii_art: String::from(
-                r"    ___
+pub const ASCII_TUX: &str = r"    ___
    (.. \
    (<> |
   //  \ \
  ( |  | /|
 _/\ __)/_)
-\/-____\/",
-            ),
-            art_color: None,
-            icon_color: Color::BrightMagenta,
-            info_color: Color::Green,
-        }
-    }
-}
+\/-____\/";

src/config/schema.rs

@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Default, Serialize, Deserialize, Debug)]
 pub struct Config {
-    pub theme: Theme,
+    pub theme: Option<Theme>,
     pub modules: Option<Modules>,
 }
 
@@ -65,10 +65,11 @@ pub struct UserConfig {
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Theme {
-    pub ascii_art: String,
+    pub ascii_art: Option<String>,
     pub art_color: Option<Color>,
-    pub icon_color: Color,
-    pub info_color: Color,
+    pub icon_color: Option<Color>,
+    pub info_color: Option<Color>,
+    pub art_info_spacing: Option<usize>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Copy)]
@@ -81,6 +82,7 @@ pub enum Alignment {
 #[derive(Serialize, Deserialize, Debug, Clone, Copy)]
 #[serde(rename_all = "snake_case")]
 pub enum Color {
+    Reset = 0,
     White = 37,
     Black = 30,
     Red = 31,
@@ -96,31 +98,3 @@ pub enum Color {
     BrightMagenta = 95,
     BrightCyan = 96,
 }
-
-impl Theme {
-    pub fn get_fmt_art_longest_ln(&self) -> usize {
-        let mut longest_line = 0;
-        for line in self.ascii_art.lines() {
-            let len = line.len();
-            if len > longest_line {
-                longest_line = len
-            }
-        }
-        longest_line
-    }
-
-    pub fn get_formatted_ascii_art(&self) -> String {
-        let mut result = String::new();
-
-        let longest_line = self.get_fmt_art_longest_ln();
-
-        for line in self.ascii_art.lines() {
-            result.push_str(&format!(
-                "{line}{}\n",
-                " ".repeat(longest_line - line.len())
-            ))
-        }
-
-        result
-    }
-}

src/main.rs

@@ -1,22 +1,46 @@
-use crate::config::{conf_unwrap_or, schema::Alignment};
+use std::{env, io::stdin};
+
+use crate::{
+    config::{
+        conf_unwrap_or,
+        default::ASCII_TUX,
+        schema::{Alignment, Color},
+    },
+    util::{format_ascii_art, get_fmt_line_len},
+};
 
 mod config;
 mod modules;
+mod util;
 
 fn main() {
     let config = config::read();
 
-    let ascii_art = config.theme.get_formatted_ascii_art();
+    let args: Vec<String> = env::args().collect();
+
+    let ascii_art = if args.len() > 1 && args.contains(&"--stdin".to_string()) {
+        let mut buf = String::new();
+        loop {
+            let bytes = stdin()
+                .read_line(&mut buf)
+                .expect("Couldn't read from stdin");
+            if bytes == 0 {
+                break;
+            }
+        }
+        buf
+    } else {
+        conf_unwrap_or!(config, ASCII_TUX.to_owned(), theme / ascii_art).to_owned()
+    };
+    let ascii_art = format_ascii_art(ascii_art);
+
     let modules = modules::get_modules(&config);
 
     let mut lines = vec![];
 
     for line in ascii_art.lines() {
-        if let Some(color) = &config.theme.art_color {
-            lines.push(format!("\x1b[{}m  {line}\x1b[0m", color.to_owned() as u32))
-        } else {
-            lines.push(format!("  {line}"))
-        }
+        let color = conf_unwrap_or!(config, Color::Reset, theme / art_color);
+        lines.push(format!("\x1b[{}m  {line}\x1b[0m", color.to_owned() as u32));
     }
 
     let modules_start = match conf_unwrap_or!(config, Alignment::Top, modules / alignment) {
@@ -30,12 +54,19 @@ fn main() {
         }
     };
 
+    let longest_art_line = get_fmt_line_len(lines.first().unwrap_or(&"".to_string()));
     for i in 0..modules.len() {
+        let spacing = conf_unwrap_or!(config, 2, theme / art_info_spacing);
+
         match lines.get_mut(i + modules_start) {
-            Some(line) => line.push_str(&format!("  {}", modules.get(i).unwrap())),
+            Some(line) => line.push_str(&format!(
+                "{}{}",
+                " ".repeat(spacing),
+                modules.get(i).unwrap()
+            )),
             None => lines.push(format!(
-                "    {}{}",
-                " ".repeat(config.theme.get_fmt_art_longest_ln()),
+                "{}{}",
+                " ".repeat(spacing + longest_art_line),
                 modules.get(i).unwrap()
             )),
         }

src/modules/module.rs

@@ -1,12 +1,15 @@
-use crate::config::schema::Config;
+use crate::{
+    conf_unwrap_or,
+    config::schema::{Color, Config},
+};
 
 pub trait Module {
     fn get_formatted(&self, config: &Config) -> String {
         format!(
             "\x1b[0m\x1b[{}m{}  \x1b[0m\x1b[{}m{}\x1b[0m",
-            config.theme.icon_color.to_owned() as u32,
+            conf_unwrap_or!(config, Color::BrightMagenta, theme / icon_color) as u32,
             self.get_icon(config),
-            config.theme.info_color.to_owned() as u32,
+            conf_unwrap_or!(config, Color::Green, theme / info_color) as u32,
             self.get_info(config)
         )
     }

src/modules/uptime.rs

@@ -20,7 +20,10 @@ impl Module for Uptime {
         format!(
             "{}{}{}",
             if days > 0 {
-                format!("{days} days{}", if hours > 0 { ", " } else { "" })
+                format!(
+                    "{days} days{}",
+                    if hours > 0 || minutes > 0 { ", " } else { "" }
+                )
             } else {
                 "".to_string()
             },

src/util.rs

@@ -0,0 +1,33 @@
+use regex::Regex;
+
+// TODO: don't call twice
+pub fn get_fmt_line_len(line: &str) -> usize {
+    let ansi_code_pattern = Regex::new(r"\u{1b}?\[[\d+;]+m").unwrap();
+    ansi_code_pattern.replace_all(line, "").chars().count()
+}
+
+fn get_longest_ln(str: &str) -> usize {
+    let mut longest_line = 0;
+    for line in str.lines() {
+        let len = get_fmt_line_len(line);
+        if len > longest_line {
+            longest_line = len
+        }
+    }
+    longest_line
+}
+
+pub fn format_ascii_art(str: String) -> String {
+    let mut result = String::new();
+
+    let longest_line = get_longest_ln(&str);
+
+    for line in str.lines() {
+        result.push_str(&format!(
+            "{line}{}\n",
+            " ".repeat(longest_line - get_fmt_line_len(line))
+        ))
+    }
+
+    result
+}