procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use old keys after template autoupdate (support).

This commit is contained in:
John Preston 2018-10-05 19:55:05 +03:00
parent a6b325f0d0
commit 052fabcae3
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Telegram/SourceFiles/support/support_templates.cpp
View File

@ -331,6 +331,15 @@ void ReplaceFileIndex(
} }
} }
void MoveKeys(TemplatesFile &to, const TemplatesFile &from) {
const auto &existing = from.questions;
for (auto &[normalized, question] : to.questions) {
if (const auto i = existing.find(normalized); i != end(existing)) {
question.keys = i->second.keys;
}
}
}
Delta ComputeDelta(const TemplatesFile &was, const TemplatesFile &now) { Delta ComputeDelta(const TemplatesFile &was, const TemplatesFile &now) {
auto result = Delta(); auto result = Delta();
for (const auto &[normalized, question] : now.questions) { for (const auto &[normalized, question] : now.questions) {
@ -522,12 +531,13 @@ void Templates::updateRequestFinished(QNetworkReply *reply) {
errors = std::move(result.errors), errors = std::move(result.errors),
index = std::move(index) index = std::move(index)
]() mutable { ]() mutable {
auto &existing = _data.files.at(path);
auto &parsed = one.files.at(path);
details::MoveKeys(parsed, existing);
details::ReplaceFileIndex(_index, details::ComputeIndex(one), path); details::ReplaceFileIndex(_index, details::ComputeIndex(one), path);
if (!errors.isEmpty()) { if (!errors.isEmpty()) {
_errors.fire(std::move(errors)); _errors.fire(std::move(errors));
} }
auto &existing = _data.files.at(path);
auto &parsed = one.files.at(path);
if (const auto delta = details::ComputeDelta(existing, parsed)) { if (const auto delta = details::ComputeDelta(existing, parsed)) {
const auto text = details::FormatUpdateNotification( const auto text = details::FormatUpdateNotification(
path, path,