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

Fix flake8 errors and add a few more tests

Browse Source
This commit is contained in:
Lasse Bigum 2013-11-02 02:43:12 +01:00 committed by Stein Magnus Jodal
parent fd213f2d78
commit 86f18935fe
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,8 +127,8 @@ def findadd(context, mpd_query):
@handle_request( @handle_request(
r'^list "?(?P<field>([Aa]rtist|[Aa]lbumartist|[Aa]lbum|[Dd]ate|[Gg]enre))"?' r'^list "?(?P<field>([Aa]rtist|[Aa]lbumartist|[Aa]lbum|[Dd]ate|'
r'( (?P<mpd_query>.*))?$') r'[Gg]enre))"?( (?P<mpd_query>.*))?$')
def list_(context, field, mpd_query=None): def list_(context, field, mpd_query=None):
""" """
*musicpd.org, music database section:* *musicpd.org, music database section:*
@ -239,8 +239,6 @@ def _list_artist(context, query):
def _list_albumartist(context, query): def _list_albumartist(context, query):
import logging
logger = logging.getLogger('mopidy.backends.local')
albumartists = set() albumartists = set()
results = context.core.library.find_exact(**query).get() results = context.core.library.find_exact(**query).get()
for track in _get_tracks(results): for track in _get_tracks(results):

12
tests/backends/local/library_test.py
View File

@ -108,6 +108,9 @@ class LocalLibraryProviderTest(unittest.TestCase):
result = self.library.find_exact(artist=['unknown artist']) result = self.library.find_exact(artist=['unknown artist'])
self.assertEqual(list(result[0].tracks), []) self.assertEqual(list(result[0].tracks), [])
result = self.library.find_exact(albumartist=['unknown albumartist'])
self.assertEqual(list(result[0].tracks), [])
result = self.library.find_exact(album=['unknown artist']) result = self.library.find_exact(album=['unknown artist'])
self.assertEqual(list(result[0].tracks), []) self.assertEqual(list(result[0].tracks), [])
@ -225,6 +228,9 @@ class LocalLibraryProviderTest(unittest.TestCase):
test = lambda: self.library.find_exact(artist=['']) test = lambda: self.library.find_exact(artist=[''])
self.assertRaises(LookupError, test) self.assertRaises(LookupError, test)
test = lambda: self.library.find_exact(albumartist=[''])
self.assertRaises(LookupError, test)
test = lambda: self.library.find_exact(track=['']) test = lambda: self.library.find_exact(track=[''])
self.assertRaises(LookupError, test) self.assertRaises(LookupError, test)
@ -247,6 +253,9 @@ class LocalLibraryProviderTest(unittest.TestCase):
result = self.library.search(artist=['unknown artist']) result = self.library.search(artist=['unknown artist'])
self.assertEqual(list(result[0].tracks), []) self.assertEqual(list(result[0].tracks), [])
result = self.library.search(albumartist=['unknown albumartist'])
self.assertEqual(list(result[0].tracks), [])
result = self.library.search(album=['unknown artist']) result = self.library.search(album=['unknown artist'])
self.assertEqual(list(result[0].tracks), []) self.assertEqual(list(result[0].tracks), [])
@ -358,6 +367,9 @@ class LocalLibraryProviderTest(unittest.TestCase):
test = lambda: self.library.search(artist=['']) test = lambda: self.library.search(artist=[''])
self.assertRaises(LookupError, test) self.assertRaises(LookupError, test)
test = lambda: self.library.search(albumartist=[''])
self.assertRaises(LookupError, test)
test = lambda: self.library.search(track=['']) test = lambda: self.library.search(track=[''])
self.assertRaises(LookupError, test) self.assertRaises(LookupError, test)