diff --git a/mopidy_funkwhale/library.py b/mopidy_funkwhale/library.py index 89d3c93efb70a2c1ac98648fc54ecb352a1e56a0..041c1332812492541ffc7ed88aaae2aabee55ea2 100644 --- a/mopidy_funkwhale/library.py +++ b/mopidy_funkwhale/library.py @@ -347,9 +347,16 @@ class FunkwhaleLibraryProvider(backend.LibraryProvider): search_query = simplify_search_query(query) logger.info("Searching Funkwhale for: %s", search_query) raw_results = self.backend.client.search(search_query) - artists = [convert_to_artist(row) for row in raw_results["artists"]] - albums = [convert_to_album(row) for row in raw_results["albums"]] - tracks = [convert_to_track(row) for row in raw_results["tracks"]] + + artists = [] + albums = [] + tracks = [] + if "artist" in query or "any" in query: + artists = [convert_to_artist(row) for row in raw_results["artists"]] + if "album" in query or "any" in query: + albums = [convert_to_album(row) for row in raw_results["albums"]] + if "track_no" in query or "any" in query: + tracks = [convert_to_track(row) for row in raw_results["tracks"]] return models.SearchResult( uri="funkwhale:search", tracks=tracks, albums=albums, artists=artists