Skip to content

Commit 7ef9b4d

Browse files
committed
fix(file-provider): Root container enumeration to process remote updates correctly.
Signed-off-by: Iva Horn <iva.horn@nextcloud.com>
1 parent 767e3b9 commit 7ef9b4d

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import OSLog
4848
// This does lead to long load times when a file provider domain is initially configured.
4949
// We can instead do a fast enumeration where we only scan folders as the user navigates through
5050
// them, thereby avoiding this issue; the trade-off is that we will be unable to detect
51-
// materialised file moves to unexplored folders, therefore deleting the item when we could have
51+
// materialized file moves to unexplored folders, therefore deleting the item when we could have
5252
// just moved it instead.
5353
//
5454
// Since it's not desirable to cancel a long recursive enumeration half-way through, we do the
@@ -500,7 +500,7 @@ import OSLog
500500
}
501501

502502
let materialisedEnumerator = fpManager.enumeratorForMaterializedItems()
503-
let materialisedObserver = MaterialisedEnumerationObserver(ncKitAccount: ncAccount.ncKitAccount, dbManager: dbManager, log: log) { _, _ in
503+
let materialisedObserver = MaterializedEnumerationObserver(account: ncAccount, dbManager: dbManager, log: log) { _, _ in
504504
completionHandler()
505505
}
506506
let startingPage = NSFileProviderPage(NSFileProviderPage.initialPageSortedByName as Data)

shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Services/FPUIExtensionServiceSource.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class FPUIExtensionServiceSource: NSObject, NSFileProviderServiceSource, NSXPCLi
9090
logger.error("Could not get db manager for \(account)")
9191
return nil
9292
}
93-
guard let item = dbManager.itemMetadataFromFileProviderItemIdentifier(identifier) else {
93+
guard let item = dbManager.itemMetadata(identifier) else {
9494
logger.error("No item \(rawIdentifier) in db, no shares.")
9595
return nil
9696
}

shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/gui/macOS/fileprovideritemmetadata_mac.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ QString nsNameComponentsToLocalisedQString(NSPersonNameComponents *const nameCom
9090

9191
if (metadata._documentSize == 0) {
9292
// If the document size is 0, we can try to get the size of the file
93-
// directly from its path. These are all materialised files anyway
93+
// directly from its path. These are all materialized files anyway
9494
// so the size will be properly represented
9595
const auto path = metadata.userVisiblePath();
9696
const auto fileInfo = QFileInfo(path);

0 commit comments

Comments
 (0)