Merge branch 'work1'

galaxy.cpp

@@ -419,10 +419,15 @@ void Galaxy::save(void) {
     for (auto const &data : n) {
       if (data.second.Type() == YAML::NodeType::Scalar) {
         of << yaml_spacer << data.first << ": " << data.second << std::endl;
-      } else {
+      } else if (data.second.Type() == YAML::NodeType::Map) {
         // nested
         of << yaml_spacer << data.first << ":" << std::endl;
         yaml_out(of, yaml_depth + 1, data.second);
+      } else if (data.second.Type() == YAML::NodeType::Sequence) {
+        // sequence
+        BUGZ_LOG(fatal) << "Ignoring Sequence... " << data.first;
+      } else {
+        BUGZ_LOG(fatal) << "Unsupported NodeType: " << data.second.Type();
       }
     }
   };

session.cpp

@@ -122,6 +122,9 @@ void Session::on_connect(const boost::system::error_code error) {
       } else {
         to_server(rlogin_auth);
       }
+    } else {
+      // server_telnet.  Step 1: negotiate a telnet connection with TWGS.
+      director.show_client = false;
     }
 
     server_read();
@@ -238,6 +241,12 @@ void Session::process_lines(std::string &received) {
       std::string clean = clean_string(line);
       BUGZ_LOG(error) << "rpos/show_client:" << clean;
       */
+      if (server_telnet) {
+        if (line.find('\xff') != std::string::npos) {
+          remove_telnet_commands(line);
+        }
+      }
+
       to_client(line);
     }
     received = received.substr(rpos + 1);
@@ -322,18 +331,20 @@ void Session::on_server_prompt(const std::string &prompt,
   BUGZ_LOG(warning) << "SP: [" << temp << "]";
   director.server_prompt(prompt, raw_prompt);
   if (server_telnet) {
-    std::string ayt = std::string( (const char *)"\x00\xff\xfd\xf6", 4 );
+    std::string ayt = std::string((const char *)"\x00\xff\xfd\xf6", 4);
     std::string ayt_resp = std::string((const char *)"\xff\xfb\x00", 3);
-    std::string ayt2 = std::string( (const char *)"\xff\xfb\x00", 3);
+    std::string ayt2 = std::string((const char *)"\xff\xfb\x00", 3);
     std::string ayt2_resp = std::string((const char *)"\xff\xfd\x00", 3);
 
     /*
     for( const char & c : prompt ) {
-      BUGZ_LOG(fatal) << "IS? " << (unsigned int)c << " " << std::hex << (unsigned int)c;
+      BUGZ_LOG(fatal) << "IS? " << (unsigned int)c << " " << std::hex <<
+    (unsigned int)c;
     }
 
     for( const char & c : ayt ) {
-      BUGZ_LOG(fatal) << "AYT? " << (unsigned int)c << " " << std::hex << (unsigned int)c;
+      BUGZ_LOG(fatal) << "AYT? " << (unsigned int)c << " " << std::hex <<
+    (unsigned int)c;
     }
     */
 
@@ -346,6 +357,8 @@ void Session::on_server_prompt(const std::string &prompt,
       to_server(ayt2_resp);
       BUGZ_LOG(fatal) << "AYT2??";
       server_prompt.clear();
+      // let the user see what is happening...  We're done negotiating (I think)
+      director.show_client = true;
     }
   }
 }

test-director.cpp

@@ -56,4 +56,19 @@ TEST(director, director_debugging) {
   }
 }
 
+TEST(director, director_galaxy_save) {
+  Director dir;
+  /*
+  std::vector<std::string> client;
+  std::vector<std::string> server;
+  dir.to_client = [&client](const std::string line) { client.push_back(line); };
+  dir.to_server = [&server](const std::string line) { server.push_back(line); };
+  */
+  dir.username = "test";
+  dir.game = 'Z';
+  dir.galaxy.meta["trade"][10963][0] = 1;
+  dir.galaxy.save();
+  EXPECT_TRUE(1) << "No execption, this is good!";
+  GTEST_COUT << "We're still alive, good!" << std::endl;
+}
 }  // namespace

utils.cpp

@@ -167,3 +167,11 @@ void str_toupper(std::string &str) {
 void str_tolower(std::string &str) {
   std::transform(str.begin(), str.end(), str.begin(), ::tolower);
 }
+
+void remove_telnet_commands(std::string &text) {
+  size_t pos;
+
+  while ( ( pos = text.find('\xff')) != std::string::npos ) {
+    text.erase(pos, pos+3 );
+  }
+}

utils.h

@@ -28,4 +28,6 @@ bool at_planet_prompt(const std::string &prompt);
 void str_toupper(std::string &text);
 void str_tolower(std::string &text);
 
+void remove_telnet_commands(std::string &text);
+
 #endif