Use async in files app

owncloud · Jul 6, 2018 · c1c2671 · c1c2671
1 parent f36220f
commit c1c2671
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
@@ -295,15 +295,43 @@ OC.FileUpload.prototype = {
 		}
 		if (size) {
 			headers['OC-Total-Length'] = size;
-
 		}
+		headers['OC-LazyOps'] = 1;
+
+		var doneDeferred = $.Deferred();
 
-		return this.uploader.davClient.move(
+		this.uploader.davClient.move(
 			'uploads/' + uid + '/' + this.getId() + '/.file',
 			'files/' + uid + '/' + OC.joinPaths(this.getFullPath(), this.getFileName()),
 			true,
 			headers
-		);
+		).then(function (status, response) {
+			if (status === 202) {
+				var evtSource = new EventSource(response.xhr.getResponseHeader('oc-jobstatus-location') + '?sse=1');
+				window.addEventListener('error', function() {
+					evtSource.close();
+				});
+
+				evtSource.addEventListener('job-status', function(e) {
+					var obj = JSON.parse(e.data);
+					if (obj.status === 'finished') {
+						doneDeferred.resolve(status, response);
+						evtSource.close();
+					}
+					if (obj.status === 'error') {
+						doneDeferred.reject(status, response);
+						evtSource.close();
+					}
+				});
+			} else {
+				doneDeferred.resolve(status, response);
+			}
+
+		}).fail( function(status, response) {
+			doneDeferred.reject(status, response);
+		});
+
+		return doneDeferred.promise();
 	},
 
 	_deleteChunkFolder: function() {

diff --git a/core/js/files/client.js b/core/js/files/client.js
@@ -672,7 +672,7 @@
 			).then(
 				function(result) {
 					if (self._isSuccessStatus(result.status)) {
-						deferred.resolve(result.status);
+						deferred.resolve(result.status, result);
 					} else {
 						result = _.extend(result, self._getSabreException(result));
 						deferred.reject(result.status, result);
@@ -697,7 +697,7 @@
 			).then(
 				function(result) {
 					if (self._isSuccessStatus(result.status)) {
-						deferred.resolve(result.status);
+						deferred.resolve(result.status, result);
 					} else {
 						result = _.extend(result, self._getSabreException(result));
 						deferred.reject(result.status, result);
@@ -740,7 +740,7 @@
 			).then(
 				function(result) {
 					if (self._isSuccessStatus(result.status)) {
-						deferred.resolve(result.status);
+						deferred.resolve(result.status, result);
 					} else {
 						result = _.extend(result, self._getSabreException(result));
 						deferred.reject(result.status, result);