WIP

Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com>

Author: mpivchev

Sources/NextcloudKit/Models/NKDataFileXML.swift

@@ -464,11 +464,8 @@ public class NKDataFileXML: NSObject {
                 file.lockTimeOut = file.lockTime?.addingTimeInterval(TimeInterval(lockTimeOut))
             }
 
-            let tagsElements = propstat["d:prop", "nc:system-tags"]
-            for element in tagsElements["nc:system-tag"] {
-                guard let tag = element.text else { continue }
-                file.tags.append(tag)
-            }
+            let tags: [NKTag] = NKTag.parse(systemTagElements: propstat["d:prop", "nc:system-tags", "nc:system-tag"])
+            file.tags.append(contentsOf: tags)
 
             // NC27 -----
             if let latitude = propstat["d:prop", "nc:file-metadata-gps", "latitude"].double {

Sources/NextcloudKit/Models/NKFile.swift

@@ -56,7 +56,7 @@ public struct NKFile: Sendable {
     public var shareType: [Int]
     public var size: Int64
     public var serverUrl: String
-    public var tags: [String]
+    public var tags: [NKTag]
     public var trashbinFileName: String
     public var trashbinOriginalLocation: String
     public var trashbinDeletionTime: Date
@@ -128,7 +128,7 @@ public struct NKFile: Sendable {
         shareType: [Int] = [],
         size: Int64 = 0,
         serverUrl: String = "",
-        tags: [String] = [],
+        tags: [NKTag] = [],
         trashbinFileName: String = "",
         trashbinOriginalLocation: String = "",
         trashbinDeletionTime: Date = Date(),

Sources/NextcloudKit/Models/NKTag.swift

@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import Foundation
+import SwiftyXMLParser
 
 public struct NKTag: Sendable, Equatable, Hashable {
     public let id: String
@@ -14,4 +15,48 @@ public struct NKTag: Sendable, Equatable, Hashable {
         self.name = name
         self.color = color
     }
+
+    static func parse(xmlData: Data) -> [NKTag] {
+        let xml = XML.parse(xmlData)
+        let responses = xml["d:multistatus", "d:response"]
+        var tags: [NKTag] = []
+
+        for response in responses {
+            let propstat = response["d:propstat"][0]
+            guard let id = propstat["d:prop", "oc:id"].text,
+                  let name = propstat["d:prop", "oc:display-name"].text else {
+                continue
+            }
+
+            let color = normalizedColor(propstat["d:prop", "nc:color"].text)
+
+            tags.append(NKTag(id: id, name: name, color: color))
+        }
+
+        return tags
+    }
+
+    static func parse(systemTagElements: XML.Accessor) -> [NKTag] {
+        var tags: [NKTag] = []
+
+        for element in systemTagElements {
+            guard let name = element.text?.trimmingCharacters(in: .whitespacesAndNewlines),
+                  !name.isEmpty else {
+                continue
+            }
+
+            let id = element.attributes["oc:id"] ?? ""
+            let color = normalizedColor(element.attributes["nc:color"])
+            tags.append(NKTag(id: id, name: name, color: color))
+        }
+
+        return tags
+    }
+
+    private static func normalizedColor(_ rawValue: String?) -> String? {
+        guard let rawValue, !rawValue.isEmpty else {
+            return nil
+        }
+        return rawValue.hasPrefix("#") ? rawValue : "#\(rawValue)"
+    }
 }