From 35b43264c09405c987b48de78b6ca19f29dc7849 Mon Sep 17 00:00:00 2001
From: tom barrett <spalf0@gmail.com>
Date: Thu, 14 Feb 2019 12:05:57 -0600
Subject: simplified receive pattern even more and moved all controls to the
 module

---
 src/server/connection.rs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

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

diff --git a/src/server/connection.rs b/src/server/connection.rs
index 9275b67..92a7531 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -56,18 +56,19 @@ impl ServerConnection {
             ModuleType::Construction => self.server_construction(&mut masses),
         }
     }
-}
 
-pub fn receive(buff_r: &mut BufReader<TcpStream>) -> Option<String> {
-    let mut recv = String::new();
-    match buff_r.read_line(&mut recv) {
-        Ok(result) => {
-            if result == 0 {
-                None
-            } else {
-                Some(recv.replace("\n", ""))
+    pub fn receive(&mut self) -> String {
+        let mut recv = String::new();
+        match self.buff_r.read_line(&mut recv) {
+            Ok(result) => {
+                if result == 0 {
+                    self.open = false;
+                    String::new()
+                } else {
+                    recv.replace("\n", "")
+                }
             }
+            Err(_) => String::new(),
         }
-        Err(_) => Some(String::new()),
     }
 }
-- 
cgit v1.2.3