Track search: '=' and quoted strings looks for exact matches

mixxxdj · Oct 5, 2023 · 42ba552 · 42ba552
1 parent 17362a7
commit 42ba552
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 9 deletions.
diff --git a/src/library/searchquery.cpp b/src/library/searchquery.cpp
@@ -168,10 +168,12 @@ QString NotNode::toSql() const {
 
 TextFilterNode::TextFilterNode(const QSqlDatabase& database,
         const QStringList& sqlColumns,
-        const QString& argument)
+        const QString& argument,
+        bool exactMatch)
         : m_database(database),
           m_sqlColumns(sqlColumns),
-          m_argument(argument) {
+          m_argument(argument),
+          m_exactMatch(exactMatch) {
     mixxx::DbConnection::makeStringLatinLow(&m_argument);
 }
 
@@ -184,8 +186,14 @@ bool TextFilterNode::match(const TrackPointer& pTrack) const {
 
         QString strValue = value.toString();
         mixxx::DbConnection::makeStringLatinLow(&strValue);
-        if (strValue.contains(m_argument)) {
-            return true;
+        if (m_exactMatch) {
+            if (strValue == m_argument) {
+                return true;
+            }
+        } else {
+            if (strValue.contains(m_argument)) {
+                return true;
+            }
         }
     }
     return false;
@@ -201,8 +209,13 @@ QString TextFilterNode::toSql() const {
             argument.append('_');
         }
     }
-    QString escapedArgument = escaper.escapeString(
-            kSqlLikeMatchAll + argument + kSqlLikeMatchAll);
+    QString escapedArgument;
+    if (m_exactMatch) {
+        escapedArgument = escaper.escapeString(argument);
+    } else {
+        escapedArgument = escaper.escapeString(
+                kSqlLikeMatchAll + argument + kSqlLikeMatchAll);
+    }
     QStringList searchClauses;
     for (const auto& sqlColumn : m_sqlColumns) {
         searchClauses << QString("%1 LIKE %2").arg(sqlColumn, escapedArgument);

diff --git a/src/library/searchquery.h b/src/library/searchquery.h
@@ -72,7 +72,8 @@ class TextFilterNode : public QueryNode {
   public:
     TextFilterNode(const QSqlDatabase& database,
             const QStringList& sqlColumns,
-            const QString& argument);
+            const QString& argument,
+            bool exactMatch = false);
 
     bool match(const TrackPointer& pTrack) const override;
     QString toSql() const override;
@@ -81,6 +82,7 @@ class TextFilterNode : public QueryNode {
     QSqlDatabase m_database;
     QStringList m_sqlColumns;
     QString m_argument;
+    bool m_exactMatch;
 };
 
 class NullOrEmptyTextFilterNode : public QueryNode {

diff --git a/src/library/searchqueryparser.cpp b/src/library/searchqueryparser.cpp
@@ -65,6 +65,8 @@ SearchQueryParser::SearchQueryParser(TrackCollection* pTrackCollection, QStringL
 
     m_fuzzyMatcher = QRegularExpression(QString("^~(%1)$").arg(m_allFilters.join("|")));
     m_textFilterMatcher = QRegularExpression(QString("^-?(%1):(.*)$").arg(m_textFilters.join("|")));
+    m_textFilterExactMatcher = QRegularExpression(
+            QString("^-?(%1)=(.*)$").arg(m_textFilters.join("|")));
     m_numericFilterMatcher = QRegularExpression(
             QString("^-?(%1):(.*)$").arg(m_numericFilters.join("|")));
     m_specialFilterMatcher = QRegularExpression(
@@ -88,7 +90,8 @@ void SearchQueryParser::setSearchColumns(QStringList searchColumns) {
 }
 
 QString SearchQueryParser::getTextArgument(QString argument,
-                                           QStringList* tokens) const {
+        QStringList* tokens,
+        bool* exactMatch) const {
     // If the argument is empty, assume the user placed a space after an
     // advanced search command. Consume another token and treat that as the
     // argument.
@@ -128,8 +131,12 @@ QString SearchQueryParser::getTextArgument(QString argument,
             // return it as "" to distinguish it from an unfinished empty string
             argument = kMissingFieldSearchTerm;
         } else {
+            // Found a closing quote.
             // Slice off the quote and everything after.
             argument = argument.left(quote_index);
+            if (exactMatch != nullptr) {
+                *exactMatch = true;
+            }
         }
     }
 
@@ -149,6 +156,7 @@ void SearchQueryParser::parseTokens(QStringList tokens,
 
         const QRegularExpressionMatch fuzzyMatch = m_fuzzyMatcher.match(token);
         const QRegularExpressionMatch textFilterMatch = m_textFilterMatcher.match(token);
+        const QRegularExpressionMatch textFilterExactMatch = m_textFilterExactMatcher.match(token);
         const QRegularExpressionMatch numericFilterMatch = m_numericFilterMatcher.match(token);
         const QRegularExpressionMatch specialFilterMatch = m_specialFilterMatcher.match(token);
         if (fuzzyMatch.hasMatch()) {
@@ -179,6 +187,36 @@ void SearchQueryParser::parseTokens(QStringList tokens,
                             m_fieldToSqlColumns[field], argument);
                 }
             }
+        } else if (textFilterExactMatch.hasMatch()) {
+            QString field = textFilterExactMatch.captured(1);
+            bool exactMatch = false;
+            QString argument = getTextArgument(
+                    textFilterExactMatch.captured(2), &tokens, &exactMatch);
+
+            if (argument == kMissingFieldSearchTerm) {
+                qDebug() << "argument explicit empty";
+                if (field == "crate") {
+                    pNode = std::make_unique<NoCrateFilterNode>(
+                            &m_pTrackCollection->crates());
+                    qDebug() << pNode->toSql();
+                } else {
+                    pNode = std::make_unique<NullOrEmptyTextFilterNode>(
+                            m_pTrackCollection->database(), m_fieldToSqlColumns[field]);
+                    qDebug() << pNode->toSql();
+                }
+            } else if (!argument.isEmpty()) {
+                if (field == "crate") {
+                    pNode = std::make_unique<CrateFilterNode>(
+                            &m_pTrackCollection->crates(), argument);
+                    //&m_pTrackCollection->crates(), argument, exactMatch);
+                } else {
+                    pNode = std::make_unique<TextFilterNode>(
+                            m_pTrackCollection->database(),
+                            m_fieldToSqlColumns[field],
+                            argument,
+                            exactMatch);
+                }
+            }
         } else if (numericFilterMatch.hasMatch()) {
             QString field = numericFilterMatch.captured(1);
             QString argument = getTextArgument(

diff --git a/src/library/searchqueryparser.h b/src/library/searchqueryparser.h
@@ -30,7 +30,8 @@ class SearchQueryParser {
                      AndNode* pQuery) const;
 
     QString getTextArgument(QString argument,
-                            QStringList* tokens) const;
+            QStringList* tokens,
+            bool* exactMatch = nullptr) const;
 
     TrackCollection* m_pTrackCollection;
     QStringList m_queryColumns;
@@ -43,6 +44,7 @@ class SearchQueryParser {
 
     QRegularExpression m_fuzzyMatcher;
     QRegularExpression m_textFilterMatcher;
+    QRegularExpression m_textFilterExactMatcher;
     QRegularExpression m_crateFilterMatcher;
     QRegularExpression m_numericFilterMatcher;
     QRegularExpression m_specialFilterMatcher;