Clean-up DolphinFacetsWidget

Summary:
Small refactor patch to clean-up some logic on setter and getter:
- Search terms are previously splitted and set separately, so no need
  for extra splitting and `foreach` loop
- Return search terms on a `QStringList` rather than join first

Depends on: D26029

Test Plan: No behavior changes

Reviewers: #dolphin, elvisangelaccio

Reviewed By: #dolphin, elvisangelaccio

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D26150

diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
index ea11a400f11dc900e9ab116465171b7386fc63fd..34719730bee88866b2bcf621175f95434e4069a5 100644 (file)
--- a/src/search/dolphinfacetswidget.cpp
+++ b/src/search/dolphinfacetswidget.cpp
@@ -115,7 +115,7 @@ void DolphinFacetsWidget::resetSearchTerms()
     updateTagsMenu();
 }
 
     updateTagsMenu();
 }
 

-QString DolphinFacetsWidget::searchTerms() const
+QStringList DolphinFacetsWidget::searchTerms() const

 {
     QStringList terms;
 
 {
     QStringList terms;
 


@@ -135,7 +135,7 @@ QString DolphinFacetsWidget::searchTerms() const
         }
     }
 
         }
     }
 

-    return terms.join(QLatin1String(" AND "));
+    return terms;

 }
 
 QString DolphinFacetsWidget::facetType() const
 }
 
 QString DolphinFacetsWidget::facetType() const


@@ -145,48 +145,34 @@ QString DolphinFacetsWidget::facetType() const
 
 bool DolphinFacetsWidget::isSearchTerm(const QString& term) const
 {
 
 bool DolphinFacetsWidget::isSearchTerm(const QString& term) const
 {

-    const QStringList subTerms = term.split(' ', QString::SkipEmptyParts);
-
-    // If term has sub terms, then sone of the sub terms are always "rating" and "modified" terms.
-    bool containsRating = false;
-    bool containsModified = false;
-    bool containsTag = false;
-
-    foreach (const QString& subTerm, subTerms) {
-        if (subTerm.startsWith(QLatin1String("rating>="))) {
-            containsRating = true;
-        } else if (subTerm.startsWith(QLatin1String("modified>="))) {
-            containsModified = true;
-        } else if (subTerm.startsWith(QLatin1String("tag:")) ||
-                   subTerm.startsWith(QLatin1String("tag="))) {
-            containsTag = true;
+    static const QLatin1String searchTokens[] {
+        QLatin1String("modified>="),
+        QLatin1String("rating>="),
+        QLatin1String("tag:"), QLatin1String("tag=")
+    };
+
+    for (const auto &searchToken : searchTokens) {
+        if (term.startsWith(searchToken)) {
+            return true;

         }
     }
         }
     }

-
-    return containsModified || containsRating || containsTag;
+    return false;

 }
 
 void DolphinFacetsWidget::setSearchTerm(const QString& term)
 {
 }
 
 void DolphinFacetsWidget::setSearchTerm(const QString& term)
 {

-    // If term has sub terms, then the sub terms are always "rating" and "modified" terms.
-    // If term has no sub terms, then the term itself is either a "rating" term or a "modified"
-    // term. To avoid code duplication we add term to subTerms list, if the list is empty.
-    QStringList subTerms = term.split(' ', QString::SkipEmptyParts);
-
-    foreach (const QString& subTerm, subTerms) {
-        if (subTerm.startsWith(QLatin1String("modified>="))) {
-            const QString value = subTerm.mid(10);
-            const QDate date = QDate::fromString(value, Qt::ISODate);
-            setTimespan(date);
-        } else if (subTerm.startsWith(QLatin1String("rating>="))) {
-            const QString value = subTerm.mid(8);
-            const int stars = value.toInt() / 2;
-            setRating(stars);
-        } else if (subTerm.startsWith(QLatin1String("tag:")) ||
-                   subTerm.startsWith(QLatin1String("tag="))) {
-            const QString value = subTerm.mid(4);
-            addSearchTag(value);
-        }
+    if (term.startsWith(QLatin1String("modified>="))) {
+        const QString value = term.mid(10);
+        const QDate date = QDate::fromString(value, Qt::ISODate);
+        setTimespan(date);
+    } else if (term.startsWith(QLatin1String("rating>="))) {
+        const QString value = term.mid(8);
+        const int stars = value.toInt() / 2;
+        setRating(stars);
+    } else if (term.startsWith(QLatin1String("tag:")) ||
+               term.startsWith(QLatin1String("tag="))) {
+        const QString value = term.mid(4);
+        addSearchTag(value);

     }
 }
 
     }
 }
 

diff --git a/src/search/dolphinfacetswidget.h b/src/search/dolphinfacetswidget.h
index 84029c20fb4af19be6d04a326e2a1ef0c4c1355b..2e91bcc9676a8165973607aace4e96cc285ebd96 100644 (file)
--- a/src/search/dolphinfacetswidget.h
+++ b/src/search/dolphinfacetswidget.h
@@ -52,7 +52,7 @@ public:
     explicit DolphinFacetsWidget(QWidget* parent = nullptr);
     ~DolphinFacetsWidget() override;
 
     explicit DolphinFacetsWidget(QWidget* parent = nullptr);
     ~DolphinFacetsWidget() override;
 

-    QString searchTerms() const;
+    QStringList searchTerms() const;

     QString facetType() const;
 
     bool isSearchTerm(const QString& term) const;
     QString facetType() const;
 
     bool isSearchTerm(const QString& term) const;

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index c216e171457f69f7b26092e41810e0f4468939de..23f520de148a3f1ba710cb652828bb2de5830f81 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -477,11 +477,7 @@ QUrl DolphinSearchBox::balooUrlForSearching() const
     Baloo::Query query;
     query.addType(m_facetsWidget->facetType());
 
     Baloo::Query query;
     query.addType(m_facetsWidget->facetType());
 

-    QStringList queryStrings;
-    QString ratingQuery = m_facetsWidget->searchTerms();
-    if (!ratingQuery.isEmpty()) {
-        queryStrings << ratingQuery;
-    }
+    QStringList queryStrings = m_facetsWidget->searchTerms();

 
     if (m_contentButton->isChecked()) {
         queryStrings << text;
 
     if (m_contentButton->isChecked()) {
         queryStrings << text;