Ticket #355: mythmusic_comma.patch

mythmusic/search.cpp

@@ -75 +75 @@
 
     bool substringSearch = true;
     bool isNumber = false;
+    QString testString;
     searchText.toULongLong(&isNumber);
+  
+  if ( !isNumber ) {
+      testString=searchText;
+      testString.replace(">","");
+      testString.toULongLong(&isNumber);
+    }
 
     char *mapping[] = {
         "[0 ]",   "1",       "[2abc]", "[3def]", "[4ghi]", "[5jkl]",
         "[6mno]", "[7pqrs]", "[8tuv]", "[9wxyz]"
     };
-
+    
     if (isNumber) {
-        // Input contains only digits. Enable digit-to-char mapping mode
-        for (int i = 0; i < 10; i++) {
-            char c = '0' + i;
-            searchText.replace(QChar(c), QString(mapping[i]));
-        }
+      // Input contains only digits. Enable digit-to-char mapping mode
+      for (int i = 0; i < 10; i++) {
+        char c = '0' + i;
+        searchText.replace(QChar(c), QString(mapping[i]));
+      }
       substringSearch = false;
     }
-
+    
     listbox->clear();
-
+    
     MSqlQuery query(MSqlQuery::InitCon());
 
     QString queryString("SELECT filename,artist,album,title,intid "
                         "FROM musicmetadata ");
 
     if (!searchText.isEmpty())
-    {
-        if (substringSearch)
-        {
-            whereClause = "WHERE filename LIKE '%" + searchText + "%'"
-                          "   OR artist   LIKE '%" + searchText + "%'"
-                          "   OR album    LIKE '%" + searchText + "%'"
-                          "   OR title    LIKE '%" + searchText + "%'"
-                          ";";
-        }
-        else
-        {
-            // regexp search
-            whereClause = "WHERE filename REGEXP '" + searchText +
-                          "'  OR artist   REGEXP '" + searchText +
-                          "'  OR album    REGEXP '" + searchText +
-                          "'  OR title    REGEXP '" + searchText +
-                          "';";
-        }
-    }
-
+      {
+        if (substringSearch) //alphanumeric
+          {
+            QStringList list = QStringList::split(",", searchText);
+            whereClause="";
+            for (uint x = 0; x < list.count(); x++)
+              {
+                testString = list[x].stripWhiteSpace();
+                if ( x == 0 ) {
+                  whereClause += "WHERE (";
+                }
+                else  //                  if (x > 0) 
+                  {
+                    whereClause += " AND ( ";
+                  }
+                  whereClause += "artist   LIKE '%" + testString + "%'"
+                           "   OR album    LIKE '%" + testString + "%'"
+                           "   OR title    LIKE '%" + testString + "%'"
+                           "   OR filename LIKE '%" + testString + "%'"
+                           ")";
+              }
+            whereClause += ";";
+            VERBOSE(VB_ALL, QString("alpha whereClause " + whereClause ));
+          }
+        else //numbers
+          {
+            QStringList list = QStringList::split(">", searchText);
+            whereClause="";
+            for (uint x = 0; x < list.count(); x++) 
+              {
+                testString = list[x].stripWhiteSpace();
+                if ( x == 0 ) {
+                  whereClause += "WHERE (";
+                } else {
+                  whereClause += " AND ( ";
+                }
+                whereClause += " artist  REGEXP '" + testString +
+                         "'   OR album   REGEXP '" + testString +
+                         "'   OR title   REGEXP '" + testString +
+                         "'   OR filename REGEXP '" + testString +
+                         "')";
+              } 
+            whereClause += ";";
+            VERBOSE(VB_ALL, QString("numeric whereClause " + whereClause ));
+          }
+      }
     unsigned int matchCount = 0;
 
     queryString += whereClause;
-
     query.prepare(queryString);
 
     if (query.exec())
@@ -132 +164 @@
             while (query.next())
             {
                 // Strip path from filename
-                QString fileName(query.value(0).toString());
-                fileName.replace(QRegExp(".*/"), "");
+                // QString fileName(query.value(0).toString());
+                // fileName.replace(QRegExp(".*/"), "");
 
-                // Append artist/title/album info... ok this is ugly :(
-                QString text(fileName + " [ " +
-                          query.value(1).toString() + "/" +
-                          query.value(2).toString() + "/" +
-                          query.value(3).toString() + "]");
-                
-                // Insert item into listbox, including song identifier
-                listbox->insertItem(
+              QString aComposer(query.value(1).toString());
+              // cut off composer's first name
+              aComposer.replace(QRegExp(",.*"),"");
+              
+              QString aTitle(query.value(2).toString());
+              // truncate Title at 30, cut off any trailing whitespace or ,
+              aTitle.truncate( 30 );
+              aTitle.replace(QRegExp(",*\\s*$"),"");
+              
+              // Append artist/title/album info... ok this is ugly :(
+              QString text(aComposer + ": " +
+                           aTitle + "; " +
+                           query.value(3).toString() );
+              
+              // Insert item into listbox, including song identifier
+              listbox->insertItem(
                     new SearchListBoxItem(QString::fromUtf8(text),
                                           query.value(4).toUInt())
                     );