Add a tags column

Hamuko · May 26, 2024 · 392c823 · 392c823
1 parent 5224c2a
commit 392c823
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/Dreadnought/ClientData.swift b/Dreadnought/ClientData.swift
@@ -44,6 +44,7 @@ struct TorrentData: Decodable {
     let category: String?
     let addedOn: Int?
     let state: String?
+    let tags: String?
 
     enum CodingKeys: String, CodingKey {
         case name
@@ -55,6 +56,7 @@ struct TorrentData: Decodable {
         case category
         case addedOn = "added_on"
         case state
+        case tags
     }
 
     init(from decoder: any Decoder) throws {
@@ -68,6 +70,7 @@ struct TorrentData: Decodable {
         category = (try? values.decode(String.self, forKey: .category))
         addedOn = try? values.decode(Int.self, forKey: .addedOn)
         state = try? values.decode(String.self, forKey: .state)
+        tags = try? values.decode(String.self, forKey: .tags)
     }
 }
 

diff --git a/Dreadnought/ContentView.swift b/Dreadnought/ContentView.swift
@@ -251,6 +251,12 @@ struct TorrentList: View {
                 .width(min: 1)
                 .customizationID("category")
 
+                TableColumn("Tags") { torrent in
+                    Text(torrent.tags.joined(separator: ", "))
+                }
+                .width(min: 1)
+                .customizationID("tags")
+
                 TableColumn("Added on", value: \.addedOn) { torrent in
                     Text(torrent.addedOn, format: .dateTime)
                         .help(torrent.addedOn.formatted(.relative(presentation: .numeric, unitsStyle: .wide)))
@@ -552,7 +558,8 @@ struct LoginView: View {
             speedUp: 1490124,
             category: "Linux",
             addedOn: Date(timeIntervalSince1970: 1710550279),
-            state: .uploading
+            state: .uploading,
+            tags: []
         ),
         "2aa4f5a7e209e54b32803d43670971c4c8caaa05": Torrent(
             hash: "2aa4f5a7e209e54b32803d43670971c4c8caaa05",
@@ -564,7 +571,8 @@ struct LoginView: View {
             speedUp: 198453,
             category: "Linux",
             addedOn: Date(timeIntervalSince1970: 1715512279),
-            state: .downloading
+            state: .downloading,
+            tags: []
         ),
         "0852ef544a4694995fcbef7132477c688ded7d9a": Torrent(
             hash: "0852ef544a4694995fcbef7132477c688ded7d9a",
@@ -576,7 +584,8 @@ struct LoginView: View {
             speedUp: 0,
             category: "Not Linux",
             addedOn: Date(timeIntervalSince1970: 1715514390),
-            state: .stalledDL
+            state: .stalledDL,
+            tags: []
         ),
     ]
     client.connectionStatus = .connected

diff --git a/Dreadnought/Data.swift b/Dreadnought/Data.swift
@@ -11,6 +11,7 @@ struct Torrent: Identifiable {
     var category: String
     var addedOn: Date
     var state: TorrentState
+    var tags: [String]
 
     var id: String { hash }
 
@@ -24,7 +25,8 @@ struct Torrent: Identifiable {
         speedUp:Int64,
         category: String,
         addedOn: Date,
-        state: TorrentState
+        state: TorrentState,
+        tags: [String]
     ) {
         self.hash = hash
         self.name = name
@@ -36,6 +38,7 @@ struct Torrent: Identifiable {
         self.category = category
         self.addedOn = addedOn
         self.state = state
+        self.tags = tags
     }
 
     init(hash: String, data: TorrentData) {
@@ -49,6 +52,7 @@ struct Torrent: Identifiable {
         self.category = data.category!
         self.addedOn = Date(timeIntervalSince1970: TimeInterval(data.addedOn!))
         self.state = TorrentState.from(data.state!)
+        self.tags = data.tags!.split(separator: ", ").map { String($0) }
     }
 
     mutating func update(data: TorrentData) {
@@ -73,6 +77,9 @@ struct Torrent: Identifiable {
         if let state = data.state {
             self.state = TorrentState.from(state)
         }
+        if let tags = data.tags {
+            self.tags = tags.split(separator: ", ").map { String($0) }
+        }
     }
 }