fix error handling for diff request types

Stephen Birarda committed 10 years ago

Commit e51aede1 parent 9522c2d6 files · +40 −38Browse files

Showing the changes to interface/src/scripting/AssetMappingsScriptingInterface.cpp (1 of 6 files). Show all

Unified · Split

interface/src/scripting/AssetMappingsScriptingInterface.cpp+7−28

     _proxyModel.sort(0);
 }
-QString AssetMappingsScriptingInterface::getErrorString(int errorCode) const {
-    switch (errorCode) {
-        case MappingRequest::NoError:
-            return "No error";
-        case MappingRequest::NotFound:
-            return "Asset not found";
-        case MappingRequest::NetworkError:
-            return "Unable to communicate with Asset Server";
-        case MappingRequest::PermissionDenied:
-            return "Permission denied";
-        case MappingRequest::InvalidPath:
-            return "Path is invalid";
-        case MappingRequest::InvalidHash:
-            return "Hash is invalid";
-        case MappingRequest::UnknownError:
-            return "Asset Server internal error";
-        default:
-            return QString();
-    }
-}
 void AssetMappingsScriptingInterface::setMapping(QString path, QString hash, QJSValue callback) {
     auto assetClient = DependencyManager::get<AssetClient>();
     auto request = assetClient->createSetMappingRequest(path, hash);
     connect(request, &SetMappingRequest::finished, this, [this, callback](SetMappingRequest* request) mutable {
         if (callback.isCallable()) {
-            QJSValueList args { uint8_t(request->getError()), request->getPath() };
+            QJSValueList args { request->getErrorString(), request->getPath() };
             callback.call(args);
         }
     connect(request, &GetMappingRequest::finished, this, [this, callback](GetMappingRequest* request) mutable {
         if (callback.isCallable()) {
-            QJSValueList args { uint8_t(request->getError()) };
+            QJSValueList args { request->getErrorString() };
             callback.call(args);
         }
     QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
         if (upload->getError() != AssetUpload::NoError) {
             if (callback.isCallable()) {
-                QJSValueList args { uint8_t(upload->getError()) };
+                QJSValueList args { upload->getErrorString() };
                 callback.call(args);
             }
         } else {
     connect(request, &DeleteMappingsRequest::finished, this, [this, callback](DeleteMappingsRequest* request) mutable {
         if (callback.isCallable()) {
-            QJSValueList args { uint8_t(request->getError()) };
+            QJSValueList args { request->getErrorString() };
             callback.call(args);
         }
         }
         if (callback.isCallable()) {
-            QJSValueList args { uint8_t(request->getError()), map };
+            QJSValueList args { request->getErrorString(), map };
             callback.call(args);
         }
     connect(request, &RenameMappingRequest::finished, this, [this, callback](RenameMappingRequest* request) mutable {
         if (callback.isCallable()) {
-            QJSValueList args { uint8_t(request->getError()) };
+            QJSValueList args { request->getErrorString() };
             callback.call(args);
         }
                 }
             }
         } else {
-            emit errorGettingMappings(static_cast<int>(request->getError()));
+            emit errorGettingMappings(request->getErrorString());
         }
     });