remove duplication

Author: o2sh

src/ui/printer/mod.rs

@@ -39,15 +39,15 @@ impl Printer {
     pub fn print(&self, writer: &mut dyn std::io::Write) -> Result<()> {
         match &self.r#type {
             PrinterType::Json => {
-                writeln!(writer, "{}", serde_json::to_string_pretty(&self.info)?)?;
+                write!(writer, "{}", serde_json::to_string_pretty(&self.info)?)?;
                 Ok(())
             }
             PrinterType::Yaml => {
-                writeln!(writer, "{}", serde_yaml::to_string(&self.info)?)?;
+                write!(writer, "{}", serde_yaml::to_string(&self.info)?)?;
                 Ok(())
             }
             PrinterType::Plain => {
-                write!(writer, "\x1B[?7l{}\x1B[?7h", self.info)?;
+                write_with_line_wrapping(writer, &self.info.to_string())?;
                 Ok(())
             }
             PrinterType::Image {
@@ -66,7 +66,7 @@ impl Printer {
                     .add_image(info_lines, image, *resolution)
                     .context("Failed to render image")?;
 
-                write!(writer, "\x1B[?7l{rendered}\x1B[?7h")?;
+                write_with_line_wrapping(writer, &rendered)?;
                 Ok(())
             }
             PrinterType::Ascii { art, no_bold } => {
@@ -86,21 +86,23 @@ impl Printer {
                             "",
                             width = logo_lines.width()
                         )?,
-                        (None, None) => {
-                            buf.push('\n');
-                            break;
-                        }
+                        (None, None) => break,
                     }
                 }
 
-                // \x1B[?7l turns off line wrapping and \x1B[?7h turns it on
-                write!(writer, "\x1B[?7l{buf}\x1B[?7h")?;
+                write_with_line_wrapping(writer, &buf)?;
                 Ok(())
             }
         }
     }
 }
 
+fn write_with_line_wrapping(writer: &mut dyn std::io::Write, content: &str) -> Result<()> {
+    // \x1B[?7l turns off line wrapping and \x1B[?7h turns it on
+    write!(writer, "\x1B[?7l{content}\x1B[?7h")?;
+    Ok(())
+}
+
 impl PartialEq for PrinterType {
     fn eq(&self, other: &Self) -> bool {
         matches!(

src/ui/text_colors.rs

@@ -12,27 +12,27 @@ pub struct TextColors {
 }
 
 impl TextColors {
-    pub fn new(colors: &[u8], logo_primary_color: DynColors) -> Self {
+    pub fn new(colors: &[u8], primary_color: DynColors) -> Self {
         let mut text_colors = Self {
-            title: logo_primary_color,
+            title: primary_color,
             tilde: DynColors::Ansi(AnsiColors::Default),
             underline: DynColors::Ansi(AnsiColors::Default),
-            subtitle: logo_primary_color,
+            subtitle: primary_color,
             colon: DynColors::Ansi(AnsiColors::Default),
             info: DynColors::Ansi(AnsiColors::Default),
         };
 
         if !colors.is_empty() {
             let custom_color = colors.iter().map(num_to_color).collect::<Vec<DynColors>>();
 
-            text_colors.title = *custom_color.first().unwrap_or(&logo_primary_color);
+            text_colors.title = *custom_color.first().unwrap_or(&primary_color);
             text_colors.tilde = *custom_color
                 .get(1)
                 .unwrap_or(&DynColors::Ansi(AnsiColors::Default));
             text_colors.underline = *custom_color
                 .get(2)
                 .unwrap_or(&DynColors::Ansi(AnsiColors::Default));
-            text_colors.subtitle = *custom_color.get(3).unwrap_or(&logo_primary_color);
+            text_colors.subtitle = *custom_color.get(3).unwrap_or(&primary_color);
             text_colors.colon = *custom_color
                 .get(4)
                 .unwrap_or(&DynColors::Ansi(AnsiColors::Default));