Ignore existing folder errors for now

owncloud · Sep 6, 2022 · 238bcd5 · 238bcd5
1 parent dc7615d
commit 238bcd5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -796,7 +796,7 @@ export default defineComponent({
 
     async handleUppyFileUpload(files: UppyResource[]) {
       this.$uppyService.publish('uploadStarted')
-      await this.createDirectoryTree(files, this.files)
+      await this.createDirectoryTree(files)
       this.$uppyService.publish('addedForUpload', files)
       this.$uppyService.uploadFiles(files)
     },

diff --git a/packages/web-runtime/src/composables/upload/useUpload.ts b/packages/web-runtime/src/composables/upload/useUpload.ts
@@ -44,7 +44,7 @@ interface UploadOptions {
 }
 
 interface UploadResult {
-  createDirectoryTree(files: UppyResource[], existingFiles: Resource[]): void
+  createDirectoryTree(files: UppyResource[]): void
 }
 
 export function useUpload(options: UploadOptions): UploadResult {
@@ -122,7 +122,7 @@ const createDirectoryTree = ({
   publicLinkPassword?: Ref<string>
   uppyService: UppyService
 }) => {
-  return async (files: UppyResource[], existingFiles: Resource[]) => {
+  return async (files: UppyResource[]) => {
     const { owncloudSdk: client } = clientService
     const createdFolders = []
     for (const file of files) {
@@ -182,8 +182,10 @@ const createDirectoryTree = ({
             unref(publicLinkPassword)
           )
         } else {
-          if (!existingFiles.some((f) => f.path === folderToCreate)) {
+          try {
             await client.files.createFolder(`${file.meta.webDavBasePath}/${folderToCreate}`)
+          }catch(error){
+            console.log(error)
           }
         }
 

diff --git a/packages/web-runtime/tests/unit/composables/upload/useUpload.spec.ts b/packages/web-runtime/tests/unit/composables/upload/useUpload.spec.ts
@@ -61,7 +61,7 @@ describe('useUpload', () => {
       }
     ]
 
-    await wrapper.vm.createDirectoryTree(uppyResources, [])
+    await wrapper.vm.createDirectoryTree(uppyResources)
     expect(createFolderMock).toHaveBeenCalledTimes(4)
   })
 })