feat: add excluded extension feature to MD5 fixer (fix #3285)

Bionus · Oct 13, 2024 · 73f6cc0 · 73f6cc0
1 parent 0e952df
commit 73f6cc0
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 12 deletions.
diff --git a/src/gui/src/utils/md5-fix/md5-fix-worker.cpp b/src/gui/src/utils/md5-fix/md5-fix-worker.cpp
@@ -3,12 +3,12 @@
 #include "functions.h"
 
 
-void Md5FixWorker::doWork(const QString &d, const QString &format, const QStringList &suffixes, bool force)
+void Md5FixWorker::doWork(const QString &d, const QString &format, const QStringList &suffixes, const QSet<QString> &excludedExtensions, bool force)
 {
 	QDir dir(d);
 
 	// Get all files from the destination directory
-	auto files = listFilesFromDirectory(dir, suffixes);
+	auto files = listFilesFromDirectory(dir, suffixes, excludedExtensions);
 	emit maximumSet(files.count());
 
 	int loaded = 0;

diff --git a/src/gui/src/utils/md5-fix/md5-fix-worker.h b/src/gui/src/utils/md5-fix/md5-fix-worker.h
@@ -9,7 +9,7 @@ class Md5FixWorker : public QObject
 	Q_OBJECT
 
 	public slots:
-		void doWork(const QString &dir, const QString &filename, const QStringList &suffixes, bool force);
+		void doWork(const QString &dir, const QString &filename, const QStringList &suffixes, const QSet<QString> &excludedExtensions, bool force);
 
 	signals:
 		void maximumSet(int max);

diff --git a/src/gui/src/utils/md5-fix/md5-fix.cpp b/src/gui/src/utils/md5-fix/md5-fix.cpp
@@ -109,5 +109,11 @@ void Md5Fix::start()
 		suffix = suffix.trimmed();
 	}
 
-	emit startWorker(dir, ui->lineFilename->text(), suffixes, force);
+	// Excluded extensions
+	QSet<QString> excludedExtensions;
+	for (QString &excludedExtension : ui->lineExcludeExtensions->text().split(',')) {
+		excludedExtensions.insert(excludedExtension.trimmed());
+	}
+
+	emit startWorker(dir, ui->lineFilename->text(), suffixes, excludedExtensions, force);
 }
diff --git a/src/gui/src/utils/md5-fix/md5-fix.h b/src/gui/src/utils/md5-fix/md5-fix.h
@@ -33,7 +33,7 @@ class Md5Fix : public QDialog
 		void workerFinished(int loadedCount);
 
 	signals:
-		void startWorker(const QString &dir, const QString &format, const QStringList &suffixes, bool force);
+		void startWorker(const QString &dir, const QString &format, const QStringList &suffixes, const QSet<QString> &excludedExtensions, bool force);
 
 	private:
 		Ui::Md5Fix *ui;

diff --git a/src/gui/src/utils/md5-fix/md5-fix.ui b/src/gui/src/utils/md5-fix/md5-fix.ui
@@ -19,7 +19,7 @@
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="fieldGrowthPolicy">
-    <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+    <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
    </property>
    <item row="0" column="0" colspan="2">
     <widget class="QLabel" name="label_3">
@@ -68,7 +68,7 @@
    <item row="4" column="1">
     <widget class="QLineEdit" name="lineFilename"/>
    </item>
-   <item row="6" column="0" colspan="2">
+   <item row="7" column="0" colspan="2">
     <widget class="QProgressBar" name="progressBar">
      <property name="enabled">
       <bool>true</bool>
@@ -78,12 +78,12 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2">
+   <item row="8" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -119,6 +119,20 @@
    <item row="5" column="1">
     <widget class="QLineEdit" name="lineSuffixes"/>
    </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="labelExcludeExtensions">
+     <property name="text">
+      <string>Exclude extensions</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <widget class="QLineEdit" name="lineExcludeExtensions">
+     <property name="text">
+      <string>txt, xmp</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>

diff --git a/src/lib/src/functions.cpp b/src/lib/src/functions.cpp
@@ -1064,15 +1064,16 @@ bool isFileParentWithSuffix(const QString &fileName, const QString &parent, cons
 	}
 	return false;
 }
-QList<QPair<QString, QStringList>> listFilesFromDirectory(const QDir &dir, const QStringList &suffixes)
+QList<QPair<QString, QStringList>> listFilesFromDirectory(const QDir &dir, const QStringList &suffixes, const QSet<QString> &excludedExtensions)
 {
 	auto files = QList<QPair<QString, QStringList>>();
 
 	QDirIterator it(dir, QDirIterator::Subdirectories);
 	while (it.hasNext()) {
 		it.next();
 
-		if (it.fileInfo().isDir()) {
+		const QFileInfo fi = it.fileInfo();
+		if (fi.isDir() || excludedExtensions.contains(fi.suffix())) {
 			continue;
 		}
 

diff --git a/src/lib/src/functions.h b/src/lib/src/functions.h
@@ -3,6 +3,7 @@
 
 #include <QMap>
 #include <QRect>
+#include <QSet>
 #include <QString>
 #include <QStringList>
 #include <QKeySequence>
@@ -88,7 +89,7 @@ QString decodeHtmlEntities(const QString &html);
 QString qFontToCss(const QFont &font);
 QFont qFontFromString(const QString &str);
 
-QList<QPair<QString, QStringList>> listFilesFromDirectory(const QDir &dir, const QStringList &suffixes);
+QList<QPair<QString, QStringList>> listFilesFromDirectory(const QDir &dir, const QStringList &suffixes, const QSet<QString> &excludedExtensions = {});
 
 QUrl removeCacheBuster(QUrl url);