Merge pull request #1114 from Holt59/iorganizer-findfiles-glob

Add findFiles overload with glob patterns.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
index e67952d9..d728ecad 100644
--- a/src/organizerproxy.cpp
+++ b/src/organizerproxy.cpp
@@ -4,6 +4,7 @@
 #include "organizercore.h"

 #include "plugincontainer.h"

 #include "settings.h"

+#include "glob_matching.h"

 

 #include <QObject>

 #include <QApplication>

@@ -217,6 +218,22 @@ QStringList OrganizerProxy::findFiles(const QString &path, const std::function<b
   return m_Proxied->findFiles(path, filter);

 }

 

+QStringList OrganizerProxy::findFiles(const QString& path, const QStringList& globFilters) const

+{

+  QList<GlobPattern<QChar>> patterns;

+  for (auto& gfilter : globFilters) {

+    patterns.append(GlobPattern(gfilter));

+  }

+  return findFiles(path, [&patterns](const QString& filename) {

+    for (auto& p : patterns) {

+      if (p.match(filename)) {

+        return true;

+      }

+    }

+    return false;

+  });

+}

+

 QStringList OrganizerProxy::getFileOrigins(const QString &fileName) const

 {

   return m_Proxied->getFileOrigins(fileName);