UTI Swift6

.gitignore

@@ -43,3 +43,4 @@ Package.resolved
 
 /.env-vars
 *.generated.swift
+/.build

Package.swift

@@ -10,10 +10,10 @@ import PackageDescription
 let package = Package(
     name: "NextcloudKit",
     platforms: [
-        .macOS(.v10_15),
-        .iOS(.v13),
-        .tvOS(.v13),
-        .watchOS(.v6),
+        .iOS(.v14),
+        .macOS(.v11),
+        .tvOS(.v14),
+        .watchOS(.v7),
         .visionOS(.v1)
     ],
     products: [
@@ -41,4 +41,28 @@ let package = Package(
             name: "NextcloudKitIntegrationTests",
             dependencies: ["NextcloudKit", "Mocker"])
     ]
+
+    /* Test simulate 6
+     targets: [
+         .target(
+             name: "NextcloudKit",
+             dependencies: ["Alamofire", "SwiftyJSON", "SwiftyXMLParser"],
+             swiftSettings: [
+                 .enableUpcomingFeature("StrictConcurrency"), // simulate Swift 6
+                 .enableExperimentalFeature("StrictConcurrency"),
+                 .unsafeFlags(["-Xfrontend", "-warn-concurrency"]),
+                 .unsafeFlags(["-Xfrontend", "-enable-actor-data-race-checks"])
+             ]
+         ),
+         .testTarget(
+             name: "NextcloudKitUnitTests",
+             dependencies: ["NextcloudKit", "Mocker"],
+             resources: [
+                 .process("Resources")
+             ]),
+         .testTarget(
+             name: "NextcloudKitIntegrationTests",
+             dependencies: ["NextcloudKit", "Mocker"])
+     ]
+     */
 )

Sources/NextcloudKit/Log/NKLogFileManager.swift

@@ -53,7 +53,7 @@ public enum NKLogTagEmoji: String {
 /// A logger that writes log messages to a file in a subdirectory of the user's Documents folder,
 /// rotates the log daily
 /// Compatible with iOS 13.0+ and Swift 6.
-public final class NKLogFileManager {
+public final class NKLogFileManager: @unchecked Sendable {
 
     // MARK: - Singleton
 
@@ -79,13 +79,13 @@ public final class NKLogFileManager {
     private let logDirectory: URL
     public var logLevel: NKLogLevel
     private var currentLogDate: String
-    private let logQueue = DispatchQueue(label: "LogWriterQueue", attributes: .concurrent)
-    private let rotationQueue = DispatchQueue(label: "LogRotationQueue")
+    private let logQueue = DispatchQueue(label: "com.nextcloud.LogWriterQueue", attributes: .concurrent)
+    private let rotationQueue = DispatchQueue(label: "com.nextcloud.LogRotationQueue")
     private let fileManager = FileManager.default
 
     // Cache for dynamic format strings, populated at runtime. Thread-safe via serial queue.
     private static var cachedDynamicFormatters: [String: DateFormatter] = [:]
-    private static let formatterAccessQueue = DispatchQueue(label: "com.yourapp.dateformatter.cache")
+    private static let formatterAccessQueue = DispatchQueue(label: "com.nextcloud.dateformatter.cache")
 
     // MARK: - Initialization
 

Sources/NextcloudKit/Models/EditorDetails/NKEditorDetailsConverter.swift

@@ -0,0 +1,24 @@
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2025 Marino Faggiana
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import Foundation
+
+public enum NKEditorDetailsConverter {
+
+    /// Parses and converts raw JSON `Data` into `[NKEditorDetailsEditors]` and `[NKEditorDetailsCreators]`.
+    /// - Parameter data: Raw JSON `Data` from the editors/creators endpoint.
+    /// - Returns: A tuple with editors and creators.
+    /// - Throws: Decoding error if parsing fails.
+    public static func from(data: Data) throws -> (editors: [NKEditorDetailsEditor], creators: [NKEditorDetailsCreator]) {
+        let decoded = try JSONDecoder().decode(NKEditorDetailsResponse.self, from: data)
+        let editors = decoded.ocs.data.editorsArray()
+        let creators = decoded.ocs.data.creatorsArray()
+
+        if NKLogFileManager.shared.logLevel == .verbose {
+            data.printJson()
+        }
+
+        return (editors, creators)
+    }
+}

Sources/NextcloudKit/Models/EditorDetails/NKEditorDetailsResponse+NKConversion.swift

@@ -0,0 +1,15 @@
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2025 Marino Faggiana
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import Foundation
+
+public extension NKEditorDetailsResponse.OCS.DataClass {
+    func editorsArray() -> [NKEditorDetailsEditor] {
+        Array(editors.values)
+    }
+
+    func creatorsArray() -> [NKEditorDetailsCreator] {
+        Array(creators.values)
+    }
+}

Sources/NextcloudKit/Models/EditorDetails/NKEditorDetailsResponse.swift

@@ -0,0 +1,85 @@
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2025 Marino Faggiana
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import Foundation
+
+public struct NKEditorDetailsResponse: Codable, Sendable {
+    public let ocs: OCS
+
+    public struct OCS: Codable, Sendable {
+        public let data: DataClass
+
+        public struct DataClass: Codable, Sendable {
+            public let editors: [String: NKEditorDetailsEditor]
+            public let creators: [String: NKEditorDetailsCreator]
+        }
+    }
+}
+
+public struct NKEditorTemplateResponse: Codable, Sendable {
+    public let ocs: OCS
+
+    public struct OCS: Codable, Sendable {
+        public let data: DataClass
+
+        public struct DataClass: Codable, Sendable {
+            public let editors: [NKEditorTemplate]
+        }
+    }
+}
+
+public struct NKEditorDetailsEditor: Codable, Sendable {
+    public let identifier: String
+    public let mimetypes: [String]
+    public let name: String
+    public let optionalMimetypes: [String]
+    public let secure: Bool
+
+    enum CodingKeys: String, CodingKey {
+        case identifier = "id"
+        case mimetypes
+        case name
+        case optionalMimetypes
+        case secure
+    }
+}
+
+public struct NKEditorDetailsCreator: Codable, Sendable {
+    public let identifier: String
+    public let templates: Bool
+    public let mimetype: String
+    public let name: String
+    public let editor: String
+    public let ext: String
+
+    enum CodingKeys: String, CodingKey {
+        case identifier = "id"
+        case templates
+        case mimetype
+        case name
+        case editor
+        case ext = "extension"
+    }
+}
+
+public struct NKEditorTemplate: Codable, Sendable {
+    public var ext: String
+    public var identifier: String
+    public var name: String
+    public var preview: String
+
+    enum CodingKeys: String, CodingKey {
+        case ext = "extension"
+        case identifier = "id"
+        case name
+        case preview
+    }
+
+    public init(ext: String = "", identifier: String = "", name: String = "", preview: String = "") {
+        self.ext = ext
+        self.identifier = identifier
+        self.name = name
+        self.preview = preview
+    }
+}

Sources/NextcloudKit/NKDataFileXML.swift → Sources/NextcloudKit/Models/NKDataFileXML.swift

@@ -253,7 +253,7 @@
         return xml["ocs", "data", "apppassword"].text
     }
 
-    func convertDataFile(xmlData: Data, nkSession: NKSession, showHiddenFiles: Bool, includeHiddenFiles: [String]) -> [NKFile] {
+    func convertDataFile(xmlData: Data, nkSession: NKSession, showHiddenFiles: Bool, includeHiddenFiles: [String]) async -> [NKFile] {
         var files: [NKFile] = []
         let rootFiles = "/" + nkSession.dav + "/files/"
         guard let baseUrl = self.nkCommonInstance.getHostName(urlString: nkSession.urlBase) else {
@@ -309,7 +309,7 @@
             let propstat = element["d:propstat"][0]
 
             if let getlastmodified = propstat["d:prop", "d:getlastmodified"].text,
                let date = getlastmodified.parsedDate(using: "EEE, dd MMM y HH:mm:ss zzz") { 
                 file.date = date
             }
 
@@ -534,12 +534,14 @@
                 file.downloadLimits.append(NKDownloadLimit(count: count, limit: limit, token: token))
             }
 
-            let results = self.nkCommonInstance.getInternalType(fileName: file.fileName, mimeType: file.contentType, directory: file.directory, account: nkSession.account)
+            let results = await self.nkCommonInstance.typeIdentifiers.getInternalType(fileName: file.fileName, mimeType: file.contentType, directory: file.directory, account: nkSession.account)
 
             file.contentType = results.mimeType
             file.iconName = results.iconName
             file.name = "files"
             file.classFile = results.classFile
+            file.typeIdentifier = results.typeIdentifier
+
             file.urlBase = nkSession.urlBase
             file.user = nkSession.user
             file.userId = nkSession.userId
@@ -557,8 +559,8 @@
             }
             if index < files.count - 1,
                (files[index].fileName as NSString).deletingPathExtension == (files[index + 1].fileName as NSString) .deletingPathExtension,
-               files[index].classFile == NKCommon.TypeClassFile.image.rawValue,
-               files[index + 1].classFile == NKCommon.TypeClassFile.video.rawValue {
+               files[index].classFile == NKTypeClassFile.image.rawValue,
+               files[index + 1].classFile == NKTypeClassFile.video.rawValue {
                 files[index].livePhotoFile = files[index + 1].fileId
                 files[index + 1].livePhotoFile = files[index].fileId
             }
@@ -567,7 +569,7 @@
         return files
     }
 
-    func convertDataTrash(xmlData: Data, nkSession: NKSession, showHiddenFiles: Bool) -> [NKTrash] {
+    func convertDataTrash(xmlData: Data, nkSession: NKSession, showHiddenFiles: Bool) async -> [NKTrash] {
         var files: [NKTrash] = []
         var first: Bool = true
         guard let baseUrl = self.nkCommonInstance.getHostName(urlString: nkSession.urlBase) else {
@@ -581,7 +583,7 @@
                 first = false
                 continue
             }
-            let file = NKTrash()
+            var file = NKTrash()
             if let href = element["d:href"].text {
                 var fileNamePath = href
 
@@ -644,11 +646,12 @@
                 file.trashbinDeletionTime = Date(timeIntervalSince1970: trashbinDeletionTimeDouble)
             }
 
-            let results = self.nkCommonInstance.getInternalType(fileName: file.trashbinFileName, mimeType: file.contentType, directory: file.directory, account: nkSession.account)
+            let results = await self.nkCommonInstance.typeIdentifiers.getInternalType(fileName: file.trashbinFileName, mimeType: file.contentType, directory: file.directory, account: nkSession.account)
 
             file.contentType = results.mimeType
             file.classFile = results.classFile
             file.iconName = results.iconName
+            file.typeIdentifier = results.typeIdentifier
 
             files.append(file)
         }