server: Extract merge_message()

[tattlekey] / server / src / main.rs

diff --git a/server/src/main.rs b/server/src/main.rs
index e7351db4ffa17f70a8c3ad9617b23155b09894b1..bf4f4fcd0c5d43257dcbc3e26c14b70e0ce9fc23 100644 (file)
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -80,6 +80,16 @@ impl Range {
     }
 }
 
+fn merge_message(presses: &mut HashMap<MessageKey, Range>, message: Message) {
+    if let Some(r) = presses.get_mut(&message.key) {
+        if !r.contains(&message.t) {
+            r.extend(&message.t);
+        }
+    } else {
+        presses.insert(message.key, Range::new(&message.t));
+    }
+}
+
 fn open_log_for_writing() -> csv::Writer<std::fs::File> {
     let log_file_exists = std::path::Path::new(LOGFILENAME).exists();
     let logfile = std::fs::OpenOptions::new()
@@ -110,13 +120,7 @@ fn main() {
                 log.serialize((&message.key, message.t))
                     .expect("Couldn't write log");
                 log.flush().expect("Couldn't flush log");
-                if let Some(r) = presses.get_mut(&message.key) {
-                    if !r.contains(&message.t) {
-                        r.extend(&message.t);
-                    }
-                } else {
-                    presses.insert(message.key, Range::new(&message.t));
-                }
+                merge_message(&mut presses, message);
             }
         }
     }