Merge pull request #36 from MustafaSalih1993/dev

added some checks

1 files changed, 11 insertions, 27 deletions

diff --git a/src/run.rs b/src/run.rs
index 1131884..c3d877d 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -4,7 +4,6 @@ use std::sync::mpsc;
 use std::thread;
 use std::time::Duration;
 
-// FIXME: The most part i hate is this, looks really ugly, fix me you dumb fuck
 pub fn run(config: Config, mut blocks: Blocks) {
     let (tx, rx) = mpsc::channel();
 
@@ -12,10 +11,9 @@ pub fn run(config: Config, mut blocks: Blocks) {
     if config.spotify.enabled {
         let spotify_tx = tx.clone();
         let configcp = config.clone();
-        let mut spotify_data = ThreadsData::Spotify(spotify::get_spotify(&configcp));
         thread::spawn(move || loop {
+            let spotify_data = ThreadsData::Spotify(spotify::get_spotify(&configcp));
             spotify_tx.send(spotify_data).unwrap();
-            spotify_data = ThreadsData::Spotify(spotify::get_spotify(&configcp));
             thread::sleep(Duration::from_secs_f64(configcp.spotify.delay))
         });
     }
@@ -24,10 +22,9 @@ pub fn run(config: Config, mut blocks: Blocks) {
     if config.mpd.enabled {
         let mpd_tx = tx.clone();
         let configcp = config.clone();
-        let mut mpd_data = ThreadsData::Mpd(mpd::get_mpd_current(&configcp));
         thread::spawn(move || loop {
+            let mpd_data = ThreadsData::Mpd(mpd::get_mpd_current(&configcp));
             mpd_tx.send(mpd_data).unwrap();
-            mpd_data = ThreadsData::Mpd(mpd::get_mpd_current(&configcp));
             thread::sleep(Duration::from_secs_f64(configcp.mpd.delay))
         });
     }
@@ -36,10 +33,9 @@ pub fn run(config: Config, mut blocks: Blocks) {
     if config.volume.enabled {
         let volume_tx = tx.clone();
         let configcp = config.clone();
-        let mut vol_data = ThreadsData::Sound(volume::get_volume(&configcp));
         thread::spawn(move || loop {
+            let vol_data = ThreadsData::Sound(volume::get_volume(&configcp));
             volume_tx.send(vol_data).unwrap();
-            vol_data = ThreadsData::Sound(volume::get_volume(&configcp));
             thread::sleep(Duration::from_secs_f64(configcp.volume.delay))
         });
     }
@@ -48,10 +44,9 @@ pub fn run(config: Config, mut blocks: Blocks) {
     if config.disk.enabled {
         let disk_tx = tx.clone();
         let configcp = config.clone();
-        let mut disk_data = ThreadsData::Disk(disk::get_disk(&configcp));
         thread::spawn(move || loop {
+            let disk_data = ThreadsData::Disk(disk::get_disk(&configcp));
             disk_tx.send(disk_data).unwrap();
-            disk_data = ThreadsData::Disk(disk::get_disk(&configcp));
             thread::sleep(Duration::from_secs_f64(configcp.disk.delay))
         });
     }
@@ -60,11 +55,9 @@ pub fn run(config: Config, mut blocks: Blocks) {
     if config.memory.enabled {
         let memory_tx = tx.clone();
         let configcp = config.clone();
-        let memory_data = memory::get_memory(&configcp).unwrap();
-        let mut memory_data = ThreadsData::Memory(memory_data);
         thread::spawn(move || loop {
+            let memory_data = ThreadsData::Memory(memory::get_memory(&configcp).unwrap());
             memory_tx.send(memory_data).unwrap();
-            memory_data = ThreadsData::Memory(memory::get_memory(&configcp).unwrap());
             thread::sleep(Duration::from_secs_f64(configcp.memory.delay))
         });
     }
@@ -73,11 +66,9 @@ pub fn run(config: Config, mut blocks: Blocks) {
     if config.weather.enabled {
         let weather_tx = tx.clone();
         let configcp = config.clone();
-        let weather_data = weather::get_weather(&configcp);
-        let mut weather_data = ThreadsData::Weather(weather_data);
         thread::spawn(move || loop {
+            let weather_data = ThreadsData::Weather(weather::get_weather(&configcp));
             weather_tx.send(weather_data).unwrap();
-            weather_data = ThreadsData::Weather(weather::get_weather(&configcp));
             thread::sleep(Duration::from_secs_f64(configcp.weather.delay))
         });
     }
@@ -86,11 +77,9 @@ pub fn run(config: Config, mut blocks: Blocks) {
     if config.battery.enabled {
         let battery_tx = tx.clone();
         let configcp = config.clone();
-        let battery_data = battery::get_battery(&configcp).unwrap();
-        let mut battery_data = ThreadsData::Battery(battery_data);
         thread::spawn(move || loop {
+            let battery_data = ThreadsData::Battery(battery::get_battery(&configcp).unwrap());
             battery_tx.send(battery_data).unwrap();
-            battery_data = ThreadsData::Battery(battery::get_battery(&configcp).unwrap());
             thread::sleep(Duration::from_secs_f64(configcp.battery.delay))
         });
     }
@@ -99,11 +88,9 @@ pub fn run(config: Config, mut blocks: Blocks) {
     if config.cpu_temperature.enabled {
         let cpu_temp_tx = tx.clone();
         let configcp = config.clone();
-        let cpu_temp_data = cpu::get_cpu_temp(&configcp).unwrap();
-        let mut cpu_temp_data = ThreadsData::CpuTemp(cpu_temp_data);
         thread::spawn(move || loop {
+            let cpu_temp_data = ThreadsData::CpuTemp(cpu::get_cpu_temp(&configcp).unwrap());
             cpu_temp_tx.send(cpu_temp_data).unwrap();
-            cpu_temp_data = ThreadsData::CpuTemp(cpu::get_cpu_temp(&configcp).unwrap());
             thread::sleep(Duration::from_secs_f64(configcp.cpu_temperature.delay))
         });
     }
@@ -112,11 +99,9 @@ pub fn run(config: Config, mut blocks: Blocks) {
     if config.uptime.enabled {
         let uptime_tx = tx.clone();
         let configcp = config.clone();
-        let uptime_data = uptime::get_uptime(&configcp).unwrap();
-        let mut uptime_data = ThreadsData::Uptime(uptime_data);
         thread::spawn(move || loop {
+            let uptime_data = ThreadsData::Uptime(uptime::get_uptime(&configcp).unwrap());
             uptime_tx.send(uptime_data).unwrap();
-            uptime_data = ThreadsData::Uptime(uptime::get_uptime(&configcp).unwrap());
             thread::sleep(Duration::from_secs_f64(configcp.uptime.delay))
         });
     }
@@ -125,10 +110,9 @@ pub fn run(config: Config, mut blocks: Blocks) {
     {
         let time_tx = tx;
         let configcp = config;
-        let mut time_data = ThreadsData::Time(time::get_time(&configcp));
         thread::spawn(move || loop {
+            let time_data = ThreadsData::Time(time::get_time(&configcp));
             time_tx.send(time_data).unwrap();
-            time_data = ThreadsData::Time(time::get_time(&configcp));
             thread::sleep(Duration::from_secs_f64(configcp.time.delay))
         });
     }
@@ -136,7 +120,7 @@ pub fn run(config: Config, mut blocks: Blocks) {
     //Main
     {
         // NOTE: order matters to the final format
-        let mut bar: Vec<String> = vec!["".to_string(); 10];
+        let mut bar: Vec<String> = vec![String::from(""); 10];
         //iterating the values recieved from the threads
         for data in rx {
             match data {