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

models: Use new Ref constructors

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-01-09 08:54:03 +01:00
parent 9da5ccbb79
commit fe28311324
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mopidy/core/library.py
View File

@ -46,13 +46,13 @@ class LibraryController(object):
track's original URI. A matching pair of objects can look like this::
Track(uri='dummy:/foo.mp3', name='foo', artists=..., album=...)
Ref(uri='dummy:/foo.mp3', name='foo', type=Ref.TRACK)
Ref.track(uri='dummy:/foo.mp3', name='foo')
The :class:`~mopidy.models.Ref` objects representing directories has
plain paths, not including any URI schema. For example, the dummy
library's ``/bar`` directory is returned like this::
Ref(uri='/dummy/bar', name='bar', type=Ref.DIRECTORY)
Ref.directory(uri='/dummy/bar', name='bar')
Note to backend implementors: The ``/dummy`` part of the URI is added
by Mopidy core, not the individual backends.
@ -66,7 +66,7 @@ class LibraryController(object):
if path == '/':
return [
Ref(uri='/%s' % name, name=name, type=Ref.DIRECTORY)
Ref.directory(uri='/%s' % name, name=name)
for name in self.backends.with_browsable_library.keys()]
groups = re.match('/(?P<library>[^/]+)(?P<path>.*)', path).groupdict()

20
tests/core/library_test.py
View File

@ -34,8 +34,8 @@ class CoreLibraryTest(unittest.TestCase):
result = self.core.library.browse('/')
self.assertEqual(result, [
Ref(uri='/dummy1', name='dummy1', type=Ref.DIRECTORY),
Ref(uri='/dummy2', name='dummy2', type=Ref.DIRECTORY),
Ref.directory(uri='/dummy1', name='dummy1'),
Ref.directory(uri='/dummy2', name='dummy2'),
])
self.assertFalse(self.library1.browse.called)
self.assertFalse(self.library2.browse.called)
@ -50,8 +50,8 @@ class CoreLibraryTest(unittest.TestCase):
def test_browse_dummy1_selects_dummy1_backend(self):
self.library1.browse().get.return_value = [
Ref(uri='/foo/bar', name='bar', type=Ref.DIRECTORY),
Ref(uri='dummy1:/foo/baz.mp3', name='Baz', type=Ref.TRACK),
Ref.directory(uri='/foo/bar', name='bar'),
Ref.track(uri='dummy1:/foo/baz.mp3', name='Baz'),
]
self.library1.browse.reset_mock()
@ -63,8 +63,8 @@ class CoreLibraryTest(unittest.TestCase):
def test_browse_dummy2_selects_dummy2_backend(self):
self.library2.browse().get.return_value = [
Ref(uri='/bar/quux', name='quux', type=Ref.DIRECTORY),
Ref(uri='dummy2:/foo/baz.mp3', name='Baz', type=Ref.TRACK),
Ref.directory(uri='/bar/quux', name='quux'),
Ref.track(uri='dummy2:/foo/baz.mp3', name='Baz'),
]
self.library2.browse.reset_mock()
@ -83,16 +83,16 @@ class CoreLibraryTest(unittest.TestCase):
def test_browse_dir_returns_subdirs_and_tracks(self):
self.library1.browse().get.return_value = [
Ref(uri='/foo/bar', name='bar', type=Ref.DIRECTORY),
Ref(uri='dummy1:/foo/baz.mp3', name='Baz', type=Ref.TRACK),
Ref.directory(uri='/foo/bar', name='bar'),
Ref.track(uri='dummy1:/foo/baz.mp3', name='Baz'),
]
self.library1.browse.reset_mock()
result = self.core.library.browse('/dummy1/foo')
self.assertEqual(result, [
Ref(uri='/dummy1/foo/bar', name='bar', type=Ref.DIRECTORY),
Ref(uri='dummy1:/foo/baz.mp3', name='Baz', type=Ref.TRACK),
Ref.directory(uri='/dummy1/foo/bar', name='bar'),
Ref.track(uri='dummy1:/foo/baz.mp3', name='Baz'),
])
def test_lookup_selects_dummy1_backend(self):

12
tests/mpd/protocol/music_db_test.py
View File

@ -169,8 +169,8 @@ class MusicDatabaseHandlerTest(protocol.BaseTestCase):
def test_lsinfo_for_root_includes_dirs_for_each_lib_with_content(self):
self.backend.library.dummy_browse_result = [
Ref(uri='dummy:/a', name='a', type='track'),
Ref(uri='/foo', name='foo', type=Ref.DIRECTORY),
Ref.track(uri='dummy:/a', name='a'),
Ref.directory(uri='/foo', name='foo'),
]
self.sendRequest('lsinfo "/"')
@ -179,8 +179,8 @@ class MusicDatabaseHandlerTest(protocol.BaseTestCase):
def test_lsinfo_for_dir_with_and_without_leading_slash_is_the_same(self):
self.backend.library.dummy_browse_result = [
Ref(uri='dummy:/a', name='a', type='track'),
Ref(uri='/foo', name='foo', type=Ref.DIRECTORY),
Ref.track(uri='dummy:/a', name='a'),
Ref.directory(uri='/foo', name='foo'),
]
response1 = self.sendRequest('lsinfo "dummy"')
@ -192,7 +192,7 @@ class MusicDatabaseHandlerTest(protocol.BaseTestCase):
Track(uri='dummy:/a', name='a'),
]
self.backend.library.dummy_browse_result = [
Ref(uri='dummy:/a', name='a', type='track'),
Ref.track(uri='dummy:/a', name='a'),
]
self.sendRequest('lsinfo "/dummy"')
@ -202,7 +202,7 @@ class MusicDatabaseHandlerTest(protocol.BaseTestCase):
def test_lsinfo_for_dir_includes_subdirs(self):
self.backend.library.dummy_browse_result = [
Ref(uri='/foo', name='foo', type=Ref.DIRECTORY),
Ref.directory(uri='/foo', name='foo'),
]
self.sendRequest('lsinfo "/dummy"')