UniformTypeIdentifiers

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

Author: marinofaggiana

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/NKCommon.swift

@@ -6,12 +6,6 @@
 import Foundation
 import Alamofire
 
-#if os(iOS)
-import MobileCoreServices
-#else
-import CoreServices
-#endif
-
 public enum NKTypeReachability: Int {
     case unknown = 0
     case notReachable = 1

Sources/NextcloudKit/TypeIdentifiers/NKTypeIdentifiers.swift

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import Foundation
-import MobileCoreServices
+import UniformTypeIdentifiers
 
 /// Actor responsible for resolving file type metadata (UTI, MIME type, icon, class file, etc.) in a thread-safe manner.
 public actor NKTypeIdentifiers {
@@ -28,16 +28,13 @@ public actor NKTypeIdentifiers {
         var iconName = ""
         var typeIdentifier = ""
         var fileNameWithoutExt = ""
-
-        var uti: CFString?
+        var uti: String?
 
         // UTI cache
         if let cachedUTI = utiCache[ext] {
-            uti = cachedUTI as CFString
-        } else if let unmanagedUTI = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, ext as CFString, nil) {
-            let resolvedUTI = unmanagedUTI.takeRetainedValue()
-            uti = resolvedUTI
-            utiCache[ext] = resolvedUTI as String
+            uti = cachedUTI
+        } else if let type = UTType(filenameExtension: ext) {
+            utiCache[ext] = type.identifier
         }
 
         if let uti {
@@ -48,10 +45,10 @@ public actor NKTypeIdentifiers {
             if mimeType.isEmpty {
                 if let cachedMime = mimeTypeCache[typeIdentifier] {
                     mimeType = cachedMime
-                } else if let mime = UTTypeCopyPreferredTagWithClass(uti, kUTTagClassMIMEType) {
-                    let mimeStr = mime.takeRetainedValue() as String
-                    mimeType = mimeStr
-                    mimeTypeCache[typeIdentifier] = mimeStr
+                } else if let type = UTType(typeIdentifier),
+                          let resolvedMime = type.preferredMIMEType {
+                    mimeType = resolvedMime
+                    mimeTypeCache[typeIdentifier] = resolvedMime
                 }
             }
 
@@ -60,7 +57,7 @@ public actor NKTypeIdentifiers {
                 mimeType = "httpd/unix-directory"
                 classFile = NKTypeClassFile.directory.rawValue
                 iconName = NKTypeIconFile.directory.rawValue
-                typeIdentifier = kUTTypeFolder as String
+                typeIdentifier = UTType.folder.identifier
                 fileNameWithoutExt = fileName
                 ext = ""
             } else {