server: SystemTime → u64 of seconds since UNIX_EPOCH

[tattlekey] / server / src / main.rs

diff --git a/server/src/main.rs b/server/src/main.rs
index bf4f4fcd0c5d43257dcbc3e26c14b70e0ce9fc23..96f35b25e9360f2bcd9d38d7917620880bba2fa0 100644 (file)
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -17,7 +17,7 @@
 use serde::Serialize;
 use std::collections::HashMap;
 use std::net::UdpSocket;
 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";
 
 const MESSAGE_SIZE: usize = 12;
 const LOGFILENAME: &str = "log.csv";


@@ -32,19 +32,23 @@ struct MessageKey {
 #[derive(Debug)]
 struct Message {
     key: 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"));
 }
 
 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")),
             },
         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(),

         }
     }
 }
         }
     }
 }


@@ -60,17 +64,17 @@ impl TryFrom<&[u8]> for Message {
 
 #[derive(Debug)]
 struct Range {
 
 #[derive(Debug)]
 struct Range {

-    start: SystemTime,
-    end: SystemTime,
+    start: u64,
+    end: u64,

 }
 impl Range {
 }
 impl Range {

-    fn new(t: &SystemTime) -> Self {
+    fn new(t: &u64) -> Self {

         Self { start: *t, end: *t }
     }
         Self { start: *t, end: *t }
     }

-    fn contains(&self, t: &SystemTime) -> bool {
+    fn contains(&self, t: &u64) -> bool {

         t > &self.start && t < &self.end
     }
         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;
         }
         if t < &self.start {
             self.start = *t;
         }