From 34a23ea20060948dc253a4a35837e38f330d0ba3 Mon Sep 17 00:00:00 2001
From: Marto <marto@marto.si>
Date: Thu, 16 Jan 2025 22:24:17 +0100
Subject: [PATCH] fin 2

---
 src/main.rs   | 5 ++---
 src/serial.rs | 6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 5ff3553..ee52702 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,15 +1,14 @@
-use crate::curl::startup;
-
 mod json;
 mod curl;
 mod serial;
 
+
 fn main() { 
     let data_file = std::path::Path::new("data.json");
     let data = json::get_json(data_file);
     let req; 
     let dt;
-    (req, dt) = startup(&data);
+    (req, dt) = curl::startup(&data);
     serial::read_messages(req, &dt);
 }
 
diff --git a/src/serial.rs b/src/serial.rs
index 8c50938..540ad13 100644
--- a/src/serial.rs
+++ b/src/serial.rs
@@ -23,11 +23,15 @@ pub fn read_messages(mut request: curl::easy::Easy, data: &str) {
     loop {
         match connection.read(serial_buf.as_mut_slice()) { 
             Ok(t) => {
+                if t < 1 { continue; }
                 let output = String::from_utf8_lossy(&serial_buf[..t]);
                 if output.contains("1") {
                     // send curl request
                     let res = crate::curl::request(&mut request, &data);
-                    println!("Response code: {}", res.unwrap());
+                    match res { 
+                        Some(t) => println!("Response code: {t}"),
+                        None => eprintln!("[ERROR] Something went wrong with the CURL request"),
+                    }
                 }
             },
             Err(_) => {}