CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: reformat

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu
2023-08-02 18:35:35 +02:00
parent ce2ca13815
commit 1d468ac35a
594 changed files with 16040 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
launcher/screenshots/ImgurAlbumCreation.cpp
View File

@ -36,15 +36,15 @@
#include "ImgurAlbumCreation.h"
#include <QNetworkRequest>
#include <QDebug>
#include <QJsonDocument>
#include <QJsonObject>
#include <QUrl>
#include <QNetworkRequest>
#include <QStringList>
#include <QDebug>
#include <QUrl>
#include "BuildConfig.h"
#include "Application.h"
#include "BuildConfig.h"
ImgurAlbumCreation::ImgurAlbumCreation(QList<ScreenShot::Ptr> screenshots) : NetAction(), m_screenshots(screenshots)
{
@ -62,19 +62,18 @@ void ImgurAlbumCreation::executeTask()
request.setRawHeader("Accept", "application/json");
QStringList hashes;
for (auto shot : m_screenshots)
{
for (auto shot : m_screenshots) {
hashes.append(shot->m_imgurDeleteHash);
}
const QByteArray data = "deletehashes=" + hashes.join(',').toUtf8() + "&title=Minecraft%20Screenshots&privacy=hidden";
QNetworkReply *rep = APPLICATION->network()->post(request, data);
QNetworkReply* rep = APPLICATION->network()->post(request, data);
m_reply.reset(rep);
connect(rep, &QNetworkReply::uploadProgress, this, &ImgurAlbumCreation::downloadProgress);
connect(rep, &QNetworkReply::finished, this, &ImgurAlbumCreation::downloadFinished);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
connect(rep, &QNetworkReply::errorOccurred, this, &ImgurAlbumCreation::downloadError);
#else
connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &ImgurAlbumCreation::downloadError);
@ -90,21 +89,18 @@ void ImgurAlbumCreation::downloadError(QNetworkReply::NetworkError error)
void ImgurAlbumCreation::downloadFinished()
{
if (m_state != State::Failed)
{
if (m_state != State::Failed) {
QByteArray data = m_reply->readAll();
m_reply.reset();
QJsonParseError jsonError;
QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
if (jsonError.error != QJsonParseError::NoError)
{
if (jsonError.error != QJsonParseError::NoError) {
qDebug() << jsonError.errorString();
emitFailed();
return;
}
auto object = doc.object();
if (!object.value("success").toBool())
{
if (!object.value("success").toBool()) {
qDebug() << doc.toJson();
emitFailed();
return;
@ -114,9 +110,7 @@ void ImgurAlbumCreation::downloadFinished()
m_state = State::Succeeded;
emit succeeded();
return;
}
else
{
} else {
qDebug() << m_reply->readAll();
m_reply.reset();
emitFailed();

25
launcher/screenshots/ImgurAlbumCreation.h
View File

@ -35,40 +35,31 @@
#pragma once
#include "net/NetAction.h"
#include "Screenshot.h"
#include "net/NetAction.h"
typedef shared_qobject_ptr<class ImgurAlbumCreation> ImgurAlbumCreationPtr;
class ImgurAlbumCreation : public NetAction
{
public:
class ImgurAlbumCreation : public NetAction {
public:
explicit ImgurAlbumCreation(QList<ScreenShot::Ptr> screenshots);
static ImgurAlbumCreationPtr make(QList<ScreenShot::Ptr> screenshots)
{
return ImgurAlbumCreationPtr(new ImgurAlbumCreation(screenshots));
}
QString deleteHash() const
{
return m_deleteHash;
}
QString id() const
{
return m_id;
}
QString deleteHash() const { return m_deleteHash; }
QString id() const { return m_id; }
protected
slots:
protected slots:
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
void downloadError(QNetworkReply::NetworkError error) override;
void downloadFinished() override;
void downloadReadyRead() override {}
public
slots:
public slots:
void executeTask() override;
private:
private:
QList<ScreenShot::Ptr> m_screenshots;
QString m_deleteHash;

31
launcher/screenshots/ImgurUpload.cpp
View File

@ -35,17 +35,17 @@
*/
#include "ImgurUpload.h"
#include "BuildConfig.h"
#include "Application.h"
#include "BuildConfig.h"
#include <QNetworkRequest>
#include <QDebug>
#include <QFile>
#include <QHttpMultiPart>
#include <QHttpPart>
#include <QJsonDocument>
#include <QJsonObject>
#include <QHttpPart>
#include <QFile>
#include <QNetworkRequest>
#include <QUrl>
#include <QDebug>
ImgurUpload::ImgurUpload(ScreenShot::Ptr shot) : NetAction(), m_shot(shot)
{
@ -63,13 +63,12 @@ void ImgurUpload::executeTask()
request.setRawHeader("Accept", "application/json");
QFile f(m_shot->m_file.absoluteFilePath());
if (!f.open(QFile::ReadOnly))
{
if (!f.open(QFile::ReadOnly)) {
emitFailed();
return;
}
QHttpMultiPart *multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
QHttpMultiPart* multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
QHttpPart filePart;
filePart.setBody(f.readAll().toBase64());
filePart.setHeader(QNetworkRequest::ContentTypeHeader, "image/png");
@ -84,12 +83,12 @@ void ImgurUpload::executeTask()
namePart.setBody(m_shot->m_file.baseName().toUtf8());
multipart->append(namePart);
QNetworkReply *rep = m_network->post(request, multipart);
QNetworkReply* rep = m_network->post(request, multipart);
m_reply.reset(rep);
connect(rep, &QNetworkReply::uploadProgress, this, &ImgurUpload::downloadProgress);
connect(rep, &QNetworkReply::finished, this, &ImgurUpload::downloadFinished);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) // QNetworkReply::errorOccurred added in 5.15
connect(rep, &QNetworkReply::errorOccurred, this, &ImgurUpload::downloadError);
#else
connect(rep, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &ImgurUpload::downloadError);
@ -100,8 +99,7 @@ void ImgurUpload::executeTask()
void ImgurUpload::downloadError(QNetworkReply::NetworkError error)
{
qCritical() << "ImgurUpload failed with error" << m_reply->errorString() << "Server reply:\n" << m_reply->readAll();
if(finished)
{
if (finished) {
qCritical() << "Double finished ImgurUpload!";
return;
}
@ -113,8 +111,7 @@ void ImgurUpload::downloadError(QNetworkReply::NetworkError error)
void ImgurUpload::downloadFinished()
{
if(finished)
{
if (finished) {
qCritical() << "Double finished ImgurUpload!";
return;
}
@ -122,8 +119,7 @@ void ImgurUpload::downloadFinished()
m_reply.reset();
QJsonParseError jsonError;
QJsonDocument doc = QJsonDocument::fromJson(data, &jsonError);
if (jsonError.error != QJsonParseError::NoError)
{
if (jsonError.error != QJsonParseError::NoError) {
qDebug() << "imgur server did not reply with JSON" << jsonError.errorString();
finished = true;
m_reply.reset();
@ -131,8 +127,7 @@ void ImgurUpload::downloadFinished()
return;
}
auto object = doc.object();
if (!object.value("success").toBool())
{
if (!object.value("success").toBool()) {
qDebug() << "Screenshot upload not successful:" << doc.toJson();
finished = true;
m_reply.reset();

16
launcher/screenshots/ImgurUpload.h
View File

@ -35,30 +35,26 @@
#pragma once
#include "net/NetAction.h"
#include "Screenshot.h"
#include "net/NetAction.h"
class ImgurUpload : public NetAction {
public:
public:
using Ptr = shared_qobject_ptr<ImgurUpload>;
explicit ImgurUpload(ScreenShot::Ptr shot);
static Ptr make(ScreenShot::Ptr shot) {
return Ptr(new ImgurUpload(shot));
}
static Ptr make(ScreenShot::Ptr shot) { return Ptr(new ImgurUpload(shot)); }
protected
slots:
protected slots:
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
void downloadError(QNetworkReply::NetworkError error) override;
void downloadFinished() override;
void downloadReadyRead() override {}
public
slots:
public slots:
void executeTask() override;
private:
private:
ScreenShot::Ptr m_shot;
bool finished = true;
};

6
launcher/screenshots/Screenshot.h
View File

@ -1,16 +1,14 @@
#pragma once
#include <QDateTime>
#include <QString>
#include <QFileInfo>
#include <QString>
#include <memory>
struct ScreenShot {
using Ptr = std::shared_ptr<ScreenShot>;
ScreenShot(QFileInfo file) {
m_file = file;
}
ScreenShot(QFileInfo file) { m_file = file; }
QFileInfo m_file;
QString m_url;
QString m_imgurId;