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

Remove redundant calls to playback.on_current_playlist_change()

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-10-21 23:25:52 +02:00
parent 8e74b94606
commit 1d25a2ddea
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mopidy/backends/base/current_playlist.py
View File

@ -81,16 +81,13 @@ class BaseCurrentPlaylistController(object):
:param tracks: tracks to append :param tracks: tracks to append
:type tracks: list of :class:`mopidy.models.Track` :type tracks: list of :class:`mopidy.models.Track`
""" """
self.version += 1
for track in tracks: for track in tracks:
self.add(track) self.add(track)
self.backend.playback.on_current_playlist_change()
def clear(self): def clear(self):
"""Clear the current playlist.""" """Clear the current playlist."""
self._cp_tracks = [] self._cp_tracks = []
self.version += 1 self.version += 1
self.backend.playback.on_current_playlist_change()
def get(self, **criteria): def get(self, **criteria):
""" """
@ -156,7 +153,6 @@ class BaseCurrentPlaylistController(object):
to_position += 1 to_position += 1
self._cp_tracks = new_cp_tracks self._cp_tracks = new_cp_tracks
self.version += 1 self.version += 1
self.backend.playback.on_current_playlist_change()
def remove(self, **criteria): def remove(self, **criteria):
""" """
@ -201,7 +197,6 @@ class BaseCurrentPlaylistController(object):
random.shuffle(shuffled) random.shuffle(shuffled)
self._cp_tracks = before + shuffled + after self._cp_tracks = before + shuffled + after
self.version += 1 self.version += 1
self.backend.playback.on_current_playlist_change()
def mpd_format(self, *args, **kwargs): def mpd_format(self, *args, **kwargs):
"""Not a part of the generic backend API.""" """Not a part of the generic backend API."""

9
tests/backends/base/current_playlist.py
View File

@ -128,7 +128,7 @@ class BaseCurrentPlaylistControllerTest(object):
def test_append_does_not_reset_version(self): def test_append_does_not_reset_version(self):
version = self.controller.version version = self.controller.version
self.controller.append([]) self.controller.append([])
self.assertEqual(self.controller.version, version + 1) self.assertEqual(self.controller.version, version)
@populate_playlist @populate_playlist
def test_append_preserves_playing_state(self): def test_append_preserves_playing_state(self):
@ -249,7 +249,12 @@ class BaseCurrentPlaylistControllerTest(object):
self.assertEqual(self.tracks[0], shuffled_tracks[0]) self.assertEqual(self.tracks[0], shuffled_tracks[0])
self.assertEqual(set(self.tracks), set(shuffled_tracks)) self.assertEqual(set(self.tracks), set(shuffled_tracks))
def test_version(self): def test_version_does_not_change_when_appending_nothing(self):
version = self.controller.version version = self.controller.version
self.controller.append([]) self.controller.append([])
self.assertEquals(version, self.controller.version)
def test_version_increases_when_appending_something(self):
version = self.controller.version
self.controller.append([Track()])
self.assert_(version < self.controller.version) self.assert_(version < self.controller.version)

2
tests/backends/base/playback.py
View File

@ -524,7 +524,7 @@ class BasePlaybackControllerTest(object):
wrapper.called = False wrapper.called = False
self.playback.on_current_playlist_change = wrapper self.playback.on_current_playlist_change = wrapper
self.backend.current_playlist.append([]) self.backend.current_playlist.append([Track()])
self.assert_(wrapper.called) self.assert_(wrapper.called)

14
tests/frontends/mpd/current_playlist_test.py
View File

@ -135,7 +135,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
def test_deleteid(self): def test_deleteid(self):
self.b.current_playlist.append([Track(), Track()]) self.b.current_playlist.append([Track(), Track()])
self.assertEqual(len(self.b.current_playlist.tracks), 2) self.assertEqual(len(self.b.current_playlist.tracks), 2)
result = self.h.handle_request(u'deleteid "2"') result = self.h.handle_request(u'deleteid "1"')
self.assertEqual(len(self.b.current_playlist.tracks), 1) self.assertEqual(len(self.b.current_playlist.tracks), 1)
self.assert_(u'OK' in result) self.assert_(u'OK' in result)
@ -193,7 +193,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
Track(name='a'), Track(name='b'), Track(name='c'), Track(name='a'), Track(name='b'), Track(name='c'),
Track(name='d'), Track(name='e'), Track(name='f'), Track(name='d'), Track(name='e'), Track(name='f'),
]) ])
result = self.h.handle_request(u'moveid "5" "2"') result = self.h.handle_request(u'moveid "4" "2"')
self.assertEqual(self.b.current_playlist.tracks[0].name, 'a') 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[1].name, 'b')
self.assertEqual(self.b.current_playlist.tracks[2].name, 'e') self.assertEqual(self.b.current_playlist.tracks[2].name, 'e')
@ -229,7 +229,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
result = self.h.handle_request( result = self.h.handle_request(
u'playlistfind filename "file:///exists"') u'playlistfind filename "file:///exists"')
self.assert_(u'file: file:///exists' in result) self.assert_(u'file: file:///exists' in result)
self.assert_(u'Id: 1' in result) self.assert_(u'Id: 0' in result)
self.assert_(u'Pos: 0' in result) self.assert_(u'Pos: 0' in result)
self.assert_(u'OK' in result) self.assert_(u'OK' in result)
@ -242,11 +242,11 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
def test_playlistid_with_songid(self): def test_playlistid_with_songid(self):
self.b.current_playlist.append([Track(name='a'), Track(name='b')]) self.b.current_playlist.append([Track(name='a'), Track(name='b')])
result = self.h.handle_request(u'playlistid "2"') result = self.h.handle_request(u'playlistid "1"')
self.assert_(u'Title: a' not in result) self.assert_(u'Title: a' not in result)
self.assert_(u'Id: 1' not in result) self.assert_(u'Id: 0' not in result)
self.assert_(u'Title: b' in result) self.assert_(u'Title: b' in result)
self.assert_(u'Id: 2' in result) self.assert_(u'Id: 1' in result)
self.assert_(u'OK' in result) self.assert_(u'OK' in result)
def test_playlistid_with_not_existing_songid_fails(self): def test_playlistid_with_not_existing_songid_fails(self):
@ -429,7 +429,7 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
Track(name='a'), Track(name='b'), Track(name='c'), Track(name='a'), Track(name='b'), Track(name='c'),
Track(name='d'), Track(name='e'), Track(name='f'), Track(name='d'), Track(name='e'), Track(name='f'),
]) ])
result = self.h.handle_request(u'swapid "2" "5"') result = self.h.handle_request(u'swapid "1" "4"')
self.assertEqual(self.b.current_playlist.tracks[0].name, 'a') self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
self.assertEqual(self.b.current_playlist.tracks[1].name, 'e') self.assertEqual(self.b.current_playlist.tracks[1].name, 'e')
self.assertEqual(self.b.current_playlist.tracks[2].name, 'c') self.assertEqual(self.b.current_playlist.tracks[2].name, 'c')

8
tests/frontends/mpd/playback_test.py
View File

@ -254,7 +254,7 @@ class PlaybackControlHandlerTest(unittest.TestCase):
def test_playid(self): def test_playid(self):
self.b.current_playlist.append([Track()]) self.b.current_playlist.append([Track()])
result = self.h.handle_request(u'playid "1"') result = self.h.handle_request(u'playid "0"')
self.assert_(u'OK' in result) self.assert_(u'OK' in result)
self.assertEqual(self.b.playback.PLAYING, self.b.playback.state) self.assertEqual(self.b.playback.PLAYING, self.b.playback.state)
@ -310,7 +310,7 @@ class PlaybackControlHandlerTest(unittest.TestCase):
def test_seekid(self): def test_seekid(self):
self.b.current_playlist.append([Track(length=40000)]) self.b.current_playlist.append([Track(length=40000)])
result = self.h.handle_request(u'seekid "1" "30"') result = self.h.handle_request(u'seekid "0" "30"')
self.assert_(u'OK' in result) self.assert_(u'OK' in result)
self.assert_(self.b.playback.time_position >= 30000) self.assert_(self.b.playback.time_position >= 30000)
@ -318,8 +318,8 @@ class PlaybackControlHandlerTest(unittest.TestCase):
seek_track = Track(uri='2', length=40000) seek_track = Track(uri='2', length=40000)
self.b.current_playlist.append( self.b.current_playlist.append(
[Track(length=40000), seek_track]) [Track(length=40000), seek_track])
result = self.h.handle_request(u'seekid "2" "30"') result = self.h.handle_request(u'seekid "1" "30"')
self.assertEqual(self.b.playback.current_cpid, 2) self.assertEqual(self.b.playback.current_cpid, 1)
self.assertEqual(self.b.playback.current_track, seek_track) self.assertEqual(self.b.playback.current_track, seek_track)
def test_stop(self): def test_stop(self):

4
tests/frontends/mpd/status_test.py
View File

@ -27,7 +27,7 @@ class StatusHandlerTest(unittest.TestCase):
self.assert_(u'Track: 0' in result) self.assert_(u'Track: 0' in result)
self.assert_(u'Date: ' in result) self.assert_(u'Date: ' in result)
self.assert_(u'Pos: 0' in result) self.assert_(u'Pos: 0' in result)
self.assert_(u'Id: 1' in result) self.assert_(u'Id: 0' in result)
self.assert_(u'OK' in result) self.assert_(u'OK' in result)
def test_currentsong_without_song(self): def test_currentsong_without_song(self):
@ -166,7 +166,7 @@ class StatusHandlerTest(unittest.TestCase):
self.b.playback.play() self.b.playback.play()
result = dict(dispatcher.status.status(self.h)) result = dict(dispatcher.status.status(self.h))
self.assert_('songid' in result) self.assert_('songid' in result)
self.assertEqual(int(result['songid']), 1) self.assertEqual(int(result['songid']), 0)
def test_status_method_when_playing_contains_time_with_no_length(self): def test_status_method_when_playing_contains_time_with_no_length(self):
self.b.current_playlist.append([Track(length=None)]) self.b.current_playlist.append([Track(length=None)])