X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/d3b6a58593b94c9ff41c30a7517086d607f28f10..ff1555c1d973c2d0aea546b4d20577715e132577:/projects/sgconf/services.cpp diff --git a/projects/sgconf/services.cpp b/projects/sgconf/services.cpp index 719435c7..22a64013 100644 --- a/projects/sgconf/services.cpp +++ b/projects/sgconf/services.cpp @@ -3,6 +3,7 @@ #include "api_action.h" #include "options.h" #include "config.h" +#include "utils.h" #include "stg/servconf.h" #include "stg/servconf_types.h" @@ -31,6 +32,15 @@ std::cout << Indent(level, true) << "name: " << info.name << "\n" << Indent(level) << "comment: " << info.comment << "\n"; } +std::vector<SGCONF::API_ACTION::PARAM> GetServiceParams() +{ +std::vector<SGCONF::API_ACTION::PARAM> params; +params.push_back(SGCONF::API_ACTION::PARAM("cost", "<cost>", "\tcost of the service")); +params.push_back(SGCONF::API_ACTION::PARAM("pay-day", "<month day>", "payment day")); +params.push_back(SGCONF::API_ACTION::PARAM("comment", "<text>", "comment")); +return params; +} + void SimpleCallback(bool result, const std::string & reason, void * /*data*/) @@ -77,6 +87,8 @@ bool GetServicesFunction(const SGCONF::CONFIG & config, { STG::SERVCONF proto(config.server.data(), config.port.data(), + config.localAddress.data(), + config.localPort.data(), config.userName.data(), config.userPass.data()); return proto.GetServices(GetServicesCallback, NULL) == STG::st_ok; @@ -88,6 +100,8 @@ bool GetServiceFunction(const SGCONF::CONFIG & config, { STG::SERVCONF proto(config.server.data(), config.port.data(), + config.localAddress.data(), + config.localPort.data(), config.userName.data(), config.userPass.data()); return proto.GetService(arg, GetServiceCallback, NULL) == STG::st_ok; @@ -99,6 +113,8 @@ bool DelServiceFunction(const SGCONF::CONFIG & config, { STG::SERVCONF proto(config.server.data(), config.port.data(), + config.localAddress.data(), + config.localPort.data(), config.userName.data(), config.userPass.data()); return proto.DelService(arg, SimpleCallback, NULL) == STG::st_ok; @@ -106,30 +122,49 @@ return proto.DelService(arg, SimpleCallback, NULL) == STG::st_ok; bool AddServiceFunction(const SGCONF::CONFIG & config, const std::string & arg, - const std::map<std::string, std::string> & /*options*/) + const std::map<std::string, std::string> & options) { -// TODO -std::cerr << "Unimplemented.\n"; -return false; +SERVICE_CONF_RES conf; +conf.name = arg; +SGCONF::MaybeSet(options, "cost", conf.cost); +SGCONF::MaybeSet(options, "pay-day", conf.payDay); +SGCONF::MaybeSet(options, "comment", conf.comment); +STG::SERVCONF proto(config.server.data(), + config.port.data(), + config.localAddress.data(), + config.localPort.data(), + config.userName.data(), + config.userPass.data()); +return proto.AddService(arg, conf, SimpleCallback, NULL) == STG::st_ok; } bool ChgServiceFunction(const SGCONF::CONFIG & config, const std::string & arg, const std::map<std::string, std::string> & options) { -// TODO -std::cerr << "Unimplemented.\n"; -return false; +SERVICE_CONF_RES conf; +conf.name = arg; +SGCONF::MaybeSet(options, "cost", conf.cost); +SGCONF::MaybeSet(options, "pay-day", conf.payDay); +SGCONF::MaybeSet(options, "comment", conf.comment); +STG::SERVCONF proto(config.server.data(), + config.port.data(), + config.localAddress.data(), + config.localPort.data(), + config.userName.data(), + config.userPass.data()); +return proto.ChgService(conf, SimpleCallback, NULL) == STG::st_ok; } } // namespace anonymous void SGCONF::AppendServicesOptionBlock(COMMANDS & commands, OPTION_BLOCKS & blocks) { +std::vector<API_ACTION::PARAM> params(GetServiceParams()); blocks.Add("Service management options") .Add("get-services", SGCONF::MakeAPIAction(commands, GetServicesFunction), "\tget service list") .Add("get-service", SGCONF::MakeAPIAction(commands, "<name>", GetServiceFunction), "get service") - .Add("add-service", SGCONF::MakeAPIAction(commands, "<name>", AddServiceFunction), "add service") - .Add("del-service", SGCONF::MakeAPIAction(commands, "<name>", DelServiceFunction), "del service") - .Add("chg-service", SGCONF::MakeAPIAction(commands, "<name>", ChgServiceFunction), "change service"); + .Add("add-service", SGCONF::MakeAPIAction(commands, "<name>", params, AddServiceFunction), "add service") + .Add("del-service", SGCONF::MakeAPIAction(commands, "<name>", DelServiceFunction), "delete service") + .Add("chg-service", SGCONF::MakeAPIAction(commands, "<name>", params, ChgServiceFunction), "change service"); }