Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update script loaders to use ResourceRequest

Browse source
This commit is contained in:
Ryan Huffman 2015-08-03 16:28:21 -07:00
parent 6b83948849
commit acff31ee2d
2 changed files with 65 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
libraries/script-engine/src/BatchLoader.cpp
View file

@ -17,9 +17,7 @@
#include "BatchLoader.h"
#include <NetworkAccessManager.h>
#include <SharedUtil.h>
#include "ResourceManager.h"
BatchLoader::BatchLoader(const QList<QUrl>& urls)
: QObject(),
@ -27,6 +25,7 @@ BatchLoader::BatchLoader(const QList<QUrl>& urls)
_finished(false),
_urls(urls.toSet()),
_data() {
qRegisterMetaType<QMap<QUrl, QString>>("QMap<QUrl, QString>");
}
void BatchLoader::start() {
@ -35,45 +34,63 @@ void BatchLoader::start() {
}
_started = true;
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
// QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
for (QUrl url : _urls) {
if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp") {
QNetworkRequest request = QNetworkRequest(url);
request.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
QNetworkReply* reply = networkAccessManager.get(request);
qCDebug(scriptengine) << "Downloading file at" << url;
connect(reply, &QNetworkReply::finished, [=]() {
if (reply->error()) {
_data.insert(url, QString());
} else {
_data.insert(url, reply->readAll());
}
reply->deleteLater();
checkFinished();
});
// If we end up being destroyed before the reply finishes, clean it up
connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
} else {
#ifdef _WIN32
QString fileName = url.toString();
#else
QString fileName = url.toLocalFile();
#endif
qCDebug(scriptengine) << "Reading file at " << fileName;
QFile scriptFile(fileName);
if (scriptFile.open(QFile::ReadOnly | QFile::Text)) {
QTextStream in(&scriptFile);
_data.insert(url, in.readAll());
auto request = ResourceManager::createResourceRequest(this, url);
if (!request) {
continue;
}
connect(request, &ResourceRequest::finished, [=]() {
if (request->getResult() == ResourceRequest::SUCCESS) {
_data.insert(url, request->moveData());
} else {
_data.insert(url, QString());
}
}
request->deleteLater();
checkFinished();
});
qCDebug(scriptengine) << "Loading script at " << url;
request->send();
// if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp") {
// QNetworkRequest request = QNetworkRequest(url);
// request.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
// QNetworkReply* reply = networkAccessManager.get(request);
//
// qCDebug(scriptengine) << "Downloading file at" << url;
//
// connect(reply, &QNetworkReply::finished, [=]() {
// if (reply->error()) {
// _data.insert(url, QString());
// } else {
// _data.insert(url, reply->readAll());
// }
// reply->deleteLater();
// checkFinished();
// });
//
// // If we end up being destroyed before the reply finishes, clean it up
// connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
//
// } else {
// #ifdef _WIN32
// QString fileName = url.toString();
// #else
// QString fileName = url.toLocalFile();
// #endif
//
// qCDebug(scriptengine) << "Reading file at " << fileName;
//
// QFile scriptFile(fileName);
// if (scriptFile.open(QFile::ReadOnly | QFile::Text)) {
// QTextStream in(&scriptFile);
// _data.insert(url, in.readAll());
// } else {
// _data.insert(url, QString());
// }
// }
}
checkFinished();
}

31
libraries/script-engine/src/ScriptCache.cpp
View file

@ -17,7 +17,6 @@
#include <QObject>
#include <assert.h>
#include <NetworkAccessManager.h>
#include <SharedUtil.h>
#include "ScriptCache.h"
@ -44,18 +43,10 @@ QString ScriptCache::getScript(const QUrl& url, ScriptUser* scriptUser, bool& is
if (alreadyWaiting) {
qCDebug(scriptengine) << "Already downloading script at:" << url.toString();
} else {
QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
QNetworkRequest networkRequest = QNetworkRequest(url);
networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
if (reload) {
networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
qCDebug(scriptengine) << "Redownloading script at:" << url.toString();
} else {
qCDebug(scriptengine) << "Downloading script at:" << url.toString();
}
QNetworkReply* reply = networkAccessManager.get(networkRequest);
connect(reply, &QNetworkReply::finished, this, &ScriptCache::scriptDownloaded);
auto request = ResourceManager::createResourceRequest(this, url);
request->setCacheEnabled(!reload);
connect(request, &ResourceRequest::finished, this, &ScriptCache::scriptDownloaded);
request->send();
}
}
return scriptContents;
@ -69,27 +60,25 @@ void ScriptCache::deleteScript(const QUrl& url) {
}
void ScriptCache::scriptDownloaded() {
QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
QUrl url = reply->url();
ResourceRequest* req = qobject_cast<ResourceRequest*>(sender());
QUrl url = req->getUrl();
QList<ScriptUser*> scriptUsers = _scriptUsers.values(url);
_scriptUsers.remove(url);
if (reply->error() == QNetworkReply::NoError && reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 200) {
_scriptCache[url] = reply->readAll();
if (req->getResult() == ResourceRequest::SUCCESS) {
_scriptCache[url] = req->moveData();
qCDebug(scriptengine) << "Done downloading script at:" << url.toString();
foreach(ScriptUser* user, scriptUsers) {
user->scriptContentsAvailable(url, _scriptCache[url]);
}
} else {
qCWarning(scriptengine) << "Error loading script from URL " << reply->url().toString()
<< "- HTTP status code is" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()
<< "and error from QNetworkReply is" << reply->errorString();
qCWarning(scriptengine) << "Error loading script from URL " << url;
foreach(ScriptUser* user, scriptUsers) {
user->errorInLoadingScript(url);
}
}
reply->deleteLater();
req->deleteLater();
}