diff --git a/src/file/regexpcache.cpp b/src/file/regexpcache.cpp index 7e2a3a2b..32938fb8 100644 --- a/src/file/regexpcache.cpp +++ b/src/file/regexpcache.cpp @@ -1,59 +1,67 @@ /* This file is part of the KDE Baloo project. Copyright (C) 2010 Sebastian Trueg Copyright (C) 2014 Vishesh Handa This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #include "regexpcache.h" #include RegExpCache::RegExpCache() { } RegExpCache::~RegExpCache() { } bool RegExpCache::exactMatch(const QString& s) const { + if (m_exactMatches.contains(s)) { + return true; + } for (const QRegularExpression& filter : qAsConst(m_regexpCache)) { if (filter.match(s).hasMatch()) { return true; } } return false; } void RegExpCache::rebuildCacheFromFilterList(const QStringList& filters) { m_regexpCache.clear(); + m_exactMatches.clear(); for (const QString& filter : filters) { QString f = filter; + if (!f.contains(QLatin1Char('*')) && !f.contains(QLatin1Char('?'))) { + m_exactMatches += f; + continue; + } f.replace(QLatin1Char('.'), QStringLiteral("\\.")); f.replace(QLatin1Char('?'), QLatin1Char('.')); f.replace(QStringLiteral("*"), QStringLiteral(".*")); f = QLatin1String("^") + f + QLatin1String("$"); m_regexpCache.append(QRegularExpression(f)); } } diff --git a/src/file/regexpcache.h b/src/file/regexpcache.h index 60d370de..2ea3bb95 100644 --- a/src/file/regexpcache.h +++ b/src/file/regexpcache.h @@ -1,43 +1,45 @@ /* This file is part of the KDE Baloo project. Copyright (C) 2010 Sebastian Trueg This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #ifndef REGEXP_CACHE_H_ #define REGEXP_CACHE_H_ #include +#include #include class RegExpCache { public: RegExpCache(); ~RegExpCache(); bool exactMatch(const QString& s) const; void rebuildCacheFromFilterList(const QStringList& filters); private: QList m_regexpCache; + QSet m_exactMatches; }; #endif