]> kaliko git repositories - python-musicpd.git/commitdiff
Update documentation
authorKaliko Jack <kaliko@azylum.org>
Sun, 3 Feb 2019 13:29:23 +0000 (14:29 +0100)
committerKaliko Jack <kaliko@azylum.org>
Sun, 3 Feb 2019 13:29:23 +0000 (14:29 +0100)
doc/source/commands.rst [new file with mode: 0644]
doc/source/commands.txt [moved from doc/commands.txt with 78% similarity]
doc/source/index.rst
doc/source/use.rst

diff --git a/doc/source/commands.rst b/doc/source/commands.rst
new file mode 100644 (file)
index 0000000..c11e5aa
--- /dev/null
@@ -0,0 +1,16 @@
+.. _commands:
+
+Available commands
+==================
+
+Get current available commands:
+
+.. code-block:: python
+
+   import musicpd
+   print(' '.join([cmd for cmd in musicpd.MPDClient()._commands.keys()]))
+
+
+List, last updated for v0.4.4:
+
+.. literalinclude:: commands.txt
similarity index 78%
rename from doc/commands.txt
rename to doc/source/commands.txt
index 10134a1b361e5d6268b9058d5524aa9852cf985a..f471bb0e3c2d9858a016aa1a71798c7c14290864 100644 (file)
@@ -27,9 +27,10 @@ playid             [<int>]                 -> fetch_nothing
 previous                                   -> fetch_nothing
 seek               <int> <int>             -> fetch_nothing
 seekid             <int> <int>             -> fetch_nothing
+seekcur            <int>                   -> fetch_nothing
 stop                                       -> fetch_nothing
 
-== Playlist Commands
+== Queue Commands
 add                <str>                   -> fetch_nothing
 addid              <str> [<int>]           -> fetch_item
 clear                                      -> fetch_nothing
@@ -44,9 +45,9 @@ playlistinfo       [<int>|<range>]         -> fetch_songs
 playlistsearch     <locate>                -> fetch_songs
 plchanges          <int>                   -> fetch_songs
 plchangesposid     <int>                   -> fetch_changes
-prio               <int> <int>|<range>     -> self._fetch_nothing,
-prioid             <int> <int>             -> self._fetch_nothing,
-rangeid            <int> <range>           -> self._fetch_nothing,
+prio               <int> <int>|<range>     -> fetch_nothing,
+prioid             <int> <int>             -> fetch_nothing,
+rangeid            <int> <range>           -> fetch_nothing,
 shuffle            [<range>]               -> fetch_nothing
 swap               <int> <int>             -> fetch_nothing
 swapid             <int> <int>             -> fetch_nothing
@@ -67,6 +68,7 @@ rm                 <str>                   -> fetch_nothing
 save               <str>                   -> fetch_nothing
 
 == Database Commands
+albumart           <str> <int>                              -> fetch_object
 count              <str> <str>                              -> fetch_object
 count              group <str>                              -> fetch_object
 find               <str> <str> [<str> <str>]...             -> fetch_songs
@@ -74,8 +76,9 @@ findadd            <str> <str> [<str> <str>]                -> fetch_nothing
 list               <str> [<str> <str>]...[group <str>]...   -> fetch_list
 listall            [<str>]                                  -> fetch_database
 listallinfo        [<str>]                                  -> fetch_database
+listfiles          <str>                                    -> fetch_database
 lsinfo             [<str>]                                  -> fetch_database
-readcomments       <str>                                    -> fetch_object
+readcomments       [<str>]                                  -> fetch_object
 search             <str> <str> [<str> <str>]...             -> fetch_song
 searchadd          <str> <str> [<str> <str>]...             -> fetch_nothing
 searchaddpl        <str> <str> <str> [<str> <str>]...       -> fetch_nothing
@@ -83,11 +86,10 @@ update             [<str>]                                  -> fetch_item
 rescan             [<str>]                                  -> fetch_item
 
 == Mounts and neighbors ==
-
-mount              <str> <str>     -> self._fetch_nothing
-unmount            <str>           -> self._fetch_nothing
-listmounts                         -> self._fetch_mounts
-listneighbors                      -> self._fetch_neighbors
+mount              <str> <str>     -> fetch_nothing
+unmount            <str>           -> fetch_nothing
+listmounts                         -> fetch_mounts
+listneighbors                      -> fetch_neighbors
 
 == Sticker Commands
 sticker   get      <str> <str> <str>       -> fetch_item
@@ -97,10 +99,15 @@ sticker   list     <str> <str>             -> fetch_list
 sticker   find     <str> <str> <str>       -> fetch_songs
 
 == Connection Commands
-close                       -> None
-kill                        -> None
-password           <str>    -> fetch_nothing
-ping                        -> fetch_nothing
+close                               -> None
+kill                                -> None
+password           <str>            -> fetch_nothing
+ping                                -> fetch_nothing
+tagtypes                            -> fetch_list
+tagtypes disable: <str> [<str>]...  -> fetch_nothing
+tagtypes enable:  <str> [<str>]...  -> fetch_nothing
+tagtypes clear:                     -> fetch_nothing
+tagtypes all:                       -> fetch_nothing
 
 == Partition Commands
 partition          <str>    -> fetch_nothing
@@ -108,15 +115,15 @@ listpartitions              -> fetch_list
 newpartition       <str>    -> fetch_nothing
 
 == Audio Output Commands
-disableoutput      <int>    -> fetch_nothing
-enableoutput       <int>    -> fetch_nothing
-toggleoutput       <int>    -> fetch_nothing
-outputs                     -> fetch_outputs
+disableoutput      <int>       -> fetch_nothing
+enableoutput       <int>       -> fetch_nothing
+toggleoutput       <int>       -> fetch_nothing
+outputs                        -> fetch_outputs
+outputset  <str> <str> <str>   -> fetch_nothing 
 
 == Reflection Commands
 config           -> fetch_object
 commands         -> fetch_list
 notcommands      -> fetch_list
-tagtypes         -> fetch_list
 urlhandlers      -> fetch_list
 decoders         -> fetch_plugins
index fdfeb70df3ac357ba1d57d322705054eec25e6ea..d552f002115af0d852c1bf077b0760bbc4c57cce 100644 (file)
@@ -66,6 +66,7 @@ Contents
 
    use.rst
    doc.rst
+   commands.rst
    contribute.rst
 
 
@@ -73,8 +74,8 @@ Indices and tables
 ==================
 
 * :ref:`genindex`
-* :ref:`modindex`
 * :ref:`search`
+.. * :ref:`modindex`
 
 
 .. vim: spell spelllang=en
index fdc13178306852e2d1cf48e97470018cff65a75c..d8e46e7e7c216143d980d72bd4f3b3628c428683 100644 (file)
@@ -1,25 +1,28 @@
 Using the client library
 =========================
 
-The client library can be used as follows::
+The client library can be used as follows:
+
+.. code-block:: python
 
     client = musicpd.MPDClient()       # create client object
     client.connect()                   # use MPD_HOST/MPD_PORT if set else
                                        #   test ${XDG_RUNTIME_DIR}/mpd/socket for existence
                                        #   fallback to localhost:6600
                                        # connect support host/port argument as well
-    print client.mpd_version           # print the mpd version
-    print client.cmd('one', 2)         # print result of the command "cmd one 2"
-    client.close()                     # send the close command
+    print(client.mpd_version)          # print the mpd protocol version
+    print(client.cmd('one', 2))        # print result of the command "cmd one 2"
     client.disconnect()                # disconnect from the server
 
-A list of supported commands, their arguments (as MPD currently understands
-them), and the functions used to parse their responses can be found in
-`doc/commands.txt`.  See the `MPD protocol documentation`_ for more
-details.
+For a list of supported commands, their arguments (as MPD currently understands
+them), and the functions used to parse their responses see :ref:`commands`.
+
+See the `MPD protocol documentation`_ for more details.
 
 Command lists are also supported using `command_list_ok_begin()` and
-`command_list_end()` ::
+`command_list_end()` :
+
+.. code-block:: python
 
     client.command_list_ok_begin()       # start a command list
     client.update()                      # insert the update command into the list
@@ -27,7 +30,9 @@ Command lists are also supported using `command_list_ok_begin()` and
     results = client.command_list_end()  # results will be a list with the results
 
 Provide a 2-tuple as argument for command supporting ranges (cf. `MPD protocol documentation`_ for more details).
-Possible ranges are: "START:END", "START:" and ":" ::
+Possible ranges are: "START:END", "START:" and ":" :
+
+.. code-block:: python
 
     # An intelligent clear
     # clears played track in the queue, currentsong included
@@ -38,7 +43,9 @@ Possible ranges are: "START:END", "START:" and ":" ::
     client.delete((pos,))  # purge queue from current to the end
 
 A notable case is the `rangeid` command allowing an empty range specified
-as a single colon as argument (i.e. sending just ":")::
+as a single colon as argument (i.e. sending just ":"):
+
+.. code-block:: python
 
     # sending "rangeid :" to clear the range, play everything
     client.rangeid(())  # send an empty tuple
@@ -47,7 +54,9 @@ Empty start in range (i.e. ":END") are not possible and will raise a CommandErro
 
 
 Commands may also return iterators instead of lists if `iterate` is set to
-`True`::
+`True`:
+
+.. code-block:: python
 
     client.iterate = True
     for song in client.playlistinfo():
@@ -55,7 +64,9 @@ Commands may also return iterators instead of lists if `iterate` is set to
 
 Each command have a *send\_<CMD>* and a *fetch\_<CMD>* variant, which allows to
 send a MPD command and then fetch the result later.
-This is useful for the idle command::
+This is useful for the idle command:
+
+.. code-block:: python
 
     >>> client.send_idle()
     # do something else or use function like select()