mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8890 from nextcloud/feat/file-provider-request-logging-support

Browse Source 
Logging NSFileProviderRequest
This commit is contained in:
Iva Horn 2025-10-20 12:21:57 +02:00 committed by GitHub
commit a5dfc3ae59
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift
View File

@ -117,11 +117,9 @@ import OSLog
// MARK: - NSFileProviderReplicatedExtension protocol methods
func item(
for identifier: NSFileProviderItemIdentifier,
request _: NSFileProviderRequest,
completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void
) -> Progress {
func item(for identifier: NSFileProviderItemIdentifier, request: NSFileProviderRequest, completionHandler: @escaping (NSFileProviderItem?, Error?) -> Void) -> Progress {
logger.debug("Received request for item.", [.item: identifier, .request: request])
guard let ncAccount else {
logger.error("Not fetching item because account not set up yet.", [.item: identifier])
completionHandler(nil, NSFileProviderError(.notAuthenticated))
@ -163,8 +161,7 @@ import OSLog
) -> Progress {
let actionId = UUID()
insertSyncAction(actionId)
logger.info("Received request to fetch contents of item.", [.item: itemIdentifier])
logger.debug("Received request to fetch contents of item.", [.item: itemIdentifier, .request: request])
guard requestedVersion == nil else {
// TODO: Add proper support for file versioning
@ -233,7 +230,7 @@ import OSLog
) -> Progress {
let actionId = UUID()
insertSyncAction(actionId)
logger.debug("Received request to create item.", [.item: itemTemplate, .name: itemTemplate.filename])
logger.debug("Received request to create item.", [.item: itemTemplate, .name: itemTemplate.filename, .request: request])
guard let ncAccount else {
logger.error(
@ -313,7 +310,7 @@ import OSLog
insertSyncAction(actionId)
let identifier = item.itemIdentifier
logger.debug("Received request to modify item.", [.item: item])
logger.debug("Received request to modify item.", [.item: item, .request: request])
guard let ncAccount else {
logger.error("Not modifying item because account not set up yet.", [.item: identifier])
@ -397,7 +394,7 @@ import OSLog
let actionId = UUID()
insertSyncAction(actionId)
logger.debug("Received request (isFileViewerRequest: \(request.isFileViewerRequest), isSystemRequest: \(request.isSystemRequest), requestingExecutable: \(request.requestingExecutable?.absoluteString ?? "nil")) to delete item.", [.item: identifier])
logger.debug("Received request to delete item.", [.item: identifier, .request: request])
guard let ncAccount else {
logger.error("Not deleting item \(identifier.rawValue), account not set up yet")
@ -461,8 +458,10 @@ import OSLog
}
func enumerator(
for containerItemIdentifier: NSFileProviderItemIdentifier, request _: NSFileProviderRequest
for containerItemIdentifier: NSFileProviderItemIdentifier, request: NSFileProviderRequest
) throws -> NSFileProviderEnumerator {
logger.debug("System requested enumerator.", [.item: containerItemIdentifier, .request: request])
guard let ncAccount else {
logger.error("Not providing enumerator for container with identifier \(containerItemIdentifier.rawValue) yet as account not set up")
throw NSFileProviderError(.notAuthenticated)

2
shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Services/ClientCommunicationService.swift
View File

@ -38,7 +38,7 @@ class ClientCommunicationService: NSObject, NSFileProviderServiceSource, NSXPCLi
func getFileProviderDomainIdentifier(completionHandler: @escaping (String?, Error?) -> Void) {
let identifier = self.fpExtension.domain.identifier.rawValue
logger.info("Returning file provider domain identifier.", [.domain: identifier])
logger.debug("Returning file provider domain identifier.", [.domain: identifier])
completionHandler(identifier, nil)
}

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

@ -15,8 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/nextcloud/NextcloudCapabilitiesKit.git",
"state" : {
"revision" : "0b97165f4ebfe6c207cd6b95a9997e210fd0c495",
"version" : "2.4.3"
"revision" : "07a481be18943cfa3ce17c91b83d6017cdbb5846",
"version" : "2.4.5"
}
},
{