Skip to content

Commit

Permalink
Merge dc78d5a into 96633e1
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZenithDK
ZenithDK committed Nov 2, 2013
2 parents 96633e1 + dc78d5a commit d1cadc3
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions mopidy/backends/local/library.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def find_exact(self, query=None, uris=None):
q = value.strip()

uri_filter = lambda t: q == t.uri
track_filter = lambda t: q == t.name
track_name_filter = lambda t: q == t.name
album_filter = lambda t: q == getattr(t, 'album', Album()).name
artist_filter = lambda t: filter(
lambda a: q == a.name, t.artists)
Expand All @@ -77,7 +77,7 @@ def find_exact(self, query=None, uris=None):
date_filter = lambda t: q == t.date
any_filter = lambda t: (
uri_filter(t) or
track_filter(t) or
track_name_filter(t) or
album_filter(t) or
artist_filter(t) or
albumartist_filter(t) or
Expand All @@ -86,8 +86,8 @@ def find_exact(self, query=None, uris=None):

if field == 'uri':
result_tracks = filter(uri_filter, result_tracks)
elif field == 'track':
result_tracks = filter(track_filter, result_tracks)
elif field == 'track_name':
result_tracks = filter(track_name_filter, result_tracks)
elif field == 'album':
result_tracks = filter(album_filter, result_tracks)
elif field == 'artist':
Expand Down Expand Up @@ -124,7 +124,7 @@ def search(self, query=None, uris=None):
q = value.strip().lower()

uri_filter = lambda t: q in t.uri.lower()
track_filter = lambda t: q in t.name.lower()
track_name_filter = lambda t: q in t.name.lower()
album_filter = lambda t: q in getattr(
t, 'album', Album()).name.lower()
artist_filter = lambda t: filter(
Expand All @@ -136,7 +136,7 @@ def search(self, query=None, uris=None):
date_filter = lambda t: t.date and t.date.startswith(q)
any_filter = lambda t: (
uri_filter(t) or
track_filter(t) or
track_name_filter(t) or
album_filter(t) or
artist_filter(t) or
albumartist_filter(t) or
Expand All @@ -145,8 +145,8 @@ def search(self, query=None, uris=None):

if field == 'uri':
result_tracks = filter(uri_filter, result_tracks)
elif field == 'track':
result_tracks = filter(track_filter, result_tracks)
elif field == 'track_name':
result_tracks = filter(track_name_filter, result_tracks)
elif field == 'album':
result_tracks = filter(album_filter, result_tracks)
elif field == 'artist':
Expand Down
2 changes: 1 addition & 1 deletion mopidy/frontends/mpd/translator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ def query_from_mpd_search_format(mpd_query):
m = MPD_SEARCH_QUERY_PART_RE.match(query_part)
field = m.groupdict()['field'].lower()
if field == 'title':
field = 'track'
field = 'track_name'
elif field == 'track':
field = 'track_no'
elif field in ('file', 'filename'):
Expand Down
16 changes: 8 additions & 8 deletions tests/backends/local/library_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def test_lookup_unknown_track(self):
self.assertEqual(tracks, [])

def test_find_exact_no_hits(self):
result = self.library.find_exact(track=['unknown track'])
result = self.library.find_exact(track_name=['unknown track'])
self.assertEqual(list(result[0].tracks), [])

result = self.library.find_exact(artist=['unknown artist'])
Expand Down Expand Up @@ -133,10 +133,10 @@ def test_find_exact_uri(self):
self.assertEqual(list(result[0].tracks), self.tracks[1:2])

def test_find_exact_track(self):
result = self.library.find_exact(track=['track1'])
result = self.library.find_exact(track_name=['track1'])
self.assertEqual(list(result[0].tracks), self.tracks[:1])

result = self.library.find_exact(track=['track2'])
result = self.library.find_exact(track_name=['track2'])
self.assertEqual(list(result[0].tracks), self.tracks[1:2])

def test_find_exact_artist(self):
Expand Down Expand Up @@ -222,7 +222,7 @@ def test_find_exact_with_empty_query(self):
test = lambda: self.library.find_exact(artist=[''])
self.assertRaises(LookupError, test)

test = lambda: self.library.find_exact(track=[''])
test = lambda: self.library.find_exact(track_name=[''])
self.assertRaises(LookupError, test)

test = lambda: self.library.find_exact(album=[''])
Expand All @@ -238,7 +238,7 @@ def test_find_exact_with_empty_query(self):
self.assertRaises(LookupError, test)

def test_search_no_hits(self):
result = self.library.search(track=['unknown track'])
result = self.library.search(track_name=['unknown track'])
self.assertEqual(list(result[0].tracks), [])

result = self.library.search(artist=['unknown artist'])
Expand Down Expand Up @@ -267,10 +267,10 @@ def test_search_uri(self):
self.assertEqual(list(result[0].tracks), self.tracks[1:2])

def test_search_track(self):
result = self.library.search(track=['Rack1'])
result = self.library.search(track_name=['Rack1'])
self.assertEqual(list(result[0].tracks), self.tracks[:1])

result = self.library.search(track=['Rack2'])
result = self.library.search(track_name=['Rack2'])
self.assertEqual(list(result[0].tracks), self.tracks[1:2])

def test_search_artist(self):
Expand Down Expand Up @@ -352,7 +352,7 @@ def test_search_with_empty_query(self):
test = lambda: self.library.search(artist=[''])
self.assertRaises(LookupError, test)

test = lambda: self.library.search(track=[''])
test = lambda: self.library.search(track_name=[''])
self.assertRaises(LookupError, test)

test = lambda: self.library.search(album=[''])
Expand Down

0 comments on commit d1cadc3

Please sign in to comment.