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

core: Always return an answer for all URIs in get_images

Browse Source 
Also make sure that results are tuples instead of lists so we don't
accidentally give out mutable state.
This commit is contained in:
Thomas Adamcik 2015-02-13 00:06:57 +01:00
parent b7c71b84d5
commit ddd872cdea
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mopidy/core/library.py
View File

@ -82,18 +82,19 @@ class LibraryController(object):
Unknown URIs or URIs the corresponding backend couldn't find anything
for will simply return an empty list for that URI.
:param list uris: list of URIsto find images for
:rtype: {uri: [:class:`mopidy.models.Image`]}
:param list uris: list of URIs to find images for
:rtype: {uri: tuple of :class:`mopidy.models.Image`}
"""
futures = [
backend.library.get_images(backend_uris)
for (backend, backend_uris)
in self._get_backends_to_uris(uris).items() if backend_uris]
images = {}
for result in pykka.get_all(futures):
images.update(result)
return images
results = {uri: tuple() for uri in uris}
for r in pykka.get_all(futures):
for uri, images in r.items():
results[uri] += tuple(images)
return results
def find_exact(self, query=None, uris=None, **kwargs):
"""

20
tests/core/test_library.py
View File

@ -40,11 +40,13 @@ class CoreLibraryTest(unittest.TestCase):
def test_get_images_returns_empty_dict_for_no_uris(self):
self.assertEqual({}, self.core.library.get_images([]))
def test_get_images_returns_empty_dict_for_unknown_uri(self):
self.assertEqual({}, self.core.library.get_images(['dummy4:bar']))
def test_get_images_returns_empty_result_for_unknown_uri(self):
result = self.core.library.get_images(['dummy4:track'])
self.assertEqual({'dummy4:track': tuple()}, result)
def test_get_images_returns_empty_dict_for_library_less_uri(self):
self.assertEqual({}, self.core.library.get_images(['dummy3:foo']))
def test_get_images_returns_empty_result_for_library_less_uri(self):
result = self.core.library.get_images(['dummy3:track'])
self.assertEqual({'dummy3:track': tuple()}, result)
def test_get_images_maps_uri_to_backend(self):
self.core.library.get_images(['dummy1:track'])
@ -62,7 +64,7 @@ class CoreLibraryTest(unittest.TestCase):
self.library1.get_images.reset_mock()
result = self.core.library.get_images(['dummy1:track'])
self.assertEqual({'dummy1:track': [Image(uri='uri')]}, result)
self.assertEqual({'dummy1:track': (Image(uri='uri'),)}, result)
def test_get_images_merges_results(self):
self.library1.get_images().get.return_value = {
@ -72,9 +74,11 @@ class CoreLibraryTest(unittest.TestCase):
'dummy2:track': [Image(uri='uri2')]}
self.library2.get_images.reset_mock()
result = self.core.library.get_images(['dummy1:track', 'dummy2:track'])
expected = {'dummy1:track': [Image(uri='uri1')],
'dummy2:track': [Image(uri='uri2')]}
result = self.core.library.get_images(
['dummy1:track', 'dummy2:track', 'dummy3:track', 'dummy4:track'])
expected = {'dummy1:track': (Image(uri='uri1'),),
'dummy2:track': (Image(uri='uri2'),),
'dummy3:track': tuple(), 'dummy4:track': tuple()}
self.assertEqual(expected, result)
def test_browse_root_returns_dir_ref_for_each_lib_with_root_dir_name(self):