server: Replay log

diff --git a/server/src/main.rs b/server/src/main.rs
index 94068111c278b7b6c75b872aba86ca2bd9794bff..ddf5217c41d67a1db956178de083f2d7f0fac753 100644 (file)
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -14,7 +14,7 @@
 // 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 serde::Serialize;
+use serde::{Deserialize, Serialize};

 use std::collections::HashMap;
 use std::net::UdpSocket;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 use std::collections::HashMap;
 use std::net::UdpSocket;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};


@@ -29,7 +29,7 @@ struct MessageKey {
     seq: u16,
 }
 
     seq: u16,
 }
 

-#[derive(Debug, Serialize)]
+#[derive(Debug, Deserialize, Serialize)]

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


@@ -104,6 +104,20 @@ fn merge_message(presses: &mut HashMap<MessageKey, Range>, message: Message) {
     }
 }
 
     }
 }
 

+fn replay_log() -> HashMap<MessageKey, Range> {
+    let mut presses = HashMap::new();
+    if std::path::Path::new(LOGFILENAME).exists() {
+        let mut log = csv::Reader::from_path(LOGFILENAME).expect("Couldn't open log for replay");
+        for message in log.deserialize() {
+            merge_message(
+                &mut presses,
+                message.expect("Error reading log during replay"),
+            );
+        }
+    }
+    presses
+}
+

 fn open_log_for_writing() -> csv::Writer<std::fs::File> {
     let log_file_exists = std::path::Path::new(LOGFILENAME).exists();
     let logfile = std::fs::OpenOptions::new()
 fn open_log_for_writing() -> csv::Writer<std::fs::File> {
     let log_file_exists = std::path::Path::new(LOGFILENAME).exists();
     let logfile = std::fs::OpenOptions::new()


@@ -118,7 +132,7 @@ fn open_log_for_writing() -> csv::Writer<std::fs::File> {
 
 fn main() {
     let socket = UdpSocket::bind("0.0.0.0:29803").expect("couldn't bind to address");
 
 fn main() {
     let socket = UdpSocket::bind("0.0.0.0:29803").expect("couldn't bind to address");

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

     let mut log = open_log_for_writing();
     loop {
         let mut buf = [0; MESSAGE_SIZE];
     let mut log = open_log_for_writing();
     loop {
         let mut buf = [0; MESSAGE_SIZE];