Merge branch 'develop' into tidy-up-core

docs/changelog.rst

@@ -48,7 +48,7 @@ v0.15.0 (UNRELEASED)
 
 **Audio**
 
-- Added support for viusalization. :confval:`audio/visualizer` can now be set
+- Added support for audio visualization. :confval:`audio/visualizer` can now be set
   to GStreamer visualizers.
 
 - Properly encode localised mixer names before logging.
@@ -66,9 +66,9 @@ v0.15.0 (UNRELEASED)
   to start providing their own custom libraries instead of being stuck with
   just our tag cache as the only option.
 
-- Converted local backend to use new `local:playlist:path` and
+- Converted local backend to use new ``local:playlist:path`` and
-  `local:track:path` uri scheme. Also moves support of `file://` to streaming
+  ``local:track:path`` URI scheme. Also moves support of ``file://`` to
-  backend.
+  streaming backend.
 
 **Spotify backend**
 
@@ -84,6 +84,10 @@ v0.15.0 (UNRELEASED)
 - Replace newline, carriage return and forward slash in playlist names. (Fixes:
   :issue:`474`, :issue:`480`)
 
+- Accept ``listall`` and ``listallinfo`` commands without the URI parameter.
+  The methods are still not implemented, but now the commands are accepted as
+  valid.
+
 
 v0.14.2 (2013-07-01)
 ====================

docs/ext/index.rst

@@ -75,3 +75,19 @@ GitHub:
     `dz0ny/mopidy-soundcloud <https://github.com/dz0ny/mopidy-soundcloud>`_
 Issues:
     https://github.com/dz0ny/mopidy-soundcloud/issues
+
+
+Mopidy-Subsonic
+---------------
+
+Provides a backend for playing music from a `Subsonic Music Streamer
+<http://www.subsonic.org/>`_ library.
+
+Author:
+    Bradon Kanyid
+PyPI:
+    `Mopidy-Subsonic <https://pypi.python.org/pypi/Mopidy-Subsonic>`_
+GitHub:
+    `rattboi/mopidy-subsonic <https://github.com/rattboi/mopidy-subsonic>`_
+Issues:
+    https://github.com/rattboi/mopidy-subsonic/issues

mopidy/frontends/mpd/protocol/current_playlist.py

@@ -101,9 +101,6 @@ def deleteid(context, tlid):
         Deletes the song ``SONGID`` from the playlist
     """
     tlid = int(tlid)
-    tl_track = context.core.playback.current_tl_track.get()
-    if tl_track and tl_track.tlid == tlid:
-        context.core.playback.next()
     tl_tracks = context.core.tracklist.remove(tlid=tlid).get()
     if not tl_tracks:
         raise MpdNoExistError('No such song', command='deleteid')

mopidy/frontends/mpd/protocol/music_db.py

@@ -245,8 +245,9 @@ def _list_date(context, query):
     return dates
 
 
-@handle_request(r'^listall "(?P<uri>[^"]+)"')
+@handle_request(r'^listall$')
-def listall(context, uri):
+@handle_request(r'^listall "(?P<uri>[^"]+)"$')
+def listall(context, uri=None):
     """
     *musicpd.org, music database section:*
 
@@ -257,8 +258,9 @@ def listall(context, uri):
     raise MpdNotImplemented  # TODO
 
 
-@handle_request(r'^listallinfo "(?P<uri>[^"]+)"')
+@handle_request(r'^listallinfo$')
-def listallinfo(context, uri):
+@handle_request(r'^listallinfo "(?P<uri>[^"]+)"$')
+def listallinfo(context, uri=None):
     """
     *musicpd.org, music database section:*
 

tests/frontends/mpd/protocol/music_db_test.py

@@ -82,11 +82,19 @@ class MusicDatabaseHandlerTest(protocol.BaseTestCase):
         self.assertEqual(playlists[0].tracks[0].uri, 'dummy:a')
         self.assertInResponse('OK')
 
-    def test_listall(self):
+    def test_listall_without_uri(self):
+        self.sendRequest('listall')
+        self.assertEqualResponse('ACK [0@0] {} Not implemented')
+
+    def test_listall_with_uri(self):
         self.sendRequest('listall "file:///dev/urandom"')
         self.assertEqualResponse('ACK [0@0] {} Not implemented')
 
-    def test_listallinfo(self):
+    def test_listallinfo_without_uri(self):
+        self.sendRequest('listallinfo')
+        self.assertEqualResponse('ACK [0@0] {} Not implemented')
+
+    def test_listallinfo_with_uri(self):
         self.sendRequest('listallinfo "file:///dev/urandom"')
         self.assertEqualResponse('ACK [0@0] {} Not implemented')