Use multipart upload in the web ui

Signed-off-by: Julius Härtl <jus@bitgrid.net>

apps/files/js/file-upload.js

@@ -258,8 +258,12 @@ OC.FileUpload.prototype = {
 			&& this.getFile().size > this.uploader.fileUploadParam.maxChunkSize
 		) {
 			data.isChunked = true;
+			var headers = (OC.getCapabilities().dav.chunking === '2.0') ? {
+				'X-Chunking-Destination': this.getTargetDestination()
+			} : {};
+
 			chunkFolderPromise = this.uploader.davClient.createDirectory(
-				'uploads/' + OC.getCurrentUser().uid + '/' + this.getId()
+				'uploads/' + OC.getCurrentUser().uid + '/' + this.getId(), headers
 			);
 			// TODO: if fails, it means same id already existed, need to retry
 		} else {
@@ -298,17 +302,24 @@ OC.FileUpload.prototype = {
 		}
 		if (size) {
 			headers['OC-Total-Length'] = size;
-
+		}
+		if (OC.getCapabilities().dav.chunking === '2.0') {
+			headers['X-Chunking-Destination'] = this.getTargetDestination();
 		}
 
 		return this.uploader.davClient.move(
 			'uploads/' + uid + '/' + this.getId() + '/.file',
-			'files/' + uid + '/' + OC.joinPaths(this.getFullPath(), this.getFileName()),
+			this.getTargetDestination(),
 			true,
 			headers
 		);
 	},
 
+	getTargetDestination: function() {
+		var uid = OC.getCurrentUser().uid;
+		return 'files/' + uid + '/' + OC.joinPaths(this.getFullPath(), this.getFileName())
+	},
+
 	_deleteChunkFolder: function() {
 		// delete transfer directory for this upload
 		this.uploader.davClient.remove(
@@ -1133,7 +1144,6 @@ OC.Uploader.prototype = _.extend({
 
 			if (options.maxChunkSize) {
 				this.fileUploadParam.maxChunkSize = options.maxChunkSize;
-			}
 
 			// initialize jquery fileupload (blueimp)
 			var fileupload = this.$uploadEl.fileupload(this.fileUploadParam);
@@ -1274,6 +1284,12 @@ OC.Uploader.prototype = _.extend({
 					var upload = self.getUpload(data);
 					var range = data.contentRange.split(' ')[1];
 					var chunkId = range.split('/')[0].split('-')[0];
+					if (OC.getCapabilities().dav.chunking === '2.0') {
+						// Calculate chunk index for usage with s3
+						chunkId = Math.ceil((data.chunkSize+Number(chunkId)) / upload.uploader.fileUploadParam.maxChunkSize);
+						data.headers['X-Chunking-Destination'] = upload.getTargetDestination();
+					}
+
 					data.url = OC.getRootPath() +
 						'/remote.php/dav/uploads' +
 						'/' + OC.getCurrentUser().uid +

apps/files/js/jquery.fileupload.js

@@ -733,6 +733,12 @@
                 promise = dfd.promise(),
                 jqXHR,
                 upload;
+
+            // Dynamically adjust the chunk size for Chunking V2 to fit into the 10000 chunk limit
+            if ((OC.getCapabilities().dav.chunking === '2.0') && file.size/mcs > 10000) {
+                mcs = Math.ceil(file.size/10000)
+            }
+
             if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) ||
                     options.data) {
                 return false;
@@ -1486,4 +1492,4 @@
 
     });
 
-}));
+}));

core/src/files/client.js

@@ -741,7 +741,7 @@ import escapeHTML from 'escape-html'
 			return promise
 		},
 
-		_simpleCall: function(method, path) {
+		_simpleCall: function(method, path, headers) {
 			if (!path) {
 				throw 'Missing argument "path"'
 			}
@@ -752,7 +752,8 @@ import escapeHTML from 'escape-html'
 
 			this._client.request(
 				method,
-				this._buildUrl(path)
+				this._buildUrl(path),
+				headers ? headers : {}
 			).then(
 				function(result) {
 					if (self._isSuccessStatus(result.status)) {
@@ -773,8 +774,8 @@ import escapeHTML from 'escape-html'
 		 *
 		 * @returns {Promise}
 		 */
-		createDirectory: function(path) {
-			return this._simpleCall('MKCOL', path)
+		createDirectory: function(path, headers) {
+			return this._simpleCall('MKCOL', path, headers)
 		},
 
 		/**