X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/f9625e91cfed21a65b720609ed1d8a7e7c0f36bd..c54403e6dc4829379e3d933f33da344c26fb7c1d:/server/src/main.rs
diff --git a/server/src/main.rs b/server/src/main.rs
index c31f873..bf4f4fc 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -14,12 +14,15 @@
// 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;
+const LOGFILENAME: &str = "log.csv";
-#[derive(Debug)]
+#[derive(Eq, Debug, Hash, PartialEq, Serialize)]
struct MessageKey {
epoch: u32,
device: u16,
@@ -29,7 +32,6 @@ struct MessageKey {
#[derive(Debug)]
struct Message {
key: MessageKey,
- ago: u32,
t: SystemTime,
}
@@ -42,7 +44,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,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, 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_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::::new();
+ let mut log = open_log_for_writing();
loop {
let mut buf = [0; MESSAGE_SIZE];
match socket.recv_from(&mut buf) {
@@ -70,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);
}
}
}