removes unnecessary thread spawn

kondinskis · Nov 10, 2021 · 26f2dc3 · 26f2dc3
1 parent 502308e
commit 26f2dc3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cloud-flight"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Once created replug the wireless dongle.
 Download the latest binary from the releases and run it.
 
 ```console
-foo@bar:~$ curl -LO https://github.com/kondinskis/hyperx-cloud-flight/releases/download/0.1.0/cloud-flight_amd64
+foo@bar:~$ curl -LO https://github.com/kondinskis/hyperx-cloud-flight/releases/download/0.1.2/cloud-flight_amd64
 foo@bar:~$ chmod +x cloud-flight_amd64
 foo@bar:~$ ./cloud-flight_amd64
 ```

diff --git a/src/main.rs b/src/main.rs
@@ -1,7 +1,6 @@
 use clokwerk::{Scheduler, TimeUnits};
 use simple_logger::SimpleLogger;
 use std::sync::Arc;
-use std::thread;
 
 const BATTERY_REFRESH_ON_MUTE: bool = true;
 
@@ -16,36 +15,33 @@ fn main() {
 
     let mut scheduler = Scheduler::new();
 
-    let handle = thread::spawn(move || {
-        let s_cf = cf.clone();
-        scheduler.every(3.minutes()).run(move || {
-            s_cf.battery();
-        });
-
-        cf.battery();
-
-        loop {
-            scheduler.run_pending();
-            let event = cf.read();
-            match event {
-                cloud_flight::Event::BatteryCharging => (),
-                cloud_flight::Event::Battery { value: _ } => (),
-                cloud_flight::Event::VolumeUp => (),
-                cloud_flight::Event::VolumeDown => (),
-                cloud_flight::Event::Muted => {
-                    if BATTERY_REFRESH_ON_MUTE {
-                        cf.battery();
-                    }
+    let s_cf = cf.clone();
+    scheduler.every(3.minutes()).run(move || {
+        s_cf.battery();
+    });
+
+    cf.battery();
+
+    loop {
+        scheduler.run_pending();
+        let event = cf.read();
+        match event {
+            cloud_flight::Event::BatteryCharging => (),
+            cloud_flight::Event::Battery { value: _ } => (),
+            cloud_flight::Event::VolumeUp => (),
+            cloud_flight::Event::VolumeDown => (),
+            cloud_flight::Event::Muted => {
+                if BATTERY_REFRESH_ON_MUTE {
+                    cf.battery();
                 }
-                cloud_flight::Event::Unmuted => (),
-                cloud_flight::Event::PowerOff => (),
-                cloud_flight::Event::PowerOn => (),
-                cloud_flight::Event::Ignored => (),
-            };
-            if !matches!(event, cloud_flight::Event::Ignored) {
-                svc.update();
             }
+            cloud_flight::Event::Unmuted => (),
+            cloud_flight::Event::PowerOff => (),
+            cloud_flight::Event::PowerOn => (),
+            cloud_flight::Event::Ignored => (),
+        };
+        if !matches!(event, cloud_flight::Event::Ignored) {
+            svc.update();
         }
-    });
-    handle.join().unwrap();
+    }
 }