kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Simplify parsing account-wide options

Browse source
This commit is contained in:
Eric Kotato 2020-08-05 17:45:20 +03:00
parent bff28e0d27
commit 92698b9f6b
1 changed files with 40 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
Telegram/SourceFiles/kotato/json_settings.cpp
View file

@ -88,6 +88,42 @@ bool ReadObjectOption(QJsonObject obj, QString key, std::function<void(QJsonObje
return (readValueResult && readResult);
}
bool ReadAccountObjectOption(QJsonObject obj, QString key, std::function<void(int, QJsonValue)> callback, std::function<bool(QJsonValue)> test) {
auto readResult = false;
auto readValueResult = ReadOption(obj, key, [&](QJsonValue v) {
if (!v.isObject()) {
return;
}
auto vObj = v.toObject();
if (vObj.isEmpty()) {
return;
}
bool isInt;
for (auto i = vObj.begin(), e = vObj.end(); i != e; ++i) {
if (!test(i.value())) {
continue;
}
auto key = i.key();
if (key.startsWith("test_")) {
key = key.mid(5).prepend("-");
}
auto account_id = key.toInt(&isInt, 10);
if (isInt) {
callback(account_id, i.value());
readResult = true;
}
}
});
return (readValueResult && readResult);
}
bool ReadArrayOption(QJsonObject obj, QString key, std::function<void(QJsonArray)> callback) {
auto readResult = false;
auto readValueResult = ReadOption(obj, key, [&](QJsonValue v) {
@ -467,30 +503,10 @@ bool Manager::readCustomFile() {
});
if (!isDefaultFilterRead) {
ReadObjectOption(o, "default", [&](auto f) {
if (f.empty()) {
return;
}
bool isInt;
for (auto i = f.begin(), e = f.end(); i != e; ++i) {
auto value = i.value().toInt(0);
if (value == 0) {
continue;
}
auto key = i.key();
if (key.startsWith("test_")) {
key = key.mid(5).prepend("-");
}
auto account_id = key.toInt(&isInt, 10);
if (isInt) {
SetDefaultFilterId(account_id, value);
}
}
ReadAccountObjectOption(o, "default", [&](auto account_id, auto value) {
SetDefaultFilterId(account_id, value.toInt(0));
}, [](auto v) {
return v.toInt(0) != 0;
});
}