diff options
| author | Ismael Asensio <[email protected]> | 2019-11-13 22:16:35 +0100 |
|---|---|---|
| committer | Ismael Asensio <[email protected]> | 2019-11-13 22:21:07 +0100 |
| commit | 8d92c8be7f117dee18710ee1ba6b7cfa45d3f5f0 (patch) | |
| tree | 57488f5813f057727a5f64bdd473b72c8d5942a7 /src/search/dolphinquery.cpp | |
| parent | 3984e607bb4437a38af16e007f1c23fbcff7dfb2 (diff) | |
refactor(search): De-couple baloo URL parsing logic from UI
Summary:
Extracts the logic that parses `baloosearch:` urls into a new model class. The parser logic itself is kept as is.
The search box UI is later updated using the model fields.
This refactor has been proposed by @bruns in the review of D24422, as it largely simplifies the unit tests and further expansion/improvements.
Test Plan:
No behavior changes.
Test case is added in the follow-up revision: D25258
Reviewers: #dolphin, elvisangelaccio, bruns
Reviewed By: #dolphin, elvisangelaccio, bruns
Subscribers: ngraham, bruns, kfm-devel
Tags: #dolphin
Differential Revision: https://phabricator.kde.org/D25257
Diffstat (limited to 'src/search/dolphinquery.cpp')
| -rw-r--r-- | src/search/dolphinquery.cpp | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/src/search/dolphinquery.cpp b/src/search/dolphinquery.cpp new file mode 100644 index 000000000..09a841859 --- /dev/null +++ b/src/search/dolphinquery.cpp @@ -0,0 +1,98 @@ +/*************************************************************************** + * Copyright (C) 2019 by Ismael Asensio <[email protected]> * + * * + * 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 * + ***************************************************************************/ + +#include "dolphinquery.h" + +#include <config-baloo.h> +#ifdef HAVE_BALOO +#include <Baloo/Query> +#endif + +namespace { + /** Checks if a given term in the Baloo::Query::searchString() is a special search term. + * This is a copy of `DolphinFacetsWidget::isRatingTerm()` method. + */ + bool isSearchTerm(const QString& term) + { + static const QLatin1String searchTokens[] { + QLatin1String("modified>="), + QLatin1String("rating>=") + }; + + for (const auto &searchToken : searchTokens) { + if (term.startsWith(searchToken)) { + return true; + } + } + return false; + } +} + +DolphinQuery DolphinQuery::fromBalooSearchUrl(const QUrl& searchUrl) +{ + DolphinQuery model; + model.m_searchUrl = searchUrl; + +#ifdef HAVE_BALOO + const Baloo::Query query = Baloo::Query::fromSearchUrl(searchUrl); + + model.m_includeFolder = query.includeFolder(); + + model.m_searchText = query.searchString(); + + const QStringList types = query.types(); + model.m_fileType = types.isEmpty() ? QString() : types.first(); + + const QStringList subTerms = query.searchString().split(' ', QString::SkipEmptyParts); + foreach (const QString& subTerm, subTerms) { + if (subTerm.startsWith(QLatin1String("filename:"))) { + const QString value = subTerm.mid(9); + model.m_searchText = value; + } else if (isSearchTerm(subTerm)) { + model.m_searchTerms << subTerm; + } + } +#endif + return model; +} + +QUrl DolphinQuery::searchUrl() const +{ + return m_searchUrl; +} + +QString DolphinQuery::text() const +{ + return m_searchText; +} + +QString DolphinQuery::type() const +{ + return m_fileType; +} + +QStringList DolphinQuery::searchTerms() const +{ + return m_searchTerms; +} + +QString DolphinQuery::includeFolder() const +{ + return m_includeFolder; +} |
