Ticket #3253: MusicSearch.patch

mythmusic/mythmusic/search.cpp

@@ -80 +80 @@
     bool substringSearch = true;
     bool isNumber = false;
     searchText.toULongLong(&isNumber);
-
+    QString searchLimit = gContext->GetSetting("MaxSearchResults");  
     searchText.replace("'", "''");
 
     if (!isNumber)
@@ -146 +146 @@
 
     queryString += whereClause;
     queryString += " ORDER BY music_artists.artist_name, album_name, name, song_id, filename ";
-
+    queryString += "LIMIT ";
+    queryString += searchLimit;
     query.prepare(queryString);
 
     bool has_entries = true;

mythmusic/mythmusic/globalsettings.cpp

@@ -286 +286 @@
     return gc;
 };
 
+static HostSpinBox *SetSearchMaxResultsReturned()
+{
+    HostSpinBox *gc = new HostSpinBox("MaxSearchResults", 0, 20000, 100);
+    gc->setLabel(QObject::tr("Maximum Search Results"));
+    gc->setValue(300);
+    gc->setHelpText(QObject::tr("Used to limit the number of results "
+                    "returned when using the search feature."));
+    return gc;
+};
+
 static HostCheckBox *UseShowRatings()
 {
     HostCheckBox *gc = new HostCheckBox("MusicShowRatings");
@@ -551 +561 @@
     playersettings->addChild(SetPlayCountWeight());
     playersettings->addChild(SetLastPlayWeight());
     playersettings->addChild(SetRandomWeight());
+    playersettings->addChild(SetSearchMaxResultsReturned());
     playersettings->addChild(UseShowRatings());
     playersettings->addChild(UseShowWholeTree());
     playersettings->addChild(UseListShuffled());