diff --git a/backends/libcommuni/main.cpp b/backends/libcommuni/main.cpp index c059714cabf20e0c10b2f37fce646fa80b04589f..4509b9af50c331305afe5906692f594260293ff5 100644 --- a/backends/libcommuni/main.cpp +++ b/backends/libcommuni/main.cpp @@ -27,63 +27,24 @@ int main (int argc, char* argv[]) { std::string host; int port; - - std::string configFile; - boost::program_options::variables_map vm; - boost::program_options::options_description desc("Usage: spectrum \nAllowed options"); - desc.add_options() - ("help", "help") - ("host,h", boost::program_options::value(&host)->default_value(""), "Host to connect to") - ("port,p", boost::program_options::value(&port)->default_value(10000), "Port to connect to") - ("config", boost::program_options::value(&configFile)->default_value(""), "Config file") - ; - - try - { - boost::program_options::positional_options_description p; - p.add("config", -1); - boost::program_options::store(boost::program_options::command_line_parser(argc, argv). - options(desc).positional(p).allow_unregistered().run(), vm); - boost::program_options::notify(vm); - - if(vm.count("help")) - { - std::cout << desc << "\n"; - return 1; - } - - if(vm.count("config") == 0) { - std::cout << desc << "\n"; - return 1; - } - } - catch (std::runtime_error& e) - { - std::cout << desc << "\n"; - return 1; - } - catch (...) - { - std::cout << desc << "\n"; + std::string error; + Config *cfg = Config::createFromArgs(argc, argv, error, host, port); + if (cfg == NULL) { + std::cerr << error; return 1; } - Config config(argc, argv); - if (!config.load(configFile)) { - std::cerr << "Can't open " << argv[1] << " configuration file.\n"; - return 1; - } QCoreApplication app(argc, argv); - Logging::initBackendLogging(&config); + Logging::initBackendLogging(cfg); Swift::QtEventLoop eventLoop; - if (!CONFIG_HAS_KEY(&config, "service.irc_server")) { - np = new IRCNetworkPlugin(&config, &eventLoop, host, port); + if (!CONFIG_HAS_KEY(cfg, "service.irc_server")) { + np = new IRCNetworkPlugin(cfg, &eventLoop, host, port); } else { - np = new SingleIRCNetworkPlugin(&config, &eventLoop, host, port); + np = new SingleIRCNetworkPlugin(cfg, &eventLoop, host, port); } return app.exec();