Another `stgTime` case.

[stg.git] / projects / sgconf / config.h

diff --git a/projects/sgconf/config.h b/projects/sgconf/config.h
index 424ca519e79dba44ae56d4b464753bd4173e3844..f5313ef987a8a97c2c949762194b9e9483d5a095 100644 (file)
--- a/projects/sgconf/config.h
+++ b/projects/sgconf/config.h
@@ -18,25 +18,27 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-#ifndef __STG_SGCONF_CONFIG_H__
-#define __STG_SGCONF_CONFIG_H__
+#pragma once
 
 #include "stg/common.h"
-#include "stg/resetable.h"
-#include "stg/os_int.h"
+#include "stg/optional.h"
 
 #include <string>
+#include <cstdint>
 
 namespace SGCONF
 {
 
 struct CONFIG
 {
-    RESETABLE<std::string> configFile;
-    RESETABLE<std::string> server;
-    RESETABLE<uint16_t> port;
-    RESETABLE<std::string> userName;
-    RESETABLE<std::string> userPass;
+    STG::Optional<std::string> configFile;
+    STG::Optional<std::string> server;
+    STG::Optional<uint16_t> port;
+    STG::Optional<std::string> localAddress;
+    STG::Optional<uint16_t> localPort;
+    STG::Optional<std::string> userName;
+    STG::Optional<std::string> userPass;
+    STG::Optional<bool> showConfig;
 
     CONFIG & operator=(const CONFIG & rhs)
     {
@@ -46,30 +48,38 @@ struct CONFIG
         server = rhs.server;
     if (!rhs.port.empty())
         port = rhs.port;
+    if (!rhs.localAddress.empty())
+        localAddress = rhs.localAddress;
+    if (!rhs.localPort.empty())
+        localPort = rhs.localPort;
     if (!rhs.userName.empty())
         userName = rhs.userName;
     if (!rhs.userPass.empty())
         userPass = rhs.userPass;
+    if (!rhs.showConfig.empty())
+        showConfig = rhs.showConfig;
     return *this;
     }
 
     std::string Serialize() const
     {
-    std::string res("{ ");
+    std::string res;
     if (!configFile.empty())
-        res += "configFile: '" + configFile.data() + "',";
+        res += "configFile: '" + configFile.data() + "'\n";
     if (!server.empty())
-        res += " server: '" + server.data() + "',";
+        res += "server: '" + server.data() + "'\n";
     if (!port.empty())
-        res += " port: " + x2str(port.data()) + ",";
+        res += "port: " + std::to_string(port.data()) + "\n";
+    if (!localAddress.empty())
+        res += "local address: '" + localAddress.data() + "'\n";
+    if (!localPort.empty())
+        res += "local port: " + std::to_string(localPort.data()) + "\n";
     if (!userName.empty())
-        res += " userName: '" + userName.data() + "',";
+        res += "userName: '" + userName.data() + "'\n";
     if (!userPass.empty())
-        res += " userPass: '" + userPass.data() + "'";
-    return res + " }";
+        res += "userPass: '" + userPass.data() + "\n";
+    return res;
     }
 };
 
 } // namespace SGCONF
-
-#endif