Handle unzip failure

David Rowe committed 9 years ago

Commit e9dbb321 parent 77676434 files · +22 −11Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

     rootContext->setContextProperty("Entities", DependencyManager::get<EntityScriptingInterface>().data());
     _fileDownload = new FileScriptingInterface(engine);
     rootContext->setContextProperty("File", _fileDownload);
-    connect(_fileDownload, &FileScriptingInterface::unzipSuccess, this, &Application::handleUnzip);
+    connect(_fileDownload, &FileScriptingInterface::unzipResult, this, &Application::handleUnzip);
     rootContext->setContextProperty("MyAvatar", getMyAvatar().get());
     rootContext->setContextProperty("Messages", DependencyManager::get<MessagesClient>().data());
     rootContext->setContextProperty("Recording", DependencyManager::get<RecordingScriptingInterface>().data());
     request->deleteLater();
 }
+void Application::addAssetToWorldUnzipFailure(QString filePath) {
+    QString filename = filePath.right(filePath.length() - filePath.lastIndexOf("/") - 1);
+    qWarning(interfaceapp) << "Couldn't unzip file" << filePath;
+    addAssetToWorldError(filename, "Couldn't unzip file " + filename + ".");
+}
 void Application::addAssetToWorld(QString filePath) {
     // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().
 }
-void Application::handleUnzip(QString filePath, bool autoAdd) {
+void Application::handleUnzip(QString zipFile, QString unzipFile, bool autoAdd) {
-    if (autoAdd && !filePath.isEmpty()) {
+    if (autoAdd) {
-        addAssetToWorld(filePath);
+        if (!unzipFile.isEmpty()) {
+            addAssetToWorld(unzipFile);
+        } else {
+            addAssetToWorldUnzipFailure(zipFile);
+        }
     } else {
-        showAssetServerWidget(filePath);
+        showAssetServerWidget(unzipFile);
     }
 }