Ticket #691: mythplugins_691.patch

mythmusic/mythmusic/search.cpp

@@ -104 +104 @@
     QString queryString("SELECT filename, artist, album, title, intid "
                         "FROM musicmetadata ");
 
+    QStringList list = QStringList::split(
+        QRegExp("[>,]"), searchText);
     if (!searchText.isEmpty())
     {
-        QStringList list = QStringList::split(
-            QRegExp("[>,]"), searchText);
         whereClause = "";
         if (substringSearch) // alpha
         {
@@ -163 +163 @@
         QString text(aComposer + ": " + aTitle + "; " +
                      query.value(3).toString() );
 
+        // Highlight matches as appropriate
+        if(!searchText.isEmpty()) {
+            if (substringSearch) // alpha
+            {
+                for (uint i = 0; i < list.count(); i++) 
+                {
+                    QString stxt = list[i].stripWhiteSpace();
+                    int index = -1;
+                    while( (index = text.findRev(stxt, index, false)) != -1 ) {
+                        text.insert(index + stxt.length(), "]");
+                        text.insert(index, "[");
+                    }
+                }
+            }
+            else // numeric
+            {
+                for (uint i = 0; i < list.count(); i++) 
+                {
+                    QString stxt = list[i].stripWhiteSpace();
+                    int index = -1;
+                    while( (index = text.findRev(QRegExp(stxt, false), index)) != -1 ) {
+                        text.insert(index + stxt.contains('['), "]");
+                        text.insert(index, "[");
+                    }
+                }
+            }
+        }
+
         // Insert item into listbox, including song identifier
         listbox->insertItem(new SearchListBoxItem(
                                 QString::fromUtf8(text),