server: Merge keystroke time ranges

diff --git a/server/src/main.rs b/server/src/main.rs
index c31f873ba08a103cc0e6a2f856b2bb8a3debf44b..94a47d854dac42599b5001993f1d8b5385052d38 100644 (file)
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -14,12 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 // 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 std::collections::HashMap;

 use std::net::UdpSocket;
 use std::time::{Duration, SystemTime};
 
 const MESSAGE_SIZE: usize = 12;
 
 use std::net::UdpSocket;
 use std::time::{Duration, SystemTime};
 
 const MESSAGE_SIZE: usize = 12;
 

-#[derive(Debug)]
+#[derive(Eq, Debug, Hash, PartialEq)]

 struct MessageKey {
     epoch: u32,
     device: u16,
 struct MessageKey {
     epoch: u32,
     device: u16,


@@ -57,7 +58,30 @@ 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() {
 fn main() {

+    let mut presses = HashMap::<MessageKey, Range>::new();

     let socket = UdpSocket::bind("0.0.0.0:29803").expect("couldn't bind to address");
     loop {
         let mut buf = [0; MESSAGE_SIZE];
     let socket = UdpSocket::bind("0.0.0.0:29803").expect("couldn't bind to address");
     loop {
         let mut buf = [0; MESSAGE_SIZE];


@@ -70,7 +94,15 @@ fn main() {
                     continue;
                 }
                 let message = Message::try_from(filled_buf).expect("I can't count");
                     continue;
                 }
                 let message = Message::try_from(filled_buf).expect("I can't count");

-                println!("Got packet from {src_addr}: {message:?}");
+                if let Some(r) = presses.get_mut(&message.key) {
+                    if !r.contains(&message.t) {
+                        r.extend(&message.t);
+                        println!("Updated press: {:?}: {r:?}", message.key);
+                    }
+                } else {
+                    println!("Got new press: {:?}: {:?}", message.key, message.t);
+                    presses.insert(message.key, Range::new(&message.t));
+                }

             }
         }
     }
             }
         }
     }