andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpd: Refactor search result to (fake) tracks functionality

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-12-21 23:51:40 +01:00
parent e5c0bcd110
commit 5060db48f2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mopidy/frontends/mpd/protocol/music_db.py
View File

@ -38,6 +38,13 @@ def _artist_as_track(artist):
artists=[artist])
def _search_results_as_tracks(results):
albums = [_album_as_track(a) for a in _get_albums(results)]
artists = [_artist_as_track(a) for a in _get_artists(results)]
tracks = _get_tracks(results)
return artists + albums + tracks
@handle_request(r'^count "(?P<tag>[^"]+)" "(?P<needle>[^"]*)"$')
def count(context, tag, needle):
"""
@ -84,10 +91,7 @@ def find(context, mpd_query):
except ValueError:
return
results = context.core.library.find_exact(**query).get()
albums = [_album_as_track(a) for a in _get_albums(results)]
artists = [_artist_as_track(a) for a in _get_artists(results)]
tracks = _get_tracks(results)
return translator.tracks_to_mpd_format(artists + albums + tracks)
return translator.tracks_to_mpd_format(_search_results_as_tracks(results))
@handle_request(r'^findadd ' + QUERY_RE)
@ -329,10 +333,7 @@ def search(context, mpd_query):
except ValueError:
return
results = context.core.library.search(**query).get()
albums = [_album_as_track(a) for a in _get_albums(results)]
artists = [_artist_as_track(a) for a in _get_artists(results)]
tracks = _get_tracks(results)
return translator.tracks_to_mpd_format(artists + albums + tracks)
return translator.tracks_to_mpd_format(_search_results_as_tracks(results))
@handle_request(r'^searchadd ' + QUERY_RE)