chatterino2
Code Issues

load cache files async

Browse Source
This commit is contained in:
fourtf
2019-08-20 20:08:49 +02:00
parent 0b8e0ff7cf
commit 4713862620
5 changed files with 202 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/NetworkRequest.cpp
+15 -225
View File
@@ -1,7 +1,7 @@
#include "common/NetworkRequest.hpp"
#include "common/NetworkData.hpp"
#include "common/NetworkManager.hpp"
//#include "common/NetworkManager.hpp"
#include "common/Outcome.hpp"
#include "common/Version.hpp"
#include "debug/AssertInGuiThread.hpp"
@@ -11,6 +11,7 @@
#include "util/DebugCount.hpp"
#include "util/PostToThread.hpp"
#include <QDebug>
#include <QFile>
#include <QtConcurrent>
@@ -21,7 +22,6 @@ namespace chatterino {
NetworkRequest::NetworkRequest(const std::string &url,
NetworkRequestType requestType)
: data(new NetworkData)
, timer(new NetworkTimer)
{
this->data->request_.setUrl(QUrl(QString::fromStdString(url)));
this->data->requestType_ = requestType;
@@ -31,7 +31,6 @@ NetworkRequest::NetworkRequest(const std::string &url,
NetworkRequest::NetworkRequest(QUrl url, NetworkRequestType requestType)
: data(new NetworkData)
, timer(new NetworkTimer)
{
this->data->request_.setUrl(url);
this->data->requestType_ = requestType;
@@ -41,7 +40,7 @@ NetworkRequest::NetworkRequest(QUrl url, NetworkRequestType requestType)
NetworkRequest::~NetworkRequest()
{
// assert(this->executed_);
//assert(this->executed_);
}
// old
@@ -89,7 +88,8 @@ void NetworkRequest::setRawHeader(const char *headerName,
void NetworkRequest::setTimeout(int ms) &
{
this->timer->timeoutMS_ = ms;
this->data->hasTimeout_ = true;
this->data->timer_.setInterval(ms);
}
void NetworkRequest::setExecuteConcurrently(bool value) &
@@ -97,7 +97,6 @@ void NetworkRequest::setExecuteConcurrently(bool value) &
this->data->executeConcurrently = value;
}
// TODO: rename to "authorizeTwitchV5"?
void NetworkRequest::makeAuthorizedV5(const QString &clientID,
const QString &oauthToken) &
{
@@ -173,7 +172,8 @@ NetworkRequest NetworkRequest::header(const char *headerName,
NetworkRequest NetworkRequest::timeout(int ms) &&
{
this->timer->timeoutMS_ = ms;
this->data->hasTimeout_ = true;
this->data->timer_.setInterval(ms);
return std::move(*this);
}
@@ -203,7 +203,7 @@ NetworkRequest NetworkRequest::payload(const QByteArray &payload) &&
return std::move(*this);
}
NetworkRequest NetworkRequest::quickLoad() &&
NetworkRequest NetworkRequest::cache() &&
{
this->data->useQuickLoadCache_ = true;
return std::move(*this);
@@ -213,57 +213,15 @@ void NetworkRequest::execute()
{
this->executed_ = true;
switch (this->data->requestType_)
// Only allow caching for GET request
if (this->data->useQuickLoadCache_ &&
this->data->requestType_ != NetworkRequestType::Get)
{
case NetworkRequestType::Get:
{
// Get requests try to load from cache, then perform the request
if (this->data->useQuickLoadCache_)
{
if (this->tryLoadCachedFile())
{
// Successfully loaded from cache
return;
}
}
this->doRequest();
}
break;
case NetworkRequestType::Put:
{
// Put requests cannot be cached, therefore the request is called
// immediately
this->doRequest();
}
break;
case NetworkRequestType::Delete:
{
// Delete requests cannot be cached, therefore the request is called
// immediately
this->doRequest();
}
break;
case NetworkRequestType::Post:
{
this->doRequest();
}
break;
default:
{
log("[Execute] Unhandled request type");
}
break;
qDebug() << "Can only cache GET requests!";
this->data->useQuickLoadCache_ = false;
}
}
QString NetworkRequest::urlString() const
{
return this->data->request_.url().toString();
load(std::move(this->data));
}
void NetworkRequest::initializeDefaultValues()
@@ -275,178 +233,10 @@ void NetworkRequest::initializeDefaultValues()
this->data->request_.setRawHeader("User-Agent", userAgent);
}
Outcome NetworkRequest::tryLoadCachedFile()
{
QFile cachedFile(getPaths()->cacheDirectory() + "/" +
this->data->getHash());
if (!cachedFile.exists())
{
// File didn't exist
return Failure;
}
if (!cachedFile.open(QIODevice::ReadOnly))
{
// File could not be opened
return Failure;
}
QByteArray bytes = cachedFile.readAll();
NetworkResult result(bytes);
auto outcome = this->data->onSuccess_(result);
cachedFile.close();
// XXX: If success is false, we should invalidate the cache file
// somehow/somewhere
return outcome;
}
void NetworkRequest::doRequest()
{
DebugCount::increase("http request started");
NetworkRequester requester;
NetworkWorker *worker = new NetworkWorker;
worker->moveToThread(&NetworkManager::workerThread);
this->timer->start();
auto onUrlRequested = [data = this->data, timer = this->timer,
worker]() mutable {
auto reply = [&]() -> QNetworkReply * {
switch (data->requestType_)
{
case NetworkRequestType::Get:
return NetworkManager::accessManager.get(data->request_);
case NetworkRequestType::Put:
return NetworkManager::accessManager.put(data->request_,
data->payload_);
case NetworkRequestType::Delete:
return NetworkManager::accessManager.deleteResource(
data->request_);
case NetworkRequestType::Post:
return NetworkManager::accessManager.post(data->request_,
data->payload_);
default:
return nullptr;
}
}();
if (reply == nullptr)
{
log("Unhandled request type");
return;
}
if (timer->isStarted())
{
timer->onTimeout(worker, [reply, data]() {
log("Aborted!");
reply->abort();
if (data->onError_)
{
data->onError_(-2);
}
});
}
if (data->onReplyCreated_)
{
data->onReplyCreated_(reply);
}
auto handleReply = [data, timer, reply]() mutable {
// TODO(pajlada): A reply was received, kill the timeout timer
if (reply->error() != QNetworkReply::NetworkError::NoError)
{
if (data->onError_)
{
data->onError_(reply->error());
}
return;
}
QByteArray bytes = reply->readAll();
data->writeToCache(bytes);
NetworkResult result(bytes);
DebugCount::increase("http request success");
// log("starting {}", data->request_.url().toString());
if (data->onSuccess_)
{
if (data->executeConcurrently)
QtConcurrent::run(
[onSuccess = std::move(data->onSuccess_),
result = std::move(result)] { onSuccess(result); });
else
data->onSuccess_(result);
}
// log("finished {}", data->request_.url().toString());
reply->deleteLater();
};
// FOURTF: Not sure what this does but it doesn't work.
// if (data->caller_ != nullptr)
// {
// QObject::connect(worker, &NetworkWorker::doneUrl, data->caller_,
// handleReply);
// QObject::connect(reply, &QNetworkReply::finished, worker,
// [worker]() mutable {
// emit worker->doneUrl();
// delete worker;
// });
// }
// else
// {
// auto
QObject::connect(
reply, &QNetworkReply::finished, worker,
[data, handleReply, worker]() mutable {
if (data->executeConcurrently || isGuiThread())
{
handleReply();
delete worker;
}
else
{
postToThread(
[worker, cb = std::move(handleReply)]() mutable {
cb();
delete worker;
});
}
});
};
QObject::connect(&requester, &NetworkRequester::requestUrl, worker,
onUrlRequested);
emit requester.requestUrl();
}
// Helper creator functions
NetworkRequest NetworkRequest::twitchRequest(QUrl url)
{
NetworkRequest request(url);
request.makeAuthorizedV5(getDefaultClientID());
return request;
return NetworkRequest(url).authorizeTwitchV5(getDefaultClientID());
}
} // namespace chatterino