Removed some conflicting macros.

[stg.git] / projects / sgconf / main.cpp

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index c4ca29cbb5a90eb83b498df6f2b10407d5ed82d4..8644e690ddd5dcd693c92730c7c4f225b6793e9d 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -16,18 +16,17 @@
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
- */
-
- /*
- $Author: faust $
- $Revision: 1.25 $
- $Date: 2010/03/25 14:37:43 $
+ *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
 #include "request.h"
 #include "common_sg.h"
 #include "sg_error_codes.h"
 
+#include "options.h"
+#include "actions.h"
+#include "config.h"
+
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"
 #include "stg/common.h"
@@ -76,7 +75,9 @@ array[pos] = value;
 return true;
 }
 
-void Usage(bool full);
+void Usage();
+void UsageAll();
+void UsageImpl(bool full);
 void UsageConnection();
 void UsageAdmins(bool full);
 void UsageTariffs(bool full);
@@ -84,8 +85,91 @@ void UsageUsers(bool full);
 void UsageServices(bool full);
 void UsageCorporations(bool full);
 
+void Version();
+
 } // namespace anonymous
 
+namespace SGCONF
+{
+
+class CONFIG_ACTION: public ACTION
+{
+    public:
+        CONFIG_ACTION(CONFIG & config,
+                      const std::string & paramDescription)
+            : m_config(config),
+              m_description(paramDescription)
+        {}
+
+        virtual std::string ParamDescription() const { return m_description; }
+        virtual std::string DefaultDescription() const { return ""; }
+        virtual OPTION_BLOCK & Suboptions() { return m_suboptions; }
+        virtual PARSER_STATE Parse(int argc, char ** argv);
+
+    private:
+        CONFIG & m_config;
+        std::string m_description;
+        OPTION_BLOCK m_suboptions;
+
+        void ParseCredentials(const std::string & credentials);
+        void ParseHostAndPort(const std::string & hostAndPort);
+};
+
+PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv)
+{
+char * pos = strchr(*argv, '@');
+if (pos != NULL)
+    {
+    ParseCredentials(std::string(*argv, pos));
+    ParseHostAndPort(std::string(pos + 1));
+    }
+else
+    {
+    ParseHostAndPort(std::string(*argv));
+    }
+return PARSER_STATE(false, --argc, ++argv);
+}
+
+void CONFIG_ACTION::ParseCredentials(const std::string & credentials)
+{
+std::string::size_type pos = credentials.find_first_of(':');
+if (pos != std::string::npos)
+    {
+    m_config.userName = credentials.substr(0, pos);
+    m_config.userPass = credentials.substr(pos + 1);
+    }
+else
+    {
+    m_config.userName = credentials;
+    }
+}
+
+void CONFIG_ACTION::ParseHostAndPort(const std::string & hostAndPort)
+{
+std::string::size_type pos = hostAndPort.find_first_of(':');
+if (pos != std::string::npos)
+    {
+    m_config.server = hostAndPort.substr(0, pos);
+    uint16_t port = 0;
+    if (str2x(hostAndPort.substr(pos + 1), port))
+        throw ERROR("Invalid port value: '" + hostAndPort.substr(pos + 1) + "'");
+    m_config.port = port;
+    }
+else
+    {
+    m_config.server = hostAndPort;
+    }
+}
+
+inline
+CONFIG_ACTION * MakeParamAction(CONFIG & config,
+                                const std::string & paramDescription)
+{
+return new CONFIG_ACTION(config, paramDescription);
+}
+
+} // namespace SGCONF
+
 time_t stgTime;
 
 struct option long_options_get[] = {
@@ -1054,8 +1138,30 @@ return ProcessSetUser(req.server.data(), req.port.data(), req.admLogin.data(), r
 //-----------------------------------------------------------------------------
 int main(int argc, char **argv)
 {
-Usage(true);
+UsageAll();
 exit(0);
+
+SGCONF::CONFIG config;
+
+SGCONF::OPTION_BLOCK generalOptions;
+generalOptions.Add("c", "config", SGCONF::MakeParamAction(config.configFile, std::string("~/.config/stg/sgconf.conf"), "<config file>"), "override default config file");
+generalOptions.Add("h", "help", SGCONF::MakeFunc0Action(Usage), "show this help and exit");
+generalOptions.Add("help-all", SGCONF::MakeFunc0Action(UsageAll), "show full help and exit");
+generalOptions.Add("v", "version", SGCONF::MakeFunc0Action(Version), "show version information and exit");
+
+SGCONF::OPTION_BLOCK connOptions;
+connOptions.Add("s", "server", SGCONF::MakeParamAction(config.server, std::string("localhost"), "<address>"), "host to connect");
+connOptions.Add("p", "port", SGCONF::MakeParamAction(config.port, uint16_t(5555), "<port>"), "port to connect");
+connOptions.Add("u", "username", SGCONF::MakeParamAction(config.userName, std::string("admin"), "<username>"), "administrative login");
+connOptions.Add("w", "userpass", SGCONF::MakeParamAction(config.userPass, "<password>"), "password for the administrative login");
+connOptions.Add("a", "address", SGCONF::MakeParamAction(config, "<connection string>"), "connection params as a single string in format: <login>:<password>@<host>:<port>");
+
+if (argc < 2)
+    {
+    Usage();
+    return 1;
+    }
+
 if (argc <= 2)
     {
     UsageConf();
@@ -1086,7 +1192,17 @@ return UNKNOWN_ERR_CODE;
 namespace
 {
 
-void Usage(bool full)
+void Usage()
+{
+UsageImpl(false);
+}
+
+void UsageAll()
+{
+UsageImpl(true);
+}
+
+void UsageImpl(bool full)
 {
 std::cout << "sgconf is the Stargazer management utility.\n\n"
           << "Usage:\n"
@@ -1094,7 +1210,7 @@ std::cout << "sgconf is the Stargazer management utility.\n\n"
           << "General options:\n"
           << "\t-c, --config <config file>\t\toverride default config file (default: \"~/.config/stg/sgconf.conf\")\n"
           << "\t-h, --help\t\t\t\tshow this help and exit\n"
-          << "\t-h, --help-all\t\t\t\tshow full help and exit\n"
+          << "\t--help-all\t\t\t\tshow full help and exit\n"
           << "\t-v, --version\t\t\t\tshow version information and exit\n\n";
 UsageConnection();
 UsageAdmins(full);
@@ -1277,4 +1393,9 @@ if (full)
               << "\t\t--set-cash <cash>[:<message>]\tnew corporation's cash and optional comment message\n\n";
 }
 
+void Version()
+{
+std::cout << "sgconf, version: 2.0.0-alpha.\n";
+}
+
 } // namespace anonymous