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

local: Order search filters consistently

Browse Source
This commit is contained in:
Stein Magnus Jodal 2013-10-27 21:26:03 +01:00
parent 4a9552fc15
commit f0aff669c6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mopidy/backends/local/library.py
View File

@ -76,13 +76,13 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
track_no_filter = lambda t: q == t.track_no track_no_filter = lambda t: q == t.track_no
date_filter = lambda t: q == t.date date_filter = lambda t: q == t.date
any_filter = lambda t: ( any_filter = lambda t: (
uri_filter(t) or
track_filter(t) or track_filter(t) or
album_filter(t) or album_filter(t) or
artist_filter(t) or artist_filter(t) or
albumartist_filter(t) or albumartist_filter(t) or
track_no_filter(t) or track_no_filter(t) or
date_filter(t) or date_filter(t))
uri_filter(t))
if field == 'uri': if field == 'uri':
result_tracks = filter(uri_filter, result_tracks) result_tracks = filter(uri_filter, result_tracks)
@ -94,10 +94,10 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
result_tracks = filter(artist_filter, result_tracks) result_tracks = filter(artist_filter, result_tracks)
elif field == 'albumartist': elif field == 'albumartist':
result_tracks = filter(albumartist_filter, result_tracks) result_tracks = filter(albumartist_filter, result_tracks)
elif field == 'date':
result_tracks = filter(date_filter, result_tracks)
elif field == 'track_no': elif field == 'track_no':
result_tracks = filter(track_no_filter, result_tracks) result_tracks = filter(track_no_filter, result_tracks)
elif field == 'date':
result_tracks = filter(date_filter, result_tracks)
elif field == 'any': elif field == 'any':
result_tracks = filter(any_filter, result_tracks) result_tracks = filter(any_filter, result_tracks)
else: else:
@ -135,13 +135,13 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
track_no_filter = lambda t: q == t.track_no track_no_filter = lambda t: q == t.track_no
date_filter = lambda t: t.date and t.date.startswith(q) date_filter = lambda t: t.date and t.date.startswith(q)
any_filter = lambda t: ( any_filter = lambda t: (
uri_filter(t) or
track_filter(t) or track_filter(t) or
album_filter(t) or album_filter(t) or
artist_filter(t) or artist_filter(t) or
albumartist_filter(t) or albumartist_filter(t) or
track_no_filter(t) or track_no_filter(t) or
date_filter(t) or date_filter(t))
uri_filter(t))
if field == 'uri': if field == 'uri':
result_tracks = filter(uri_filter, result_tracks) result_tracks = filter(uri_filter, result_tracks)
@ -153,10 +153,10 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
result_tracks = filter(artist_filter, result_tracks) result_tracks = filter(artist_filter, result_tracks)
elif field == 'albumartist': elif field == 'albumartist':
result_tracks = filter(albumartist_filter, result_tracks) result_tracks = filter(albumartist_filter, result_tracks)
elif field == 'date':
result_tracks = filter(date_filter, result_tracks)
elif field == 'track_no': elif field == 'track_no':
result_tracks = filter(track_no_filter, result_tracks) result_tracks = filter(track_no_filter, result_tracks)
elif field == 'date':
result_tracks = filter(date_filter, result_tracks)
elif field == 'any': elif field == 'any':
result_tracks = filter(any_filter, result_tracks) result_tracks = filter(any_filter, result_tracks)
else: else: