3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-16 08:06:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

added Group entity

Browse source
This commit is contained in:
badaix 2016-11-30 17:40:52 +01:00
parent db2b5e06a3
commit 7272be0d1b
3 changed files with 108 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

53
server/config.cpp
View file

@ -51,16 +51,14 @@ Config::Config()
ifs >> j;
if (j.count("ConfigVersion"))
{
json jClient = j["Client"];
for (auto it = jClient.begin(); it != jClient.end(); ++it)
json jGroups = j["Groups"];
for (auto it = jGroups.begin(); it != jGroups.end(); ++it)
{
ClientInfoPtr client = make_shared<ClientInfo>();
client->fromJson(*it);
if (client->clientId.empty() || getClientInfo(client->clientId))
continue;
client->connected = false;
clients.push_back(client);
GroupPtr group = make_shared<Group>();
group->fromJson(*it);
// if (client->clientId.empty() || getClientInfo(client->clientId))
// continue;
groups.push_back(group);
}
}
}
@ -82,8 +80,8 @@ void Config::save()
{
std::ofstream ofs(filename_.c_str(), std::ofstream::out|std::ofstream::trunc);
json clients = {
{"ConfigVersion", 1},
{"Client", getClientInfos()}
{"ConfigVersion", 2},
{"Groups", getGroups()}
};
ofs << std::setw(4) << clients;
ofs.close();
@ -118,6 +116,26 @@ ClientInfoPtr Config::addClientInfo(const std::string& clientId)
}
GroupPtr Config::getGroup(ClientInfoPtr client)
{
for (auto group: groups)
{
for (auto c: group->clients)
{
if (c->clientId == client->clientId)
return group;
}
}
GroupPtr group = std::make_shared<Group>();
group->id = generateUUID();
group->clients.push_back(client);
groups.push_back(group);
return group;
}
json Config::getServerStatus(const std::string& clientId, const json& streams) const
{
json jClient = json::array();
@ -156,8 +174,21 @@ json Config::getClientInfos() const
}
json Config::getGroups() const
{
json result = json::array();
for (auto group: groups)
result.push_back(group->toJson());
return result;
}
void Config::remove(ClientInfoPtr client)
{
auto group = getGroup(client);
if (group->clients.size() == 1)
groups.erase(std::remove(groups.begin(), groups.end(), group), groups.end());
clients.erase(std::remove(clients.begin(), clients.end(), client), clients.end());
}