Style for storage list

- console can handle Style separately

Cargo.lock

@@ -348,13 +348,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
-name = "colored"
-version = "2.1.0"
+name = "console"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
+ "encode_unicode",
  "lazy_static",
- "windows-sys 0.48.0",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -464,6 +467,12 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
 [[package]]
 name = "env_filter"
 version = "0.1.0"
@@ -1851,7 +1860,7 @@ dependencies = [
  "clap",
  "clap-verbosity-flag",
  "clap_complete",
- "colored",
+ "console",
  "dirs",
  "dunce",
  "env_logger",

Cargo.toml

@@ -30,7 +30,7 @@ byte-unit = "5.1.4"
 anyhow = "1.0"
 pathdiff = "0.2.1"
 unicode-width = "0.1.13"
-colored = "2"
+console = "0.15"
 
 [dev-dependencies]
 assert_cmd = "2.0.14"

src/cmd_backup.rs

@@ -6,7 +6,7 @@ use std::{
 
 use anyhow::{anyhow, Context, Ok, Result};
 use chrono::{Local, TimeDelta};
-use colored::Colorize;
+use console::Style;
 use dunce::canonicalize;
 use git2::Repository;
 use unicode_width::UnicodeWidthStr;
@@ -154,6 +154,17 @@ pub fn cmd_backup_list(
     Ok(())
 }
 
+fn duration_style(time: TimeDelta) -> Style {
+    match time {
+        x if x < TimeDelta::days(7) => Style::new().green(),
+        x if x < TimeDelta::days(14) => Style::new().yellow(),
+        x if x < TimeDelta::days(28) => Style::new().magenta(),
+        x if x < TimeDelta::days(28 * 3) => Style::new().red(),
+        x if x < TimeDelta::days(180) => Style::new().red().bold(),
+        _ => Style::new().on_red().black(),
+    }
+}
+
 /// TODO: status printing
 fn write_backups_list(
     mut writer: impl io::Write,
@@ -192,34 +203,27 @@ fn write_backups_list(
             "Couldn't find the device specified in the backup config: {}",
             backup.name()
         ))?;
-        let name = match backup.last_backup() {
-            Some(log) => {
-                let time = Local::now() - log.datetime;
-                match time {
-                    x if x < TimeDelta::days(14) => backup.name().normal(),
-                    x if x < TimeDelta::days(28) => backup.name().magenta(),
-                    x if x < TimeDelta::days(28 * 3) => backup.name().red(),
-                    x if x < TimeDelta::days(180) => backup.name().red().bold(),
-                    _ => backup.name().black().on_red(),
-                }
-            }
-            None => backup.name().normal(),
-        };
         let src = backup.source().path(storages, device)?;
         let dest = backup.destination().path(storages, device)?;
         let cmd_name = backup.command().name();
-        let last_backup_elapsed = match backup.last_backup() {
+        let (last_backup_elapsed, style_on_time_elapsed) = match backup.last_backup() {
             Some(log) => {
                 let time = Local::now() - log.datetime;
-                util::format_summarized_duration(time)
+                let s = util::format_summarized_duration(time);
+                let style = duration_style(time);
+                (style.apply_to(s), style)
             }
-            None => "---".to_string().red(),
+            None => {
+                let style = Style::new().red();
+                (style.apply_to("---".to_string()), style)
+            },
         };
         if !longprint {
             writeln!(
                 writer,
                 "{name:<name_width$} [{dev:<dev_width$}] {src:<src_storage_width$} → {dest:<dest_storage_width$} {last_backup_elapsed}",
-                dev = dev.blue(),
+                name = style_on_time_elapsed.apply_to(backup.name()),
+                dev = console::style(dev).blue(),
                 src = backup.source().storage,
                 dest = backup.destination().storage,
             )?;
@@ -227,8 +231,8 @@ fn write_backups_list(
             writeln!(
                 writer,
                 "[{dev:<dev_width$}] {name:<name_width$} {last_backup_elapsed}",
-                dev = dev.blue(),
-                name = name.bold(),
+                dev = console::style(dev).blue(),
+                name = style_on_time_elapsed.bold().apply_to(backup.name()),
             )?;
             let last_backup_date = match backup.last_backup() {
                 Some(date) => date.datetime.format("%Y-%m-%d %T").to_string(),
@@ -238,27 +242,27 @@ fn write_backups_list(
             writeln!(
                 writer,
                 "{s_src} {src}",
-                s_src = "src :".italic().bright_black(),
+                s_src = console::style("src :").italic().bright().black(),
                 src = src.display()
             )?;
             writeln!(
                 writer,
                 "{s_dest} {dest}",
-                s_dest = "dest:".italic().bright_black(),
+                s_dest = console::style("dest:").italic().bright().black(),
                 dest = dest.display()
             )?;
             writeln!(
                 writer,
                 "{s_last} {last}",
-                s_last = "last:".italic().bright_black(),
+                s_last = console::style("last:").italic().bright().black(),
                 last = last_backup_date,
             )?;
             writeln!(
                 writer,
                 "{s_cmd} {cmd_name}({note})",
-                s_cmd = "cmd :".italic().bright_black(),
-                cmd_name = cmd_name.underline(),
-                note = cmd_note.italic(),
+                s_cmd = console::style("cmd :").italic().bright().black(),
+                cmd_name = console::style(cmd_name).underlined(),
+                note = console::style(cmd_note).italic(),
             )?;
             writeln!(writer)?;
         }

src/cmd_storage.rs

@@ -7,6 +7,7 @@ use std::{
 
 use anyhow::{anyhow, Context, Result};
 use byte_unit::{Byte, UnitType};
+use console::style;
 use dunce::canonicalize;
 use git2::Repository;
 use inquire::{Confirm, CustomType, Text};
@@ -211,7 +212,7 @@ fn write_storages_list(
                 "-"
             }
         } else {
-            " "
+            ""
         };
         let path = storage.mount_path(device).map_or_else(
             |e| {
@@ -227,23 +228,24 @@ fn write_storages_list(
         } else {
             ""
         };
+        let typestyle = storage.typestyle();
         writeln!(
             writer,
-            "{stype}{isremovable}: {name:<name_width$} {size:>10} {parent:<name_width$} {path}",
-            stype = storage.shorttypename(),
+            "{stype}{isremovable:<1}: {name:<name_width$} {size:>10} {parent:<name_width$} {path}",
+            stype = typestyle.apply_to(storage.shorttypename()),
             isremovable = isremovable,
-            name = storage.name(),
+            name = typestyle.apply_to(storage.name()),
             size = size_str,
-            parent = parent_name,
+            parent = console::style(parent_name).bright().black(),
             path = path,
         )?;
         if long_display {
             let note = match storage {
-                Storage::Physical(s) => s.kind(),
-                Storage::SubDirectory(s) => &s.notes,
-                Storage::Online(s) => &s.provider,
+                Storage::Physical(s) => format!("kind: {}", s.kind()),
+                Storage::SubDirectory(s) => s.notes.clone(),
+                Storage::Online(s) => s.provider.clone(),
             };
-            writeln!(writer, "    {}", note)?;
+            writeln!(writer, "  {}", style(note).italic())?;
         }
     }
     Ok(())

src/storages.rs

@@ -1,5 +1,6 @@
 //! Manipulates storages.
 
+use console::{style, Style, StyledObject};
 use crate::devices;
 use crate::storages::{
     directory::Directory, online_storage::OnlineStorage,
@@ -9,7 +10,7 @@ use anyhow::{anyhow, Context, Result};
 use clap::ValueEnum;
 use core::panic;
 use serde::{Deserialize, Serialize};
-use std::{collections::BTreeMap, fmt, fs, io, path, u64};
+use std::{collections::BTreeMap, fmt, fs, io, path};
 
 /// YAML file to store known storages..
 pub const STORAGESFILE: &str = "storages.yml";
@@ -50,6 +51,14 @@ impl Storage {
             Self::Online(_) => "O",
         }
     }
+
+    pub fn typestyle(&self) -> Style {
+        match self {
+            Storage::Physical(_) => Style::new().cyan(),
+            Storage::SubDirectory(_) => Style::new().yellow(),
+            Storage::Online(_) => Style::new().green(),
+        }
+    }
 }
 
 impl StorageExt for Storage {

src/util.rs

@@ -1,7 +1,7 @@
 use std::path::{self, PathBuf};
 
 use anyhow::{Context, Result};
-use colored::{ColoredString, Colorize};
+use console::Style;
 
 use crate::{
     devices::Device,
@@ -52,21 +52,13 @@ pub fn expand_tilde(path: PathBuf) -> Result<PathBuf> {
     }
 }
 
-pub fn format_summarized_duration(dt: chrono::Duration) -> ColoredString {
+pub fn format_summarized_duration(dt: chrono::Duration) -> String {
     if dt.num_days() > 0 {
-        let days = format!("{}d", dt.num_days());
-        match dt.num_days() {
-            x if x < 7 => days.green(),
-            x if x < 14 => days.yellow(),
-            x if x < 28 => days.magenta(),
-            x if x < 28 * 3 => days.red(),
-            x if x < 180 => days.red().bold(),
-            _ => days.black().on_red(),
-        }
+        format!("{}d", dt.num_days())
     } else if dt.num_hours() > 0 {
-        format!("{}h", dt.num_hours()).green()
+        format!("{}h", dt.num_hours())
     } else {
-        format!("{}min", dt.num_minutes()).green()
+        format!("{}min", dt.num_minutes())
     }
 }