From 284cac8f4034f15e7edeba5c8232a770fc082e20 Mon Sep 17 00:00:00 2001
From: tom barrett <spalf0@gmail.com>
Date: Wed, 13 Feb 2019 13:25:00 -0600
Subject: added engine fuel and simplified/unified txrx from server

---
 src/server/refinery.rs | 43 ++++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

(limited to 'src/server/refinery.rs')

diff --git a/src/server/refinery.rs b/src/server/refinery.rs
index 7cec23e..1a9a6ab 100644
--- a/src/server/refinery.rs
+++ b/src/server/refinery.rs
@@ -1,13 +1,12 @@
 extern crate serde_json;
 
 use std::collections::HashMap;
-use std::io::BufRead;
 use std::io::Write;
 
 use crate::item::{Item, ItemType};
 use crate::mass::{Mass, MassType};
 use crate::modules::refinery::RefineryStatus;
-use crate::server::connection::ServerConnection;
+use crate::server::connection::{receive, ServerConnection};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct RefineryData {
@@ -35,8 +34,18 @@ impl ServerConnection {
                 status: refinery.status.clone(),
             };
 
-            if self.open && self.txrx_refinery(&refinery_data) {
-                refinery.toggle();
+            let send = serde_json::to_string(&refinery_data).unwrap() + "\n";
+            self.open = self.stream.write(send.as_bytes()).is_ok();
+
+            match receive(&mut self.buff_r) {
+                Some(recv) => {
+                    if let "R" = recv.as_str() {
+                        if refinery_data.has_crude_minerals {
+                            refinery.toggle();
+                        }
+                    }
+                }
+                None => self.open = false,
             }
 
             if !refinery_data.has_crude_minerals {
@@ -46,35 +55,11 @@ impl ServerConnection {
             if refinery.status == RefineryStatus::Refined {
                 storage.take_item(ItemType::CrudeMinerals);
                 storage.give_item(Item::new(ItemType::Iron));
+                storage.give_item(Item::new(ItemType::Hydrogen));
                 refinery.taken();
             }
         }
 
         masses.insert(self.name.clone(), ship);
     }
-
-    fn txrx_refinery(&mut self, refinery_data: &RefineryData) -> bool {
-        let send = serde_json::to_string(refinery_data).unwrap() + "\n";
-        if let Err(_err) = self.stream.write(send.as_bytes()) {
-            self.open = false;
-        }
-
-        let mut recv = String::new();
-        if let Ok(result) = self.buff_r.read_line(&mut recv) {
-            match recv.as_bytes() {
-                b"R\n" => {
-                    if refinery_data.has_crude_minerals {
-                        return true;
-                    }
-                }
-                _ => {
-                    if result == 0 {
-                        self.open = false;
-                    }
-                }
-            }
-        }
-
-        false
-    }
 }
-- 
cgit v1.2.3