Add option to remove and add tags

Michael-128 · Feb 5, 2025 · 1fcee35 · 1fcee35
1 parent edf8304
commit 1fcee35
Show file tree

Hide file tree

Showing 4 changed files with 119 additions and 23 deletions.
diff --git a/Localization/Localizations/Localizable.xcstrings b/Localization/Localizations/Localizable.xcstrings
@@ -646,6 +646,9 @@
     },
     "Add New Category" : {
 
+    },
+    "Add New Tag" : {
+
     },
     "Add Server" : {
       "localizations" : {
@@ -686,6 +689,9 @@
           }
         }
       }
+    },
+    "Add Tag" : {
+
     },
     "Add Task" : {
       "localizations" : {
@@ -6603,6 +6609,9 @@
           }
         }
       }
+    },
+    "Tag Name" : {
+
     },
     "Tags" : {
       "localizations" : {

diff --git a/qBitControl/Classes/qBittorrentClass.swift b/qBitControl/Classes/qBittorrentClass.swift
@@ -355,6 +355,30 @@ class qBittorrent {
         qBitRequest.requestTorrentManagement(request: request, statusCode: {code in result((code == 200))})
     }
 
+    static func removeTag(tag: String, then callback: ((Int) -> Void)?) {
+        let request = qBitRequest.prepareURLRequest(path: "/api/v2/torrents/deleteTags", queryItems: [
+            URLQueryItem(name: "tags", value: tag)
+        ])
+
+        if let callback = callback {
+            qBitRequest.requestTorrentManagement(request: request, statusCode: {status in callback(status ?? 0)})
+        } else {
+            qBitRequest.requestTorrentManagement(request: request, statusCode: {_ in})
+        }
+    }
+
+    static func addTag(tag: String, then callback: ((Int) -> Void)?) {
+        let request = qBitRequest.prepareURLRequest(path: "/api/v2/torrents/createTags", queryItems: [
+            URLQueryItem(name: "tags", value: tag)
+        ])
+
+        if let callback = callback {
+            qBitRequest.requestTorrentManagement(request: request, statusCode: {status in callback(status ?? 0)})
+        } else {
+            qBitRequest.requestTorrentManagement(request: request, statusCode: {_ in})
+        }
+    }
+
     static func pauseTorrent(hash: String) {
         // qBittorrent 5.0.0 changes pause route to stop and resume to start
         let suffix = self.version.major == 5 ? "stop" : "pause"

diff --git a/qBitControl/Components/ChangeTagsView.swift b/qBitControl/Components/ChangeTagsView.swift
@@ -8,17 +8,26 @@ struct ChangeTagsView: View {
 
     public var onTagsChange: ((Set<String>) -> Void)?
 
+    @State private var showAddTagAlert = false
+    @State private var newTagName = ""
+
     init(torrentHash: String, selectedTags: [String]) {
         self.torrentHash = torrentHash
         self.selectedTags = Set(selectedTags)
     }
 
-    init(onTagsChange: @escaping (Set<String>) -> Void) {
-        self.selectedTags = Set()
+    init(selectedTags: Set<String>, onTagsChange: @escaping (Set<String>) -> Void) {
+        self.selectedTags = selectedTags
         self.onTagsChange = onTagsChange
     }
 
-    func removeTag(tag: String) {
+    func getTags() {
+        qBittorrent.getTags(completionHandler: { tags in
+            self.allTags = tags.sorted()
+        })
+    }
+
+    func unsetTag(tag: String) {
         if let hash = self.torrentHash {
             qBittorrent.unsetTag(hash: hash, tag: tag, result: { isSuccess in
                 if(isSuccess) { selectedTags.remove(tag) }
@@ -32,7 +41,7 @@ struct ChangeTagsView: View {
         }
     }
 
-    func addTag(tag: String) {
+    func setTag(tag: String) {
         if let hash = self.torrentHash {
             qBittorrent.setTag(hash: hash, tag: tag, result: { isSuccess in
                 if(isSuccess) { selectedTags.insert(tag) }
@@ -46,36 +55,90 @@ struct ChangeTagsView: View {
         }
     }
 
+    func addTag() {
+        qBittorrent.addTag(tag: newTagName, then: { status in
+            if(status == 200) {
+                self.getTags()
+            }
+        })
+    }
+
+    func removeTag(tag: String) {
+        qBittorrent.removeTag(tag: tag, then: { status in
+            if(status == 200) {
+                self.getTags()
+                self.clearSelectedTags()
+            }
+        })
+    }
+
+    func clearSelectedTags() {
+        if let onTagsChange = self.onTagsChange {
+            self.selectedTags = self.selectedTags.filter { tag in
+                return self.allTags.contains(tag)
+            }
+            onTagsChange(selectedTags)
+        }
+    }
+
+
     var body: some View {
         VStack {
             Form {
+                Section(header: Text("Add Tag")) {
+                    Button {
+                        showAddTagAlert = true
+                    } label: {
+                        Label("Add Tag", systemImage: "plus.circle")
+                    }.alert("Add New Tag", isPresented: $showAddTagAlert, actions: {
+                        TextField("Tag Name", text: $newTagName)
+                        Button("Add", action: {
+                            self.addTag()
+                            newTagName = ""
+                        })
+                        Button("Cancel", role: .cancel, action: {
+                            newTagName = ""
+                        })
+                    })
+                }
+
                 if allTags.count > 1 {
-                    List(allTags, id: \.self) { tag in
-                        Button {
-                            if selectedTags.contains(tag) {
-                                removeTag(tag: tag)
-                            } else {
-                                addTag(tag: tag)
-                            }
-                        } label: {
-                            HStack {
-                                Text(tag)
-                                    .foregroundStyle(.foreground)
-                                Spacer()
-                                if selectedTags.contains(tag) {
-                                    Image(systemName: "checkmark")
-                                        .foregroundColor(.accentColor)
+                    Section {
+                        List {
+                            ForEach(allTags, id: \.self) { tag in
+                                Button {
+                                    if selectedTags.contains(tag) {
+                                        unsetTag(tag: tag)
+                                    } else {
+                                        setTag(tag: tag)
+                                    }
+                                } label: {
+                                    HStack {
+                                        Text(tag)
+                                            .foregroundStyle(.foreground)
+                                        Spacer()
+                                        if selectedTags.contains(tag) {
+                                            Image(systemName: "checkmark")
+                                                .foregroundColor(.accentColor)
+                                        }
+                                    }
                                 }
                             }
+
+                            .onDelete(perform: { atOffsets in
+                                atOffsets.forEach { index in
+                                    self.removeTag(tag: self.allTags[index])
+                                }
+
+                                self.allTags.remove(atOffsets: atOffsets)
+                            })
                         }
                     }
                 }
             }
             .navigationTitle("Tags")
         }.onAppear() {
-            qBittorrent.getTags(completionHandler: { _tags in
-                self.allTags = _tags.sorted()
-            })
+            self.getTags()
         }
     }
 }
diff --git a/qBitControl/Views/TorrentViews/TorrentAddView.swift b/qBitControl/Views/TorrentViews/TorrentAddView.swift
@@ -120,7 +120,7 @@ struct TorrentAddView: View {
                     }
 
                     NavigationLink {
-                        ChangeTagsView(onTagsChange: { selectedTags in
+                        ChangeTagsView(selectedTags: viewModel.selectedTags, onTagsChange: { selectedTags in
                             viewModel.selectedTags = selectedTags
                         })
                     } label: {