Merge pull request #6 from MustafaSalih1993/dev

Added sound/volume and it can be customized through  the rsblocks.yml…

1 files changed, 23 insertions, 8 deletions

diff --git a/src/main.rs b/src/main.rs
index 23960af..bed2045 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,21 +6,36 @@ mod date;
 mod disk;
 mod load_config;
 mod mem;
+mod sound;
 
 fn main() {
     let settings = load_config::load().unwrap();
-
+    sound::get_sound(&settings);
     loop {
-        let args = format!(
-            "{}{}{}",
-            disk::disk_free(&settings),
-            mem::mem(&settings).unwrap(),
-            date::fmt_date(&settings)
-        );
+        let mut bar = String::from("");
+
+        // the order of the IF's below matters to the final format
+
+        if settings.volume.enabled {
+            // volume return String
+            bar.push_str(&sound::get_sound(&settings));
+        }
+
+        if settings.disk.enabled {
+            // disk_free return String
+            bar.push_str(&disk::disk_free(&settings));
+        }
+
+        if settings.memory.enabled {
+            // mem return Result
+            bar.push_str(&mem::mem(&settings).unwrap());
+        }
+
+        bar.push_str(&date::fmt_date(&settings));
 
         Command::new("xsetroot")
             .arg("-name")
-            .arg(args)
+            .arg(bar)
             .output()
             .unwrap();