Properly account for (non-error) collision errors during bundle create/modify

claucambra · claucambra · commit ee1641da6836 · 2025-05-07T15:52:21.000+08:00
Signed-off-by: Claudio Cambra &lt;developer@claudiocambra.com&gt;
diff --git a/Sources/NextcloudFileProviderKit/Item/Item+Create.swift b/Sources/NextcloudFileProviderKit/Item/Item+Create.swift
@@ -348,7 +348,8 @@ public extension Item {
                     progressHandler: { _ in }
                 )
 
-                guard error == .success else {
+                // Do not fail on existing item, just keep going
+                guard error == .success || error.matchesCollisionError else {
                     Self.logger.error(
                         """
                         Could not upload bpi file at: \(childUrlPath, privacy: .public),
diff --git a/Sources/NextcloudFileProviderKit/Item/Item+Modify.swift b/Sources/NextcloudFileProviderKit/Item/Item+Modify.swift
@@ -385,7 +385,8 @@ public extension Item {
                         }
                     }
                 )
-                guard createError == .success else {
+                // Don't error if there is a collision
+                guard createError == .success || createError.matchesCollisionError else {
                     Self.logger.error(
                         """
                         Could not create new bpi folder at: \(remotePath, privacy: .public),

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,8 @@ public extension Item {`
`348`	`348`	`progressHandler: { _ in }`
`349`	`349`	`)`
`350`	`350`
`351`		`- guard error == .success else {`
	`351`	`+ // Do not fail on existing item, just keep going`
	`352`	`+ guard error == .success \|\| error.matchesCollisionError else {`
`352`	`353`	`Self.logger.error(`
`353`	`354`	`"""`
`354`	`355`	`Could not upload bpi file at: \(childUrlPath, privacy: .public),`
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,8 @@ public extension Item {`
`385`	`385`	`}`
`386`	`386`	`}`
`387`	`387`	`)`
`388`		`- guard createError == .success else {`
	`388`	`+ // Don't error if there is a collision`
	`389`	`+ guard createError == .success \|\| createError.matchesCollisionError else {`
`389`	`390`	`Self.logger.error(`
`390`	`391`	`"""`
`391`	`392`	`Could not create new bpi folder at: \(remotePath, privacy: .public),`