artist: now shows only songs with empty artist values

Author: gramanas

src/library/features/mixxxlibrary/mixxxlibrarytreemodel.cpp

@@ -174,7 +174,7 @@ QVariant MixxxLibraryTreeModel::getQuery(TreeItem* pTree) const {
         return "$groupingSettings$";
     }
 
-    const QString param("%1:=%2");
+    const QString param("%1:=\"%2\"");
 
     int depth = 0;
     TreeItem* pAux = pTree;
@@ -193,12 +193,6 @@ QVariant MixxxLibraryTreeModel::getQuery(TreeItem* pTree) const {
         if (pAux->isDivider()) {
             value.append("*");
         }
-        if (value == "") {
-            value = "0";
-        }
-        if (value != "0") {
-            value = "\"" + value + "\"";
-        }
         result << param.arg(m_sortOrder[depth], value);
 
         pAux = pAux->parent();

src/library/searchqueryparser.cpp

@@ -61,7 +61,6 @@ SearchQueryParser::SearchQueryParser(TrackCollection* pTrackCollection)
     m_fuzzyMatcher = QRegExp(QString("^~(%1)$").arg(m_allFilters.join("|")));
     m_textFilterMatcher = QRegExp(QString("^-?(%1):(.*)$").arg(m_textFilters.join("|")));
     m_exactTextMatcher = QRegExp(QString("^-?(%1):=(.*)$").arg(m_textFilters.join("|")));
-    m_nullFilterMatcher = QRegExp(QString("^-?(%1):=0$").arg(m_textFilters.join("|")));
     m_numericFilterMatcher = QRegExp(QString("^-?(%1):(.*)$").arg(m_numericFilters.join("|")));
     m_specialFilterMatcher = QRegExp(QString("^[~-]?(%1):(.*)$").arg(m_specialFilters.join("|")));
 }
@@ -122,7 +121,6 @@ void SearchQueryParser::parseTokens(QStringList tokens,
         }
 
         bool exact = m_exactTextMatcher.indexIn(token) != -1;
-        bool nullMatch = m_nullFilterMatcher.indexIn(token) != -1;
         bool negate = token.startsWith(kNegatePrefix);
         std::unique_ptr<QueryNode> pNode;
 
@@ -139,24 +137,28 @@ void SearchQueryParser::parseTokens(QStringList tokens,
                             m_textFilterMatcher.cap(2), &tokens).trimmed();
             }
 
-            if (!argument.isEmpty()) {
-                if (field == "crate") {
+            if (field == "crate") {
+                if (!argument.isEmpty()) {
                     pNode = std::make_unique<CrateFilterNode>(
-                            &m_pTrackCollection->crates(), argument);
-                } else if (exact) {
-                    if (nullMatch) {
-                           pNode = std::make_unique<SqlNode>(QString(
-                               "(%1 LIKE \"\") OR (%1 IS NULL)").arg(field));
-                    } else {
-                        pNode = std::make_unique<ExactFilterNode>(
-                                  m_pTrackCollection->database(),
-                                  m_fieldToSqlColumns[field], argument);
-                    }
+                          &m_pTrackCollection->crates(), argument);
+                } else {
+                    //TODO(gramanas) It should generate a query to
+                    //match all the tracks that are not in a crate.
+                }
+            }
+            else if (!argument.isEmpty()) {
+                if (exact) {
+                    pNode = std::make_unique<ExactFilterNode>(
+                            m_pTrackCollection->database(),
+                            m_fieldToSqlColumns[field], argument);
                 } else {
                     pNode = std::make_unique<TextFilterNode>(
                             m_pTrackCollection->database(),
                             m_fieldToSqlColumns[field], argument);
                 }
+            } else {
+                pNode = std::make_unique<SqlNode>(QString(
+                        "(%1 = \"\") OR (%1 IS NULL)").arg(field));
             }
 
         } else if (m_numericFilterMatcher.indexIn(token) != -1) {

src/library/searchqueryparser.h

@@ -39,7 +39,6 @@ class SearchQueryParser {
 
     QRegExp m_fuzzyMatcher;
     QRegExp m_textFilterMatcher;
-    QRegExp m_nullFilterMatcher;
     QRegExp m_exactTextMatcher;
     QRegExp m_numericFilterMatcher;
     QRegExp m_specialFilterMatcher;

src/test/searchqueryparsertest.cpp

@@ -191,16 +191,20 @@ TEST_F(SearchQueryParserTest, TextFilterEmpty) {
     searchColumns << "artist"
                   << "album";
 
-    // An empty argument should pass "is null" elements.
+    // An empty argument should pass NULL and empty ("") elements.
     auto pQuery(
-        m_parser.parseQuery("comment:", searchColumns, ""));
+        m_parser.parseQuery("artist:", searchColumns, ""));
 
     TrackPointer pTrack(Track::newTemporary());
-    pTrack->setComment("test ASDF test");
+    pTrack->setArtist("joe");
+    EXPECT_FALSE(pQuery->match(pTrack));
+    pTrack->setArtist(nullptr);
+    EXPECT_TRUE(pQuery->match(pTrack));
+    pTrack->setArtist("");
     EXPECT_TRUE(pQuery->match(pTrack));
 
     EXPECT_STREQ(
-        qPrintable(QString("")),
+        qPrintable(QString("(artist = \"\") OR (artist IS NULL)")),
         qPrintable(pQuery->toSql()));
 }
 
@@ -712,6 +716,7 @@ TEST_F(SearchQueryParserTest, CrateFilter) {
 
 TEST_F(SearchQueryParserTest, CrateFilterEmpty) {
     // Empty should match everything
+    // TODO(gramanas) Empty should match tracks without a crate.
     auto pQuery(m_parser.parseQuery(QString("crate: "), QStringList(), ""));
 
     TrackPointer pTrackA(Track::newTemporary());