From 6b14facd29b114f3ec22162aad7940d8a163f887 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Fri, 23 Feb 2024 22:09:57 +0100
Subject: [PATCH] impr: Cleanup task progress handling

---
 .../builtin/source/content/main_menu_items.cpp | 18 ++++++------------
 .../content/tools/file_tool_combiner.cpp       |  4 +---
 .../content/data_information_sections.cpp      |  4 +---
 .../source/content/views/view_yara.cpp         |  5 +----
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/plugins/builtin/source/content/main_menu_items.cpp b/plugins/builtin/source/content/main_menu_items.cpp
index bf510aa42..a12a2d602 100644
--- a/plugins/builtin/source/content/main_menu_items.cpp
+++ b/plugins/builtin/source/content/main_menu_items.cpp
@@ -89,14 +89,12 @@ namespace hex::plugin::builtin {
 
                     auto provider = ImHexApi::Provider::get();
 
-                    u64 count = 0;
                     for (auto &[address, value] : patch->get()) {
                         provider->write(address, &value, sizeof(value));
-                        count += 1;
-                        task.update(count);
+                        task.increment();
                     }
 
-                    provider->getUndoStack().groupOperations(count, "hex.builtin.undo_operation.patches");
+                    provider->getUndoStack().groupOperations(patch->get().size(), "hex.builtin.undo_operation.patches");
                 });
             });
         }
@@ -115,14 +113,12 @@ namespace hex::plugin::builtin {
 
                     auto provider = ImHexApi::Provider::get();
 
-                    u64 count = 0;
                     for (auto &[address, value] : patch->get()) {
                         provider->write(address, &value, sizeof(value));
-                        count += 1;
-                        task.update(count);
+                        task.increment();
                     }
 
-                    provider->getUndoStack().groupOperations(count, "hex.builtin.undo_operation.patches");
+                    provider->getUndoStack().groupOperations(patch->get().size(), "hex.builtin.undo_operation.patches");
                 });
             });
         }
@@ -151,14 +147,12 @@ namespace hex::plugin::builtin {
 
                     task.setMaxValue(patches.size());
 
-                    u64 count = 0;
                     for (auto &[address, value] : patches) {
                         provider->write(address, &value, sizeof(value));
-                        count += 1;
-                        task.update(count);
+                        task.increment();
                     }
 
-                    provider->getUndoStack().groupOperations(count, "hex.builtin.undo_operation.patches");
+                    provider->getUndoStack().groupOperations(patches.size(), "hex.builtin.undo_operation.patches");
                 });
             });
         }
diff --git a/plugins/builtin/source/content/tools/file_tool_combiner.cpp b/plugins/builtin/source/content/tools/file_tool_combiner.cpp
index 2a308c310..523d6865d 100644
--- a/plugins/builtin/source/content/tools/file_tool_combiner.cpp
+++ b/plugins/builtin/source/content/tools/file_tool_combiner.cpp
@@ -120,10 +120,8 @@ namespace hex::plugin::builtin {
 
                         task.setMaxValue(files.size());
 
-                        u64 fileIndex = 0;
                         for (const auto &file : files) {
-                            task.update(fileIndex);
-                            fileIndex++;
+                            task.increment();
 
                             wolv::io::File input(file, wolv::io::File::Mode::Read);
                             if (!input.isValid()) {
diff --git a/plugins/yara_rules/source/content/data_information_sections.cpp b/plugins/yara_rules/source/content/data_information_sections.cpp
index 4943de2f4..b19a6ccca 100644
--- a/plugins/yara_rules/source/content/data_information_sections.cpp
+++ b/plugins/yara_rules/source/content/data_information_sections.cpp
@@ -30,7 +30,6 @@ namespace hex::plugin::yara {
             const auto &ruleFilePaths = romfs::list("rules");
             task.setMaxValue(ruleFilePaths.size());
 
-            u32 progress = 0;
             for (const auto &ruleFilePath : ruleFilePaths) {
                 const std::string fileContent = romfs::get(ruleFilePath).data<const char>();
 
@@ -46,8 +45,7 @@ namespace hex::plugin::yara {
                     }
                 }
 
-                task.update(progress);
-                progress += 1;
+                task.increment();
             }
         }
 
diff --git a/plugins/yara_rules/source/content/views/view_yara.cpp b/plugins/yara_rules/source/content/views/view_yara.cpp
index 6de536fd6..9c0c4f642 100644
--- a/plugins/yara_rules/source/content/views/view_yara.cpp
+++ b/plugins/yara_rules/source/content/views/view_yara.cpp
@@ -247,8 +247,6 @@ namespace hex::plugin::yara {
             return;
 
         m_matcherTask = TaskManager::createTask("hex.yara_rules.view.yara.matching", 0, [this, provider](auto &task) {
-            u32 progress = 0;
-
             std::vector<YaraRule::Result> results;
             for (const auto &[fileName, filePath] : *m_rulePaths) {
                 YaraRule rule(filePath);
@@ -268,8 +266,7 @@ namespace hex::plugin::yara {
 
                 results.emplace_back(result.value());
 
-                task.update(progress);
-                progress += 1;
+                task.increment();
             }
 
             TaskManager::doLater([this, results = std::move(results)] {