basename in config. Fixed blank Date Built : bug.

CMakeLists.txt

@@ -56,11 +56,11 @@ option(gtest_build_samples "Build gtest's sample programs." OFF)
 option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF)
 
 ### TESTS
-add_executable(test-galaxy test-galaxy.cpp galaxy.cpp utils.cpp buysell.cpp)
+add_executable(test-galaxy test-galaxy.cpp galaxy.cpp config.cpp utils.cpp buysell.cpp)
 add_dependencies(test-galaxy gtest)
 target_link_libraries(test-galaxy gtest_main ${Boost_LIBRARIES} yaml-cpp)
 
-add_executable(test-director test-director.cpp galaxy.cpp utils.cpp buysell.cpp director.cpp dispatchers.cpp boxes.cpp scripts.cpp)
+add_executable(test-director test-director.cpp galaxy.cpp utils.cpp buysell.cpp director.cpp dispatchers.cpp boxes.cpp scripts.cpp config.cpp)
 add_dependencies(test-director gtest)
 target_link_libraries(test-director gtest_main ${Boost_LIBRARIES} yaml-cpp)
 
@@ -71,7 +71,7 @@ add_test(NAME test-director
   COMMAND test-director)
 
 # dispatchers.cpp 
-ADD_EXECUTABLE( twproxy twproxy.cpp utils.cpp session.cpp boxes.cpp director.cpp galaxy.cpp dispatchers.cpp scripts.cpp buysell.cpp )
+ADD_EXECUTABLE( twproxy twproxy.cpp utils.cpp session.cpp boxes.cpp director.cpp galaxy.cpp dispatchers.cpp scripts.cpp buysell.cpp config.cpp)
 TARGET_LINK_LIBRARIES( twproxy ${Boost_LIBRARIES} pthread yaml-cpp)
 
 target_precompile_headers(twproxy PRIVATE pch.hpp)

config.cpp

@@ -0,0 +1,4 @@
+#include "yaml-cpp/yaml.h"
+
+YAML::Node CONFIG;
+

config.h

@@ -1,3 +1,8 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
 #include "yaml-cpp/yaml.h"
 
-extern YAML::Node CONFIG;
+extern YAML::Node CONFIG;
+
+#endif

director.cpp

@@ -984,8 +984,9 @@ void Director::SL_infoline(const std::string &line) {
 
   // info to parse:
   size_t pos = line.find(" : ");
-  if (pos != line.npos) {
+  if ((!endswith(line, " : ")) && (pos != line.npos)) {
     std::string key = line.substr(0, pos);
+    // Ferrengi ships don't have date built
     std::string value = line.substr(pos + 3);
     trim(key);
     trim(value);

galaxy.cpp

@@ -9,6 +9,7 @@
 #include <set>
 #include <string>
 
+#include "config.h"
 #include "logging.h"
 #include "yaml-cpp/yaml.h"
 
@@ -300,8 +301,14 @@ void Galaxy::add_port(port p) {
 }
 
 void Galaxy::load(void) {
+  std::string basename = "galaxy";
+
+  if (CONFIG["basename"]) {
+    basename = CONFIG["basename"].as<std::string>();
+  }
   std::string filename =
-      str(boost::format("galaxy-%1%-%2%.yaml") % game % username);
+      str(boost::format("%1%-%2%-%3%.yaml") % basename % game % username);
+
   // reset ?
   meta = YAML::Node();
   config = YAML::Node();
@@ -377,8 +384,13 @@ void Galaxy::load(void) {
 }
 
 void Galaxy::save(void) {
+  std::string basename = "galaxy";
+
+  if (CONFIG["basename"]) {
+    basename = CONFIG["basename"].as<std::string>();
+  }
   std::string filename =
-      str(boost::format("galaxy-%1%-%2%.yaml") % game % username);
+      str(boost::format("%1%-%2%-%3%.yaml") % basename % game % username);
 
   std::ofstream fout(filename);
   fout << "%YAML 1.2" << std::endl << "---" << std::endl;

twproxy.cpp

@@ -23,10 +23,6 @@
 #include <map>
 #include <string>
 
-#include "yaml-cpp/yaml.h"
-
-YAML::Node CONFIG;
-
 #include "config.h"
 #include "logging.h"
 #include "session.h"
@@ -118,7 +114,7 @@ int main(int argc, char *argv[]) {
   bool config_ok = true;
 
   // for (const char *key : {"server", "host", "port"}) {
-  for (auto key : {"server", "host", "port"}) {
+  for (auto key : {"server", "host", "port", "basename"}) {
     if (!CONFIG[key]) {
       config_ok = false;
       std::cout << "Config file missing: " << key << std::endl;