Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 06:37:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update BatchLoader to use ScriptCache

Browse source
This commit is contained in:
Ryan Huffman 2016-10-03 09:31:09 -07:00
parent ca4022814e
commit 82aa1bafad
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,12 +13,14 @@
#include <QNetworkReply> #include <QNetworkReply>
#include <QFile> #include <QFile>
#include <QPointer>
#include "ScriptEngineLogging.h" #include "ScriptEngineLogging.h"
#include "BatchLoader.h" #include "BatchLoader.h"
#include <NetworkAccessManager.h> #include <NetworkAccessManager.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include "ResourceManager.h" #include "ResourceManager.h"
#include "ScriptEngines.h" #include "ScriptEngines.h"
#include "ScriptCache.h"
BatchLoader::BatchLoader(const QList<QUrl>& urls) BatchLoader::BatchLoader(const QList<QUrl>& urls)
: QObject(), : QObject(),
@ -38,30 +40,25 @@ void BatchLoader::start() {
for (const auto& rawURL : _urls) { for (const auto& rawURL : _urls) {
QUrl url = expandScriptUrl(normalizeScriptURL(rawURL)); QUrl url = expandScriptUrl(normalizeScriptURL(rawURL));
auto request = ResourceManager::createResourceRequest(this, url);
if (!request) { qCDebug(scriptengine) << "Loading script at " << url;
_data.insert(url, QString());
qCDebug(scriptengine) << "Could not load" << url; QPointer<BatchLoader> self = this;
continue; DependencyManager::get<ScriptCache>()->getScriptContents(url.toString(), [this, self](const QString& url, const QString& contents, bool isURL, bool success) {
} if (!self) {
connect(request, &ResourceRequest::finished, this, [=]() { return;
if (request->getResult() == ResourceRequest::Success) { }
_data.insert(url, request->getData()); if (isURL && success) {
_data.insert(url, contents);
qCDebug(scriptengine) << "Loaded: " << url;
} else { } else {
_data.insert(url, QString()); _data.insert(url, QString());
qCDebug(scriptengine) << "Could not load" << url; qCDebug(scriptengine) << "Could not load" << url;
} }
request->deleteLater();
checkFinished(); checkFinished();
}); }, false);
// If we end up being destroyed before the reply finishes, clean it up
connect(this, &QObject::destroyed, request, &QObject::deleteLater);
qCDebug(scriptengine) << "Loading script at " << url;
request->send();
} }
checkFinished(); checkFinished();
} }

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

@ -182,7 +182,6 @@ void ScriptCache::scriptContentAvailable() {
if (success) { if (success) {
allCallbacks = scriptRequest.scriptUsers; allCallbacks = scriptRequest.scriptUsers;
//auto scriptContent = _scriptCache[url];
_activeScriptRequests.remove(url); _activeScriptRequests.remove(url);