X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/7a3bc82f02480088052d4d583c89b7cd9c90f8cf..e8a97c557b79be528de66f9c8e39f21f7d41527d:/server/src/main.rs diff --git a/server/src/main.rs b/server/src/main.rs index 573edc5..9406811 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -17,34 +17,47 @@ 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)] +#[derive(Eq, Debug, Hash, PartialEq)] struct MessageKey { epoch: u32, device: u16, seq: u16, } -#[derive(Debug)] +#[derive(Debug, Serialize)] struct Message { - key: MessageKey, - t: SystemTime, + epoch: u32, + device: u16, + seq: u16, + t: u64, +} +impl Message { + fn key(&self) -> MessageKey { + MessageKey { + epoch: self.epoch, + device: self.device, + seq: self.seq, + } + } } 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), + 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: press_time + .duration_since(UNIX_EPOCH) + .expect("Bad time?") + .as_secs(), } } } @@ -60,17 +73,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; } @@ -80,18 +93,33 @@ impl Range { } } -fn main() { +fn merge_message(presses: &mut HashMap, message: Message) { + let key = message.key(); + if let Some(r) = presses.get_mut(&key) { + if !r.contains(&message.t) { + r.extend(&message.t); + } + } else { + presses.insert(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_new(!log_file_exists) .append(true) .open(LOGFILENAME) .expect("Coudln't open log file"); - let mut log = csv::WriterBuilder::new() + csv::WriterBuilder::new() .has_headers(!log_file_exists) - .from_writer(logfile); - let mut presses = HashMap::::new(); + .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) { @@ -103,16 +131,9 @@ fn main() { continue; } let message = Message::try_from(filled_buf).expect("I can't count"); - log.serialize((&message.key, message.t)) - .expect("Couldn't write log"); + log.serialize(&message).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); } } }