rearranging commands to match new protocol documentation

diff --git a/doc/commands.txt b/doc/commands.txt
index fcf48bb77fa323efa5457ec3d4ffdca124408443..68f6ed2cd568c3bbee4053eabbb968da111de458 100644 (file)
--- a/doc/commands.txt
+++ b/doc/commands.txt
@@ -1,69 +1,80 @@
-== Admin Commands
-disableoutput    <int>             -> getnone
-enableoutput     <int>             -> getnone
-kill                               -> None
-update           [<str>]           -> getitem
-== Informational Commands
+== Status Commands
+clearerror                         -> getnone
+currentsong                        -> getobject
 status                             -> getobject
 stats                              -> getobject
-outputs                            -> getoutputs
-commands                           -> getlist
-notcommands                        -> getlist
-tagtypes                           -> getlist
-urlhandlers                        -> getlist
-== Database Commands
-find             <locate>          -> getsongs
-list             <str> [<locate>]  -> getlist
-listall          [<str>]           -> getdatabase
-listallinfo      [<str>]           -> getdatabase
-lsinfo           [<str>]           -> getdatabase
-search           <locate>          -> getsongs
-count            <locate>          -> getobject
+
+== Playback Option Commands
+crossfade        <int>             -> getnone
+random           <bool>            -> getnone
+repeat           <bool>            -> getnone
+setvol           <int>             -> getnone
+volume           <int>             -> getnone
+
+== Playback Control Commands
+next                               -> getnone
+pause            [<bool>]          -> getnone
+play             [<int>]           -> getnone
+playid           [<int>]           -> getnone
+previous                           -> getnone
+seek             <int> <int>       -> getnone
+seekid           <int> <int>       -> getnone
+stop                               -> getnone
+
 == Playlist Commands
 add              <str>             -> getnone
 addid            <str> [<int>]     -> getitem
 clear                              -> getnone
-currentsong                        -> getobject
 delete           <int>             -> getnone
 deleteid         <int>             -> getnone
-load             <str>             -> getnone
-rename           <str> <str>       -> getnone
 move             <int> <int>       -> getnone
 moveid           <int> <int>       -> getnone
 playlist                           -> getplaylist
-playlistinfo     [<int>]           -> getsongs
+playlistfind     <locate>          -> getsongs
 playlistid       [<int>]           -> getsongs
+playlistinfo     [<int>]           -> getsongs
+playlistsearch   <locate>          -> getsongs
 plchanges        <int>             -> getsongs
 plchangesposid   <int>             -> getchanges
-rm               <str>             -> getnone
-save             <str>             -> getnone
 shuffle                            -> getnone
 swap             <int> <int>       -> getnone
 swapid           <int> <int>       -> getnone
+
+== Stored Playlist Commands
 listplaylist     <str>             -> getlist
 listplaylistinfo <str>             -> getsongs
+load             <str>             -> getnone
 playlistadd      <str> <str>       -> getnone
 playlistclear    <str>             -> getnone
 playlistdelete   <str> <int>       -> getnone
 playlistmove     <str> <int> <int> -> getnone
-playlistfind     <locate>          -> getsongs
-playlistsearch   <locate>          -> getsongs
-== Playback Commands
-crossfade        <int>             -> getnone
-next                               -> getnone
-pause            [<bool>]          -> getnone
-play             [<int>]           -> getnone
-playid           [<int>]           -> getnone
-previous                           -> getnone
-random           <bool>            -> getnone
-repeat           <bool>            -> getnone
-seek             <int> <int>       -> getnone
-seekid           <int> <int>       -> getnone
-setvol           <int>             -> getnone
-stop                               -> getnone
-volume           <int>             -> getnone
-== Miscellaneous Commands
-clearerror                         -> getnone
+rename           <str> <str>       -> getnone
+rm               <str>             -> getnone
+save             <str>             -> getnone
+
+== Database Commands
+count            <locate>          -> getobject
+find             <locate>          -> getsongs
+list             <str> [<locate>]  -> getlist
+listall          [<str>]           -> getdatabase
+listallinfo      [<str>]           -> getdatabase
+lsinfo           [<str>]           -> getdatabase
+search           <locate>          -> getsongs
+update           [<str>]           -> getitem
+
+== Connection Commands
 close                              -> None
+kill                               -> None
 password         <str>             -> getnone
 ping                               -> getnone
+
+== Audio Output Commands
+disableoutput    <int>             -> getnone
+enableoutput     <int>             -> getnone
+outputs                            -> getoutputs
+
+== Reflection Commands
+commands                           -> getlist
+notcommands                        -> getlist
+tagtypes                           -> getlist
+urlhandlers                        -> getlist

diff --git a/mpd.py b/mpd.py
index 384f856f522d44214c444179c2f5ba586d48e4f2..d7aaf5d46306831895564a53a9f43f2b4361ebdb 100644 (file)
--- a/mpd.py
+++ b/mpd.py
@@ -51,75 +51,78 @@ class MPDClient(object):
         self.iterate = False
         self._reset()
         self._commands = {
-            # Admin Commands
-            "disableoutput":    self._getnone,
-            "enableoutput":     self._getnone,
-            "kill":             None,
-            "update":           self._getitem,
-            # Informational Commands
+            # Status Commands
+            "clearerror":       self._getnone,
+            "currentsong":      self._getobject,
             "status":           self._getobject,
             "stats":            self._getobject,
-            "outputs":          self._getoutputs,
-            "commands":         self._getlist,
-            "notcommands":      self._getlist,
-            "tagtypes":         self._getlist,
-            "urlhandlers":      self._getlist,
-            # Database Commands
-            "find":             self._getsongs,
-            "list":             self._getlist,
-            "listall":          self._getdatabase,
-            "listallinfo":      self._getdatabase,
-            "lsinfo":           self._getdatabase,
-            "search":           self._getsongs,
-            "count":            self._getobject,
+            # Playback Option Commands
+            "crossfade":        self._getnone,
+            "random":           self._getnone,
+            "repeat":           self._getnone,
+            "setvol":           self._getnone,
+            "volume":           self._getnone,
+            # Playback Control Commands
+            "next":             self._getnone,
+            "pause":            self._getnone,
+            "play":             self._getnone,
+            "playid":           self._getnone,
+            "previous":         self._getnone,
+            "seek":             self._getnone,
+            "seekid":           self._getnone,
+            "stop":             self._getnone,
             # Playlist Commands
             "add":              self._getnone,
             "addid":            self._getitem,
             "clear":            self._getnone,
-            "currentsong":      self._getobject,
             "delete":           self._getnone,
             "deleteid":         self._getnone,
-            "load":             self._getnone,
-            "rename":           self._getnone,
             "move":             self._getnone,
             "moveid":           self._getnone,
             "playlist":         self._getplaylist,
-            "playlistinfo":     self._getsongs,
+            "playlistfind":     self._getsongs,
             "playlistid":       self._getsongs,
+            "playlistinfo":     self._getsongs,
+            "playlistsearch":   self._getsongs,
             "plchanges":        self._getsongs,
             "plchangesposid":   self._getchanges,
-            "rm":               self._getnone,
-            "save":             self._getnone,
             "shuffle":          self._getnone,
             "swap":             self._getnone,
             "swapid":           self._getnone,
+            # Stored Playlist Commands
             "listplaylist":     self._getlist,
             "listplaylistinfo": self._getsongs,
+            "load":             self._getnone,
             "playlistadd":      self._getnone,
             "playlistclear":    self._getnone,
             "playlistdelete":   self._getnone,
             "playlistmove":     self._getnone,
-            "playlistfind":     self._getsongs,
-            "playlistsearch":   self._getsongs,
-            # Playback Commands
-            "crossfade":        self._getnone,
-            "next":             self._getnone,
-            "pause":            self._getnone,
-            "play":             self._getnone,
-            "playid":           self._getnone,
-            "previous":         self._getnone,
-            "random":           self._getnone,
-            "repeat":           self._getnone,
-            "seek":             self._getnone,
-            "seekid":           self._getnone,
-            "setvol":           self._getnone,
-            "stop":             self._getnone,
-            "volume":           self._getnone,
-            # Miscellaneous Commands
-            "clearerror":       self._getnone,
+            "rename":           self._getnone,
+            "rm":               self._getnone,
+            "save":             self._getnone,
+            # Database Commands
+            "count":            self._getobject,
+            "find":             self._getsongs,
+            "list":             self._getlist,
+            "listall":          self._getdatabase,
+            "listallinfo":      self._getdatabase,
+            "lsinfo":           self._getdatabase,
+            "search":           self._getsongs,
+            "update":           self._getitem,
+            # Connection Commands
             "close":            None,
+            "kill":             None,
             "password":         self._getnone,
             "ping":             self._getnone,
+            # Audio Output Commands
+            "disableoutput":    self._getnone,
+            "enableoutput":     self._getnone,
+            "outputs":          self._getoutputs,
+            # Reflection Commands
+            "commands":         self._getlist,
+            "notcommands":      self._getlist,
+            "tagtypes":         self._getlist,
+            "urlhandlers":      self._getlist,
         }
 
     def __getattr__(self, attr):