History

partial getMapping PR integration

humbletim committed 8 years ago

Commit 0930cc41 parent a863aec2 files · +17 −3Browse files

Showing the changes to libraries/script-engine/src/AssetScriptingInterface.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/AssetScriptingInterface.cpp+2−3
@@ -27,8 +27,7 @@ · 26 unmodified lines
27#include <shared/QtHelpers.h>27#include <shared/QtHelpers.h>
28#include "Gzip.h"28#include "Gzip.h"
29#include "ScriptEngine.h"29#include "ScriptEngine.h"
30 30#include "ScriptEngineLogging.h"
31//using Promise = MiniPromise::Promise;
32 31
33AssetScriptingInterface::AssetScriptingInterface(QObject* parent) : BaseAssetScriptingInterface(parent) {32AssetScriptingInterface::AssetScriptingInterface(QObject* parent) : BaseAssetScriptingInterface(parent) {
34 if (auto engine = qobject_cast<QScriptEngine*>(parent)) {33 if (auto engine = qobject_cast<QScriptEngine*>(parent)) {
@@ -88,7 +87,7 @@ void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callb · 53 unmodified lines
88 87
89 if (!urlString.startsWith(ATP_SCHEME)) {88 if (!urlString.startsWith(ATP_SCHEME)) {
90 // ... for now at least log a message so user can check logs89 // ... for now at least log a message so user can check logs
91 qDebug() << "AssetScriptingInterface::downloadData ERROR: url does not start with " << ATP_SCHEME;90 qCDebug(scriptengine) << "AssetScriptingInterface::downloadData url must be of form atp:<hash-value>";
92 return;91 return;
93 }92 }
94 QString hash = AssetUtils::extractAssetHash(urlString);93 QString hash = AssetUtils::extractAssetHash(urlString);