feat: Applied SwiftFormat.

This is a dedicated commit to clearly separate the pure formatting changes from the actual SwiftFormat introduction.

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

Author: i2h3

.swiftformat

@@ -0,0 +1 @@
+--indent-case true

Package.swift

@@ -8,20 +8,21 @@ let package = Package(
     platforms: [
         .iOS(.v16),
         .macOS(.v11),
-        .visionOS(.v1)
+        .visionOS(.v1),
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
             name: "NextcloudFileProviderKit",
-            targets: ["NextcloudFileProviderKit"]),
+            targets: ["NextcloudFileProviderKit"]
+        ),
     ],
     dependencies: [
         .package(url: "https://github.com/nextcloud/NextcloudCapabilitiesKit.git", from: "2.3.0"),
         .package(url: "https://github.com/nextcloud/NextcloudKit", from: "7.0.0"),
         .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.0"),
         .package(url: "https://github.com/realm/realm-swift.git", from: "20.0.1"),
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0")
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
@@ -31,12 +32,15 @@ let package = Package(
             dependencies: [
                 .product(name: "NextcloudCapabilitiesKit", package: "NextcloudCapabilitiesKit"),
                 .product(name: "NextcloudKit", package: "NextcloudKit"),
-                .product(name: "RealmSwift", package: "realm-swift")]),
+                .product(name: "RealmSwift", package: "realm-swift"),
+            ]
+        ),
         .target(
             name: "NextcloudFileProviderKitMocks",
             dependencies: [
-                "NextcloudFileProviderKit"
-            ]),
+                "NextcloudFileProviderKit",
+            ]
+        ),
         .target(
             name: "TestInterface",
             dependencies: [
@@ -45,16 +49,18 @@ let package = Package(
                 .product(name: "NIOCore", package: "swift-nio"),
                 .product(name: "NIOPosix", package: "swift-nio"),
                 .product(name: "NIOHTTP1", package: "swift-nio"),
-                .product(name: "NIOWebSocket", package: "swift-nio")
+                .product(name: "NIOWebSocket", package: "swift-nio"),
             ],
-            path: "Tests/Interface"),
+            path: "Tests/Interface"
+        ),
         .testTarget(
             name: "TestInterfaceTests",
             dependencies: ["NextcloudFileProviderKit", "TestInterface"],
             path: "Tests/InterfaceTests"
         ),
         .testTarget(
             name: "NextcloudFileProviderKitTests",
-            dependencies: ["NextcloudFileProviderKit", "TestInterface"]),
+            dependencies: ["NextcloudFileProviderKit", "TestInterface"]
+        ),
     ]
 )

Sources/NextcloudFileProviderKit/Database/FilesDatabaseManager+Directories.swift

@@ -5,7 +5,7 @@ import FileProvider
 import Foundation
 import RealmSwift
 
-extension FilesDatabaseManager {
+public extension FilesDatabaseManager {
     private func fullServerPathUrl(for metadata: any ItemMetadata) -> String {
         if metadata.ocId == NSFileProviderItemIdentifier.rootContainer.rawValue {
             metadata.serverUrl
@@ -14,29 +14,29 @@ extension FilesDatabaseManager {
         }
     }
 
-    public func childItems(directoryMetadata: SendableItemMetadata) -> [SendableItemMetadata] {
+    func childItems(directoryMetadata: SendableItemMetadata) -> [SendableItemMetadata] {
         let directoryServerUrl = fullServerPathUrl(for: directoryMetadata)
         return itemMetadatas
-            .where({ $0.serverUrl.starts(with: directoryServerUrl) })
+            .where { $0.serverUrl.starts(with: directoryServerUrl) }
             .toUnmanagedResults()
     }
 
-    public func childItemCount(directoryMetadata: SendableItemMetadata) -> Int {
+    func childItemCount(directoryMetadata: SendableItemMetadata) -> Int {
         let directoryServerUrl = fullServerPathUrl(for: directoryMetadata)
         return itemMetadatas
-            .where({ $0.serverUrl.starts(with: directoryServerUrl) })
+            .where { $0.serverUrl.starts(with: directoryServerUrl) }
             .count
     }
 
-    public func parentDirectoryMetadataForItem(
+    func parentDirectoryMetadataForItem(
         _ itemMetadata: SendableItemMetadata
     ) -> SendableItemMetadata? {
         self.itemMetadata(
             account: itemMetadata.account, locatedAtRemoteUrl: itemMetadata.serverUrl
         )
     }
 
-    public func directoryMetadata(ocId: String) -> SendableItemMetadata? {
+    func directoryMetadata(ocId: String) -> SendableItemMetadata? {
         if let metadata = itemMetadatas.where({ $0.ocId == ocId && $0.directory }).first {
             return SendableItemMetadata(value: metadata)
         }
@@ -45,7 +45,7 @@ extension FilesDatabaseManager {
     }
 
     // Deletes all metadatas related to the info of the directory provided
-    public func deleteDirectoryAndSubdirectoriesMetadata(
+    func deleteDirectoryAndSubdirectoriesMetadata(
         ocId: String
     ) -> [SendableItemMetadata]? {
         guard let directoryMetadata = itemMetadatas
@@ -67,7 +67,7 @@ extension FilesDatabaseManager {
         let database = ncDatabase()
         do {
             try database.write { directoryMetadata.deleted = true }
-        } catch let error {
+        } catch {
             logger.error("Failure to delete root directory metadata in recursive delete.", [.error: error, .eTag: directoryEtag, .item: directoryOcId, .url: directoryUrlPath])
             return nil
         }
@@ -83,7 +83,7 @@ extension FilesDatabaseManager {
             do {
                 try database.write { result.deleted = true }
                 deletedMetadatas.append(inactiveItemMetadata)
-            } catch let error {
+            } catch {
                 logger.error("Failure to delete directory metadata child in recursive delete", [.error: error, .eTag: directoryEtag, .item: directoryOcId, .url: directoryUrlPath])
             }
         }
@@ -93,7 +93,7 @@ extension FilesDatabaseManager {
         return deletedMetadatas
     }
 
-    public func renameDirectoryAndPropagateToChildren(
+    func renameDirectoryAndPropagateToChildren(
         ocId: String, newServerUrl: String, newFileName: String
     ) -> [SendableItemMetadata]? {
         guard let directoryMetadata = itemMetadatas
@@ -110,7 +110,7 @@ extension FilesDatabaseManager {
         let newDirectoryServerUrl = newServerUrl + "/" + newFileName
         let childItemResults = itemMetadatas.where {
             $0.account == directoryMetadata.account &&
-            $0.serverUrl.starts(with: oldDirectoryServerUrl)
+                $0.serverUrl.starts(with: oldDirectoryServerUrl)
         }
 
         renameItemMetadata(ocId: ocId, newServerUrl: newServerUrl, newFileName: newFileName)
@@ -122,7 +122,8 @@ extension FilesDatabaseManager {
                 for childItem in childItemResults {
                     let oldServerUrl = childItem.serverUrl
                     let movedServerUrl = oldServerUrl.replacingOccurrences(
-                        of: oldDirectoryServerUrl, with: newDirectoryServerUrl)
+                        of: oldDirectoryServerUrl, with: newDirectoryServerUrl
+                    )
                     childItem.serverUrl = movedServerUrl
                     database.add(childItem, update: .all)
                     logger.debug(
@@ -140,7 +141,7 @@ extension FilesDatabaseManager {
         return itemMetadatas
             .where {
                 $0.account == directoryMetadata.account &&
-                $0.serverUrl.starts(with: newDirectoryServerUrl)
+                    $0.serverUrl.starts(with: newDirectoryServerUrl)
             }
             .toUnmanagedResults()
     }