Fixed merge issues.

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

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index c0debdc11ac901d943264fa122d994610564e998..c1fc4c3e58a34c3388ca97dfc48666a743456e78 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -16,18 +16,17 @@
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
 
 /*
  *    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 "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"
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"
 #include "stg/common.h"


@@ -66,6 +65,65 @@ struct ARRAY_TYPE<T[N]>
 typedef T type;
 };
 
 typedef T type;
 };
 

+template <typename T>
+struct nullary_function
+{
+typedef T result_type;
+};
+
+template <typename F>
+class binder0 : public nullary_function<typename F::result_type>
+{
+    public:
+        binder0(const F & func, const typename F::argument_type & arg)
+            : m_func(func), m_arg(arg) {}
+        typename F::result_type operator()() const { return m_func(m_arg); }
+    private:
+        F m_func;
+        typename F::argument_type m_arg;
+};
+
+template <typename F>
+inline
+binder0<F> bind0(const F & func, const typename F::argument_type & arg)
+{
+return binder0<F>(func, arg);
+}
+
+template <typename C, typename A, typename R>
+class METHOD1_ADAPTER : public std::unary_function<A, R>
+{
+    public:
+        METHOD1_ADAPTER(R (C::* func)(A), C & obj) : m_func(func), m_obj(obj) {}
+        R operator()(A arg) { return (m_obj.*m_func)(arg); }
+    private:
+        R (C::* m_func)(A);
+        C & m_obj;
+};
+
+template <typename C, typename A, typename R>
+class CONST_METHOD1_ADAPTER : public std::unary_function<A, R>
+{
+    public:
+        CONST_METHOD1_ADAPTER(R (C::* func)(A) const, C & obj) : m_func(func), m_obj(obj) {}
+        R operator()(A arg) const { return (m_obj.*m_func)(arg); }
+    private:
+        R (C::* m_func)(A) const;
+        C & m_obj;
+};
+
+template <typename C, typename A, typename R>
+METHOD1_ADAPTER<C, A, R> Method1Adapt(R (C::* func)(A), C & obj)
+{
+return METHOD1_ADAPTER<C, A, R>(func, obj);
+}
+
+template <typename C, typename A, typename R>
+CONST_METHOD1_ADAPTER<C, A, R> Method1Adapt(R (C::* func)(A) const, C & obj)
+{
+return CONST_METHOD1_ADAPTER<C, A, R>(func, obj);
+}
+

 template <typename T>
 bool SetArrayItem(T & array, const char * index, const typename ARRAY_TYPE<T>::type & value)
 {
 template <typename T>
 bool SetArrayItem(T & array, const char * index, const typename ARRAY_TYPE<T>::type & value)
 {


@@ -76,7 +134,9 @@ array[pos] = value;
 return true;
 }
 
 return true;
 }
 

-void Usage(bool full);
+void Usage();
+void UsageAll();
+void UsageImpl(bool full);

 void UsageConnection();
 void UsageAdmins(bool full);
 void UsageTariffs(bool full);
 void UsageConnection();
 void UsageAdmins(bool full);
 void UsageTariffs(bool full);


@@ -84,8 +144,97 @@ void UsageUsers(bool full);
 void UsageServices(bool full);
 void UsageCorporations(bool full);
 
 void UsageServices(bool full);
 void UsageCorporations(bool full);
 

+void Version();
+

 } // namespace anonymous
 
 } // 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 ACTION * Clone() const { return new CONFIG_ACTION(*this); }
+
+        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)
+{
+if (argc == 0 ||
+    argv == NULL ||
+    *argv == NULL)
+    throw ERROR("Missing argument.");
+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[] = {
 time_t stgTime;
 
 struct option long_options_get[] = {


@@ -1052,66 +1201,50 @@ if (isMessage)
 return ProcessSetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), conf, stat);
 }
 //-----------------------------------------------------------------------------
 return ProcessSetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), conf, stat);
 }
 //-----------------------------------------------------------------------------

-PARSER_STATE TryParse(const PARSERS& parsers, char ** argv, int argc)
-{
-PARSERS::const_iterator it = parsers.find(*argv);
-if (it != parsers.end())
-    return it->second(++argv, --argc);
-PARSER_STATE state;
-state.argc = argc;
-state.argv = argv;
-state.result = false;
-return state;
-}
-//-----------------------------------------------------------------------------
-PARSER_STATE ParseCommon(int argc, char ** argv, CONFIG& config)
+int main(int argc, char **argv)

 {
 {

-if (pos == 0)
-    ++pos;
+SGCONF::CONFIG config;

 
 

-PARSERS parsers;
-parsers.add<std::string>("-c", "--config", config.configFile);
-parsers.add<void>("-h", "--help", Usage, false);
-parsers.add<void>("--help-all", Usage, true);
-parsers.add<void>("-v", "--version", Version);
+SGCONF::OPTION_BLOCKS blocks;
+blocks.Add("General options")
+      .Add("c", "config", SGCONF::MakeParamAction(config.configFile, std::string("~/.config/stg/sgconf.conf"), "<config file>"), "override default config file")
+      .Add("h", "help", SGCONF::MakeFunc0Action(bind0(Method1Adapt(&SGCONF::OPTION_BLOCKS::Help, blocks), 0)), "\t\tshow this help and exit")
+      .Add("help-all", SGCONF::MakeFunc0Action(UsageAll), "\t\tshow full help and exit")
+      .Add("v", "version", SGCONF::MakeFunc0Action(Version), "\t\tshow version information and exit");
+blocks.Add("Connection options")
+      .Add("s", "server", SGCONF::MakeParamAction(config.server, std::string("localhost"), "<address>"), "\t\thost to connect")
+      .Add("p", "port", SGCONF::MakeParamAction(config.port, uint16_t(5555), "<port>"), "\t\tport to connect")
+      .Add("u", "username", SGCONF::MakeParamAction(config.userName, std::string("admin"), "<username>"), "\tadministrative login")
+      .Add("w", "userpass", SGCONF::MakeParamAction(config.userPass, "<password>"), "\tpassword for the administrative login")
+      .Add("a", "address", SGCONF::MakeParamAction(config, "<connection string>"), "connection params as a single string in format: <login>:<password>@<host>:<port>");

 
 

-while (true)
-    {
-    PARSER_STATE state(TryParse(parsers, argv, argc, config));
-    if (state.argv == argv)
-        return state; // No-op
-    if (state.argc == 0)
-        return state; // EOF
-    if (state.result)
-        return state; // Done
-    argv = state.argv;
-    argc = state.argc;
-    }

 
 

-assert(0 && "Can't be here.");
-return PARSER_STATE();
+SGCONF::PARSER_STATE state(false, argc, argv);
+
+try
+{
+state = blocks.Parse(--argc, ++argv); // Skipping self name

 }
 }

-//-----------------------------------------------------------------------------
-int main(int argc, char **argv)
+catch (const SGCONF::OPTION::ERROR& ex)

 {
 {

-Usage(true);
-exit(0);
+std::cerr << ex.what() << "\n";
+return -1;
+}

 
 

-// Ok - succesfully parsed
-// Done - don't continue, return 0
-// Error - don't continue, return -1
-// No-op - nothing changed
+if (state.stop)
+    return 0;

 
 

-return COMPOSER(argv).compose(ParseCommon)
-                     .compose(ReadConfig)
-                     .compose(ParseCommand)
-                     .exec();
+if (state.argc > 0)
+    {
+    std::cerr << "Unknown option: '" << *state.argv << "'\n";
+    return -1;
+    }

 
 

+return 0;

 
 if (argc < 2)
     {
 
 if (argc < 2)
     {

-    // TODO: no arguments
-    Usage(false);
+    Usage();

     return 1;
     }
 
     return 1;
     }
 


@@ -1145,7 +1278,17 @@ return UNKNOWN_ERR_CODE;
 namespace
 {
 
 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"
 {
 std::cout << "sgconf is the Stargazer management utility.\n\n"
           << "Usage:\n"


@@ -1336,4 +1479,9 @@ if (full)
               << "\t\t--set-cash <cash>[:<message>]\tnew corporation's cash and optional comment message\n\n";
 }
 
               << "\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
 } // namespace anonymous