X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/f9625e91cfed21a65b720609ed1d8a7e7c0f36bd..3ad889296b9111d1a6864554a1bb9716812a9462:/server/src/main.rs diff --git a/server/src/main.rs b/server/src/main.rs index c31f873..a186abd 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -14,12 +14,14 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +use serde::Serialize; +use std::collections::HashMap; use std::net::UdpSocket; use std::time::{Duration, SystemTime}; const MESSAGE_SIZE: usize = 12; -#[derive(Debug)] +#[derive(Eq, Debug, Hash, PartialEq, Serialize)] struct MessageKey { epoch: u32, device: u16, @@ -29,7 +31,6 @@ struct MessageKey { #[derive(Debug)] struct Message { key: MessageKey, - ago: u32, t: SystemTime, } @@ -42,7 +43,6 @@ impl From<&[u8; MESSAGE_SIZE]> for Message { 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, t: SystemTime::now() - Duration::new(ago.into(), 0), } } @@ -57,7 +57,36 @@ 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 main() { + let logfile = std::fs::OpenOptions::new() + .create(true) + .append(true) + .open("log.csv") + .expect("Coudln't open log file"); + let mut log = csv::Writer::from_writer(logfile); + let mut presses = HashMap::::new(); let socket = UdpSocket::bind("0.0.0.0:29803").expect("couldn't bind to address"); loop { let mut buf = [0; MESSAGE_SIZE]; @@ -70,7 +99,16 @@ 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"); + 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)); + } } } }