DEBUG BpmFilterNode

mixxxdj · Oct 12, 2023 · b2d1f25 · b2d1f25
1 parent 78406ba
commit b2d1f25
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/src/library/searchquery.cpp b/src/library/searchquery.cpp
@@ -533,18 +533,21 @@ void BpmFilterNode::init(QString argument) {
         m_bNullQuery = true;
         return;
     }
+    qWarning() << "     .BpmFilter:" << argument;
 
     QRegularExpressionMatch opMatch = kNumericOperatorRegex.match(argument);
     if (opMatch.hasMatch()) {
         m_operator = opMatch.captured(1);
         argument = opMatch.captured(2);
+        qWarning() << "     .opMatch:" << m_operator;
     }
 
     bool parsed = false;
     const double bpm = parse(argument, &parsed);
     if (parsed) {
         if (m_fuzzy) {
             if (opMatch.hasMatch()) {
+                qWarning() << "     .fuzzy but op";
                 // invalid arg
                 return;
             }
@@ -554,6 +557,7 @@ void BpmFilterNode::init(QString argument) {
             m_bRangeQuery = true;
         } else if (!opMatch.hasMatch() && !m_negate && s_halfDoubleSearchEnabled) {
             // include half/double BPM
+            qWarning() << "     .halfDouble";
             m_bpm = bpm;
             m_bpmHalf = bpm / 2;
             m_bpmHalfIsInt = doubleIsIntElseSetRange(m_bpmHalf, &m_bpmHalfLow, &m_bpmHalfHigh);
@@ -562,7 +566,10 @@ void BpmFilterNode::init(QString argument) {
                     m_bpmDouble, &m_bpmDoubleLow, &m_bpmDoubleHigh);
             m_bHalfDoubleQuery = true;
         } else {
+            qWarning() << "     .op/exact/negate";
+            qWarning() << "      op:" << m_operator;
             // exact / op / negate
+            // if there was no opMatch, m_operator is still the initial '='
             m_bpm = bpm;
             m_bOperatorQuery = true;
         }
@@ -631,9 +638,15 @@ QString BpmFilterNode::toSql() const {
     }
 
     if (m_bOperatorQuery) {
+        qWarning() << "     #op/exact/negate";
         if (m_fuzzy) {
+            qWarning() << "     #also fuzzy, return ()";
             return QString();
         }
+        qWarning() << "      #op:" << m_operator;
+        qWarning()
+                << "      #toSql:"
+                << QString("bpm %1 %2").arg(m_operator, QString::number(m_bpm));
         return QString("bpm %1 %2").arg(m_operator, QString::number(m_bpm));
     }
 

diff --git a/src/library/searchqueryparser.cpp b/src/library/searchqueryparser.cpp
@@ -225,6 +225,7 @@ void SearchQueryParser::parseTokens(QStringList tokens,
             QString argument = getTextArgument(
                     specialFilterMatch.captured(2), &tokens, false)
                                        .argument;
+            qWarning() << "    #special:" << argument;
             if (!argument.isEmpty()) {
                 if (field == "key") {
                     mixxx::track::io::key::ChromaticKey key =

diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp
@@ -21,6 +21,7 @@
 #include "widget/wnumberpos.h"
 
 namespace {
+// TODO(ronso0) make this accessible for DlgPrefLibrary
 constexpr int kDefaultRateRangePercent = 8;
 constexpr double kRateDirectionInverted = -1;
 constexpr RateControl::RampMode kDefaultRampingMode = RateControl::RampMode::Stepping;

diff --git a/src/preferences/dialog/dlgpreflibrary.cpp b/src/preferences/dialog/dlgpreflibrary.cpp
@@ -619,6 +619,13 @@ void DlgPrefLibrary::slotBpmRangeSelected(int index) {
     m_pConfig->set(kSearchBpmFuzzyRangeConfigKey, ConfigValue{bpmRange});
     const int rateRangePercent =
             m_pConfig->getValue(ConfigKey("[Controls]", "RateRangePercent"), 8);
+    qWarning() << "     .";
+    qWarning() << "     Pref fuzzy range selected:";
+    qWarning().nospace() << "       " << bpmRange << "%";
+    qWarning().nospace() << "       of " << rateRangePercent << "%";
+    qWarning() << "       =" << bpmRange * rateRangePercent / 10000.0;
+    qWarning() << "     .";
+    // 75% / 100 * 8% / 100
     BpmFilterNode::setBpmRelativeRange(bpmRange * rateRangePercent / 10000.0);
 }