[Slim-Checkins] r33715 - in /7.7/trunk/server: Changelog7.html Slim/Menu/BrowseLibrary.pm

Author: ayoung
Date: Thu Nov 17 01:58:26 2011
New Revision: 33715

URL: http://svn.slimdevices.com/slim?rev=33715&view=rev
Log:
Fixed bug 17718: Searching genres using "browselibrary items mode:genres" does not work 
Add genre searching via browselibrary.
Note: search result does not contain any All Songs, All Artists or All Albums item.

Modified:
    7.7/trunk/server/Changelog7.html
    7.7/trunk/server/Slim/Menu/BrowseLibrary.pm

Modified: 7.7/trunk/server/Changelog7.html
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Changelog7.html?rev=33715&r1=33714&r2=33715&view=diff
==============================================================================
--- 7.7/trunk/server/Changelog7.html (original)
+++ 7.7/trunk/server/Changelog7.html Thu Nov 17 01:58:26 2011
@@ -13,6 +13,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17643">#17643</a> - Displayed playlist not refreshed on repeat with reshuffle</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17647">#17647</a> - "Generic OPML Browser" plugin needs to be forced enabled</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17644">#17644</a> - Squeezebox database and logfiles fill up OS-partition</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17718">#17718</a> - Searching genres using "browselibrary items mode:genres" does not work</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17719">#17719</a> - Now Playing playlist in the web UI doesn't show correct metadata for remote music services</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17726">#17726</a> - Windows Control Panel can't authenticate to password protected server</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17728">#17728</a> - Web GUI Jumps to Track More Info on Playlist Play</li>

Modified: 7.7/trunk/server/Slim/Menu/BrowseLibrary.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Menu/BrowseLibrary.pm?rev=33715&r1=33714&r2=33715&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Menu/BrowseLibrary.pm (original)
+++ 7.7/trunk/server/Slim/Menu/BrowseLibrary.pm Thu Nov 17 01:58:26 2011
@@ -1166,8 +1166,14 @@
 sub _genres {
 	my ($client, $callback, $args, $pt) = @_;
 	my @searchTags = $pt->{'searchTags'} ? @{$pt->{'searchTags'}} : ();
-	
-	_generic($client, $callback, $args, 'genres', \@searchTags,
+	my $search     = $pt->{'search'};
+
+	if (!$search && !scalar @searchTags && $args->{'search'}) {
+		$search = $args->{'search'};
+	}
+		
+	_generic($client, $callback, $args, 'genres', 
+		[@searchTags, ($search ? 'search:' . $search : undef)],
 		sub {
 			my $results = shift;
 			my $items = $results->{'genres_loop'};