Add a rate limiter to Qt's progress dialog

To work around a macOS specific issue where theh progress bar is not updated. With this the previous workaround for other OSes also isn't needed.
2026-07-07 08:49:07 +00:00 · 2021-08-18 20:40:53 +08:00
parent a30dfd7e34
commit adb4325d79
7 changed files with 229 additions and 189 deletions
@@ -1,55 +1,56 @@
-// Copyright 2019 threeSD Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <atomic>
-#include <functional>
-#include <QThread>
-#include "common/progress_callback.h"
-#include "core/importer.h"
-
-class MultiJob : public QThread {
-    Q_OBJECT
-
-public:
-    using ExecuteFunc = std::function<bool(Core::SDMCImporter&, const Core::ContentSpecifier&,
-                                           const Common::ProgressCallback&)>;
-    using AbortFunc = std::function<void(Core::SDMCImporter&)>;
-
-    explicit MultiJob(QObject* parent, Core::SDMCImporter& importer,
-                      std::vector<Core::ContentSpecifier> contents, ExecuteFunc execute_func,
-                      AbortFunc abort_func);
-    ~MultiJob() override;
-
-    void run() override;
-    void Cancel();
-
-    std::vector<Core::ContentSpecifier> GetFailedContents() const;
-
-signals:
-    /**
-     * Called when progress is updated on the current content.
-     * @param current_imported_size Imported size of the current content.
-     * @param total_imported_size Total imported size taking all previous contents into
-     * consideration.
-     * @param eta ETA in seconds, 0 when not determined.
-     */
-    void ProgressUpdated(u64 current_imported_size, u64 total_imported_size, int eta);
-
-    /// Dumping of a content has been finished, go on to the next. Called at start as well.
-    void NextContent(std::size_t count, const Core::ContentSpecifier& next_content, int eta);
-
-    void Completed();
-
-private:
-    std::atomic_bool cancelled{false};
-    Core::SDMCImporter& importer;
-    std::vector<Core::ContentSpecifier> contents;
-    std::vector<Core::ContentSpecifier> failed_contents;
-    ExecuteFunc execute_func;
-    AbortFunc abort_func;
-};
-
-Q_DECLARE_METATYPE(Core::ContentSpecifier)
+// Copyright 2019 threeSD Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <atomic>
+#include <functional>
+#include <QThread>
+#include "common/progress_callback.h"
+#include "core/importer.h"
+
+class MultiJob : public QThread {
+    Q_OBJECT
+
+public:
+    using ExecuteFunc = std::function<bool(Core::SDMCImporter&, const Core::ContentSpecifier&,
+                                           const Common::ProgressCallback&)>;
+    using AbortFunc = std::function<void(Core::SDMCImporter&)>;
+
+    explicit MultiJob(QObject* parent, Core::SDMCImporter& importer,
+                      std::vector<Core::ContentSpecifier> contents, ExecuteFunc execute_func,
+                      AbortFunc abort_func);
+    ~MultiJob() override;
+
+    void run() override;
+    void Cancel();
+
+    std::vector<Core::ContentSpecifier> GetFailedContents() const;
+
+signals:
+    /**
+     * Called when progress is updated on the current content.
+     * @param current_imported_size Imported size of the current content.
+     * @param total_imported_size Total imported size taking all previous contents into
+     * consideration.
+     * @param eta ETA in seconds, 0 when not determined.
+     */
+    void ProgressUpdated(u64 current_imported_size, u64 total_imported_size, int eta);
+
+    /// Dumping of a content has been finished, go on to the next. Called at start as well.
+    void NextContent(std::size_t count, u64 total_imported_size,
+                     const Core::ContentSpecifier& next_content, int eta);
+
+    void Completed();
+
+private:
+    std::atomic_bool cancelled{false};
+    Core::SDMCImporter& importer;
+    std::vector<Core::ContentSpecifier> contents;
+    std::vector<Core::ContentSpecifier> failed_contents;
+    ExecuteFunc execute_func;
+    AbortFunc abort_func;
+};
+
+Q_DECLARE_METATYPE(Core::ContentSpecifier)