X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/2da962edada912d8081f7e15db0ac887b98b179e..6b783a3154c0e105e8480057844cf11d482ac279:/stglibs/srvconf.lib/servconf.cpp?ds=sidebyside

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 8b4e259b..950669f2 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -21,13 +21,20 @@
 #include "stg/servconf.h"
 
 #include "netunit.h"
-#include "parsers/auth_by.h"
+
+#include "parsers/simple.h"
+
 #include "parsers/server_info.h"
-#include "parsers/check_user.h"
+
+#include "parsers/get_admins.h"
+#include "parsers/get_admin.h"
+#include "parsers/chg_admin.h"
+
+#include "parsers/auth_by.h"
 #include "parsers/get_users.h"
 #include "parsers/get_user.h"
 #include "parsers/chg_user.h"
-#include "parsers/send_message.h"
+
 #include "parsers/base.h"
 
 #include "stg/common.h"
@@ -45,34 +52,32 @@ public:
     IMPL(const std::string & server, uint16_t port,
          const std::string & login, const std::string & password);
 
-    int ServerInfo(SERVER_INFO::CALLBACK f, void * data);
-
-    int GetAdmins(GET_ADMINS::CALLBACK f, void * data);
-    int GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data);
-    int ChgAdmin(const std::string & login, const ADMIN_CONF_RES & conf, CHG_ADMIN::CALLBACK f, void * data);
-    int AddAdmin(const std::string & login, const ADMIN_CONF & conf, GET_ADMIN::CALLBACK f, void * data);
-    int DelAdmin(const std::string & login, DEL_ADMIN::CALLBACK f, void * data);
-
-    int GetUsers(GET_USERS::CALLBACK f, void * data);
-    int GetUser(const std::string & login, GET_USER::CALLBACK f, void * data);
-    int ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data);
-    int AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data);
-    int SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data);
-    int CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data);
-
     const std::string & GetStrError() const;
     static void Start(void * data, const char * el, const char ** attr);
     static void End(void * data, const char * el);
 
+    template <class P, typename C>
+    int Exec(const std::string & request, C callback, void * data)
+    {
+        P cp(callback, data);
+        return ExecImpl(request, cp);
+    }
+
+    template <class P, typename C>
+    int Exec(const std::string & tag, const std::string & request, C callback, void * data)
+    {
+        P cp(tag, callback, data);
+        return ExecImpl(request, cp);
+    }
+
 private:
     NETTRANSACT nt;
 
     std::string errorMsg;
     XML_Parser parser;
 
-    int Exec(const std::string & request, PARSER & cp);
-
     static bool AnsRecv(void * data, const std::string & chunk, bool final);
+    int ExecImpl(const std::string & request, PARSER & cp);
 };
 
 bool SERVCONF::IMPL::AnsRecv(void * data, const std::string & chunk, bool final)
@@ -99,98 +104,98 @@ SERVCONF::SERVCONF(const std::string & server, uint16_t port,
 
 SERVCONF::~SERVCONF()
 {
-    delete pImpl;
+delete pImpl;
 }
 
-int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data)
+int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data)
 {
-    return pImpl->GetUsers( f, data );
+return pImpl->Exec<SERVER_INFO::PARSER>("<GetServerInfo/>", f, data);
 }
 
-int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data)
+// -- Admins --
+
+int SERVCONF::GetAdmins(GET_ADMINS::CALLBACK f, void * data)
 {
-    return pImpl->GetUser(login, f, data);
+return pImpl->Exec<GET_ADMINS::PARSER>("<GetAdmins/>", f, data);
 }
 
-int SERVCONF::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data)
+int SERVCONF::GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data)
 {
-    return pImpl->ChgUser(request, f, data);
+return pImpl->Exec<GET_ADMIN::PARSER>("<GetAdmin login=\"" + login + "\"/>", f, data);
 }
 
-int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
+int SERVCONF::ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data)
 {
-    return pImpl->AuthBy(login, f, data);
+return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf) + "/>", f, data);
 }
 
-int SERVCONF::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data)
+int SERVCONF::AddAdmin(const std::string & login, const ADMIN_CONF & conf, SIMPLE::CALLBACK f, void * data)
 {
-    return pImpl->SendMessage(request, f, data);
+int res = pImpl->Exec<SIMPLE::PARSER>("AddAdmin", "<AddAdmin login=\"" + login + "\"/>", f, data);
+if (res != st_ok)
+    return res;
+return pImpl->Exec<SIMPLE::PARSER>("ChgAdmin", "<ChgAdmin" + CHG_ADMIN::Serialize(conf) + "/>", f, data);
 }
 
-int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data)
+int SERVCONF::DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data)
 {
-    return pImpl->ServerInfo(f, data);
+return pImpl->Exec<SIMPLE::PARSER>("DelAdmin", "<DelAdmin login=\"" + login + "\"/>", f, data);
 }
 
-int SERVCONF::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data)
+// -- Users --
+
+int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data)
 {
-    return pImpl->CheckUser(login, password, f, data);
+return pImpl->Exec<GET_USERS::PARSER>("<GetUsers/>", f, data);
 }
 
-const std::string & SERVCONF::GetStrError() const
+int SERVCONF::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data)
 {
-    return pImpl->GetStrError();
+return pImpl->Exec<GET_USER::PARSER>("<GetUser login=\"" + login + "\"/>", f, data);
 }
 
-//-----------------------------------------------------------------------------
-SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
-                     const std::string & login, const std::string & password)
-    : nt( server, port, login, password )
+int SERVCONF::ChgUser(const std::string & request, SIMPLE::CALLBACK f, void * data)
 {
-parser = XML_ParserCreate(NULL);
-nt.SetRxCallback(this, AnsRecv);
+return pImpl->Exec<CHG_USER::PARSER>(request, f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data)
+
+int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data)
 {
-GET_USER::PARSER parser(f, data);
-return Exec("<GetUser login=\"" + login + "\"/>", parser);
+return pImpl->Exec<SIMPLE::PARSER>("DelUser", "<DelUser login=\"" + login + "\"/>", f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
+
+int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data)
 {
-AUTH_BY::PARSER parser(f, data);
-return Exec("<GetUserAuthBy login=\"" + login + "\"/>", parser);
+return pImpl->Exec<SIMPLE::PARSER>("AddUser", "<AddUser><Login value=\"" + login + "\"/></AddUser>", f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::GetUsers(GET_USERS::CALLBACK f, void * data)
+
+int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
 {
-GET_USERS::PARSER parser(f, data);
-return Exec("<GetUsers/>", parser);
+return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>", f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::ServerInfo(SERVER_INFO::CALLBACK f, void * data)
+
+int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data)
 {
-SERVER_INFO::PARSER parser(f, data);
-return Exec("<GetServerInfo/>", parser);
+return pImpl->Exec<SIMPLE::PARSER>("SendMessage", "<Message login=\"" + login + "\" msgver=\"1\" msgtype=\"1\" repeat=\"0\" repeatperiod=\"0\" showtime=\"0\" text=\"" + Encode12str(text) + "\"/>", f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data)
+
+int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data)
 {
-CHG_USER::PARSER parser(f, data);
-return Exec(request, parser);
+return pImpl->Exec<SIMPLE::PARSER>("CheckUser", "<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", f, data);
 }
-//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data)
+
+const std::string & SERVCONF::GetStrError() const
 {
-SEND_MESSAGE::PARSER parser(f, data);
-return Exec(request, parser);
+return pImpl->GetStrError();
 }
+
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data)
+SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
+                     const std::string & login, const std::string & password)
+    : nt( server, port, login, password )
 {
-CHECK_USER::PARSER parser(f, data);
-return Exec("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", parser);
+parser = XML_ParserCreate(NULL);
+nt.SetRxCallback(this, AnsRecv);
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)
@@ -210,7 +215,7 @@ const std::string & SERVCONF::IMPL::GetStrError() const
 return errorMsg;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::IMPL::Exec(const std::string & request, PARSER & cp)
+int SERVCONF::IMPL::ExecImpl(const std::string & request, PARSER & cp)
 {
 XML_ParserReset(parser, NULL);
 XML_SetElementHandler(parser, Start, End);