BpmFilterNode: Allow a range in case of floor(halfBpm) ) == halfBpm i…

…n MatchMode::HalveDouble
ronso0 · Apr 7, 2024 · fa35e36 · fa35e36
1 parent 0f4669c
commit fa35e36
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/src/library/searchquery.cpp b/src/library/searchquery.cpp
@@ -645,10 +645,20 @@ BpmFilterNode::BpmFilterNode(QString& argument, bool fuzzy, bool negate)
         // We find everything that is displayed as 127.** in the library
         m_rangeLower = bpm - kLibraryRoundRange; // [126.95
         m_rangeUpper = bpm + 1;                  // ]128
-        // In case bpm / 2 is a fractional, we include the *.0 value neighbours
-        // since fractional bpm values are less common in some genres.
-        m_bpmHalfLower = floor(bpm / 2); // [63
-        m_bpmHalfUpper = ceil(bpm / 2);  // 64]
+
+        double halfBpm = bpm / 2;
+        qDebug() << "if (floor(halfBpm) != halfBpm) {" << floor(halfBpm) << halfBpm;
+        if (floor(halfBpm) != halfBpm) {
+            // In case bpm / 2 is a fractional, we include the *.0 value neighbours
+            // since fractional bpm values are less common in some genres.
+            m_bpmHalfLower = floor(halfBpm) - kLibraryRoundRange; // [62.95
+            m_bpmHalfUpper = halfBpm + 1;                         // ]64.5
+        } else {
+            // Here we are for instance with 126
+            // We find everything that is displayed as 63.** in the library
+            m_bpmHalfLower = halfBpm - kLibraryRoundRange; // [62.95
+            m_bpmHalfUpper = halfBpm + 1;                  // ]64
+        }
         // We find everything which would be found when editing the beat grid via / 2
         m_bpmDoubleLower = (bpm * 2) - kLibraryRoundRange; // [253.95
         m_bpmDoubleUpper = m_rangeUpper * 2;               // ]256
@@ -729,7 +739,7 @@ QString BpmFilterNode::toSql() const {
     case MatchMode::HalveDouble: {
         QStringList searchClauses;
         searchClauses << rangeUpperExclusiveSqlString(m_rangeLower, m_rangeUpper);
-        searchClauses << rangeSqlString(m_bpmHalfLower, m_bpmHalfUpper);
+        searchClauses << rangeUpperExclusiveSqlString(m_bpmHalfLower, m_bpmHalfUpper);
         searchClauses << rangeUpperExclusiveSqlString(m_bpmDoubleLower, m_bpmDoubleUpper);
         return concatSqlClauses(searchClauses, "OR");
     }

diff --git a/src/test/searchqueryparsertest.cpp b/src/test/searchqueryparsertest.cpp
@@ -498,16 +498,29 @@ TEST_F(SearchQueryParserTest, BpmFilter) {
     m_parser.setSearchColumns({"artist", "album"});
 
     // Test BpmFilter's MatchModes:
-    // HalveDouble
-    auto pQuery(m_parser.parseQuery("bpm:127", QString()));
+
+    // HalveDouble even
+    auto pQuery = m_parser.parseQuery("bpm:126", QString());
     TrackPointer pTrack = newTestTrack();
     EXPECT_FALSE(pQuery->match(pTrack));
+    pTrack->trySetBpm(126.13);
+    EXPECT_TRUE(pQuery->match(pTrack));
+
+    EXPECT_STREQ(
+            qPrintable(QString("(bpm >= 125.95 AND bpm < 127) OR "
+                               "(bpm >= 62.95 AND bpm < 64) OR "
+                               "(bpm >= 251.95 AND bpm < 254)")),
+            qPrintable(pQuery->toSql()));
+
+    // HalveDouble uneven
+    pQuery = m_parser.parseQuery("bpm:127", QString());
+    EXPECT_FALSE(pQuery->match(pTrack));
     pTrack->trySetBpm(127.13);
     EXPECT_TRUE(pQuery->match(pTrack));
 
     EXPECT_STREQ(
             qPrintable(QString("(bpm >= 126.95 AND bpm < 128) OR "
-                               "(bpm BETWEEN 63 AND 64) OR "
+                               "(bpm >= 62.95 AND bpm < 64.5) OR "
                                "(bpm >= 253.95 AND bpm < 256)")),
             qPrintable(pQuery->toSql()));