Merge branch 'work1'

Merging my changes (port_CIM).

director.cpp

@@ -255,7 +255,8 @@ void Director::server_prompt(const std::string &prompt,
     }
 
     // in-game parsing here.
-    if (startswith(prompt, "Command [") && endswith(prompt, "] (?=Help)? : ")) {
+    // if (startswith(prompt, "Command [") && endswith(prompt, "] (?=Help)? : ")) {
+    if (at_command_prompt(prompt)) {
       std::string sector_text;
       size_t before, after;
       before = prompt.find("]:[") + 3;
@@ -342,6 +343,24 @@ void Director::proxy_activate(void) {
   to_client(box.row(output));
   to_client(box.bottom());
 
+  if (galaxy.meta["port_CIM"]) {
+    time_t last_port_cim_report = galaxy.meta["port_CIM"].as<int>();
+    int seconds_ago = time_t_now() - last_port_cim_report;
+    int minutes_ago = seconds_ago / 60;
+    BUGZ_LOG(fatal) << "port_CIM was " << minutes_ago << " minutes ago.";
+
+    if (minutes_ago >= 60 ) {
+      float hours_ago = minutes_ago / 60.0;
+      std::string message = str(boost::format("Warning: Last Port CIM Refresh was %1$.2f% hours ago.\n\r") % hours_ago);
+      to_client(message);
+    }
+  } else {
+    BUGZ_LOG(fatal) << "no meta port_CIM value seen.";
+    for( auto const &d : galaxy.meta) {
+      BUGZ_LOG(fatal) << d.first << " : " << d.second;
+    }
+  }
+
   chain = main_menu;
   main_menu->activate();
   /*
@@ -438,6 +457,7 @@ void Director::menu_choice(void) {
       case 'P': // Port CIM
         // Since we're adding/updating, we don't lose our
         // type 0 ports.  Type 9 stays at 9.
+        galaxy.meta["port_CIM"] = (int)time_t_now();
         chain = cim;
         to_server("^RQ");
         {

dispatchers.h

@@ -121,8 +121,6 @@ class CIMDispatch : public Dispatch {
   
   void activate(void) override;
   void deactivate(void) override;
-
-  // optional here
   void server_line(const std::string &line, const std::string &raw_line) override;
 };
 

galaxy.cpp

@@ -295,13 +295,18 @@ void Galaxy::load(void) {
   ports.clear();
   warps.clear();
   if (file_exists(filename)) {
+    BUGZ_LOG(fatal) << "Galaxy::load( " << filename << " )";
+
     YAML::Node data = YAML::LoadFile(filename);
-    if (config["meta"]) meta = config["meta"];
+
+    if (data["meta"]) {
+      meta = data["meta"];
+    } else {
+      BUGZ_LOG(fatal) << "Missing meta data.";
+    }
     meta["load_from"] = filename;
-    std::chrono::_V2::system_clock::time_point now =
-        std::chrono::system_clock::now();
+    meta["load_time"] = time_t_now();  // time_t
 
-    meta["load_time"] = std::chrono::system_clock::to_time_t(now);  // time_t
     if (data["config"]) {
       config = data["config"];
     } else {
@@ -354,9 +359,10 @@ void Galaxy::load(void) {
       BUGZ_LOG(fatal) << "YAML Missing warps section.";
     }
 
-    BUGZ_LOG(fatal) << "YAML: config keys: " << config.size();
-    BUGZ_LOG(fatal) << "YAML:   warp keys: " << warps.size();
-    BUGZ_LOG(fatal) << "YAML:   port keys: " << ports.size();
+    BUGZ_LOG(trace) << "YAML:   meta keys: " << meta.size();
+    BUGZ_LOG(trace) << "YAML: config keys: " << config.size();
+    BUGZ_LOG(trace) << "YAML:   warp keys: " << warps.size();
+    BUGZ_LOG(trace) << "YAML:   port keys: " << ports.size();
 
   } else {
     BUGZ_LOG(fatal) << "Missing YAML: " << filename;
@@ -373,16 +379,15 @@ void Galaxy::save(void) {
       str(boost::format("%1%-%2%-%3%.yaml") % basename % game % username);
 
   std::ofstream fout(filename);
-  fout << "%YAML 1.2" << std::endl << "---" << std::endl;
+  // fout << "%YAML 1.2" << std::endl << "---" << std::endl;
+  fout << "---" << std::endl;
 
   BUGZ_LOG(fatal) << "YAML: " << filename;
   int depth = 0;
   std::string depth_spacer;
 
   meta["save_to"] = filename;
-  std::chrono::_V2::system_clock::time_point now =
-      std::chrono::system_clock::now();
-  meta["save_time"] = std::chrono::system_clock::to_time_t(now);  // time_t
+  meta["save_time"] = time_t_now();  // time_t
 
   /*   // testing sequence code
   meta["sequence"]["part"].push_back(1);
@@ -428,17 +433,17 @@ void Galaxy::save(void) {
       }
     }
   };
-
+  BUGZ_LOG(trace) << "YAML meta: " << meta.size();
   yaml_out(fout, depth, meta);
 
-  BUGZ_LOG(fatal) << "YAML config: " << config.size();
+  BUGZ_LOG(trace) << "YAML config: " << config.size();
   fout << "config:" << std::endl;
 
   // in config, I usually switch to doing flow instead.  I'll keep this like
   // this for now.
   yaml_out(fout, depth, config);
 
-  BUGZ_LOG(fatal) << "YAML warps: " << warps.size();
+  BUGZ_LOG(trace) << "YAML warps: " << warps.size();
   fout << "warps:" << std::endl;
 
   for (auto const &warp : warps) {
@@ -454,7 +459,7 @@ void Galaxy::save(void) {
     fout << "]" << std::endl;
   }
 
-  BUGZ_LOG(fatal) << "YAML ports: " << ports.size();
+  BUGZ_LOG(trace) << "YAML ports: " << ports.size();
   fout << "ports:" << std::endl;
 
   /*

utils.cpp

@@ -231,3 +231,7 @@ int sstoi(const std::string &text, int failure) {
   }
   return result;
 }
+
+time_t time_t_now(void) {
+    return std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+}

utils.h

@@ -40,5 +40,6 @@ void remove_telnet_commands(std::string &text);
  * @return int 
  */
 int sstoi(const std::string &text, int failure=0);
+time_t time_t_now(void);
 
 #endif