Cargo.lock update

Cargo.lock

@@ -914,7 +914,7 @@ dependencies = [
 
 [[package]]
 name = "rsblocks"
-version = "0.1.19"
+version = "0.1.20"
 dependencies = [
  "alsa",
  "async-std",

src/config/volume.rs

@@ -3,7 +3,9 @@ use std::default::Default;
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Volume {
-    pub icon: String,
+    pub icon_high: String,
+    pub icon_low: String,
+    pub icon_muted: String,
     pub enabled: bool,
     pub delay: f64,
     pub card: String,
@@ -12,7 +14,9 @@ pub struct Volume {
 impl Default for Volume {
     fn default() -> Self {
         Volume {
-            icon: String::from(""),
+            icon_high: String::from("🕪"),
+            icon_low: String::from("🕩"),
+            icon_muted: String::from("🔇"),
             enabled: false,
             delay: 0.17,
             card: String::from("ALSA"),

src/types.rs

@@ -60,7 +60,9 @@ pub struct Disk {
 }
 #[derive(Clone)]
 pub struct Volume {
-    pub icon: String,
+    pub icon_muted: String,
+    pub icon_high: String,
+    pub icon_low: String,
     pub enabled: bool,
     pub delay: f64,
     pub card: String,

src/utils/cpu.rs

@@ -12,7 +12,7 @@ pub async fn get_cpu_temp() -> ThreadsData {
     let value = buf.trim().parse::<f32>().unwrap();
 
     let result = format!(
-        "  {}  {}°  {}",
+        "  {}  {: <3.1}°  {}",
         CONFIG.cpu_temperature.icon,
         value / 1000.0,
         CONFIG.seperator

src/utils/netspeed.rs

@@ -18,7 +18,7 @@ pub async fn get_netspeed() -> ThreadsData {
     let rx = calculate(rx_bps);
 
     let data = format!(
-        "{}{} {}{} {}",
+        " {}{} {}{} {}",
         rx, CONFIG.netspeed.recieve_icon, tx, CONFIG.netspeed.transmit_icon, CONFIG.seperator
     );
     ThreadsData::NetSpeed(data)
@@ -36,7 +36,7 @@ fn parse_speed_file(pth: &str) -> u64 {
 }
 
 fn calculate(speed: u64) -> String {
-    let lookup = ["B", "kB", "MB"];
+    let lookup = ["b", "kb", "Mb"];
     let mut speed = speed as f64;
     let mut idx = 0;
     while speed >= 1024.0 && idx < lookup.len() {

src/utils/volume.rs

@@ -28,6 +28,15 @@ pub async fn get_volume() -> ThreadsData {
         ((raw_volume as f64 / range as f64) * 100.) as u64
     };
 
-    let data = format!("  {}  {}%  {}", CONFIG.volume.icon, vol, CONFIG.seperator);
+    let muted = selem
+        .get_playback_switch(selem_chan_id)
+        .expect("Failed to get playback state");
+
+    let icon = match muted {
+        0 => &CONFIG.volume.icon_muted,
+        _ => if vol < 50 { &CONFIG.volume.icon_low } else { &CONFIG.volume.icon_high }
+    };
+
+    let data = format!(" {} {}%  {}", icon, vol, CONFIG.seperator);
     ThreadsData::Sound(data)
 }