Add LongJobHelper to the Addons::CleanUp

Author: u-235

addons/src/cleanup/addons-cleanup.cpp

@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2006-2018 by Artur Kozioł, artkoz78@gmail.com
- *  Copyright (C) 2023 Nick Egorrov, nicegorov@yandex.ru
+ *  Copyright (C) 2023-2025 Nick Egorrov, nicegorov@yandex.ru
  *
  *  This file is part of GCodeWorkShop.
  *
@@ -18,11 +18,16 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QDialog>      // for QDialog, QDialog::Accepted
-#include <QObject>      // for QObject
-#include <QString>      // for QString
-#include <QStringList>  // for QStringList
-#include <QWidget>      // for QWidget
+#include <functional>   // for function
+
+#include <QCoreApplication> // for QCoreApplication
+#include <QDialog>          // for QDialog, QDialog::Accepted
+#include <QObject>          // for QObject
+#include <QString>          // for QString
+#include <QStringList>      // for QStringList
+#include <QWidget>          // for QWidget
+
+#include <ui/longjobhelper.h>   // for LongJobHelper, LongJobHelper::CANCEL
 
 #include "addons-cleanup.h"
 #include "cleanupdialog.h"          // for CleanUpDialog
@@ -54,10 +59,18 @@ bool Addons::doCleanUp(QWidget* parent, QSettings* settings,  QString& tx)
 
 	dlg->setText(tx);
 
-	if (dlg->exec() == QDialog::Accepted) {
-		result = Utils::removeTextByRegExp(tx, dlg->options().selected);
+	if (dlg->exec() != QDialog::Accepted) {
+		return false;
 	}
 
+	LongJobHelper helper{parent};
+	helper.begin(tx.length(), QCoreApplication::translate("Addons::Actions", "Cleaning up"), 20);
+
+	result = Utils::removeTextByRegExp(tx, dlg->options().selected, true, [&helper](int pos) -> bool{
+		return helper.check(pos) == LongJobHelper::CANCEL;
+	});
+
+	helper.end();
 	dlg->deleteLater();
 	return result;
 }

addons/src/cleanup/utils-removebyregex.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2023 Nick Egorrov, nicegorov@yandex.ru
+ *  Copyright (C) 2023-2023 Nick Egorrov, nicegorov@yandex.ru
  *
  *  This file is part of GCodeWorkShop.
  *
@@ -17,26 +17,60 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QRegularExpression>   // for QRegularExpression
-#include <QString>              // for QString
-#include <QStringList>          // for QStringList
+#include <QRegularExpression>               // for QRegularExpression
+#include <QRegularExpressionMatch>          // for QRegularExpressionMatch
+#include <QRegularExpressionMatchIterator>  // for QRegularExpressionMatchIterator
+#include <QString>                          // for QString
+#include <QStringList>                      // for QStringList
 
 #include "utils-removebyregex.h"
 
 
-bool Utils::removeTextByRegExp(QString& tx, QStringList expList, bool replaceDollar)
+bool Utils::removeTextByRegExp(QString& tx,
+                               const QStringList& expList,
+                               bool replaceDollar,
+                               const std::function<bool (int)>& interrupt)
 {
 	if (expList.isEmpty()) {
 		return false;
 	}
 
-	for (QString regexp : expList) {
-		if (replaceDollar && regexp.contains('$') && !regexp.contains("\\$")) {
-			regexp.replace('$', "\\n");
+	QString complex;
+
+	// Glue multiple regular expressions into one.
+	for (QString exp : expList) {
+		if (replaceDollar && exp.contains('$') && !exp.contains("\\$")) {
+			exp.replace('$', "\\n");
+		}
+
+		if (!complex.isEmpty()) {
+			complex.append("|");
+		}
+
+		complex.append(exp);
+	}
+
+	QRegularExpression regexpr{
+		complex,
+		QRegularExpression::CaseInsensitiveOption
+	};
+	QRegularExpressionMatchIterator iterator = regexpr.globalMatch(tx);
+
+	int pos = 0;
+	QString result;
+
+	while (iterator.hasNext()) {
+		if (interrupt(pos)) {
+			return false;
 		}
 
-		tx.remove(QRegularExpression(regexp));
+		const QRegularExpressionMatch& match = iterator.next();
+		const QString& sub = tx.mid(pos, match.capturedStart() - pos);
+		result.append(sub);
+		pos = match.capturedEnd();
 	}
 
+	result.append(tx.mid(pos));
+	tx = result;
 	return true;
 }

addons/src/cleanup/utils-removebyregex.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2023 Nick Egorrov, nicegorov@yandex.ru
+ *  Copyright (C) 2023-2025 Nick Egorrov, nicegorov@yandex.ru
  *
  *  This file is part of GCodeWorkShop.
  *
@@ -20,13 +20,18 @@
 #ifndef UTILS_REMOVEBYREGEX_H
 #define UTILS_REMOVEBYREGEX_H
 
+#include <functional>   // for function
+
 #include <QStringList>  // for QStringList
 
 class QString;
 
 
 namespace Utils {
-bool removeTextByRegExp(QString& tx, QStringList expList, bool replaceDollar = true);
+bool removeTextByRegExp(QString& tx,
+                        const QStringList& expList,
+                        bool replaceDollar,
+                        const std::function<bool(int)>& interrupt);
 }
 
 #endif // UTILSREMOVEBY_REGEX_H