[Pkg-mpd-commits] [python-mpd] 105/262: Imported Upstream version 0.3.0.621664b
Simon McVittie
smcv at debian.org
Sun May 22 18:16:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch upstream
in repository python-mpd.
commit 2183fecd625534a6226263aa3264523e3a049568
Author: kaliko <efrim at azylum.org>
Date: Mon Feb 27 17:36:44 2012 +0100
Imported Upstream version 0.3.0.621664b
---
CHANGES.txt | 33 +++
GPL.txt | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
LICENSE.txt | 165 ++++++++++++++
MANIFEST.in | 3 +
README.txt | 93 ++++++++
doc/commands.txt | 109 +++++++++
mpd.py | 488 ++++++++++++++++++++++++++++++++++++++++
setup.cfg | 2 +
setup.py | 57 +++++
test.py | 132 +++++++++++
10 files changed, 1756 insertions(+)
diff --git a/CHANGES.txt b/CHANGES.txt
new file mode 100644
index 0000000..e9dac67
--- /dev/null
+++ b/CHANGES.txt
@@ -0,0 +1,33 @@
+python-mpd Changes List
+=======================
+
+Changes in 0.3.0
+----------------
+
+* added replay_gain_mode and replay_gain_status commands
+* added mixrampdb and mixrampdelay commands
+* added findadd and rescan commands
+* added decoders command
+* changed license to LGPL
+* added sticker commands
+* correctly handle errors in command lists (fixes a longstanding bug)
+* raise IteratingError instead of breaking horribly when called wrong
+* added fileno() to export socket FD (for polling with select et al.)
+* asynchronous API (use send_<cmd> to queue, fetch_<cmd> to retrieve)
+* support for connecting to unix domain sockets
+* added consume and single commands
+* added idle and noidle commands
+* added listplaylists command
+
+Changes in 0.2.1
+----------------
+
+* connect() no longer broken on Windows
+
+Changes in 0.2.0
+----------------
+
+* support for IPv6 and multi-homed hostnames
+* connect() will fail if already connected
+* commands may now raise ConnectionError
+* addid and update may now return None
diff --git a/GPL.txt b/GPL.txt
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/GPL.txt
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..65c5ca8
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..066ee11
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,3 @@
+exclude setup.cfg
+include *.txt
+recursive-include doc *.txt
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..c8b68df
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,93 @@
+python-mpd
+==========
+
+Getting python-mpd
+------------------
+
+The latest release of python-mpd can be found at
+http://pypi.python.org/pypi/python-mpd/.
+
+
+Getting the latest source code
+------------------------------
+
+If you would instead like to use the latest source code, you can grab a copy
+of the development version from git by running the command::
+
+ git clone git://jatreuman.indefero.net/jatreuman/python-mpd.git
+
+
+Installing from source
+----------------------
+
+To install python-mpd from source, simply run the command::
+
+ python setup.py install
+
+You can use the ``--help`` switch to ``setup.py`` for a complete list of commands
+and their options. See the `Installing Python Modules
+<http://docs.python.org/inst/inst.html>`_ document for more details.
+
+
+Using the client library
+------------------------
+
+The client library can be used as follows::
+
+ client = mpd.MPDClient() # create client object
+ client.connect("localhost", 6600) # connect to localhost:6600
+ print(client.mpd_version) # print the mpd version
+ print(client.find("any", "house")) # print result of the command "find any house"
+ client.close() # send the close command
+ 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
+<http://www.musicpd.org/doc/protocol/>`_ for more details.
+
+Command lists are also supported using ``command_list_ok_begin()`` and
+``command_list_end()``::
+
+ client.command_list_ok_begin() # start a command list
+ client.update() # insert the update command into the list
+ client.status() # insert the status command into the list
+ results = client.command_list_end() # results will be a list with the results
+
+Commands may also return iterators instead of lists if ``iterate`` is set to
+``True``::
+
+ client.iterate = True
+ for song in client.playlistinfo():
+ print song["file"]
+
+Each command have a ``send_`` and a ``fetch_`` variant, which allows to send a
+mpd command and the fetch the result later. This is useful for the idle
+command::
+
+ client.send_idle()
+ # do something else ...
+ events = client.fetch_idle()
+
+Future Compatible
+-----------------
+
+New commands or special handling of commands can be easily implemented.
+Use ``add_command()`` or ``remove_command()`` to modify the commands of the
+``MPDClient`` class and all its instances.
+
+::
+
+ def fetch_cover(client):
+ """"Take a MPDClient instance as its arguments and return mimetype and image"""
+ # this command may come in the future.
+ pass
+ self.client.add_command("get_cover", fetch_cover)
+ # remove the command, because it doesn't exist already.
+ self.client.remove_command("get_cover")
+
+Contacting the author
+---------------------
+
+You can contact the author by emailing J. Alexander Treuman jat at spatialrift.net.
+He can also be found idling in #mpd on irc.freenode.net as jat.
diff --git a/doc/commands.txt b/doc/commands.txt
new file mode 100644
index 0000000..6efc6a6
--- /dev/null
+++ b/doc/commands.txt
@@ -0,0 +1,109 @@
+== Status Commands
+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
+mixrampdb <str> -> fetch_nothing
+mixrampdelay <int> -> fetch_nothing
+random <bool> -> fetch_nothing
+repeat <bool> -> fetch_nothing
+setvol <int> -> fetch_nothing
+single <bool> -> fetch_nothing
+replay_gain_mode <str> -> fetch_nothing
+replay_gain_status -> fetch_item
+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
+seekcur <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
+prior <int> <str> -> fetch_nothing
+priorid <int> <id> -> fetch_nothing
+shuffle [<str>] -> 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
+
+== Database Commands
+count <locate> -> fetch_object
+find <locate> -> fetch_songs
+findadd <locate> -> fetch_nothing
+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
+rescan [<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
+
+== Audio Output Commands
+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
+decoders -> fetch_plugins
+
+== Client To Client
+subscribe <str> -> fetch_nothing
+unsubscribe <str> -> fetch_nothing
+channels -> fetch_list
+readmessages -> fetch_messages
+sendmessage <str> <str> -> fetch_nothing
diff --git a/mpd.py b/mpd.py
new file mode 100644
index 0000000..6995bb2
--- /dev/null
+++ b/mpd.py
@@ -0,0 +1,488 @@
+# python-mpd: Python MPD client library
+# Copyright (C) 2008-2010 J. Alexander Treuman <jat at spatialrift.net>
+#
+# python-mpd is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# python-mpd is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with python-mpd. If not, see <http://www.gnu.org/licenses/>.
+
+import socket
+from collections import Callable
+
+HELLO_PREFIX = "OK MPD "
+ERROR_PREFIX = "ACK "
+SUCCESS = "OK"
+NEXT = "list_OK"
+
+
+class MPDError(Exception):
+ pass
+
+class ConnectionError(MPDError):
+ pass
+
+class ProtocolError(MPDError):
+ pass
+
+class CommandError(MPDError):
+ pass
+
+class CommandListError(MPDError):
+ pass
+
+class PendingCommandError(MPDError):
+ pass
+
+class IteratingError(MPDError):
+ pass
+
+
+class _NotConnected(object):
+ def __getattr__(self, attr):
+ return self._dummy
+
+ def _dummy(*args):
+ raise ConnectionError("Not connected")
+
+_commands = {
+ # Status Commands
+ "clearerror": "_fetch_nothing",
+ "currentsong": "_fetch_object",
+ "idle": "_fetch_list",
+ "noidle": None,
+ "status": "_fetch_object",
+ "stats": "_fetch_object",
+ # Playback Option Commands
+ "consume": "_fetch_nothing",
+ "crossfade": "_fetch_nothing",
+ "mixrampdb": "_fetch_nothing",
+ "mixrampdelay": "_fetch_nothing",
+ "random": "_fetch_nothing",
+ "repeat": "_fetch_nothing",
+ "setvol": "_fetch_nothing",
+ "single": "_fetch_nothing",
+ "replay_gain_mode": "_fetch_nothing",
+ "replay_gain_status": "_fetch_item",
+ "volume": "_fetch_nothing",
+ # Playback Control Commands
+ "next": "_fetch_nothing",
+ "pause": "_fetch_nothing",
+ "play": "_fetch_nothing",
+ "playid": "_fetch_nothing",
+ "previous": "_fetch_nothing",
+ "seek": "_fetch_nothing",
+ "seekid": "_fetch_nothing",
+ "seekcur": "_fetch_nothing",
+ "stop": "_fetch_nothing",
+ # Playlist Commands
+ "add": "_fetch_nothing",
+ "addid": "_fetch_item",
+ "clear": "_fetch_nothing",
+ "delete": "_fetch_nothing",
+ "deleteid": "_fetch_nothing",
+ "move": "_fetch_nothing",
+ "moveid": "_fetch_nothing",
+ "playlist": "_fetch_playlist",
+ "playlistfind": "_fetch_songs",
+ "playlistid": "_fetch_songs",
+ "playlistinfo": "_fetch_songs",
+ "playlistsearch": "_fetch_songs",
+ "plchanges": "_fetch_songs",
+ "plchangesposid": "_fetch_changes",
+ "prior": "_fetch_nothing",
+ "priorid": "_fetch_nothing",
+ "shuffle": "_fetch_nothing",
+ "swap": "_fetch_nothing",
+ "swapid": "_fetch_nothing",
+ # Stored Playlist Commands
+ "listplaylist": "_fetch_list",
+ "listplaylistinfo": "_fetch_songs",
+ "listplaylists": "_fetch_playlists",
+ "load": "_fetch_nothing",
+ "playlistadd": "_fetch_nothing",
+ "playlistclear": "_fetch_nothing",
+ "playlistdelete": "_fetch_nothing",
+ "playlistmove": "_fetch_nothing",
+ "rename": "_fetch_nothing",
+ "rm": "_fetch_nothing",
+ "save": "_fetch_nothing",
+ # Database Commands
+ "count": "_fetch_object",
+ "find": "_fetch_songs",
+ "findadd": "_fetch_nothing",
+ "list": "_fetch_list",
+ "listall": "_fetch_database",
+ "listallinfo": "_fetch_database",
+ "lsinfo": "_fetch_database",
+ "search": "_fetch_songs",
+ "update": "_fetch_item",
+ "rescan": "_fetch_item",
+ # Sticker Commands
+ "sticker get": "_fetch_item",
+ "sticker set": "_fetch_nothing",
+ "sticker delete": "_fetch_nothing",
+ "sticker list": "_fetch_list",
+ "sticker find": "_fetch_songs",
+ # Connection Commands
+ "close": None,
+ "kill": None,
+ "password": "_fetch_nothing",
+ "ping": "_fetch_nothing",
+ # Audio Output Commands
+ "disableoutput": "_fetch_nothing",
+ "enableoutput": "_fetch_nothing",
+ "outputs": "_fetch_outputs",
+ # Reflection Commands
+ "commands": "_fetch_list",
+ "notcommands": "_fetch_list",
+ "tagtypes": "_fetch_list",
+ "urlhandlers": "_fetch_list",
+ "decoders": "_fetch_plugins",
+ # Client To Client
+ "subscribe": "_fetch_nothing",
+ "unsubscribe": "_fetch_nothing",
+ "channels": "_fetch_list",
+ "readmessages": "_fetch_messages",
+ "sendmessage": "_fetch_nothing",
+}
+
+class MPDClient():
+ def __init__(self):
+ self.iterate = False
+ self._reset()
+
+ def _send(self, command, args, retval):
+ if self._command_list is not None:
+ raise CommandListError("Cannot use send_%s in a command list" %
+ command)
+ self._write_command(command, args)
+ if retval is not None:
+ self._pending.append(command)
+
+ def _fetch(self, command, args, retval):
+ if self._command_list is not None:
+ raise CommandListError("Cannot use fetch_%s in a command list" %
+ command)
+ if self._iterating:
+ raise IteratingError("Cannot use fetch_%s while iterating" %
+ command)
+ if not self._pending:
+ raise PendingCommandError("No pending commands to fetch")
+ if self._pending[0] != command:
+ raise PendingCommandError("'%s' is not the currently "
+ "pending command" % command)
+ del self._pending[0]
+ if isinstance(retval, Callable):
+ return retval()
+ return retval
+
+ def _execute(self, command, args, retval):
+ if self._iterating:
+ raise IteratingError("Cannot execute '%s' while iterating" %
+ command)
+ if self._pending:
+ raise PendingCommandError("Cannot execute '%s' with "
+ "pending commands" % command)
+ if self._command_list is not None:
+ if not isinstance(retval, Callable):
+ raise CommandListError("'%s' not allowed in command list" %
+ command)
+ self._write_command(command, args)
+ self._command_list.append(retval)
+ else:
+ self._write_command(command, args)
+ if isinstance(retval, Callable):
+ return retval()
+ return retval
+
+ def _write_line(self, line):
+ self._wfile.write(("%s\n" % line).encode('utf-8'))
+ self._wfile.flush()
+
+ def _write_command(self, command, args=[]):
+ parts = [command]
+ for arg in args:
+ parts.append('"%s"' % escape(str(arg)))
+ self._write_line(" ".join(parts))
+
+ def _read_line(self):
+ line = self._rfile.readline().decode('utf-8')
+ if not line.endswith("\n"):
+ raise ConnectionError("Connection lost while reading line")
+ line = line.rstrip("\n")
+ if line.startswith(ERROR_PREFIX):
+ error = line[len(ERROR_PREFIX):].strip()
+ raise CommandError(error)
+ if self._command_list is not None:
+ if line == NEXT:
+ return
+ if line == SUCCESS:
+ raise ProtocolError("Got unexpected '%s'" % SUCCESS)
+ elif line == SUCCESS:
+ return
+ return line
+
+ def _read_pair(self, separator):
+ line = self._read_line()
+ if line is None:
+ return
+ pair = line.split(separator, 1)
+ if len(pair) < 2:
+ raise ProtocolError("Could not parse pair: '%s'" % line)
+ return pair
+
+ def _read_pairs(self, separator=": "):
+ pair = self._read_pair(separator)
+ while pair:
+ yield pair
+ pair = self._read_pair(separator)
+
+ def _read_list(self):
+ seen = None
+ for key, value in self._read_pairs():
+ if key != seen:
+ if seen is not None:
+ raise ProtocolError("Expected key '%s', got '%s'" %
+ (seen, key))
+ seen = key
+ yield value
+
+ def _read_playlist(self):
+ for key, value in self._read_pairs(":"):
+ yield value
+
+ def _read_objects(self, delimiters=[]):
+ obj = {}
+ for key, value in self._read_pairs():
+ key = key.lower()
+ if obj:
+ if key in delimiters:
+ yield obj
+ obj = {}
+ elif key in obj:
+ if not isinstance(obj[key], list):
+ obj[key] = [obj[key], value]
+ else:
+ obj[key].append(value)
+ continue
+ obj[key] = value
+ if obj:
+ yield obj
+
+ def _read_command_list(self):
+ try:
+ for retval in self._command_list:
+ yield retval()
+ finally:
+ self._command_list = None
+ self._fetch_nothing()
+
+ def _iterator_wrapper(self, iterator):
+ try:
+ for item in iterator:
+ yield item
+ finally:
+ self._iterating = False
+
+ def _wrap_iterator(self, iterator):
+ if not self.iterate:
+ return list(iterator)
+ self._iterating = True
+ return self._iterator_wrapper(iterator)
+
+ def _fetch_nothing(self):
+ line = self._read_line()
+ if line is not None:
+ raise ProtocolError("Got unexpected return value: '%s'" % line)
+
+ def _fetch_item(self):
+ pairs = list(self._read_pairs())
+ if len(pairs) != 1:
+ return
+ return pairs[0][1]
+
+ def _fetch_list(self):
+ return self._wrap_iterator(self._read_list())
+
+ def _fetch_playlist(self):
+ return self._wrap_iterator(self._read_playlist())
+
+ def _fetch_object(self):
+ objs = list(self._read_objects())
+ if not objs:
+ return {}
+ return objs[0]
+
+ def _fetch_objects(self, delimiters):
+ return self._wrap_iterator(self._read_objects(delimiters))
+
+ def _fetch_changes(self):
+ return self._fetch_objects(["cpos"])
+
+ def _fetch_songs(self):
+ return self._fetch_objects(["file"])
+
+ def _fetch_playlists(self):
+ return self._fetch_objects(["playlist"])
+
+ def _fetch_database(self):
+ return self._fetch_objects(["file", "directory", "playlist"])
+
+ def _fetch_messages(self):
+ return self._fetch_objects(["channel"])
+
+ def _fetch_outputs(self):
+ return self._fetch_objects(["outputid"])
+
+ def _fetch_plugins(self):
+ return self._fetch_objects(["plugin"])
+
+ def _fetch_command_list(self):
+ return self._wrap_iterator(self._read_command_list())
+
+ def _hello(self):
+ line = self._rfile.readline().decode('utf-8')
+ if not line.endswith("\n"):
+ raise ConnectionError("Connection lost while reading MPD hello")
+ line = line.rstrip("\n")
+ if not line.startswith(HELLO_PREFIX):
+ raise ProtocolError("Got invalid MPD hello: '%s'" % line)
+ self.mpd_version = line[len(HELLO_PREFIX):].strip()
+
+ def _reset(self):
+ self.mpd_version = None
+ self._iterating = False
+ self._pending = []
+ self._command_list = None
+ self._sock = None
+ self._rfile = _NotConnected()
+ self._wfile = _NotConnected()
+
+ def _connect_unix(self, path):
+ if not hasattr(socket, "AF_UNIX"):
+ raise ConnectionError("Unix domain sockets not supported "
+ "on this platform")
+ sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+ sock.connect(path)
+ return sock
+
+ def _connect_tcp(self, host, port):
+ try:
+ flags = socket.AI_ADDRCONFIG
+ except AttributeError:
+ flags = 0
+ err = None
+ for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC,
+ socket.SOCK_STREAM, socket.IPPROTO_TCP,
+ flags):
+ af, socktype, proto, canonname, sa = res
+ sock = None
+ try:
+ sock = socket.socket(af, socktype, proto)
+ sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+ sock.connect(sa)
+ return sock
+ except socket.error as e:
+ err = e
+ if sock is not None:
+ sock.close()
+ if err is not None:
+ raise err
+ else:
+ raise ConnectionError("getaddrinfo returns an empty list")
+
+ def connect(self, host, port):
+ if self._sock is not None:
+ raise ConnectionError("Already connected")
+ if host.startswith("/"):
+ self._sock = self._connect_unix(host)
+ else:
+ self._sock = self._connect_tcp(host, port)
+ self._rfile = self._sock.makefile("rb")
+ self._wfile = self._sock.makefile("wb")
+ try:
+ self._hello()
+ except:
+ self.disconnect()
+ raise
+
+ def disconnect(self):
+ self._rfile.close()
+ self._wfile.close()
+ self._sock.close()
+ self._reset()
+
+ def fileno(self):
+ if self._sock is None:
+ raise ConnectionError("Not connected")
+ return self._sock.fileno()
+
+ def command_list_ok_begin(self):
+ if self._command_list is not None:
+ raise CommandListError("Already in command list")
+ if self._iterating:
+ raise IteratingError("Cannot begin command list while iterating")
+ if self._pending:
+ raise PendingCommandError("Cannot begin command list "
+ "with pending commands")
+ self._write_command("command_list_ok_begin")
+ self._command_list = []
+
+ def command_list_end(self):
+ if self._command_list is None:
+ raise CommandListError("Not in command list")
+ if self._iterating:
+ raise IteratingError("Already iterating over a command list")
+ self._write_command("command_list_end")
+ return self._fetch_command_list()
+
+ @classmethod
+ def add_command(cls, name, callback):
+ method = newFunction(cls._execute, key, callback)
+ send_method = newFunction(cls._send, key, callback)
+ fetch_method = newFunction(cls._fetch, key, callback)
+
+ # create new mpd commands as function in the tree flavors:
+ # normal, with "send_"-prefix and with "fetch_"-prefix
+ escaped_name = name.replace(" ", "_")
+ setattr(cls, escaped_name, method)
+ setattr(cls, "send_"+escaped_name, send_method)
+ setattr(cls, "fetch_"+escaped_name, fetch_method)
+
+ @classmethod
+ def remove_command(cls, name):
+ if not hasattr(cls, name):
+ raise ValueError("Can't remove not existent '%s' command" % name)
+ name = name.replace(" ", "_")
+ delattr(cls, str(name))
+ delattr(cls, str("send_" + name))
+ delattr(cls, str("fetch_" + name))
+
+def bound_decorator(self, function):
+ """ bind decorator to self """
+ def decorator(*args, **kwargs):
+ return function(self, *args, **kwargs)
+ return decorator
+
+def newFunction(wrapper, name, returnValue):
+ def decorator(self, *args):
+ return wrapper(self, name, args, bound_decorator(self, returnValue))
+ return decorator
+
+for key, value in _commands.items():
+ returnValue = None if value is None else MPDClient.__dict__[value]
+ MPDClient.add_command(key, returnValue)
+
+def escape(text):
+ return text.replace("\\", "\\\\").replace('"', '\\"')
+
+
+# vim: set expandtab shiftwidth=4 softtabstop=4 textwidth=79:
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..75d2fcb
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[sdist]
+formats=bztar,gztar,zip
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..f5f23dc
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,57 @@
+#! /usr/bin/env python
+
+from distutils.core import setup
+from setuptools import Extension
+
+
+DESCRIPTION = """\
+An MPD (Music Player Daemon) client library written in pure Python.\
+"""
+
+CLASSIFIERS = [
+ "Development Status :: 5 - Production/Stable",
+ "Intended Audience :: Developers",
+ "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
+ "Natural Language :: English",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+]
+
+LICENSE = """\
+Copyright (C) 2008-2010 J. Alexander Treuman <jat at spatialrift.net>
+
+python-mpd is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+python-mpd is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with python-mpd. If not, see <http://www.gnu.org/licenses/>.\
+"""
+
+
+setup(
+ name="python-mpd",
+ version="0.3.0",
+ description="Python MPD client library",
+ long_description=DESCRIPTION,
+ author="J. Alexander Treuman",
+ author_email="jat at spatialrift.net",
+ url="http://jatreuman.indefero.net/p/python-mpd/",
+ download_url="http://pypi.python.org/pypi/python-mpd/",
+ py_modules=["mpd"],
+ classifiers=CLASSIFIERS,
+ #license=LICENSE,
+ keywords=["mpd"],
+ #platforms=["Independant"],
+ test_suite="test"
+)
+
+
+# vim: set expandtab shiftwidth=4 softtabstop=4 textwidth=79:
diff --git a/test.py b/test.py
new file mode 100755
index 0000000..1434e09
--- /dev/null
+++ b/test.py
@@ -0,0 +1,132 @@
+#!/usr/bin/env python
+
+import types
+from socket import error as SocketError
+import sys
+from mpd import MPDClient, CommandError, ConnectionError
+
+try:
+ # is required for python2.6
+ # python2.7 works with this module too
+ import unittest2 as unittest
+except ImportError:
+ # required for python3
+ # python2.7 works with this module too!
+ if sys.version_info >= (2, 7):
+ import unittest
+ else:
+ print("Please install unittest2 from pypi to run tests!")
+ sys.exit(1)
+
+# Alternate this to your setup
+# Make sure you have at least one song on your playlist
+MPD_HOST = "localhost"
+MPD_PORT = 6600
+MPD_PASSW = None
+
+class TestMPDClient(unittest.TestCase):
+ @classmethod
+ def setUpClass(self):
+ self.client = MPDClient()
+ self.idleclient = MPDClient()
+ try:
+ self.client.connect(MPD_HOST, MPD_PORT)
+ self.idleclient.connect(MPD_HOST, MPD_PORT)
+ except SocketError as e:
+ raise Exception("Can't connect mpd! Start it or check the configuration: %s" % e)
+ if MPD_PASSW != None:
+ try:
+ self.client.password(MPD_PASSW)
+ self.idleclient.password(MPD_PASSW)
+ except CommandError as e:
+ raise Exception("Fail to authenticate to mpd.")
+ @classmethod
+ def tearDownClass(self):
+ self.client.disconnect()
+ self.idleclient.disconnect()
+ def test_metaclass_commands(self):
+ # just some random functions
+ self.assertTrue(hasattr(self.client, "commands"))
+ self.assertTrue(hasattr(self.client, "save"))
+ self.assertTrue(hasattr(self.client, "random"))
+ # space should be replaced
+ self.assertFalse(hasattr(self.client, "sticker get"))
+ self.assertTrue(hasattr(self.client, "sticker_get"))
+ # each command should have prefixe
+ self.assertTrue(hasattr(self.client, "close"))
+ self.assertTrue(hasattr(self.client, "fetch_close"))
+ self.assertTrue(hasattr(self.client, "send_close"))
+ def test_fetch_nothing(self):
+ self.assertIsNone(self.client.ping())
+ self.assertIsNone(self.client.clearerror())
+ def test_fetch_list(self):
+ self.assertIsInstance(self.client.list("album"), list)
+ def test_fetch_item(self):
+ self.assertIsNotNone(self.client.update())
+ def test_fetch_object(self):
+ status = self.client.status()
+ stats = self.client.stats()
+ self.assertIsInstance(status, dict)
+ # some keys should be there
+ self.assertIn("volume", status)
+ self.assertIn("song", status)
+ self.assertIsInstance(stats, dict)
+ self.assertIn("artists", stats)
+ self.assertIn("uptime", stats)
+ def test_fetch_songs(self):
+ playlist = self.client.playlistinfo()
+ self.assertTrue(type(playlist) is list)
+ if len(playlist) > 0:
+ self.assertIsInstance(playlist[0], dict)
+ def test_send_and_fetch(self):
+ self.client.send_status()
+ self.client.fetch_status()
+ def test_iterating(self):
+ self.client.iterate = True
+ playlist = self.client.playlistinfo()
+ self.assertIsInstance(playlist, types.GeneratorType)
+ for song in playlist:
+ self.assertIsInstance(song, dict)
+ self.client.iterate = False
+ def test_idle(self):
+ # clean event mask
+ self.idleclient.idle()
+
+ self.idleclient.send_idle()
+ # new event
+ self.client.update()
+ event = self.idleclient.fetch_idle()
+ self.assertEqual(event, ['update'])
+ def test_add_and_remove_command(self):
+ self.client.add_command("awesome command", MPDClient._fetch_nothing)
+ self.assertTrue(hasattr(self.client, "awesome_command"))
+ self.assertTrue(hasattr(self.client, "send_awesome_command"))
+ self.assertTrue(hasattr(self.client, "fetch_awesome_command"))
+ # should be unknown by mpd
+ with self.assertRaises(CommandError):
+ self.client.awesome_command()
+ self.client.remove_command("awesome_command")
+ self.assertFalse(hasattr(self.client, "awesome_command"))
+ self.assertFalse(hasattr(self.client, "send_awesome_command"))
+ self.assertFalse(hasattr(self.client, "fetch_awesome_command"))
+ # remove non existing command
+ self.assertRaises(ValueError, self.client.remove_command,
+ "awesome_command")
+ def test_client_to_client(self):
+ # client to client is at this time in beta!
+ if not "channels" in self.client.commands():
+ return
+ self.assertIsNone(self.client.subscribe("monty"))
+ channels = self.client.channels()
+ self.assertIn("monty", channels)
+
+ self.assertIsNone(self.client.sendmessage("monty", "SPAM"))
+ msg = self.client.readmessages()
+ self.assertEqual(msg, [{"channel":"monty", "message": "SPAM"}])
+
+ self.assertIsNone(self.client.unsubscribe("monty"))
+ channels = self.client.channels()
+ self.assertNotIn("monty", channels)
+
+if __name__ == '__main__':
+ unittest.main()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/python-mpd.git
More information about the Pkg-mpd-commits
mailing list