History

add consistent error handling for asset request and upload

Stephen Birarda committed 10 years ago

Commit 9d19bf81 parent fccad7d6 files · +63 −91Browse files

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

Unified · Split

libraries/script-engine/src/AssetScriptingInterface.cpp+0−8
@@ -27,10 +27,6 @@ AssetScriptingInterface::AssetScriptingInterface(QScriptEngine* engine) : · 26 unmodified lines
27void AssetScriptingInterface::uploadData(QString data, QScriptValue callback) {27void AssetScriptingInterface::uploadData(QString data, QScriptValue callback) {
28 QByteArray dataByteArray = data.toUtf8();28 QByteArray dataByteArray = data.toUtf8();
29 auto upload = DependencyManager::get<AssetClient>()->createUpload(dataByteArray);29 auto upload = DependencyManager::get<AssetClient>()->createUpload(dataByteArray);
30 if (!upload) {
31 qCWarning(asset_client) << "Error uploading file to asset server";
32 return;
33 }
34 30
35 QObject::connect(upload, &AssetUpload::finished, this, [this, callback](AssetUpload* upload, const QString& hash) mutable {31 QObject::connect(upload, &AssetUpload::finished, this, [this, callback](AssetUpload* upload, const QString& hash) mutable {
36 if (callback.isFunction()) {32 if (callback.isFunction()) {
@@ -61,10 +57,6 @@ void AssetScriptingInterface::downloadData(QString urlString, QScriptValue callb · 24 unmodified lines
61 auto assetClient = DependencyManager::get<AssetClient>();57 auto assetClient = DependencyManager::get<AssetClient>();
62 auto assetRequest = assetClient->createRequest(hash);58 auto assetRequest = assetClient->createRequest(hash);
63 59
64 if (!assetRequest) {
65 return;
66 }
67
68 _pendingRequests << assetRequest;60 _pendingRequests << assetRequest;
69 61
70 connect(assetRequest, &AssetRequest::finished, this, [this, callback](AssetRequest* request) mutable {62 connect(assetRequest, &AssetRequest::finished, this, [this, callback](AssetRequest* request) mutable {