Add readpicture command

diff --git a/doc/source/use.rst b/doc/source/use.rst
index 28f94131c453a0532fc98a85918523b17b3c8687..a213247adaf4c7004d207b5acbeb56ad964dc1fb 100644 (file)
--- a/doc/source/use.rst
+++ b/doc/source/use.rst
@@ -107,14 +107,14 @@ Fetching album covers is possible with albumart, here is an example:
 
 .. code-block:: python
 
-    >>> fetched_cover_file = '/tmp/cover'
     >>> cli = musicpd.MPDClient()
     >>> cli.connect()
     >>> track = "Steve Reich/1978-Music for 18 Musicians"
-    >>> with open(fetched_cover_file, 'wb') as cover:
-    >>>     aart = cli.albumart(track, 0)
-    >>>     received = int(aart.get('binary'))
-    >>>     size = int(aart.get('size'))
+    >>> aart = cli.albumart(track, 0)
+    >>> received = int(aart.get('binary'))
+    >>> size = int(aart.get('size'))
+    >>> with open('/tmp/cover', 'wb') as cover:
+    >>>     # aart = {'size': 42, 'binary': 2051, data: bytes(...)}
     >>>     cover.write(aart.get('data'))
     >>>     while received < size:
     >>>         aart = cli.albumart(track, received)
@@ -124,6 +124,30 @@ Fetching album covers is possible with albumart, here is an example:
     >>>         print('something went wrong', file=sys.stderr)
     >>> cli.disconnect()
 
+A `CommandError` is raised if the album does not expose a cover.
+
+You can also use `readpicture` command to fetch embedded picture:
+
+.. code-block:: python
+
+    >>> cli = musicpd.MPDClient()
+    >>> cli.connect()
+    >>> track = 'muse/Amon Tobin/2011-ISAM/01-Amon Tobin - Journeyman.mp3'
+    >>> rpict = cli.readpicture(track, 0)
+    >>> if not rpict:
+    >>>     print('No embedded picture found', file=sys.stderr)
+    >>>     sys.exit(1)
+    >>> size = int(rpict['size'])
+    >>> done = int(rpict['binary'])
+    >>> with open('/tmp/cover', 'wb') as cover:
+    >>>     cover.write(rpict['data'])
+    >>>     while size > done:
+    >>>         rpict = cli.readpicture(track, done)
+    >>>         done += int(rpict['binary'])
+    >>>         print(f'writing {rpict["binary"]}, done {100*done/size:03.0f}%')
+    >>>         cover.write(rpict['data'])
+    >>> cli.disconnect()
+
 Refer to `MPD protocol documentation`_ for the meaning of `binary`, `size` and `data`.
 
 .. _MPD protocol documentation: http://www.musicpd.org/doc/protocol/

diff --git a/musicpd.py b/musicpd.py
index 3425a6f7f84fd9d37f3ffdd1a749d24b19dacbc0..008d9d8d4838539fad90031ce538d166971fe5b7 100644 (file)
--- a/musicpd.py
+++ b/musicpd.py
@@ -233,6 +233,7 @@ class MPDClient:
             "listfiles":          self._fetch_database,
             "lsinfo":             self._fetch_database,
             "readcomments":       self._fetch_object,
+            "readpicture":        self._fetch_composite,
             "search":             self._fetch_songs,
             "searchadd":          self._fetch_nothing,
             "searchaddpl":        self._fetch_nothing,
@@ -542,6 +543,10 @@ class MPDClient:
             obj[key] = value
             if key == 'binary':
                 break
+        if not obj:
+            # If the song file was recognized, but there is no picture, the
+            # response is successful, but is otherwise empty.
+            return obj
         amount = int(obj['binary'])
         try:
             obj['data'] = self._read_binary(amount)