chore: Applied SwiftFormat.

Signed-off-by: Iva Horn <iva.horn@nextcloud.com>

Author: i2h3

Sources/NextcloudFileProviderKit/Enumeration/Enumerator.swift

@@ -7,7 +7,7 @@ import NextcloudKit
 ///
 /// The `NSFileProviderEnumerator` implementation to enumerate file provider items and related change sets.
 ///
-final public class Enumerator: NSObject, NSFileProviderEnumerator, Sendable {
+public final class Enumerator: NSObject, NSFileProviderEnumerator, Sendable {
     let enumeratedItemIdentifier: NSFileProviderItemIdentifier
     private let enumeratedItemMetadata: SendableItemMetadata?
 
@@ -111,8 +111,8 @@ final public class Enumerator: NSObject, NSFileProviderEnumerator, Sendable {
                     return
                 }
 
-                let domain = self.domain
-                let enumeratedItemIdentifier = self.enumeratedItemIdentifier
+                let domain = domain
+                let enumeratedItemIdentifier = enumeratedItemIdentifier
 
                 let (_, trashedItems, _, trashReadError) = await remoteInterface.listingTrashAsync(
                     filename: nil,
@@ -305,8 +305,8 @@ final public class Enumerator: NSObject, NSFileProviderEnumerator, Sendable {
                     return
                 }
 
-                let domain = self.domain
-                let enumeratedItemIdentifier = self.enumeratedItemIdentifier
+                let domain = domain
+                let enumeratedItemIdentifier = enumeratedItemIdentifier
 
                 let (_, trashedItems, _, trashReadError) = await remoteInterface.listingTrashAsync(
                     filename: nil,
@@ -371,14 +371,14 @@ final public class Enumerator: NSObject, NSFileProviderEnumerator, Sendable {
             }
 
             guard readError == nil else {
-                logger.error("Finished enumerating changes.", [.url: self.serverUrl, .error: readError])
+                logger.error("Finished enumerating changes.", [.url: serverUrl, .error: readError])
 
-                let error = readError?.fileProviderError(handlingNoSuchItemErrorUsingItemIdentifier: self.enumeratedItemIdentifier) ?? NSFileProviderError(.cannotSynchronize)
+                let error = readError?.fileProviderError(handlingNoSuchItemErrorUsingItemIdentifier: enumeratedItemIdentifier) ?? NSFileProviderError(.cannotSynchronize)
 
                 if readError!.isNotFoundError {
-                    logger.info("404 error means item no longer exists. Deleting metadata and reporting deletion without error.", [.url: self.serverUrl])
+                    logger.info("404 error means item no longer exists. Deleting metadata and reporting deletion without error.", [.url: serverUrl])
 
-                    guard let itemMetadata = self.enumeratedItemMetadata else {
+                    guard let itemMetadata = enumeratedItemMetadata else {
                         logger.error("Invalid enumeratedItemMetadata. Could not delete metadata nor report deletion.")
                         observer.finishEnumeratingWithError(error)
                         return
@@ -397,7 +397,7 @@ final public class Enumerator: NSObject, NSFileProviderEnumerator, Sendable {
                     completeChangesObserver(
                         observer,
                         anchor: anchor,
-                        enumeratedItemIdentifier: self.enumeratedItemIdentifier,
+                        enumeratedItemIdentifier: enumeratedItemIdentifier,
                         account: account,
                         remoteInterface: remoteInterface,
                         dbManager: dbManager,
@@ -416,12 +416,12 @@ final public class Enumerator: NSObject, NSFileProviderEnumerator, Sendable {
                 return
             }
 
-            logger.info("Finished reading remote changes.", [.account: self.account.ncKitAccount, .url: self.serverUrl])
+            logger.info("Finished reading remote changes.", [.account: account.ncKitAccount, .url: serverUrl])
 
             completeChangesObserver(
                 observer,
                 anchor: anchor,
-                enumeratedItemIdentifier: self.enumeratedItemIdentifier,
+                enumeratedItemIdentifier: enumeratedItemIdentifier,
                 account: account,
                 remoteInterface: remoteInterface,
                 dbManager: dbManager,

Sources/NextcloudFileProviderKit/Enumeration/RemoteChangeObserver.swift

@@ -91,7 +91,7 @@ public final class RemoteChangeObserver: NSObject, @unchecked Sendable {
 
     private func startPollingTimer() {
         guard !invalidated else {
-            self.logger.error("Starting polling timer while the current one is not invalidated yet!")
+            logger.error("Starting polling timer while the current one is not invalidated yet!")
             return
         }
 
@@ -134,7 +134,7 @@ public final class RemoteChangeObserver: NSObject, @unchecked Sendable {
             startPollingTimer()
             return
         }
-        
+
         Task { [weak self] in
             try await Task.sleep(nanoseconds: self?.webSocketReconfigureIntervalNanoseconds ?? 0)
             await self?.configureNotifyPush()
@@ -237,7 +237,7 @@ public final class RemoteChangeObserver: NSObject, @unchecked Sendable {
             webSocketPingTask.cancel()
         }
 
-        let account = self.accountId
+        let account = accountId
 
         webSocketPingTask = Task.detached(priority: .background) {
             do {
@@ -272,15 +272,15 @@ public final class RemoteChangeObserver: NSObject, @unchecked Sendable {
                     return
                 }
 
-                guard await self.invalidated == false else {
+                guard await invalidated == false else {
                     return
                 }
 
                 guard error == nil else {
-                    self.logger.error("Websocket ping failed.", [.error: error])
-                    self.incrementWebSocketPingFailCount()
+                    logger.error("Websocket ping failed.", [.error: error])
+                    incrementWebSocketPingFailCount()
 
-                    if self.webSocketPingFailCount > self.webSocketPingFailLimit {
+                    if webSocketPingFailCount > webSocketPingFailLimit {
                         Task.detached(priority: .medium) {
                             self.reconnectWebSocket()
                         }
@@ -309,20 +309,20 @@ public final class RemoteChangeObserver: NSObject, @unchecked Sendable {
 
                 switch result {
                     case .failure:
-                        let accountId = self.accountId
-                        self.logger.debug("Failed to read websocket.", [.account: accountId])
-                        // Do not reconnect here, delegate methods will handle reconnecting
+                        let accountId = accountId
+                        logger.debug("Failed to read websocket.", [.account: accountId])
+                    // Do not reconnect here, delegate methods will handle reconnecting
                     case let .success(message):
                         switch message {
                             case let .data(data):
-                                self.processWebsocket(data: data)
+                                processWebsocket(data: data)
                             case let .string(string):
-                                self.processWebsocket(string: string)
+                                processWebsocket(string: string)
                             @unknown default:
-                                self.logger.error("Unknown case encountered while reading websocket!")
+                                logger.error("Unknown case encountered while reading websocket!")
                         }
 
-                        self.readWebSocket()
+                        readWebSocket()
                 }
             }
         }
@@ -371,14 +371,14 @@ public final class RemoteChangeObserver: NSObject, @unchecked Sendable {
     }
 
     func setWebSocketPingInterval(to nanoseconds: UInt64) {
-        self.webSocketPingIntervalNanoseconds = nanoseconds
+        webSocketPingIntervalNanoseconds = nanoseconds
     }
 }
 
 // MARK: - URLSessionWebSocketDelegate
 
 extension RemoteChangeObserver: URLSessionWebSocketDelegate {
-    nonisolated public func urlSession(_: URLSession, webSocketTask _: URLSessionWebSocketTask, didOpenWithProtocol _: String?) {
+    public nonisolated func urlSession(_: URLSession, webSocketTask _: URLSessionWebSocketTask, didOpenWithProtocol _: String?) {
         Task {
             guard invalidated == false else {
                 return
@@ -389,7 +389,7 @@ extension RemoteChangeObserver: URLSessionWebSocketDelegate {
         }
     }
 
-    nonisolated public func urlSession(_: URLSession, webSocketTask: URLSessionWebSocketTask, didCloseWith _: URLSessionWebSocketTask.CloseCode, reason: Data?) {
+    public nonisolated func urlSession(_: URLSession, webSocketTask: URLSessionWebSocketTask, didCloseWith _: URLSessionWebSocketTask.CloseCode, reason: Data?) {
         Task {
             guard invalidated == false else {
                 return
@@ -407,13 +407,13 @@ extension RemoteChangeObserver: URLSessionWebSocketDelegate {
         }
     }
 
-    nonisolated public func urlSessionDidFinishEvents(forBackgroundURLSession _: URLSession) {}
+    public nonisolated func urlSessionDidFinishEvents(forBackgroundURLSession _: URLSession) {}
 }
 
 // MARK: - NextcloudKitDelegate methods
 
 extension RemoteChangeObserver: NextcloudKitDelegate {
-    nonisolated public func authenticationChallenge(_: URLSession, didReceive challenge: URLAuthenticationChallenge, completionHandler: @Sendable @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
+    public nonisolated func authenticationChallenge(_: URLSession, didReceive challenge: URLAuthenticationChallenge, completionHandler: @Sendable @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         Task { [weak self] in
             guard let self else {
                 return
@@ -447,17 +447,17 @@ extension RemoteChangeObserver: NextcloudKitDelegate {
         }
     }
 
-    nonisolated public func networkReachabilityObserver(_ typeReachability: NKTypeReachability) {
+    public nonisolated func networkReachabilityObserver(_ typeReachability: NKTypeReachability) {
         Task { [weak self] in
             guard let self else {
                 return
             }
 
-            self.setNetworkReachability(typeReachability)
+            setNetworkReachability(typeReachability)
         }
     }
 
-    nonisolated public func downloadProgress(
+    public nonisolated func downloadProgress(
         _: Float,
         totalBytes _: Int64,
         totalBytesExpected _: Int64,
@@ -467,7 +467,7 @@ extension RemoteChangeObserver: NextcloudKitDelegate {
         task _: URLSessionTask
     ) {}
 
-    nonisolated public func uploadProgress(
+    public nonisolated func uploadProgress(
         _: Float,
         totalBytes _: Int64,
         totalBytesExpected _: Int64,
@@ -477,13 +477,13 @@ extension RemoteChangeObserver: NextcloudKitDelegate {
         task _: URLSessionTask
     ) {}
 
-    nonisolated public func downloadingFinish(
+    public nonisolated func downloadingFinish(
         _: URLSession,
         downloadTask _: URLSessionDownloadTask,
         didFinishDownloadingTo _: URL
     ) {}
 
-    nonisolated public func downloadComplete(
+    public nonisolated func downloadComplete(
         fileName _: String,
         serverUrl _: String,
         etag _: String?,
@@ -494,7 +494,7 @@ extension RemoteChangeObserver: NextcloudKitDelegate {
         error _: NKError
     ) {}
 
-    nonisolated public func uploadComplete(
+    public nonisolated func uploadComplete(
         fileName _: String,
         serverUrl _: String,
         ocId _: String?,
@@ -505,7 +505,7 @@ extension RemoteChangeObserver: NextcloudKitDelegate {
         error _: NKError
     ) {}
 
-    nonisolated public func request(_: Alamofire.DataRequest, didParseResponse _: Alamofire.AFDataResponse<some Any>) {}
+    public nonisolated func request(_: Alamofire.DataRequest, didParseResponse _: Alamofire.AFDataResponse<some Any>) {}
 
     ///
     /// Dispatches the asynchronous working set check.

Sources/NextcloudFileProviderKit/Item/Item.swift

@@ -8,7 +8,7 @@ import UniformTypeIdentifiers
 ///
 /// Data model implementation for file provider items as defined by the file provider framework and `NSFileProviderItemProtocol`.
 ///
-final public class Item: NSObject, NSFileProviderItem, Sendable {
+public final class Item: NSObject, NSFileProviderItem, Sendable {
     public enum FileProviderItemTransferError: Error {
         case downloadError
         case uploadError

Sources/NextcloudFileProviderKit/Metadata/RealmItemMetadata.swift

@@ -62,7 +62,7 @@ class RealmItemMetadata: Object, ItemMetadata {
     @Persisted var sessionTaskIdentifier: Int?
     @Persisted var storedShareType = List<Int>()
     var shareType: [Int] {
-        get { storedShareType.map { $0 } }
+        get { storedShareType.map(\.self) }
         set {
             storedShareType = List<Int>()
             storedShareType.append(objectsIn: newValue)
@@ -73,7 +73,7 @@ class RealmItemMetadata: Object, ItemMetadata {
     // TODO: Find a way to compare these two below in remote state check
     @Persisted var storedSharePermissionsCloudMesh = List<String>()
     var sharePermissionsCloudMesh: [String] {
-        get { storedSharePermissionsCloudMesh.map { $0 } }
+        get { storedSharePermissionsCloudMesh.map(\.self) }
         set {
             storedSharePermissionsCloudMesh = List<String>()
             storedSharePermissionsCloudMesh.append(objectsIn: newValue)
@@ -84,7 +84,7 @@ class RealmItemMetadata: Object, ItemMetadata {
     @Persisted var status: Int = 0
     @Persisted var storedTags = List<String>()
     var tags: [String] {
-        get { storedTags.map { $0 } }
+        get { storedTags.map(\.self) }
         set {
             storedTags = List<String>()
             storedTags.append(objectsIn: newValue)

Sources/NextcloudFileProviderKitMocks/TestableRemoteInterface.swift

@@ -84,13 +84,13 @@ public struct TestableRemoteInterface: RemoteInterface, @unchecked Sendable {
     ) async -> (account: String, data: Data?, error: NKError) { ("", nil, .invalidResponseError) }
 
     public func downloadAsync(
-        serverUrlFileName: Any,
-        fileNameLocalPath: String,
-        account: String,
-        options: NKRequestOptions,
-        requestHandler: @escaping (_ request: DownloadRequest) -> Void,
-        taskHandler: @Sendable @escaping (_ task: URLSessionTask) -> Void,
-        progressHandler: @escaping (_ progress: Progress) -> Void
+        serverUrlFileName _: Any,
+        fileNameLocalPath _: String,
+        account _: String,
+        options _: NKRequestOptions,
+        requestHandler _: @escaping (_ request: DownloadRequest) -> Void,
+        taskHandler _: @Sendable @escaping (_ task: URLSessionTask) -> Void,
+        progressHandler _: @escaping (_ progress: Progress) -> Void
     ) async -> (
         account: String,
         etag: String?,
@@ -130,11 +130,11 @@ public struct TestableRemoteInterface: RemoteInterface, @unchecked Sendable {
     }
 
     public func listingTrashAsync(
-        filename: String?,
-        showHiddenFiles: Bool,
-        account: String,
-        options: NKRequestOptions,
-        taskHandler: @Sendable @escaping (_ task: URLSessionTask) -> Void
+        filename _: String?,
+        showHiddenFiles _: Bool,
+        account _: String,
+        options _: NKRequestOptions,
+        taskHandler _: @Sendable @escaping (_ task: URLSessionTask) -> Void
     ) async -> (
         account: String,
         items: [NKTrash]?,
@@ -159,9 +159,9 @@ public struct TestableRemoteInterface: RemoteInterface, @unchecked Sendable {
     ) async -> (account: String, data: Data?, error: NKError) { ("", nil, .invalidResponseError) }
 
     public func getUserProfileAsync(
-        account: String,
-        options: NKRequestOptions,
-        taskHandler: @Sendable @escaping (_ task: URLSessionTask) -> Void
+        account _: String,
+        options _: NKRequestOptions,
+        taskHandler _: @Sendable @escaping (_ task: URLSessionTask) -> Void
     ) async -> (
         account: String,
         userProfile: NKUserProfile?,

Tests/Interface/MockChangeNotificationInterface.swift

@@ -4,7 +4,7 @@
 import Foundation
 import NextcloudFileProviderKit
 
-public final class MockChangeNotificationInterface:  ChangeNotificationInterface {
+public final class MockChangeNotificationInterface: ChangeNotificationInterface {
     public typealias ChangeHandler = @Sendable () -> Void
 
     let changeHandler: ChangeHandler?