server: Extract merge_message()

[tattlekey] / server / src / main.rs

diff --git a/server/src/main.rs b/server/src/main.rs
index 37de6bd44fae83acde13602b49a1a90876938441..bf4f4fcd0c5d43257dcbc3e26c14b70e0ce9fc23 100644 (file)
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -14,13 +14,15 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+use serde::Serialize;
 use std::collections::HashMap;
 use std::net::UdpSocket;
 use std::time::{Duration, SystemTime};
 
 const MESSAGE_SIZE: usize = 12;
+const LOGFILENAME: &str = "log.csv";
 
-#[derive(Eq, Debug, Hash, PartialEq)]
+#[derive(Eq, Debug, Hash, PartialEq, Serialize)]
 struct MessageKey {
     epoch: u32,
     device: u16,
@@ -78,9 +80,32 @@ 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()
+        .create_new(!log_file_exists)
+        .append(true)
+        .open(LOGFILENAME)
+        .expect("Coudln't open log file");
+    csv::WriterBuilder::new()
+        .has_headers(!log_file_exists)
+        .from_writer(logfile)
+}
+
 fn main() {
-    let mut presses = HashMap::<MessageKey, Range>::new();
     let socket = UdpSocket::bind("0.0.0.0:29803").expect("couldn't bind to address");
+    let mut presses = HashMap::<MessageKey, Range>::new();
+    let mut log = open_log_for_writing();
     loop {
         let mut buf = [0; MESSAGE_SIZE];
         match socket.recv_from(&mut buf) {
@@ -92,15 +117,10 @@ fn main() {
                     continue;
                 }
                 let message = Message::try_from(filled_buf).expect("I can't count");
-                if let Some(r) = presses.get_mut(&message.key) {
-                    if !r.contains(&message.t) {
-                        r.extend(&message.t);
-                        println!("Updated press: {:?}: {r:?}", message.key);
-                    }
-                } else {
-                    println!("Got new press: {:?}: {:?}", message.key, message.t);
-                    presses.insert(message.key, Range::new(&message.t));
-                }
+                log.serialize((&message.key, message.t))
+                    .expect("Couldn't write log");
+                log.flush().expect("Couldn't flush log");
+                merge_message(&mut presses, message);
             }
         }
     }