small optimization and dependencies

dheijl · Feb 21, 2024 · ae3c9f4 · ae3c9f4
1 parent f005c41
commit ae3c9f4
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -55,7 +55,7 @@ log = { version = "0.4.20", features = [
 ] }
 once_cell = "1.19.0"
 parking_lot = "0.12.1"
-serde = { version = "1.0.196", features = ["derive"] }
+serde = { version = "1.0.197", features = ["derive"] }
 simplelog = "0.12.1"
 rand = "0.8.5"
 strfmt = "0.2.4"

diff --git a/src/bin/swyh-rs-cli.rs b/src/bin/swyh-rs-cli.rs
@@ -394,15 +394,15 @@ fn run_ssdp_updater(ssdp_tx: &Sender<Renderer>, ssdp_interval_mins: f64) {
     loop {
         let renderers = discover(&rmap, &ui_log).unwrap_or_default();
         for r in &renderers {
-            if !rmap.contains_key(&r.remote_addr) {
-                rmap.insert(r.remote_addr.clone(), r.clone());
+            rmap.entry(r.remote_addr.clone()).or_insert_with(|| {
                 let _ = ssdp_tx.send(r.clone());
+                thread::yield_now();
                 info!(
                     "Found new renderer {} {}  at {}",
                     r.dev_name, r.dev_model, r.remote_addr
                 );
-                thread::yield_now();
-            }
+                r.clone()
+            });
         }
         thread::sleep(Duration::from_millis(
             (ssdp_interval_mins * 60.0 * 1000.0) as u64,

diff --git a/src/bin/swyh-rs.rs b/src/bin/swyh-rs.rs
@@ -357,16 +357,16 @@ fn run_ssdp_updater(ssdp_tx: &Sender<Renderer>, ssdp_interval_mins: f64) {
     loop {
         let renderers = discover(&rmap, &ui_log).unwrap_or_default();
         for r in &renderers {
-            if !rmap.contains_key(&r.remote_addr) {
-                rmap.insert(r.remote_addr.clone(), r.clone());
+            rmap.entry(r.remote_addr.clone()).or_insert_with(|| {
                 let _ = ssdp_tx.send(r.clone());
+                app::awake();
+                thread::yield_now();
                 info!(
                     "Found new renderer {} {}  at {}",
                     r.dev_name, r.dev_model, r.remote_addr
                 );
-                app::awake();
-                thread::yield_now();
-            }
+                r.clone()
+            });
         }
         thread::sleep(Duration::from_millis(
             (ssdp_interval_mins * 60.0 * 1000.0) as u64,