stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Working variable

Browse source
This commit is contained in:
HanzZ 2011-10-28 08:55:47 +02:00
parent 0cd6ed8502
commit 347ed28618
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
backends/libpurple/main.cpp
View file

@ -69,6 +69,20 @@ class SpectrumNetworkPlugin;
GKeyFile *keyfile;
SpectrumNetworkPlugin *np;
std::string replaceAll(
std::string result,
const std::string& replaceWhat,
const std::string& replaceWithWhat)
{
while(1)
{
const int pos = result.find(replaceWhat);
if (pos==-1) break;
result.replace(pos,replaceWhat.size(),replaceWithWhat);
}
return result;
}
static std::string KEYFILE_STRING(const std::string &cat, const std::string &key, const std::string &def = "") {
gchar *str = g_key_file_get_string(keyfile, cat.c_str(), key.c_str(), 0);
if (!str) {
@ -83,6 +97,11 @@ static std::string KEYFILE_STRING(const std::string &cat, const std::string &key
ret.erase(ret.end() - 1);
}
}
if (ret.find("$jid") != std::string::npos) {
std::string jid = KEYFILE_STRING("service", "jid");
ret = replaceAll(ret, "$jid", jid);
}
return ret;
}

14
src/config.cpp
View file

@ -60,8 +60,8 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
("service.group", value<std::string>()->default_value(""), "The name of group Spectrum runs as.")
("service.backend", value<std::string>()->default_value("libpurple_backend"), "Backend")
("service.protocol", value<std::string>()->default_value(""), "Protocol")
("service.pidfile", value<std::string>()->default_value("/var/run/spectrum2/spectrum2.pid"), "Full path to pid file")
("service.working_dir", value<std::string>()->default_value("/var/lib/spectrum2"), "Working dir")
("service.pidfile", value<std::string>()->default_value("/var/run/spectrum2/$jid.pid"), "Full path to pid file")
("service.working_dir", value<std::string>()->default_value("/var/lib/spectrum2/$jid"), "Working dir")
("service.allowed_servers", value<std::string>()->default_value(""), "Only users from these servers can connect")
("service.server_mode", value<bool>()->default_value(false), "True if Spectrum should behave as server")
("service.users_per_backend", value<int>()->default_value(100), "Number of users per one legacy network backend")
@ -101,10 +101,20 @@ bool Config::load(std::istream &ifs, boost::program_options::options_description
parsed_options parsed = parse_config_file(ifs, opts, true);
std::string jid = "";
BOOST_FOREACH(option opt, parsed.options) {
if (opt.string_key == "service.jid") {
jid = opt.value[0];
}
}
BOOST_FOREACH(option &opt, parsed.options) {
if (opt.unregistered) {
m_unregistered[opt.string_key] = opt.value[0];
}
else if (opt.value[0].find("$jid") != std::string::npos) {
boost::replace_all(opt.value[0], "$jid", jid);
}
}
store(parsed, m_variables);