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

core: Make history.add() private

Browse Source 
Instead of changing the signature to add(uri, name) I opted for
renaming it to _add_track(track).

Since it's internal we may change it whenever we like to. Since you need
different logic for extracting an interesting name from a track and from
a ref or a stream title, it makes sense to add another method for adding
refs/stream titles to the history when that time comes.

Fixes #1056
This commit is contained in:
Stein Magnus Jodal 2015-03-20 22:34:36 +01:00
parent 35a8fecd5d
commit 861f60e6f1
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.rst
View File

@ -26,7 +26,8 @@ v1.0.0 (UNRELEASED)
the Python API with the WebSocket/JavaScript API. (Fixes: :issue:`952`) the Python API with the WebSocket/JavaScript API. (Fixes: :issue:`952`)
- Add :class:`mopidy.core.HistoryController` which keeps track of what tracks - Add :class:`mopidy.core.HistoryController` which keeps track of what tracks
have been played. (Fixes: :issue:`423`, PR: :issue:`803`) have been played. (Fixes: :issue:`423`, :issue:`1056`, PR: :issue:`803`,
:issue:`1063`)
- Add :class:`mopidy.core.MixerController` which keeps track of volume and - Add :class:`mopidy.core.MixerController` which keeps track of volume and
mute. (Fixes: :issue:`962`) mute. (Fixes: :issue:`962`)

4
mopidy/core/history.py
View File

@ -15,9 +15,11 @@ class HistoryController(object):
def __init__(self): def __init__(self):
self._history = [] self._history = []
def add(self, track): def _add_track(self, track):
"""Add track to the playback history. """Add track to the playback history.
Internal method for :class:`mopidy.core.PlaybackController`.
:param track: track to add :param track: track to add
:type track: :class:`mopidy.models.Track` :type track: :class:`mopidy.models.Track`
""" """

2
mopidy/core/playback.py
View File

@ -312,7 +312,7 @@ class PlaybackController(object):
if success: if success:
self.core.tracklist._mark_playing(tl_track) self.core.tracklist._mark_playing(tl_track)
self.core.history.add(tl_track.track) self.core.history._add_track(tl_track.track)
# TODO: replace with stream-changed # TODO: replace with stream-changed
self._trigger_track_playback_started() self._trigger_track_playback_started()
else: else:

10
tests/core/test_history.py
View File

@ -18,24 +18,24 @@ class PlaybackHistoryTest(unittest.TestCase):
self.history = HistoryController() self.history = HistoryController()
def test_add_track(self): def test_add_track(self):
self.history.add(self.tracks[0]) self.history._add_track(self.tracks[0])
self.assertEqual(self.history.get_length(), 1) self.assertEqual(self.history.get_length(), 1)
self.history.add(self.tracks[1]) self.history._add_track(self.tracks[1])
self.assertEqual(self.history.get_length(), 2) self.assertEqual(self.history.get_length(), 2)
self.history.add(self.tracks[2]) self.history._add_track(self.tracks[2])
self.assertEqual(self.history.get_length(), 3) self.assertEqual(self.history.get_length(), 3)
def test_non_tracks_are_rejected(self): def test_non_tracks_are_rejected(self):
with self.assertRaises(TypeError): with self.assertRaises(TypeError):
self.history.add(object()) self.history._add_track(object())
self.assertEqual(self.history.get_length(), 0) self.assertEqual(self.history.get_length(), 0)
def test_history_entry_contents(self): def test_history_entry_contents(self):
track = self.tracks[0] track = self.tracks[0]
self.history.add(track) self.history._add_track(track)
result = self.history.get_history() result = self.history.get_history()
(timestamp, ref) = result[0] (timestamp, ref) = result[0]