redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-22 20:47:45 +00:00
Code Activity

Fix double patch visual bug when installing patches

Browse source
This commit is contained in:
Joshua Goins 2023-12-20 17:09:17 -05:00
parent 123d0ea6f7
commit dde85bbccf
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
launcher/src/patcher.cpp
View file

@ -141,7 +141,7 @@ QCoro::Task<bool> Patcher::patch(const PatchList &patchList)
} }
Q_EMIT m_launcher.stageChanged(i18n("Installing %1 - %2 [%3/%4]", repositoryName, patch.version, i++, m_remainingPatches)); Q_EMIT m_launcher.stageChanged(i18n("Installing %1 - %2 [%3/%4]", repositoryName, patch.version, i++, m_remainingPatches));
Q_EMIT m_launcher.stageDeterminate(0, static_cast<int>(m_patchQueue.size()), i++); Q_EMIT m_launcher.stageDeterminate(0, static_cast<int>(m_patchQueue.size()), i);
co_await QtConcurrent::run([this, patch] { co_await QtConcurrent::run([this, patch] {
processPatch(patch); processPatch(patch);
@ -158,7 +158,9 @@ void Patcher::processPatch(const QueuedPatch &patch)
auto f = QFile(patch.path); auto f = QFile(patch.path);
f.open(QIODevice::ReadOnly); f.open(QIODevice::ReadOnly);
Q_ASSERT(patch.length == f.size()); qDebug(ASTRA_PATCHER) << "Installing" << patch.path;
Q_ASSERT_X(patch.length == f.size(), "Patcher", "Patch length does not match sizeQ!");
const int parts = std::ceil(static_cast<double>(patch.length) / static_cast<double>(patch.hashBlockSize)); const int parts = std::ceil(static_cast<double>(patch.length) / static_cast<double>(patch.hashBlockSize));
@ -175,7 +177,7 @@ void Patcher::processPatch(const QueuedPatch &patch)
QCryptographicHash hash(QCryptographicHash::Sha1); QCryptographicHash hash(QCryptographicHash::Sha1);
hash.addData(block); hash.addData(block);
Q_ASSERT(QString::fromUtf8(hash.result().toHex()) == patch.hashes[i]); Q_ASSERT_X(QString::fromUtf8(hash.result().toHex()) == patch.hashes[i], "Patcher", "Patch hash does not match!");
} }
} }