diff --git a/Cargo.lock b/Cargo.lock index 9fca893..057d3fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -141,7 +141,7 @@ dependencies = [ [[package]] name = "swaybar_info" -version = "0.1.11" +version = "0.1.12" dependencies = [ "chrono", "regex", diff --git a/Cargo.toml b/Cargo.toml index 45280c2..83fc8bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "swaybar_info" -version = "0.1.11" +version = "0.1.12" edition = "2021" description = "Provides swaybar with info to be displayed" license = "MIT" diff --git a/Changelog.md b/Changelog.md index 7f1dda3..d0e8f91 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ ## Upcoming Changes +## 0.1.12 + +Some refactoring of the code related to colorizing the netgraph. + ## 0.1.11 Use pango markup to colorize the netgraph, making it look cleaner. diff --git a/src/main.rs b/src/main.rs index 4bfc007..697feb9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,6 +4,7 @@ mod external; mod proc; mod swaybar_object; +use std::fmt::Write as FMTWrite; use std::io::{self, Write}; use std::time::Duration; use swaybar_object::*; @@ -287,19 +288,25 @@ fn main() { for item in graph_items.iter() { match item.get_value_type() { proc::GraphItemType::Download => { - text += &("".to_owned() - + &item.get_value().to_string() - + ""); + write!( + &mut text, + "{}", + item.get_value() + )?; } proc::GraphItemType::Upload => { - text += &("".to_owned() - + &item.get_value().to_string() - + ""); + write!( + &mut text, + "{}", + item.get_value() + )?; } proc::GraphItemType::Both => { - text += &("".to_owned() - + &item.get_value().to_string() - + ""); + write!( + &mut text, + "{}", + item.get_value() + )?; } } } diff --git a/src/proc.rs b/src/proc.rs index 1baaeac..d651205 100644 --- a/src/proc.rs +++ b/src/proc.rs @@ -180,7 +180,7 @@ impl NetInfo { pub fn get_netstring( &mut self, graph_max_opt: Option, - ) -> Result<(String, Vec, usize, String), Error> { + ) -> Result<(String, &Vec, usize, String), Error> { let down_diff: f64 = if self.down > self.prev_down { let value = (self.down - self.prev_down) as f64; self.prev_down = self.down; @@ -333,7 +333,7 @@ impl NetInfo { } } - Ok((output, self.graph.clone(), history_max_idx, diff_max_string)) + Ok((output, &self.graph, history_max_idx, diff_max_string)) } }