server: Extract merge_message()

[tattlekey] / server / src / main.rs

diff --git a/server/src/main.rs b/server/src/main.rs
index c4c0b19c07f9587a80090e2ea45f7944b6984abc..bf4f4fcd0c5d43257dcbc3e26c14b70e0ce9fc23 100644 (file)
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -14,11 +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(Debug)]
+#[derive(Eq, Debug, Hash, PartialEq, Serialize)]
 struct MessageKey {
     epoch: u32,
     device: u16,
@@ -28,18 +32,19 @@ struct MessageKey {
 #[derive(Debug)]
 struct Message {
     key: MessageKey,
-    ago: u32,
+    t: SystemTime,
 }
 
 impl From<&[u8; MESSAGE_SIZE]> for Message {
     fn from(value: &[u8; MESSAGE_SIZE]) -> Self {
+        let ago = u32::from_be_bytes(value[8..=11].try_into().expect("I can't count"));
         Self {
             key: MessageKey {
                 epoch: u32::from_be_bytes(value[0..=3].try_into().expect("I can't count")),
                 device: u16::from_be_bytes(value[4..=5].try_into().expect("I can't count")),
                 seq: u16::from_be_bytes(value[6..=7].try_into().expect("I can't count")),
             },
-            ago: u32::from_be_bytes(value[8..=11].try_into().expect("I can't count")),
+            t: SystemTime::now() - Duration::new(ago.into(), 0),
         }
     }
 }
@@ -53,8 +58,54 @@ impl TryFrom<&[u8]> for Message {
     }
 }
 
+#[derive(Debug)]
+struct Range {
+    start: SystemTime,
+    end: SystemTime,
+}
+impl Range {
+    fn new(t: &SystemTime) -> Self {
+        Self { start: *t, end: *t }
+    }
+    fn contains(&self, t: &SystemTime) -> bool {
+        t > &self.start && t < &self.end
+    }
+    fn extend(&mut self, t: &SystemTime) {
+        if t < &self.start {
+            self.start = *t;
+        }
+        if t > &self.end {
+            self.end = *t;
+        }
+    }
+}
+
+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 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) {
@@ -66,7 +117,10 @@ fn main() {
                     continue;
                 }
                 let message = Message::try_from(filled_buf).expect("I can't count");
-                println!("Got packet from {src_addr}: {message:?}");
+                log.serialize((&message.key, message.t))
+                    .expect("Couldn't write log");
+                log.flush().expect("Couldn't flush log");
+                merge_message(&mut presses, message);
             }
         }
     }