dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: paste upload to report the error directly

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-05-07 10:12:46 +03:00
parent c3749c4fdc
commit de541bf397
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
3 changed files with 74 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

101
launcher/net/PasteUpload.cpp
View file

@ -36,6 +36,7 @@
*/ */
#include "PasteUpload.h" #include "PasteUpload.h"
#include <qobject.h>
#include <QHttpPart> #include <QHttpPart>
#include <QJsonArray> #include <QJsonArray>
@ -99,86 +100,101 @@ QNetworkReply* PasteUpload::getReply(QNetworkRequest& request)
return nullptr; return nullptr;
}; };
auto PasteUpload::Sink::init(QNetworkRequest&) -> Task::State auto PasteUpload::Sink::finalize(QNetworkReply& reply) -> Task::State
{ {
m_output.clear(); if (!finalizeAllValidators(reply)) {
return Task::State::Running; m_fail_reason = "Failed to finalize validators";
}; return Task::State::Failed;
}
int statusCode = reply.attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
auto PasteUpload::Sink::write(QByteArray& data) -> Task::State if (reply.error() != QNetworkReply::NetworkError::NoError) {
{ m_fail_reason = QObject::tr("Network error: %1").arg(reply.errorString());
m_output.append(data); return Task::State::Failed;
return Task::State::Running; } else if (statusCode != 200 && statusCode != 201) {
} QString reasonPhrase = reply.attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString();
m_fail_reason =
QObject::tr("Error: %1 returned unexpected status code %2 %3").arg(m_d->url().toString()).arg(statusCode).arg(reasonPhrase);
return Task::State::Failed;
}
auto PasteUpload::Sink::abort() -> Task::State switch (m_d->m_paste_type) {
{
m_output.clear();
return Task::State::Failed;
}
auto PasteUpload::Sink::finalize(QNetworkReply&) -> Task::State
{
switch (m_paste_type) {
case PasteUpload::NullPointer: case PasteUpload::NullPointer:
m_result->link = QString::fromUtf8(m_output).trimmed(); m_d->m_pasteLink = QString::fromUtf8(*m_output).trimmed();
break; break;
case PasteUpload::Hastebin: { case PasteUpload::Hastebin: {
QJsonParseError jsonError; QJsonParseError jsonError;
auto doc = QJsonDocument::fromJson(m_output, &jsonError); auto doc = QJsonDocument::fromJson(*m_output, &jsonError);
if (jsonError.error != QJsonParseError::NoError) { if (jsonError.error != QJsonParseError::NoError) {
qDebug() << "hastebin server did not reply with JSON" << jsonError.errorString(); qDebug() << "hastebin server did not reply with JSON" << jsonError.errorString();
m_fail_reason =
QObject::tr("Failed to parse response from hastebin server: expected JSON but got an invalid response. Error: %1")
.arg(jsonError.errorString());
return Task::State::Failed; return Task::State::Failed;
} }
auto obj = doc.object(); auto obj = doc.object();
if (obj.contains("key") && obj["key"].isString()) { if (obj.contains("key") && obj["key"].isString()) {
QString key = doc.object()["key"].toString(); QString key = doc.object()["key"].toString();
m_result->link = m_base_url + "/" + key; m_d->m_pasteLink = m_d->m_baseUrl + "/" + key;
} else { } else {
qDebug() << "Log upload failed:" << doc.toJson(); qDebug() << "Log upload failed:" << doc.toJson();
m_fail_reason = QObject::tr("Error: %1 returned a malformed response body").arg(m_d->url().toString());
return Task::State::Failed; return Task::State::Failed;
} }
break; break;
} }
case PasteUpload::Mclogs: { case PasteUpload::Mclogs: {
QJsonParseError jsonError; QJsonParseError jsonError;
auto doc = QJsonDocument::fromJson(m_output, &jsonError); auto doc = QJsonDocument::fromJson(*m_output, &jsonError);
if (jsonError.error != QJsonParseError::NoError) { if (jsonError.error != QJsonParseError::NoError) {
qDebug() << "mclogs server did not reply with JSON" << jsonError.errorString(); qDebug() << "mclogs server did not reply with JSON" << jsonError.errorString();
m_fail_reason =
QObject::tr("Failed to parse response from mclogs server: expected JSON but got an invalid response. Error: %1")
.arg(jsonError.errorString());
return Task::State::Failed; return Task::State::Failed;
} }
auto obj = doc.object(); auto obj = doc.object();
if (obj.contains("success") && obj["success"].isBool()) { if (obj.contains("success") && obj["success"].isBool()) {
bool success = obj["success"].toBool(); bool success = obj["success"].toBool();
if (success) { if (success) {
m_result->link = obj["url"].toString(); m_d->m_pasteLink = obj["url"].toString();
} else { } else {
m_result->error = obj["error"].toString(); QString error = obj["error"].toString();
m_fail_reason = QObject::tr("Error: %1 returned an error: %2").arg(m_d->url().toString(), error);
return Task::State::Failed;
} }
} else { } else {
qDebug() << "Log upload failed:" << doc.toJson(); qDebug() << "Log upload failed:" << doc.toJson();
m_fail_reason = QObject::tr("Error: %1 returned a malformed response body").arg(m_d->url().toString());
return Task::State::Failed; return Task::State::Failed;
} }
break; break;
} }
case PasteUpload::PasteGG: case PasteUpload::PasteGG:
QJsonParseError jsonError; QJsonParseError jsonError;
auto doc = QJsonDocument::fromJson(m_output, &jsonError); auto doc = QJsonDocument::fromJson(*m_output, &jsonError);
if (jsonError.error != QJsonParseError::NoError) { if (jsonError.error != QJsonParseError::NoError) {
qDebug() << "pastegg server did not reply with JSON" << jsonError.errorString(); qDebug() << "pastegg server did not reply with JSON" << jsonError.errorString();
m_fail_reason =
QObject::tr("Failed to parse response from pasteGG server: expected JSON but got an invalid response. Error: %1")
.arg(jsonError.errorString());
return Task::State::Failed; return Task::State::Failed;
} }
auto obj = doc.object(); auto obj = doc.object();
if (obj.contains("status") && obj["status"].isString()) { if (obj.contains("status") && obj["status"].isString()) {
QString status = obj["status"].toString(); QString status = obj["status"].toString();
if (status == "success") { if (status == "success") {
m_result->link = m_base_url + "/p/anonymous/" + obj["result"].toObject()["id"].toString(); m_d->m_pasteLink = m_d->m_baseUrl + "/p/anonymous/" + obj["result"].toObject()["id"].toString();
} else { } else {
m_result->error = obj["error"].toString(); QString error = obj["error"].toString();
m_result->extra_message = (obj.contains("message") && obj["message"].isString()) ? obj["message"].toString() : "none"; QString message = (obj.contains("message") && obj["message"].isString()) ? obj["message"].toString() : "none";
m_fail_reason =
QObject::tr("Error: %1 returned an error code: %2\nError message: %3").arg(m_d->url().toString(), error, message);
return Task::State::Failed;
} }
} else { } else {
qDebug() << "Log upload failed:" << doc.toJson(); qDebug() << "Log upload failed:" << doc.toJson();
m_fail_reason = QObject::tr("Error: %1 returned a malformed response body").arg(m_d->url().toString());
return Task::State::Failed; return Task::State::Failed;
} }
break; break;
@ -186,23 +202,18 @@ auto PasteUpload::Sink::finalize(QNetworkReply&) -> Task::State
return Task::State::Succeeded; return Task::State::Succeeded;
} }
Net::NetRequest::Ptr PasteUpload::make(const QString& log, PasteUpload::PasteType pasteType, QString customBaseURL, ResultPtr result) PasteUpload::PasteUpload(const QString& log, QString url, PasteType pasteType) : m_log(log), m_baseUrl(url), m_paste_type(pasteType)
{
auto base = PasteUpload::PasteTypes.at(pasteType);
QString baseUrl = customBaseURL.isEmpty() ? base.defaultBase : customBaseURL;
auto up = makeShared<PasteUpload>(log, pasteType);
// HACK: Paste's docs say the standard API path is at /api/<version> but the official instance paste.gg doesn't follow that??
if (pasteType == PasteUpload::PasteGG && baseUrl == base.defaultBase)
up->m_url = "https://api.paste.gg/v1/pastes";
else
up->m_url = baseUrl + base.endpointPath;
up->m_sink.reset(new Sink(pasteType, baseUrl, result));
return up;
}
PasteUpload::PasteUpload(const QString& log, PasteType pasteType) : m_log(log), m_paste_type(pasteType)
{ {
anonymizeLog(m_log); anonymizeLog(m_log);
auto base = PasteUpload::PasteTypes.at(pasteType);
if (m_baseUrl.isEmpty())
m_baseUrl = base.defaultBase;
// HACK: Paste's docs say the standard API path is at /api/<version> but the official instance paste.gg doesn't follow that??
if (pasteType == PasteUpload::PasteGG && m_baseUrl == base.defaultBase)
m_url = "https://api.paste.gg/v1/pastes";
else
m_url = m_baseUrl + base.endpointPath;
m_sink.reset(new Sink(this));
} }

30
launcher/net/PasteUpload.h
View file

@ -35,6 +35,7 @@
#pragma once #pragma once
#include "net/ByteArraySink.h"
#include "net/NetRequest.h" #include "net/NetRequest.h"
#include "tasks/Task.h" #include "tasks/Task.h"
@ -67,40 +68,29 @@ class PasteUpload : public Net::NetRequest {
}; };
static const std::array<PasteTypeInfo, 4> PasteTypes; static const std::array<PasteTypeInfo, 4> PasteTypes;
struct Result {
QString link;
QString error;
QString extra_message;
};
using ResultPtr = std::shared_ptr<Result>; class Sink : public Net::ByteArraySink {
class Sink : public Net::Sink {
public: public:
Sink(const PasteType pasteType, const QString base_url, ResultPtr result) Sink(PasteUpload* p) : Net::ByteArraySink(std::make_shared<QByteArray>()), m_d(p) {};
: m_paste_type(pasteType), m_base_url(base_url), m_result(result) {};
virtual ~Sink() = default; virtual ~Sink() = default;
public: public:
auto init(QNetworkRequest& request) -> Task::State override;
auto write(QByteArray& data) -> Task::State override;
auto abort() -> Task::State override;
auto finalize(QNetworkReply& reply) -> Task::State override; auto finalize(QNetworkReply& reply) -> Task::State override;
auto hasLocalData() -> bool override { return false; }
private: private:
const PasteType m_paste_type; PasteUpload* m_d;
const QString m_base_url;
ResultPtr m_result;
QByteArray m_output;
}; };
PasteUpload(const QString& log, PasteType pasteType); friend Sink;
PasteUpload(const QString& log, QString url, PasteType pasteType);
virtual ~PasteUpload() = default; virtual ~PasteUpload() = default;
static NetRequest::Ptr make(const QString& log, PasteType pasteType, QString baseURL, ResultPtr result); QString pasteLink() { return m_pasteLink; }
private: private:
virtual QNetworkReply* getReply(QNetworkRequest&) override; virtual QNetworkReply* getReply(QNetworkRequest&) override;
QString m_log; QString m_log;
QString m_pasteLink;
QString m_baseUrl;
const PasteType m_paste_type; const PasteType m_paste_type;
}; };

23
launcher/ui/GuiUtil.cpp
View file

@ -43,11 +43,10 @@
#include <QFileDialog> #include <QFileDialog>
#include <QStandardPaths> #include <QStandardPaths>
#include <memory>
#include "FileSystem.h" #include "FileSystem.h"
#include "logs/AnonymizeLog.h" #include "logs/AnonymizeLog.h"
#include "net/NetJob.h" #include "net/NetJob.h"
#include "net/NetRequest.h"
#include "net/PasteUpload.h" #include "net/PasteUpload.h"
#include "ui/dialogs/CustomMessageBox.h" #include "ui/dialogs/CustomMessageBox.h"
#include "ui/dialogs/ProgressDialog.h" #include "ui/dialogs/ProgressDialog.h"
@ -134,10 +133,10 @@ std::optional<QString> GuiUtil::uploadPaste(const QString& name, const QString&
textToUpload = truncateLogForMclogs(text); textToUpload = truncateLogForMclogs(text);
} }
auto result = std::make_shared<PasteUpload::Result>();
auto job = NetJob::Ptr(new NetJob("Log Upload", APPLICATION->network())); auto job = NetJob::Ptr(new NetJob("Log Upload", APPLICATION->network()));
job->addNetAction(PasteUpload::make(textToUpload, pasteType, baseURL, result)); auto pasteJob = new PasteUpload(textToUpload, baseURL, pasteType);
job->addNetAction(Net::NetRequest::Ptr(pasteJob));
QObject::connect(job.get(), &Task::failed, [parentWidget](QString reason) { QObject::connect(job.get(), &Task::failed, [parentWidget](QString reason) {
CustomMessageBox::selectable(parentWidget, QObject::tr("Failed to upload logs!"), reason, QMessageBox::Critical)->show(); CustomMessageBox::selectable(parentWidget, QObject::tr("Failed to upload logs!"), reason, QMessageBox::Critical)->show();
}); });
@ -148,27 +147,19 @@ std::optional<QString> GuiUtil::uploadPaste(const QString& name, const QString&
}); });
if (dialog.execWithTask(job.get()) == QDialog::Accepted) { if (dialog.execWithTask(job.get()) == QDialog::Accepted) {
if (!result->error.isEmpty() || !result->extra_message.isEmpty()) { if (pasteJob->pasteLink().isEmpty()) {
QString message = QObject::tr("Error: %1").arg(result->error);
if (!result->extra_message.isEmpty()) {
message += QObject::tr("\nError message: %1").arg(result->extra_message);
}
CustomMessageBox::selectable(parentWidget, QObject::tr("Failed to upload logs!"), message, QMessageBox::Critical)->show();
return {};
}
if (result->link.isEmpty()) {
CustomMessageBox::selectable(parentWidget, QObject::tr("Failed to upload logs!"), "The upload link is empty", CustomMessageBox::selectable(parentWidget, QObject::tr("Failed to upload logs!"), "The upload link is empty",
QMessageBox::Critical) QMessageBox::Critical)
->show(); ->show();
return {}; return {};
} }
setClipboardText(result->link); setClipboardText(pasteJob->pasteLink());
CustomMessageBox::selectable( CustomMessageBox::selectable(
parentWidget, QObject::tr("Upload finished"), parentWidget, QObject::tr("Upload finished"),
QObject::tr("The <a href=\"%1\">link to the uploaded log</a> has been placed in your clipboard.").arg(result->link), QObject::tr("The <a href=\"%1\">link to the uploaded log</a> has been placed in your clipboard.").arg(pasteJob->pasteLink()),
QMessageBox::Information) QMessageBox::Information)
->exec(); ->exec();
return result->link; return pasteJob->pasteLink();
} }
return {}; return {};
} }