Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import OSLog
// This does lead to long load times when a file provider domain is initially configured.
// We can instead do a fast enumeration where we only scan folders as the user navigates through
// them, thereby avoiding this issue; the trade-off is that we will be unable to detect
// materialised file moves to unexplored folders, therefore deleting the item when we could have
// materialized file moves to unexplored folders, therefore deleting the item when we could have
// just moved it instead.
//
// Since it's not desirable to cancel a long recursive enumeration half-way through, we do the
Expand Down Expand Up @@ -500,7 +500,7 @@ import OSLog
}

let materialisedEnumerator = fpManager.enumeratorForMaterializedItems()
let materialisedObserver = MaterialisedEnumerationObserver(ncKitAccount: ncAccount.ncKitAccount, dbManager: dbManager, log: log) { _, _ in
let materialisedObserver = MaterializedEnumerationObserver(account: ncAccount, dbManager: dbManager, log: log) { _, _ in
completionHandler()
}
let startingPage = NSFileProviderPage(NSFileProviderPage.initialPageSortedByName as Data)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class FPUIExtensionServiceSource: NSObject, NSFileProviderServiceSource, NSXPCLi
logger.error("Could not get db manager for \(account)")
return nil
}
guard let item = dbManager.itemMetadataFromFileProviderItemIdentifier(identifier) else {
guard let item = dbManager.itemMetadata(identifier) else {
logger.error("No item \(rawIdentifier) in db, no shares.")
return nil
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
AAD7F6032EAA11670071D385 /* gui */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); name = gui; path = /Users/iva/Projekte/nextcloud/desktop/src/gui; sourceTree = "<absolute>"; };
AAFDB1862ECB63AD00C26AE7 /* src */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); name = src; path = /Users/iva/Projekte/nextcloud/desktop/src; sourceTree = "<absolute>"; };
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -407,7 +407,7 @@
C2B573941B1CD88000303B36 = {
isa = PBXGroup;
children = (
AAD7F6032EAA11670071D385 /* gui */,
AAFDB1862ECB63AD00C26AE7 /* src */,
AA27A4E32E93C0D700665051 /* README.md */,
C2B573B31B1CD91E00303B36 /* desktopclient */,
AA0A6B1C2E8EA948007F4A7A /* NextcloudDev */,
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/gui/macOS/fileprovideritemmetadata_mac.mm
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ QString nsNameComponentsToLocalisedQString(NSPersonNameComponents *const nameCom

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