redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-21 04:07:46 +00:00
Code Activity

Bubble up patching errors to the UI

Browse source 
It was asserting before and is very, very annoying to debug (I keep
having to do it today.) The errenous patch files are now deleted, too.
This commit is contained in:
Joshua Goins 2024-06-27 22:27:21 -04:00
parent 7db671b1af
commit ed35e95f9e
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
launcher/src/patcher.cpp
View file

@ -100,6 +100,11 @@ QCoro::Task<bool> Patcher::patch(const PatchList &patchList)
m_patchQueue[ourIndex] = queuedPatch; m_patchQueue[ourIndex] = queuedPatch;
if (!QFile::exists(patchPath)) { if (!QFile::exists(patchPath)) {
// make sure to remove any previous attempts
if (QFile::exists(tempPatchPath)) {
QFile::remove(tempPatchPath);
}
const auto patchRequest = QNetworkRequest(QUrl(patch.url)); const auto patchRequest = QNetworkRequest(QUrl(patch.url));
Utility::printRequest(QStringLiteral("GET"), patchRequest); Utility::printRequest(QStringLiteral("GET"), patchRequest);
@ -168,7 +173,12 @@ void Patcher::processPatch(const QueuedPatch &patch)
qDebug(ASTRA_PATCHER) << "Installing" << patch.path; qDebug(ASTRA_PATCHER) << "Installing" << patch.path;
Q_ASSERT_X(patch.length == f.size(), "Patcher", "Patch length does not match size!"); if (patch.length != f.size()) {
f.remove();
qFatal(ASTRA_PATCHER) << patch.path << "has the wrong size.";
Q_EMIT m_launcher.miscError(i18n("Patch %1 is the wrong size. The downloaded patch has been discarded, please log in again.", patch.name));
return;
}
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));
@ -185,14 +195,26 @@ void Patcher::processPatch(const QueuedPatch &patch)
QCryptographicHash hash(QCryptographicHash::Sha1); QCryptographicHash hash(QCryptographicHash::Sha1);
hash.addData(block); hash.addData(block);
Q_ASSERT_X(QString::fromUtf8(hash.result().toHex()) == patch.hashes[i], "Patcher", "Patch hash does not match!"); if (QString::fromUtf8(hash.result().toHex()) != patch.hashes[i]) {
f.remove();
qFatal(ASTRA_PATCHER) << patch.path << "failed the hash check.";
Q_EMIT m_launcher.miscError(i18n("Patch %1 failed the hash check. The downloaded patch has been discarded, please log in again.", patch.name));
return;
}
} }
} }
bool res;
if (isBoot()) { if (isBoot()) {
physis_bootdata_apply_patch(m_bootData, patch.path.toStdString().c_str()); res = physis_bootdata_apply_patch(m_bootData, patch.path.toStdString().c_str());
} else { } else {
physis_gamedata_apply_patch(m_gameData, patch.path.toStdString().c_str()); res = physis_gamedata_apply_patch(m_gameData, patch.path.toStdString().c_str());
}
if (!res) {
qFatal(ASTRA_PATCHER) << "Failed to install" << patch.path << "to" << (isBoot() ? QStringLiteral("boot") : patch.repository);
Q_EMIT m_launcher.miscError(i18n("Patch %1 failed to apply. The game is now in an invalid state and must be immediately repaired."));
return;
} }
qDebug(ASTRA_PATCHER) << "Installed" << patch.path << "to" << (isBoot() ? QStringLiteral("boot") : patch.repository); qDebug(ASTRA_PATCHER) << "Installed" << patch.path << "to" << (isBoot() ? QStringLiteral("boot") : patch.repository);