adding sticker commands

diff --git a/doc/commands.txt b/doc/commands.txt
index 6762d525add96b8b5147ce0e3efdae479461d282..46a85baa02397bba97e247b489aa2753ed46d622 100644 (file)
--- a/doc/commands.txt
+++ b/doc/commands.txt
@@ -1,85 +1,92 @@
 == Status Commands
-clearerror                         -> fetch_nothing
-currentsong                        -> fetch_object
-idle             <str>             -> fetch_list
-noidle                             -> None
-status                             -> fetch_object
-stats                              -> fetch_object
+clearerror                               -> fetch_nothing
+currentsong                              -> fetch_object
+idle             <str>                   -> fetch_list
+noidle                                   -> None
+status                                   -> fetch_object
+stats                                    -> fetch_object
 
 == Playback Option Commands
-consume          <bool>            -> fetch_nothing
-crossfade        <int>             -> fetch_nothing
-random           <bool>            -> fetch_nothing
-repeat           <bool>            -> fetch_nothing
-setvol           <int>             -> fetch_nothing
-single           <bool>            -> fetch_nothing
-volume           <int>             -> fetch_nothing
+consume          <bool>                  -> fetch_nothing
+crossfade        <int>                   -> fetch_nothing
+random           <bool>                  -> fetch_nothing
+repeat           <bool>                  -> fetch_nothing
+setvol           <int>                   -> fetch_nothing
+single           <bool>                  -> fetch_nothing
+volume           <int>                   -> fetch_nothing
 
 == Playback Control Commands
-next                               -> fetch_nothing
-pause            [<bool>]          -> fetch_nothing
-play             [<int>]           -> fetch_nothing
-playid           [<int>]           -> fetch_nothing
-previous                           -> fetch_nothing
-seek             <int> <int>       -> fetch_nothing
-seekid           <int> <int>       -> fetch_nothing
-stop                               -> fetch_nothing
+next                                     -> fetch_nothing
+pause            [<bool>]                -> fetch_nothing
+play             [<int>]                 -> fetch_nothing
+playid           [<int>]                 -> fetch_nothing
+previous                                 -> fetch_nothing
+seek             <int> <int>             -> fetch_nothing
+seekid           <int> <int>             -> fetch_nothing
+stop                                     -> fetch_nothing
 
 == Playlist Commands
-add              <str>             -> fetch_nothing
-addid            <str> [<int>]     -> fetch_item
-clear                              -> fetch_nothing
-delete           <int>             -> fetch_nothing
-deleteid         <int>             -> fetch_nothing
-move             <int> <int>       -> fetch_nothing
-moveid           <int> <int>       -> fetch_nothing
-playlist                           -> fetch_playlist
-playlistfind     <locate>          -> fetch_songs
-playlistid       [<int>]           -> fetch_songs
-playlistinfo     [<int>]           -> fetch_songs
-playlistsearch   <locate>          -> fetch_songs
-plchanges        <int>             -> fetch_songs
-plchangesposid   <int>             -> fetch_changes
-shuffle                            -> fetch_nothing
-swap             <int> <int>       -> fetch_nothing
-swapid           <int> <int>       -> fetch_nothing
+add              <str>                   -> fetch_nothing
+addid            <str> [<int>]           -> fetch_item
+clear                                    -> fetch_nothing
+delete           <int>                   -> fetch_nothing
+deleteid         <int>                   -> fetch_nothing
+move             <int> <int>             -> fetch_nothing
+moveid           <int> <int>             -> fetch_nothing
+playlist                                 -> fetch_playlist
+playlistfind     <locate>                -> fetch_songs
+playlistid       [<int>]                 -> fetch_songs
+playlistinfo     [<int>]                 -> fetch_songs
+playlistsearch   <locate>                -> fetch_songs
+plchanges        <int>                   -> fetch_songs
+plchangesposid   <int>                   -> fetch_changes
+shuffle                                  -> fetch_nothing
+swap             <int> <int>             -> fetch_nothing
+swapid           <int> <int>             -> fetch_nothing
 
 == Stored Playlist Commands
-listplaylist     <str>             -> fetch_list
-listplaylistinfo <str>             -> fetch_songs
-listplaylists                      -> fetch_playlists
-load             <str>             -> fetch_nothing
-playlistadd      <str> <str>       -> fetch_nothing
-playlistclear    <str>             -> fetch_nothing
-playlistdelete   <str> <int>       -> fetch_nothing
-playlistmove     <str> <int> <int> -> fetch_nothing
-rename           <str> <str>       -> fetch_nothing
-rm               <str>             -> fetch_nothing
-save             <str>             -> fetch_nothing
+listplaylist     <str>                   -> fetch_list
+listplaylistinfo <str>                   -> fetch_songs
+listplaylists                            -> fetch_playlists
+load             <str>                   -> fetch_nothing
+playlistadd      <str> <str>             -> fetch_nothing
+playlistclear    <str>                   -> fetch_nothing
+playlistdelete   <str> <int>             -> fetch_nothing
+playlistmove     <str> <int> <int>       -> fetch_nothing
+rename           <str> <str>             -> fetch_nothing
+rm               <str>                   -> fetch_nothing
+save             <str>                   -> fetch_nothing
 
 == Database Commands
-count            <locate>          -> fetch_object
-find             <locate>          -> fetch_songs
-list             <str> [<locate>]  -> fetch_list
-listall          [<str>]           -> fetch_database
-listallinfo      [<str>]           -> fetch_database
-lsinfo           [<str>]           -> fetch_database
-search           <locate>          -> fetch_songs
-update           [<str>]           -> fetch_item
+count            <locate>                -> fetch_object
+find             <locate>                -> fetch_songs
+list             <str> [<locate>]        -> fetch_list
+listall          [<str>]                 -> fetch_database
+listallinfo      [<str>]                 -> fetch_database
+lsinfo           [<str>]                 -> fetch_database
+search           <locate>                -> fetch_songs
+update           [<str>]                 -> fetch_item
+
+== Sticker Commands
+sticker get      <str> <str> <str>       -> fetch_item
+sticker set      <str> <str> <str> <str> -> fetch_nothing
+sticker delete   <str> <str> [<str>]     -> fetch_nothing
+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
 
 == Audio Output Commands
-disableoutput    <int>             -> fetch_nothing
-enableoutput     <int>             -> fetch_nothing
-outputs                            -> fetch_outputs
+disableoutput    <int>                   -> fetch_nothing
+enableoutput     <int>                   -> fetch_nothing
+outputs                                  -> fetch_outputs
 
 == Reflection Commands
-commands                           -> fetch_list
-notcommands                        -> fetch_list
-tagtypes                           -> fetch_list
-urlhandlers                        -> fetch_list
+commands                                 -> fetch_list
+notcommands                              -> fetch_list
+tagtypes                                 -> fetch_list
+urlhandlers                              -> fetch_list

diff --git a/mpd.py b/mpd.py
index 56112a9f5db6950ed16c3318569d8be5ee976475..7f610759d6cb516203511068da869ca2066a1cf0 100644 (file)
--- a/mpd.py
+++ b/mpd.py
@@ -120,6 +120,12 @@ class MPDClient(object):
             "lsinfo":           self._fetch_database,
             "search":           self._fetch_songs,
             "update":           self._fetch_item,
+            # Sticker Commands
+            "sticker get":      self._fetch_item,
+            "sticker set":      self._fetch_nothing,
+            "sticker delete":   self._fetch_nothing,
+            "sticker list":     self._fetch_list,
+            "sticker find":     self._fetch_songs,
             # Connection Commands
             "close":            None,
             "kill":             None,