X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/3ad889296b9111d1a6864554a1bb9716812a9462..d9c1d028d1f70711493df2e394ea044fd79af46a:/server/src/main.rs diff --git a/server/src/main.rs b/server/src/main.rs index a186abd..96f35b2 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -17,9 +17,10 @@ use serde::Serialize; use std::collections::HashMap; use std::net::UdpSocket; -use std::time::{Duration, SystemTime}; +use std::time::{Duration, SystemTime, UNIX_EPOCH}; const MESSAGE_SIZE: usize = 12; +const LOGFILENAME: &str = "log.csv"; #[derive(Eq, Debug, Hash, PartialEq, Serialize)] struct MessageKey { @@ -31,19 +32,23 @@ struct MessageKey { #[derive(Debug)] struct Message { key: MessageKey, - t: SystemTime, + t: u64, } 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")); + let press_time = SystemTime::now() - Duration::new(ago.into(), 0); 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")), }, - t: SystemTime::now() - Duration::new(ago.into(), 0), + t: press_time + .duration_since(UNIX_EPOCH) + .expect("Bad time?") + .as_secs(), } } } @@ -59,17 +64,17 @@ impl TryFrom<&[u8]> for Message { #[derive(Debug)] struct Range { - start: SystemTime, - end: SystemTime, + start: u64, + end: u64, } impl Range { - fn new(t: &SystemTime) -> Self { + fn new(t: &u64) -> Self { Self { start: *t, end: *t } } - fn contains(&self, t: &SystemTime) -> bool { + fn contains(&self, t: &u64) -> bool { t > &self.start && t < &self.end } - fn extend(&mut self, t: &SystemTime) { + fn extend(&mut self, t: &u64) { if t < &self.start { self.start = *t; } @@ -79,15 +84,32 @@ impl Range { } } -fn main() { +fn merge_message(presses: &mut HashMap, 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 { + let log_file_exists = std::path::Path::new(LOGFILENAME).exists(); let logfile = std::fs::OpenOptions::new() - .create(true) + .create_new(!log_file_exists) .append(true) - .open("log.csv") + .open(LOGFILENAME) .expect("Coudln't open log file"); - let mut log = csv::Writer::from_writer(logfile); - let mut presses = HashMap::::new(); + 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::::new(); + let mut log = open_log_for_writing(); loop { let mut buf = [0; MESSAGE_SIZE]; match socket.recv_from(&mut buf) { @@ -102,13 +124,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); } } }