X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/438620f2b77f4da62c682729bc6e1c0ce8bfc2c6..1e5bc5b3d6ba344da09369802d822f6cd6da7c4c:/src/search/dolphinquery.cpp diff --git a/src/search/dolphinquery.cpp b/src/search/dolphinquery.cpp index 4b5499378..ed2a6a766 100644 --- a/src/search/dolphinquery.cpp +++ b/src/search/dolphinquery.cpp @@ -1,90 +1,75 @@ -/*************************************************************************** - * Copyright (C) 2019 by Ismael Asensio * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program 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 General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2019 Ismael Asensio + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dolphinquery.h" #include -#include -#ifdef HAVE_BALOO +#include "config-dolphin.h" +#if HAVE_BALOO #include #endif -namespace { -#ifdef HAVE_BALOO - /** Checks if a given term in the Baloo::Query::searchString() is a special search term - * @return: the specific search token of the term, or an empty QString() if none is found - */ - QString searchTermToken(const QString& term) - { - static const QLatin1String searchTokens[] { - QLatin1String("filename:"), - QLatin1String("modified>="), - QLatin1String("rating>="), - QLatin1String("tag:"), QLatin1String("tag=") - }; - - for (const auto &searchToken : searchTokens) { - if (term.startsWith(searchToken)) { - return searchToken; - } +namespace +{ +#if HAVE_BALOO +/** Checks if a given term in the Baloo::Query::searchString() is a special search term + * @return: the specific search token of the term, or an empty QString() if none is found + */ +QString searchTermToken(const QString &term) +{ + static const QLatin1String searchTokens[]{QLatin1String("filename:"), + QLatin1String("modified>="), + QLatin1String("rating>="), + QLatin1String("tag:"), + QLatin1String("tag=")}; + + for (const auto &searchToken : searchTokens) { + if (term.startsWith(searchToken)) { + return searchToken; } - return QString(); } + return QString(); +} - QString stripQuotes(const QString& text) - { - if (text.length() >= 2 && text.at(0) == QLatin1Char('"') - && text.back() == QLatin1Char('"')) { - return text.mid(1, text.size() - 2); - } - return text; +QString stripQuotes(const QString &text) +{ + if (text.length() >= 2 && text.at(0) == QLatin1Char('"') && text.back() == QLatin1Char('"')) { + return text.mid(1, text.size() - 2); } + return text; +} - QStringList splitOutsideQuotes(const QString& text) - { - // Match groups on 3 possible conditions: - // - Groups with two leading quotes must close both on them (filename:""abc xyz" tuv") - // - Groups enclosed in quotes - // - Words separated by spaces - const QRegularExpression subTermsRegExp("(\\S*?\"\"[^\"]+\"[^\"]+\"+|\\S*?\"[^\"]+\"+|(?<=\\s|^)\\S+(?=\\s|$))"); - auto subTermsMatchIterator = subTermsRegExp.globalMatch(text); - - QStringList textParts; - while (subTermsMatchIterator.hasNext()) { - textParts << subTermsMatchIterator.next().captured(0); - } - return textParts; +QStringList splitOutsideQuotes(const QString &text) +{ + // Match groups on 3 possible conditions: + // - Groups with two leading quotes must close both on them (filename:""abc xyz" tuv") + // - Groups enclosed in quotes + // - Words separated by spaces + static const QRegularExpression subTermsRegExp("(\\S*?\"\"[^\"]+\"[^\"]+\"+|\\S*?\"[^\"]+\"+|(?<=\\s|^)\\S+(?=\\s|$))"); + auto subTermsMatchIterator = subTermsRegExp.globalMatch(text); + + QStringList textParts; + while (subTermsMatchIterator.hasNext()) { + textParts << subTermsMatchIterator.next().captured(0); } + return textParts; +} #endif - QString trimChar(const QString& text, const QLatin1Char aChar) - { - const int start = text.startsWith(aChar) ? 1 : 0; - const int end = (text.length() > 1 && text.endsWith(aChar)) ? 1 : 0; +QString trimChar(const QString &text, const QLatin1Char aChar) +{ + const int start = text.startsWith(aChar) ? 1 : 0; + const int end = (text.length() > 1 && text.endsWith(aChar)) ? 1 : 0; - return text.mid(start, text.length() - start - end); - } + return text.mid(start, text.length() - start - end); +} } - -DolphinQuery DolphinQuery::fromSearchUrl(const QUrl& searchUrl) +DolphinQuery DolphinQuery::fromSearchUrl(const QUrl &searchUrl) { DolphinQuery model; model.m_searchUrl = searchUrl; @@ -100,7 +85,7 @@ DolphinQuery DolphinQuery::fromSearchUrl(const QUrl& searchUrl) return model; } -bool DolphinQuery::supportsScheme(const QString& urlScheme) +bool DolphinQuery::supportsScheme(const QString &urlScheme) { static const QStringList supportedSchemes = { QStringLiteral("baloosearch"), @@ -112,7 +97,7 @@ bool DolphinQuery::supportsScheme(const QString& urlScheme) void DolphinQuery::parseBalooQuery() { -#ifdef HAVE_BALOO +#if HAVE_BALOO const Baloo::Query query = Baloo::Query::fromSearchUrl(m_searchUrl); m_includeFolder = query.includeFolder(); @@ -124,7 +109,7 @@ void DolphinQuery::parseBalooQuery() QString fileName; const QStringList subTerms = splitOutsideQuotes(query.searchString()); - foreach (const QString& subTerm, subTerms) { + for (const QString &subTerm : subTerms) { const QString token = searchTermToken(subTerm); const QString value = stripQuotes(subTerm.mid(token.length())); @@ -157,7 +142,6 @@ void DolphinQuery::parseBalooQuery() #endif } - QUrl DolphinQuery::searchUrl() const { return m_searchUrl;