Expand DolphinQuery to support different Url schemes

[dolphin.git] / src / search / dolphinquery.cpp

diff --git a/src/search/dolphinquery.cpp b/src/search/dolphinquery.cpp
index 4d5f8e132099810e19704c41cea636babcf00968..0581a02ece041fcc242ca13388d72131ca5e44d4 100644 (file)
--- a/src/search/dolphinquery.cpp
+++ b/src/search/dolphinquery.cpp
@@ -27,12 +27,14 @@
 #endif
 
 namespace {
 #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.
+#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

      */
      */

-    bool isSearchTerm(const QString& term)
+    QString searchTermToken(const QString& term)

     {
         static const QLatin1String searchTokens[] {
     {
         static const QLatin1String searchTokens[] {

+            QLatin1String("filename:"),

             QLatin1String("modified>="),
             QLatin1String("rating>="),
             QLatin1String("tag:"), QLatin1String("tag=")
             QLatin1String("modified>="),
             QLatin1String("rating>="),
             QLatin1String("tag:"), QLatin1String("tag=")


@@ -40,27 +42,24 @@ namespace {
 
         for (const auto &searchToken : searchTokens) {
             if (term.startsWith(searchToken)) {
 
         for (const auto &searchToken : searchTokens) {
             if (term.startsWith(searchToken)) {

-                return true;
+                return searchToken;

             }
         }
             }
         }

-        return false;
+        return QString();

     }
 
     QString stripQuotes(const QString& text)
     {
     }
 
     QString stripQuotes(const QString& text)
     {

-        QString cleanedText = text;
-        if (!cleanedText.isEmpty() && cleanedText.at(0) == QLatin1Char('"')) {
-            cleanedText = cleanedText.mid(1);
-        }
-        if (!cleanedText.isEmpty() && cleanedText.back() == QLatin1Char('"')) {
-            cleanedText = cleanedText.mid(0, cleanedText.size() - 1);
+        if (text.length() >= 2 && text.at(0) == QLatin1Char('"')
+                               && text.back() == QLatin1Char('"')) {
+            return text.mid(1, text.size() - 2);

         }
         }

-        return cleanedText;
+        return text;

     }
 
     QStringList splitOutsideQuotes(const QString& text)
     {
     }
 
     QStringList splitOutsideQuotes(const QString& text)
     {

-        const QRegularExpression subTermsRegExp("([^ ]*\"[^\"]*\"|(?<= |^)[^ ]+(?= |$))");
+        const QRegularExpression subTermsRegExp("(\\S*?\"[^\"]*?\"|(?<=\\s|^)\\S+(?=\\s|$))");

         auto subTermsMatchIterator = subTermsRegExp.globalMatch(text);
 
         QStringList textParts;
         auto subTermsMatchIterator = subTermsRegExp.globalMatch(text);
 
         QStringList textParts;


@@ -69,60 +68,79 @@ namespace {
         }
         return textParts;
     }
         }
         return textParts;
     }

+#endif

 }
 
 }
 

-DolphinQuery DolphinQuery::fromBalooSearchUrl(const QUrl& searchUrl)
+
+DolphinQuery DolphinQuery::fromSearchUrl(const QUrl& searchUrl)

 {
     DolphinQuery model;
     model.m_searchUrl = searchUrl;
 
 {
     DolphinQuery model;
     model.m_searchUrl = searchUrl;
 

+    if (searchUrl.scheme() == QLatin1String("baloosearch")) {
+        model.parseBalooQuery();
+    }
+
+    return model;
+}
+
+bool DolphinQuery::supportsScheme(const QString& urlScheme)
+{
+    static const QStringList supportedSchemes = {
+        QStringLiteral("baloosearch"),
+    };
+
+    return supportedSchemes.contains(urlScheme);
+}
+
+void DolphinQuery::parseBalooQuery()
+{

 #ifdef HAVE_BALOO
 #ifdef HAVE_BALOO

-    const Baloo::Query query = Baloo::Query::fromSearchUrl(searchUrl);
+    const Baloo::Query query = Baloo::Query::fromSearchUrl(m_searchUrl);

 
 

-    model.m_includeFolder = query.includeFolder();
+    m_includeFolder = query.includeFolder();

 
     const QStringList types = query.types();
 
     const QStringList types = query.types();

-    model.m_fileType = types.isEmpty() ? QString() : types.first();
+    m_fileType = types.isEmpty() ? QString() : types.first();

 
     QStringList textParts;
     QString fileName;
 
     const QStringList subTerms = splitOutsideQuotes(query.searchString());
     foreach (const QString& subTerm, subTerms) {
 
     QStringList textParts;
     QString fileName;
 
     const QStringList subTerms = splitOutsideQuotes(query.searchString());
     foreach (const QString& subTerm, subTerms) {

-        if (subTerm.startsWith(QLatin1String("filename:"))) {
-            fileName = stripQuotes(subTerm.mid(9));
-            if (!fileName.isEmpty()) {
-                model.m_hasFileName = true;
+        const QString token = searchTermToken(subTerm);
+        const QString value = stripQuotes(subTerm.mid(token.length()));
+
+        if (token == QLatin1String("filename:")) {
+            if (!value.isEmpty()) {
+                fileName = value;
+                m_hasFileName = true;

             }
             continue;
             }
             continue;

-        } else if (isSearchTerm(subTerm)) {
-            model.m_searchTerms << subTerm;
+        } else if (!token.isEmpty()) {
+            m_searchTerms << token + value;

             continue;
         } else if (subTerm == QLatin1String("AND") && subTerm != subTerms.at(0) && subTerm != subTerms.back()) {
             continue;
             continue;
         } else if (subTerm == QLatin1String("AND") && subTerm != subTerms.at(0) && subTerm != subTerms.back()) {
             continue;

-        } else {
-            const QString cleanedTerm = stripQuotes(subTerm);
-            if (!cleanedTerm.isEmpty()) {
-                textParts << cleanedTerm;
-                model.m_hasContentSearch = true;
-            }
+        } else if (!value.isEmpty()) {
+            textParts << value;
+            m_hasContentSearch = true;

         }
     }
 
         }
     }
 

-    if (model.m_hasFileName) {
-        if (model.m_hasContentSearch) {
+    if (m_hasFileName) {
+        if (m_hasContentSearch) {

             textParts << QStringLiteral("filename:\"%1\"").arg(fileName);
         } else {
             textParts << fileName;
         }
     }
 
             textParts << QStringLiteral("filename:\"%1\"").arg(fileName);
         } else {
             textParts << fileName;
         }
     }
 

-    model.m_searchText = textParts.join(QLatin1Char(' '));
-
+    m_searchText = textParts.join(QLatin1Char(' '));

 #endif
 #endif

-    return model;

 }
 
 }
 

+

 QUrl DolphinQuery::searchUrl() const
 {
     return m_searchUrl;
 QUrl DolphinQuery::searchUrl() const
 {
     return m_searchUrl;