Add mounts and neighbors commands (MPD 0.19)

diff --git a/CHANGES.txt b/CHANGES.txt
index 921e0f6455e7f7034b74a667da2ad2a3d591bbf2..a82e7caa172e4c1129a62f700dc658ac409691b2 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,8 @@ Changes in 0.4.2 UNRELEASED
 ----------------
 
 * Add unittest (requires mock)
+* Add mounts and neighbors commands (mount, unmount, listmounts and
+  listneighbors)
 
 Changes in 0.4.1
 ----------------

diff --git a/doc/commands.txt b/doc/commands.txt
index 1ec938c20838a85f16dd17e2a8f63732ea6f6788..0e169c3207f8a73c22253629b2980a48ca6f81b8 100644 (file)
--- a/doc/commands.txt
+++ b/doc/commands.txt
@@ -74,6 +74,13 @@ update             [<str>]                 -> fetch_item
 rescan             [<str>]                 -> fetch_item
 readcomments       <str>                   -> fetch_object
 
+== Mounts and neighbors ==
+
+mount              <str> <str>             -> self._fetch_nothing
+unmount            <str>                   -> self._fetch_nothing
+listmounts                                 -> self._fetch_mounts
+listneighbors                              -> self._fetch_neighbors
+
 == Sticker Commands
 sticker   get      <str> <str> <str>       -> fetch_item
 sticker   set      <str> <str> <str> <str> -> fetch_nothing

diff --git a/musicpd.py b/musicpd.py
index 0fe3b671deff665e3ff73c6394ac7d363e9eb693..8358ddcd4892bbe3ca30b38a3b10595f41448653 100644 (file)
--- a/musicpd.py
+++ b/musicpd.py
@@ -1,6 +1,6 @@
 # python-musicpd: Python MPD client library
 # Copyright (C) 2008-2010  J. Alexander Treuman <jat@spatialrift.net>
-# Copyright (C) 2012-2013  Kaliko Jack <kaliko@azylum.org>
+# Copyright (C) 2012-2014  Kaliko Jack <kaliko@azylum.org>
 #
 # python-musicpd is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -159,6 +159,11 @@ class MPDClient:
             "update":             self._fetch_item,
             "rescan":             self._fetch_item,
             "readcomments":       self._fetch_object,
+            # Mounts and neighbors
+            "mount":              self._fetch_nothing,
+            "unmount":            self._fetch_nothing,
+            "listmounts":         self._fetch_mounts,
+            "listneighbors":      self._fetch_neighbors,
             # Sticker Commands
             "sticker get":        self._fetch_item,
             "sticker set":        self._fetch_nothing,
@@ -405,6 +410,12 @@ class MPDClient:
     def _fetch_messages(self):
         return self._fetch_objects(["channel"])
 
+    def _fetch_mounts(self):
+        return self._fetch_objects(["mount"])
+
+    def _fetch_neighbors(self):
+        return self._fetch_objects(["neighbor"])
+
     def _fetch_command_list(self):
         return self._wrap_iterator(self._read_command_list())