From 6451519d2ae332c8e06a5929fb189d74ec9e7d19 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 20 Sep 2012 00:28:30 +0200 Subject: [PATCH] MPD: Support 'playid 0' without quotes around id --- mopidy/frontends/mpd/protocol/playback.py | 4 ++-- tests/frontends/mpd/protocol/playback_test.py | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mopidy/frontends/mpd/protocol/playback.py b/mopidy/frontends/mpd/protocol/playback.py index b0c299c8..356196e6 100644 --- a/mopidy/frontends/mpd/protocol/playback.py +++ b/mopidy/frontends/mpd/protocol/playback.py @@ -121,8 +121,8 @@ def play(context): """ return context.backend.playback.play().get() -@handle_request(r'^playid "(?P\d+)"$') -@handle_request(r'^playid "(?P-1)"$') +@handle_request(r'^playid (?P-?\d+)$') +@handle_request(r'^playid "(?P-?\d+)"$') def playid(context, cpid): """ *musicpd.org, playback section:* diff --git a/tests/frontends/mpd/protocol/playback_test.py b/tests/frontends/mpd/protocol/playback_test.py index 88452d3d..4f8f7430 100644 --- a/tests/frontends/mpd/protocol/playback_test.py +++ b/tests/frontends/mpd/protocol/playback_test.py @@ -287,6 +287,13 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase): self.assertEqual(PLAYING, self.backend.playback.state.get()) self.assertInResponse(u'OK') + def test_playid_without_quotes(self): + self.backend.current_playlist.append([Track()]) + + self.sendRequest(u'playid 0') + self.assertEqual(PLAYING, self.backend.playback.state.get()) + self.assertInResponse(u'OK') + def test_playid_minus_one_plays_first_in_playlist_if_no_current_track(self): self.assertEqual(self.backend.playback.current_track.get(), None) self.backend.current_playlist.append([Track(uri='a'), Track(uri='b')])