From 7211ed31e5412eb84f8fbf0e3a465305068f1d7c Mon Sep 17 00:00:00 2001
From: tom barrett <spalf0@gmail.com>
Date: Fri, 20 Apr 2018 09:15:29 -0500
Subject: -made modules their own structs instead of structs with enumeration

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

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

diff --git a/src/server/connection.rs b/src/server/connection.rs
index 8354d70..a1b808d 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -5,12 +5,12 @@ use std::io::prelude::*;
 use std::net::TcpStream;
 use std::collections::HashMap;
 
-use module::{Module, ModuleType};
-use mass::{Mass, MassType};
+use mass::Mass;
+use module::ModuleType;
 
 pub struct ServerConnection {
     pub name        : String,
-    pub module      : Module,
+    pub module_type : ModuleType,
     pub stream      : TcpStream,
     pub buff_r      : BufReader<TcpStream>,
     pub open        : bool,
@@ -26,20 +26,17 @@ impl ServerConnection {
 
         let ship = masses.entry(name.to_string()).or_insert(Mass::new_ship());
 
-        let send = match ship.mass_type {
-            MassType::Ship{ref modules, ..} => serde_json::to_string(modules).unwrap() + "\n",
-            _ => String::new(),
-        };
+        let send = serde_json::to_string(&ship.get_modules()).unwrap() + "\n";
         stream.write(send.as_bytes()).unwrap();
 
         let mut recv = String::new();
         buff_r.read_line(&mut recv).unwrap();
-        let module : Module = serde_json::from_str(&recv.replace("\n","")).unwrap();
+        let module_type : ModuleType = serde_json::from_str(&recv.replace("\n","")).unwrap();
 
         stream.set_nonblocking(true).unwrap();
         ServerConnection { 
             name        : String::from(name),
-            module      : module,
+            module_type : module_type,
             stream      : stream,
             buff_r      : buff_r,
             open        : true,
@@ -47,11 +44,11 @@ impl ServerConnection {
     }
 
     pub fn process(&mut self, mut masses : &mut HashMap<String, Mass>) {
-        self.open = match self.module.module_type {
+        self.open = match self.module_type {
             ModuleType::Dashboard => self.server_dashboard(&mut masses),
             ModuleType::Engines => self.server_engines(&mut masses),
-            ModuleType::Mining{..} => self.server_mining(&mut masses),
-            ModuleType::Navigation{..} => self.server_navigation(&mut masses),
+            ModuleType::Mining => self.server_mining(&mut masses),
+            ModuleType::Navigation => self.server_navigation(&mut masses),
         };
     }
 }
-- 
cgit v1.2.3