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

Screenshot fixes, move some code around, fix some stuff

Browse Source
This commit is contained in:
Jan Dalheimer
2014-02-24 09:34:21 +01:00
parent 5e33da258c
commit 226c1bdae5
11 changed files with 91 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
logic/lists/ScreenshotList.cpp
View File

@ -1,6 +1,6 @@
#include "ScreenshotList.h"
#include "QDir"
#include "QIcon"
#include <QDir>
#include <QIcon>
ScreenshotList::ScreenshotList(BaseInstance *instance, QObject *parent)
: QAbstractListModel(parent), m_instance(instance)
@ -39,7 +39,7 @@ QVariant ScreenshotList::headerData(int section, Qt::Orientation orientation, in
Qt::ItemFlags ScreenshotList::flags(const QModelIndex &index) const
{
return Qt::ItemIsSelectable;
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
}
Task *ScreenshotList::load()

26
logic/net/ScreenshotUploader.cpp
View File

@ -1,5 +1,5 @@
#include "ScreenshotUploader.h"
#include "logic/lists/ScreenshotList.h"
#include <QNetworkRequest>
#include <QHttpMultiPart>
#include <QJsonDocument>
@ -7,11 +7,13 @@
#include <QHttpPart>
#include <QFile>
#include <QUrl>
#include "logic/lists/ScreenshotList.h"
#include "URLConstants.h"
#include "MultiMC.h"
#include "logger/QsLog.h"
ScreenShotUpload::ScreenShotUpload(ScreenShot *shot) : m_shot(shot)
ScreenShotUpload::ScreenShotUpload(ScreenShot *shot) : NetAction(), m_shot(shot)
{
m_url = URLConstants::IMGUR_UPLOAD_URL;
m_status = Job_NotStarted;
@ -26,9 +28,16 @@ void ScreenShotUpload::start()
request.setRawHeader("Authorization", "Client-ID 5b97b0713fba4a3");
request.setRawHeader("Accept", "application/json");
QFile f(m_shot->file);
if (!f.open(QFile::ReadOnly))
{
emit failed(m_index_within_job);
return;
}
QHttpMultiPart *multipart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
QHttpPart filePart;
filePart.setBody(QFile(m_shot->file).readAll().toBase64());
filePart.setBody(f.readAll().toBase64());
filePart.setHeader(QNetworkRequest::ContentTypeHeader, "image/png");
filePart.setHeader(QNetworkRequest::ContentDispositionHeader, "form-data; name=\"image\"");
multipart->append(filePart);
@ -45,12 +54,10 @@ void ScreenShotUpload::start()
QNetworkReply *rep = worker->post(request, multipart);
m_reply = std::shared_ptr<QNetworkReply>(rep);
connect(rep, SIGNAL(downloadProgress(qint64, qint64)),
SLOT(downloadProgress(qint64, qint64)));
connect(rep, SIGNAL(finished()), SLOT(downloadFinished()));
connect(rep, &QNetworkReply::uploadProgress, this, &ScreenShotUpload::downloadProgress);
connect(rep, &QNetworkReply::finished, this, &ScreenShotUpload::downloadFinished);
connect(rep, SIGNAL(error(QNetworkReply::NetworkError)),
SLOT(downloadError(QNetworkReply::NetworkError)));
connect(rep, SIGNAL(readyRead()), SLOT(downloadReadyRead()));
}
void ScreenShotUpload::downloadError(QNetworkReply::NetworkError error)
{
@ -86,6 +93,7 @@ void ScreenShotUpload::downloadFinished()
}
else
{
QLOG_DEBUG() << m_reply->readAll();
m_reply.reset();
emit failed(m_index_within_job);
return;
@ -97,7 +105,3 @@ void ScreenShotUpload::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
m_progress = bytesReceived;
emit progress(m_index_within_job, bytesReceived, bytesTotal);
}
void ScreenShotUpload::downloadReadyRead()
{
// noop
}

4
logic/net/ScreenshotUploader.h
View File

@ -18,7 +18,9 @@ slots:
virtual void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
virtual void downloadError(QNetworkReply::NetworkError error);
virtual void downloadFinished();
virtual void downloadReadyRead();
virtual void downloadReadyRead()
{
}
public
slots: