SearchQueryParser: Try supporting spelled out OR

mixxxdj · Oct 5, 2023 · 3e70205 · 3e70205
1 parent 6858b7e
commit 3e70205
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/src/library/searchqueryparser.cpp b/src/library/searchqueryparser.cpp
@@ -16,7 +16,7 @@ const QRegularExpression kSplitIntoWordsRegexp = QRegularExpression(
         QStringLiteral(" " STRING_QUOTE_SUFFIX));
 
 const QRegularExpression kSplitOnOrOperatorRegexp = QRegularExpression(
-        QStringLiteral("\\|" STRING_QUOTE_SUFFIX));
+        QStringLiteral("(?:\\||\\bOR\\b)" STRING_QUOTE_SUFFIX));
 
 SearchQueryParser::SearchQueryParser(TrackCollection* pTrackCollection, QStringList searchColumns)
         : m_pTrackCollection(pTrackCollection),

diff --git a/src/test/searchqueryparsertest.cpp b/src/test/searchqueryparsertest.cpp
@@ -1046,6 +1046,48 @@ TEST_F(SearchQueryParserTest, EmptyOrOperator) {
     EXPECT_FALSE(pQuery->match(pTrack));
 }
 
+TEST_F(SearchQueryParserTest, EmptySpelledOutOrOperator) {
+    auto pQuery = m_parser.parseQuery("OR", QString());
+
+    // An empty OR query matches no tracks.
+    TrackPointer pTrack = Track::newTemporary();
+    EXPECT_FALSE(pQuery->match(pTrack));
+}
+
+TEST_F(SearchQueryParserTest, LowercaseOr) {
+    // Lowercase 'or' is not parsed as an operator and treated literally instead
+    auto pQuery = m_parser.parseQuery("or", QString());
+
+    TrackPointer pTrackA = newTestTrack();
+    pTrackA->setTitle("or");
+    EXPECT_TRUE(pQuery->match(pTrackA));
+
+    TrackPointer pTrackB = newTestTrack();
+    pTrackB->setTitle("and");
+    EXPECT_FALSE(pQuery->match(pTrackB));
+
+    TrackPointer pTrackC = newTestTrack();
+    pTrackC->setTitle("OR");
+    EXPECT_TRUE(pQuery->match(pTrackC));
+}
+
+TEST_F(SearchQueryParserTest, QuotedOr) {
+    // Quoted uppercase 'OR' is treated literally too.
+    auto pQuery = m_parser.parseQuery("\"OR\"", QString());
+
+    TrackPointer pTrackA = newTestTrack();
+    pTrackA->setTitle("or");
+    EXPECT_TRUE(pQuery->match(pTrackA));
+
+    TrackPointer pTrackB = newTestTrack();
+    pTrackB->setTitle("and");
+    EXPECT_FALSE(pQuery->match(pTrackB));
+
+    TrackPointer pTrackC = newTestTrack();
+    pTrackC->setTitle("OR");
+    EXPECT_TRUE(pQuery->match(pTrackC));
+}
+
 TEST_F(SearchQueryParserTest, DurationSearchWithOrOperator) {
     // Query is intentionally "misformatted" to ensure whitespace-invariance
     auto pQuery = m_parser.parseQuery("duration:<39|duration:>=2:00", QString());