Add TUS capability detection and fix upload

Read TUS capability from the file info returned by the SDK. Fix chunked upload by removing the file name from the path.
owncloud · Apr 22, 2020 · f562697 · f562697
1 parent a144afb
commit f562697
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/apps/files/src/mixins.js b/apps/files/src/mixins.js
@@ -40,6 +40,7 @@ export default {
       'highlightedFile',
       'publicLinkPassword',
       'fileSortField',
+      'currentFolder',
       'fileSortDirectionDesc'
     ]),
     ...mapGetters(['getToken', 'capabilities']),
@@ -408,11 +409,11 @@ export default {
       } else {
         basePath = this.path || ''
         relativePath = pathUtil.join(basePath, relativePath)
-        const isChunkedSupported = true
-
-        if (isChunkedSupported) {
+        // FIXME: this might break if relativePath is not the currentFolder
+        // and is a mount point that has no chunk support
+        if (this.browserSupportsChunked && this.currentFolder.isChunkedUploadSupported) {
           promise = this.uploadQueue.add(() => {
-            return this.uploadChunkedFile(file, relativePath, {
+            return this.uploadChunkedFile(file, pathUtil.dirname(relativePath), {
               emitProgress: progress => {
                 this.$_ocUpload_onProgress(progress, file)
               }

diff --git a/apps/files/src/store/actions.js b/apps/files/src/store/actions.js
@@ -93,7 +93,8 @@ function _buildFile(file) {
     },
     isReceivedShare: function() {
       return this.permissions.indexOf('S') >= 0
-    }
+    },
+    isChunkedUploadSupported: !!(file.getTusSupport && file.getTusSupport())
   }
 }
 

diff --git a/src/plugins/upload.js b/src/plugins/upload.js
@@ -3,6 +3,11 @@ import tus from 'tus-js-client'
 export default {
   install(Vue) {
     Vue.mixin({
+      computed: {
+        browserSupportsChunked() {
+          return tus.isSupported
+        }
+      },
       methods: {
         uploadChunkedFile(file, path, options) {
           // TODO: proper handling of directory uploads which have a path prefix
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,7 +93,8 @@ function _buildFile(file) { @@
         },
         isReceivedShare: function() {
           return this.permissions.indexOf('S') >= 0
-        }
+        },
+        isChunkedUploadSupported: !!(file.getTusSupport && file.getTusSupport())
       }
     }
@@ Expand Down @@