Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/1133 Add nextsong and nextsongid to mpd status command #1523

Merged
merged 7 commits into from Jun 26, 2016
Merged

Fix/1133 Add nextsong and nextsongid to mpd status command #1523

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ac92069
Add nextsong/nextsongid to mpd status
ismailof Jun 6, 2016
a1c219e
Add nextsong/nextsongid to mpd status
ismailof Jun 6, 2016
19818d3
Add MPD nextsong/nextsongid test case
ismailof Jun 6, 2016
6787a04
Add MPD nextsong/nextsongid test case
ismailof Jun 6, 2016
fc26b73
chmod correction
ismailof Jun 6, 2016
95ac271
Add changelog entry
ismailof Jun 26, 2016
6549848
Add changelog entry
ismailof Jun 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 15 additions & 1 deletion mopidy/mpd/protocol/status.py
View file
Open in desktop
Expand Up @@ -173,6 +173,7 @@ def status(context):
decimal places for millisecond precision.
"""
tl_track = context.core.playback.get_current_tl_track()
next_tlid = context.core.tracklist.get_next_tlid()

futures = {
'tracklist.length': context.core.tracklist.get_length(),
Expand All @@ -185,6 +186,9 @@ def status(context):
'playback.state': context.core.playback.get_state(),
'playback.current_tl_track': tl_track,
'tracklist.index': context.core.tracklist.index(tl_track.get()),
'tracklist.next_tlid': next_tlid,
'tracklist.next_index': context.core.tracklist.index(
tlid=next_tlid.get()),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we shouldn't have this .get() inside here. But given the APIs that are currently available this is the correct way to do it as far as I can see.

'playback.time_position': context.core.playback.get_time_position(),
}
pykka.get_all(futures.values())
Expand All @@ -199,10 +203,12 @@ def status(context):
('xfade', _status_xfade(futures)),
('state', _status_state(futures)),
]
# TODO: add nextsong and nextsongid
if futures['playback.current_tl_track'].get() is not None:
result.append(('song', _status_songpos(futures)))
result.append(('songid', _status_songid(futures)))
if futures['tracklist.next_tlid'].get() is not None:
result.append(('nextsong', _status_nextsongpos(futures)))
result.append(('nextsongid', _status_nextsongid(futures)))
if futures['playback.state'].get() in (
PlaybackState.PLAYING, PlaybackState.PAUSED):
result.append(('time', _status_time(futures)))
Expand Down Expand Up @@ -259,6 +265,14 @@ def _status_songpos(futures):
return futures['tracklist.index'].get()


def _status_nextsongid(futures):
return futures['tracklist.next_tlid'].get()


def _status_nextsongpos(futures):
return futures['tracklist.next_index'].get()


def _status_state(futures):
state = futures['playback.state'].get()
if state == PlaybackState.PLAYING:
Expand Down
35 changes: 24 additions & 11 deletions tests/mpd/test_status.py
View file
Open in desktop
Expand Up @@ -48,9 +48,9 @@ def setUp(self): # noqa: N802
def tearDown(self): # noqa: N802
pykka.ActorRegistry.stop_all()

def set_tracklist(self, track):
self.backend.library.dummy_library = [track]
self.core.tracklist.add(uris=[track.uri]).get()
def set_tracklist(self, tracks):
self.backend.library.dummy_library = tracks
self.core.tracklist.add(uris=[track.uri for track in tracks]).get()

def test_stats_method(self):
result = status.stats(self.context)
Expand Down Expand Up @@ -154,22 +154,35 @@ def test_status_method_contains_state_is_pause(self):
self.assertEqual(result['state'], 'pause')

def test_status_method_when_playlist_loaded_contains_song(self):
self.set_tracklist(Track(uri='dummy:/a'))

self.set_tracklist([Track(uri='dummy:/a')])
self.core.playback.play().get()
result = dict(status.status(self.context))
self.assertIn('song', result)
self.assertGreaterEqual(int(result['song']), 0)

def test_status_method_when_playlist_loaded_contains_tlid_as_songid(self):
self.set_tracklist(Track(uri='dummy:/a'))
self.set_tracklist([Track(uri='dummy:/a')])
self.core.playback.play().get()
result = dict(status.status(self.context))
self.assertIn('songid', result)
self.assertEqual(int(result['songid']), 1)

def test_status_method_when_playlist_loaded_contains_nextsong(self):
self.set_tracklist([Track(uri='dummy:/a'), Track(uri='dummy:/b')])
self.core.playback.play().get()
result = dict(status.status(self.context))
self.assertIn('nextsong', result)
self.assertGreaterEqual(int(result['nextsong']), 0)

def test_status_method_when_playlist_loaded_contains_nextsongid(self):
self.set_tracklist([Track(uri='dummy:/a'), Track(uri='dummy:/b')])
self.core.playback.play().get()
result = dict(status.status(self.context))
self.assertIn('nextsongid', result)
self.assertEqual(int(result['nextsongid']), 2)

def test_status_method_when_playing_contains_time_with_no_length(self):
self.set_tracklist(Track(uri='dummy:/a', length=None))
self.set_tracklist([Track(uri='dummy:/a', length=None)])
self.core.playback.play().get()
result = dict(status.status(self.context))
self.assertIn('time', result)
Expand All @@ -179,7 +192,7 @@ def test_status_method_when_playing_contains_time_with_no_length(self):
self.assertLessEqual(position, total)

def test_status_method_when_playing_contains_time_with_length(self):
self.set_tracklist(Track(uri='dummy:/a', length=10000))
self.set_tracklist([Track(uri='dummy:/a', length=10000)])
self.core.playback.play()
result = dict(status.status(self.context))
self.assertIn('time', result)
Expand All @@ -189,7 +202,7 @@ def test_status_method_when_playing_contains_time_with_length(self):
self.assertLessEqual(position, total)

def test_status_method_when_playing_contains_elapsed(self):
self.set_tracklist(Track(uri='dummy:/a', length=60000))
self.set_tracklist([Track(uri='dummy:/a', length=60000)])
self.core.playback.play().get()
self.core.playback.pause()
self.core.playback.seek(59123)
Expand All @@ -198,15 +211,15 @@ def test_status_method_when_playing_contains_elapsed(self):
self.assertEqual(result['elapsed'], '59.123')

def test_status_method_when_starting_playing_contains_elapsed_zero(self):
self.set_tracklist(Track(uri='dummy:/a', length=10000))
self.set_tracklist([Track(uri='dummy:/a', length=10000)])
self.core.playback.play().get()
self.core.playback.pause()
result = dict(status.status(self.context))
self.assertIn('elapsed', result)
self.assertEqual(result['elapsed'], '0.000')

def test_status_method_when_playing_contains_bitrate(self):
self.set_tracklist(Track(uri='dummy:/a', bitrate=3200))
self.set_tracklist([Track(uri='dummy:/a', bitrate=3200)])
self.core.playback.play().get()
result = dict(status.status(self.context))
self.assertIn('bitrate', result)
Expand Down