Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-03 16:14:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve profile setup error messages (#3256)

Browse Source
This commit is contained in:
Alexandru Ionut Tripon 2025-03-02 08:18:40 +02:00 committed by GitHub
commit 74ed1f3b5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
launcher/ui/dialogs/ProfileSetupDialog.cpp
View File

@ -226,14 +226,17 @@ struct MojangError {
static MojangError fromJSON(QByteArray data) static MojangError fromJSON(QByteArray data)
{ {
MojangError out; MojangError out;
out.error = QString::fromUtf8(data); out.rawError = QString::fromUtf8(data);
auto doc = QJsonDocument::fromJson(data, &out.parseError); auto doc = QJsonDocument::fromJson(data, &out.parseError);
auto object = doc.object();
out.fullyParsed = true; out.fullyParsed = false;
out.fullyParsed &= Parsers::getString(object.value("path"), out.path); if (!out.parseError.error) {
out.fullyParsed &= Parsers::getString(object.value("error"), out.error); auto object = doc.object();
out.fullyParsed &= Parsers::getString(object.value("errorMessage"), out.errorMessage); out.fullyParsed = true;
out.fullyParsed &= Parsers::getString(object.value("path"), out.path);
out.fullyParsed &= Parsers::getString(object.value("error"), out.error);
out.fullyParsed &= Parsers::getString(object.value("errorMessage"), out.errorMessage);
}
return out; return out;
} }
@ -261,7 +264,21 @@ void ProfileSetupDialog::setupProfileFinished()
} else { } else {
auto parsedError = MojangError::fromJSON(*m_profile_response); auto parsedError = MojangError::fromJSON(*m_profile_response);
ui->errorLabel->setVisible(true); ui->errorLabel->setVisible(true);
ui->errorLabel->setText(tr("The server returned the following error:") + "\n\n" + parsedError.errorMessage);
QString errorMessage =
tr("Network Error: %1\nHTTP Status: %2").arg(m_profile_task->errorString(), QString::number(m_profile_task->replyStatusCode()));
if (parsedError.fullyParsed) {
errorMessage += "Path: " + parsedError.path + "\n";
errorMessage += "Error: " + parsedError.error + "\n";
errorMessage += "Message: " + parsedError.errorMessage + "\n";
} else {
errorMessage += "Failed to parse error from Mojang API: " + parsedError.parseError.errorString() + "\n";
errorMessage += "Log:\n" + parsedError.rawError + "\n";
}
ui->errorLabel->setText(tr("The server responded with the following error:") + "\n\n" + errorMessage);
qDebug() << parsedError.rawError; qDebug() << parsedError.rawError;
auto button = ui->buttonBox->button(QDialogButtonBox::Cancel); auto button = ui->buttonBox->button(QDialogButtonBox::Cancel);
button->setEnabled(true); button->setEnabled(true);