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

CurrentPlaylistController.load() reuse add() logic

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-06-30 00:28:17 +02:00
parent 93b606af3e
commit 1e0a5e5bb3
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/backends/__init__.py
View File

@ -166,7 +166,9 @@ class BaseCurrentPlaylistController(object):
:param tracks: tracks to load
:type tracks: list of :class:`mopidy.models.Track`
"""
self.tracks = tracks
self.tracks = []
for track in tracks:
self.add(track)
self.backend.playback.new_playlist_loaded_callback()
def move(self, start, end, to_position):

7
tests/backends/base.py
View File

@ -170,9 +170,8 @@ class BaseCurrentPlaylistControllerTest(object):
def test_load_does_not_reset_version(self):
version = self.controller.version
self.controller.load(Playlist())
self.assertEqual(self.controller.version, version+1)
self.controller.load([])
self.assertEqual(self.controller.version, version + 1)
@populate_playlist
def test_load_preserves_playing_state(self):
@ -608,7 +607,7 @@ class BasePlaybackControllerTest(object):
wrapper.called = False
self.playback.new_playlist_loaded_callback = wrapper
self.backend.current_playlist.load(Playlist())
self.backend.current_playlist.load([])
self.assert_(wrapper.called)

12
tests/mpd/frontend_test.py
View File

@ -817,9 +817,9 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
Track(name='a'), Track(name='b'), Track(name='c'),
Track(name='d'), Track(name='e'), Track(name='f'),
])
self.assertEqual(self.b.current_playlist.version, 1)
version = self.b.current_playlist.version
result = self.h.handle_request(u'shuffle')
self.assertEqual(self.b.current_playlist.version, 2)
self.assert_(version < self.b.current_playlist.version)
self.assert_(u'OK' in result)
def test_shuffle_with_open_range(self):
@ -827,9 +827,9 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
Track(name='a'), Track(name='b'), Track(name='c'),
Track(name='d'), Track(name='e'), Track(name='f'),
])
self.assertEqual(self.b.current_playlist.version, 1)
version = self.b.current_playlist.version
result = self.h.handle_request(u'shuffle "4:"')
self.assertEqual(self.b.current_playlist.version, 2)
self.assert_(version < self.b.current_playlist.version)
self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
self.assertEqual(self.b.current_playlist.tracks[1].name, 'b')
self.assertEqual(self.b.current_playlist.tracks[2].name, 'c')
@ -841,9 +841,9 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
Track(name='a'), Track(name='b'), Track(name='c'),
Track(name='d'), Track(name='e'), Track(name='f'),
])
self.assertEqual(self.b.current_playlist.version, 1)
version = self.b.current_playlist.version
result = self.h.handle_request(u'shuffle "1:3"')
self.assertEqual(self.b.current_playlist.version, 2)
self.assert_(version < self.b.current_playlist.version)
self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
self.assertEqual(self.b.current_playlist.tracks[4].name, 'e')