Ignore existing folder errors for now

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

Hide file tree

Showing 4 changed files with 9 additions and 8 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-app-files/src/helpers/resource/copyMove.ts b/packages/web-app-files/src/helpers/resource/copyMove.ts
@@ -27,7 +27,7 @@ export const resolveFileExists = (
   $gettext,
   $gettextInterpolate,
   isSingleConflict,
-  suggestMerge=false
+  suggestMerge = false
 ): Promise<ResolveConflict> => {
   return new Promise<ResolveConflict>((resolve) => {
     let doForAllConflicts = false
@@ -43,7 +43,7 @@ export const resolveFileExists = (
         true
       ),
       cancelText: $gettext('Skip'),
-      confirmText: $gettext('Keep both') ,
+      confirmText: $gettext('Keep both'),
       buttonSecondaryText: suggestMerge ? $gettext('Merge') : $gettext('Replace'),
       checkboxLabel: isSingleConflict
         ? ''

diff --git a/packages/web-runtime/src/composables/upload/useUpload.ts b/packages/web-runtime/src/composables/upload/useUpload.ts
@@ -12,7 +12,6 @@ import {
 import { computed, Ref, unref, watch } from '@vue/composition-api'
 import { UppyService } from '../../services/uppyService'
 import * as uuid from 'uuid'
-import { Resource } from 'web-client/src/helpers/resource'
 
 export interface UppyResource {
   id?: string
@@ -44,7 +43,7 @@ interface UploadOptions {
 }
 
 interface UploadResult {
-  createDirectoryTree(files: UppyResource[], existingFiles: Resource[]): void
+  createDirectoryTree(files: UppyResource[]): void
 }
 
 export function useUpload(options: UploadOptions): UploadResult {
@@ -122,7 +121,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 +181,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)
   })
 })