From 2d388879d3a97d986f0b3fb86b56b8881f3016a9 Mon Sep 17 00:00:00 2001 From: stephendenham Date: Sun, 18 Sep 2011 09:58:40 +0000 Subject: [PATCH] Compliant with all XBMC addon requirements. git-svn-id: svn://svn.code.sf.net/p/xbmc-groove/code@54 2dec19e3-eb1d-4749-8193-008c8bba0994 --- LICENSE.txt | 674 +++++++++++++++++++++++++ addon.xml | 2 +- changelog.txt | 8 + default.py | 172 ++++--- description.xml | 2 +- icon.png | Bin 6003 -> 11805 bytes resources/language/English/strings.xml | 91 +++- resources/lib/GroovesharkAPI.py | 17 + 8 files changed, 889 insertions(+), 77 deletions(-) create mode 100644 LICENSE.txt rewrite icon.png (98%) diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. diff --git a/addon.xml b/addon.xml index 1a4c4f5..be8c965 100644 --- a/addon.xml +++ b/addon.xml @@ -1,6 +1,6 @@ + version="0.6.0" provider-name="Stephen Denham"> diff --git a/changelog.txt b/changelog.txt index c8bc4a8..2eef2e8 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,11 @@ +0.6.0 + +Compliant with all XBMC addon requirements. + +0.5.4 + +Fix https for windows. + 0.5.3 Improve app engine security. diff --git a/default.py b/default.py index ff6d2bd..f747929 100644 --- a/default.py +++ b/default.py @@ -1,4 +1,30 @@ +# Copyright 2011 Stephen Denham + +# This file is part of xbmc-groove. +# +# xbmc-groove 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. +# +# xbmc-groove 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 xbmc-groove. If not, see . + + import urllib, sys, os, shutil, re, pickle, time, tempfile, xbmcaddon, xbmcplugin, xbmcgui, xbmc + +__addon__ = xbmcaddon.Addon() +__addonname__ = __addon__.getAddonInfo('name') +__cwd__ = __addon__.getAddonInfo('path') +__author__ = __addon__.getAddonInfo('author') +__version__ = __addon__.getAddonInfo('version') +__language__ = __addon__.getLocalizedString + MODE_SEARCH_SONGS = 1 MODE_SEARCH_ALBUMS = 2 MODE_SEARCH_ARTISTS = 3 @@ -41,20 +67,20 @@ songMarkTime = 0 player = xbmc.Player() playTimer = None -baseDir = os.getcwd() +baseDir = __cwd__ resDir = xbmc.translatePath(os.path.join(baseDir, 'resources')) libDir = xbmc.translatePath(os.path.join(resDir, 'lib')) imgDir = xbmc.translatePath(os.path.join(resDir, 'img')) -cacheDir = os.path.join(xbmc.translatePath('special://masterprofile/addon_data/'), os.path.basename(os.getcwd())) +cacheDir = os.path.join(xbmc.translatePath('special://masterprofile/addon_data/'), os.path.basename(baseDir)) thumbDirName = 'thumb' -thumbDir = os.path.join('special://masterprofile/addon_data/', os.path.basename(os.getcwd()), thumbDirName) +thumbDir = os.path.join('special://masterprofile/addon_data/', os.path.basename(baseDir), thumbDirName) baseModeUrl = 'plugin://plugin.audio.groove/' playlistUrl = baseModeUrl + '?mode=' + str(MODE_PLAYLIST) playlistsUrl = baseModeUrl + '?mode=' + str(MODE_PLAYLISTS) favoritesUrl = baseModeUrl + '?mode=' + str(MODE_FAVORITES) -searchArtistsAlbumsName = "Search for artist's albums..." +searchArtistsAlbumsName = xbmc.getLocalizedString(30006) thumbDef = os.path.join(imgDir, 'default.tbn') listBackground = os.path.join(imgDir, 'listbackground.png') @@ -66,10 +92,10 @@ from threading import Event, Thread try: groovesharkApi = GrooveAPI() if groovesharkApi.pingService() != True: - raise StandardError('No Grooveshark service') + raise StandardError(xbmc.getLocalizedString(30007)) except: - dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'Unable to connect with Grooveshark.', 'Please try again later') + dialog = xbmcgui.Dialog(xbmc.getLocalizedString(30008),xbmc.getLocalizedString(30009),xbmc.getLocalizedString(30010)) + dialog.ok() sys.exit(-1) # Mark song as playing or played @@ -118,7 +144,7 @@ class GroovesharkPlaylistSelect(xbmcgui.WindowDialog): listitems = [] for playlist in items: listitems.append(xbmcgui.ListItem(playlist[0])) - listitems.append(xbmcgui.ListItem('New...')) + listitems.append(xbmcgui.ListItem(xbmc.getLocalizedString(30011))) self.playlistControl.addItems(listitems) self.setFocus(self.playlistControl) self.playlistControl.selectItem(0) @@ -220,11 +246,11 @@ class Groveshark: self._handle = int(sys.argv[1]) if os.path.isdir(cacheDir) == False: os.makedirs(cacheDir) - xbmc.log("Made " + cacheDir) + xbmc.log(xbmc.getLocalizedString(30012) + " " + cacheDir) artDir = xbmc.translatePath(thumbDir) if os.path.isdir(artDir) == False: os.makedirs(artDir) - xbmc.log("Made " + artDir) + xbmc.log(xbmc.getLocalizedString(30012) + " " + artDir) # Top-level menu def categories(self): @@ -234,70 +260,70 @@ class Groveshark: # Setup xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg) - self._add_dir('Search for songs...', '', MODE_SEARCH_SONGS, self.songImg, 0) - self._add_dir('Search for albums...', '', MODE_SEARCH_ALBUMS, self.albumImg, 0) - self._add_dir('Search for artists...', '', MODE_SEARCH_ARTISTS, self.artistImg, 0) + self._add_dir(xbmc.getLocalizedString(30013), '', MODE_SEARCH_SONGS, self.songImg, 0) + self._add_dir(xbmc.getLocalizedString(30014), '', MODE_SEARCH_ALBUMS, self.albumImg, 0) + self._add_dir(xbmc.getLocalizedString(30015), '', MODE_SEARCH_ARTISTS, self.artistImg, 0) self._add_dir(searchArtistsAlbumsName, '', MODE_SEARCH_ARTISTS_ALBUMS, self.artistsAlbumsImg, 0) # Not supported by key #self._add_dir("Search for user's playlists...", '', MODE_SEARCH_PLAYLISTS, self.usersplaylistsImg, 0) - self._add_dir('Popular Grooveshark songs for artist...', '', MODE_ARTIST_POPULAR, self.popularSongsArtistImg, 0) - self._add_dir('Popular Grooveshark songs', '', MODE_POPULAR_SONGS, self.popularSongsImg, 0) + self._add_dir(xbmc.getLocalizedString(30016), '', MODE_ARTIST_POPULAR, self.popularSongsArtistImg, 0) + self._add_dir(xbmc.getLocalizedString(30017), '', MODE_POPULAR_SONGS, self.popularSongsImg, 0) if (self.userid != 0): - self._add_dir('My Grooveshark favorites', '', MODE_FAVORITES, self.favoritesImg, 0) - self._add_dir('My Grooveshark playlists', '', MODE_PLAYLISTS, self.playlistImg, 0) + self._add_dir(xbmc.getLocalizedString(30018), '', MODE_FAVORITES, self.favoritesImg, 0) + self._add_dir(xbmc.getLocalizedString(30019), '', MODE_PLAYLISTS, self.playlistImg, 0) # Search for songs def searchSongs(self): - query = self._get_keyboard(default="", heading='Search for songs powered by Grooveshark') + query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30020)) if (query != ''): songs = groovesharkApi.getSongSearchResults(query, limit = self.songsearchlimit) if (len(songs) > 0): self._add_songs_directory(songs) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'No matching songs.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30021)) self.categories() else: self.categories() # Search for albums def searchAlbums(self): - query = self._get_keyboard(default="", heading='Search for albums powered by Grooveshark') + query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30022)) if (query != ''): albums = groovesharkApi.getAlbumSearchResults(query, limit = self.albumsearchlimit) if (len(albums) > 0): self._add_albums_directory(albums) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'No matching albums.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30023)) self.categories() else: self.categories() # Search for artists def searchArtists(self): - query = self._get_keyboard(default="", heading='Search for artists powered by Grooveshark') + query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30024)) if (query != ''): artists = groovesharkApi.getArtistSearchResults(query, limit = self.artistsearchlimit) if (len(artists) > 0): self._add_artists_directory(artists) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'No matching artists.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30025)) self.categories() else: self.categories() # Search for playlists def searchPlaylists(self): - query = self._get_keyboard(default="", heading="Username") + query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30026)) if (query != ''): playlists = groovesharkApi.getUserPlaylistsByUsername(query) if (len(playlists) > 0): self._add_playlists_directory(playlists) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'No Grooveshark playlists found.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30027)) self.categories() else: self.categories() @@ -305,7 +331,7 @@ class Groveshark: # Search for artists albums def searchArtistsAlbums(self, artistName = None): if artistName == None or artistName == searchArtistsAlbumsName: - query = self._get_keyboard(default="", heading="Search for artist's albums powered by Grooveshark") + query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30028)) else: query = artistName if (query != ''): @@ -319,11 +345,11 @@ class Groveshark: self._add_albums_directory(albums, artistID) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'No matching albums.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30029)) self.categories() else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'No matching artists.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30030)) self.categories() else: self.categories() @@ -337,7 +363,7 @@ class Groveshark: self._add_songs_directory(favorites, isFavorites=True) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You have no favorites.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30031)) self.categories() # Get popular songs @@ -347,7 +373,7 @@ class Groveshark: self._add_songs_directory(popular) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'No popular songs.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30032)) self.categories() # Get my playlists @@ -359,11 +385,11 @@ class Groveshark: self._add_playlists_directory(playlists) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You have no Grooveshark playlists.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30033)) self.categories() else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in ', ' to see your Grooveshark playlists.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30035)) # Make songs a favorite def favorite(self, songid): @@ -371,10 +397,10 @@ class Groveshark: if (userid != 0): xbmc.log("Favorite song: " + str(songid)) groovesharkApi.addUserFavoriteSong(songID = songid) - xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Added to favorites, 1000, ' + thumbDef + ')') + xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ', ' + xbmc.getLocalizedString(30036) + ', 1000, ' + thumbDef + ')') else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to add favorites.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30037)) # Remove song from favorites def unfavorite(self, songid, prevMode=0): @@ -382,13 +408,13 @@ class Groveshark: if (userid != 0): xbmc.log("Unfavorite song: " + str(songid) + ', previous mode was ' + str(prevMode)) groovesharkApi.removeUserFavoriteSongs(songIDs = songid) - xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Removed from Grooveshark favorites, 1000, ' + thumbDef + ')') + xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ', ' + xbmc.getLocalizedString(30038) + ', 1000, ' + thumbDef + ')') # Refresh to remove item from directory if (int(prevMode) == MODE_FAVORITES): xbmc.executebuiltin("Container.Refresh(" + favoritesUrl + ")") else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to remove Grooveshark favorites.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30039)) # Show selected album @@ -409,11 +435,11 @@ class Groveshark: self._add_songs_directory(songs, trackLabelFormat=NAME_ALBUM_ARTIST_LABEL, playlistid=playlistid, playlistname=playlistname) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to get Grooveshark playlists.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30040)) # Show popular songs of the artist def artistPopularSongs(self): - query = self._get_keyboard(default="", heading="Artist") + query = self._get_keyboard(default="", heading=xbmc.getLocalizedString(30041)) if (query != ''): artists = groovesharkApi.getArtistSearchResults(query, limit = self.artistsearchlimit) if (len(artists) > 0): @@ -425,11 +451,11 @@ class Groveshark: self._add_songs_directory(songs, trackLabelFormat=NAME_ALBUM_ARTIST_LABEL) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'No popular songs.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30042)) self.categories() else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'No matching artists.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30043)) self.categories() else: self.categories() @@ -461,7 +487,7 @@ class Groveshark: time.sleep(1) seconds = seconds + 1 else: - xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Unable to play song, 1000, ' + thumbDef + ')') + xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ', ' + xbmc.getLocalizedString(30044) + ', 1000, ' + thumbDef + ')') # Make a song directory item def songItem(self, songid, name, album, artist, coverart, trackLabelFormat=ARTIST_ALBUM_NAME_LABEL): @@ -494,7 +520,7 @@ class Groveshark: if (userid != 0): re.split(' - ',name,1) nameTokens = re.split(' - ',name,1) # suggested name - name = self._get_keyboard(default=nameTokens[0], heading="Grooveshark playlist name") + name = self._get_keyboard(default=nameTokens[0], heading=xbmc.getLocalizedString(30045)) if name != '': album = groovesharkApi.getAlbumSongs(albumid, limit = self.songsearchlimit) songids = [] @@ -502,45 +528,45 @@ class Groveshark: songids.append(song[1]) if groovesharkApi.createPlaylist(name, songids) == 0: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'Cannot create Grooveshark playlist ', name) + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30046), name) else: - xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Grooveshark playlist created, 1000, ' + thumbDef + ')') + xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ',' + xbmc.getLocalizedString(30047)+ ', 1000, ' + thumbDef + ')') else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in ', ' to create a Grooveshark playlist.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30048)) # Rename a playlist def renamePlaylist(self, playlistid, name): userid = self._get_login() if (userid != 0): - newname = self._get_keyboard(default=name, heading="Grooveshark playlist name") + newname = self._get_keyboard(default=name, heading=xbmc.getLocalizedString(30049)) if newname == '': return elif groovesharkApi.playlistRename(playlistid, newname) == 0: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'Cannot rename Grooveshark playlist ', name) + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30050), name) else: # Refresh to show new item name xbmc.executebuiltin("Container.Refresh") else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in ', ' to rename a Grooveshark playlist.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30051)) # Remove a playlist def removePlaylist(self, playlistid, name): dialog = xbmcgui.Dialog() - if dialog.yesno('Grooveshark XBMC', name, 'Delete this Grooveshark playlist?') == True: + if dialog.yesno(xbmc.getLocalizedString(30008), name, xbmc.getLocalizedString(30052)) == True: userid = self._get_login() if (userid != 0): if groovesharkApi.playlistDelete(playlistid) == 0: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'Cannot remove Grooveshark playlist ', name) + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30053), name) else: # Refresh to remove item from directory xbmc.executebuiltin("Container.Refresh(" + playlistsUrl + ")") else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in ', ' to delete a Grooveshark playlist.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30054)) # Add song to playlist def addPlaylistSong(self, songid): @@ -558,15 +584,15 @@ class Groveshark: if i > -1: # Add a new playlist if i >= len(playlists): - name = self._get_keyboard(default='', heading="Grooveshark playlist name") + name = self._get_keyboard(default='', heading=xbmc.getLocalizedString(30055)) if name != '': songIds = [] songIds.append(songid) if groovesharkApi.createPlaylist(name, songIds) == 0: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'Cannot create Grooveshark playlist ', name) + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30056), name) else: - xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Grooveshark playlist created, 1000, ' + thumbDef + ')') + xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ',' + xbmc.getLocalizedString(30057) + ', 1000, ' + thumbDef + ')') # Existing playlist else: playlist = playlists[i] @@ -580,21 +606,21 @@ class Groveshark: ret = groovesharkApi.setPlaylistSongs(playlistid, songIDs) if ret == False: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'Cannot add to playlist ') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30058)) else: - xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Added song to Grooveshark playlist, 1000, ' + thumbDef + ')') + xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ',' + xbmc.getLocalizedString(30059) + ', 1000, ' + thumbDef + ')') else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You have no Grooveshark playlists.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30060)) self.categories() else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to add a song to a Grooveshark playlist.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30061)) # Remove song from playlist def removePlaylistSong(self, playlistid, playlistname, songid): dialog = xbmcgui.Dialog() - if dialog.yesno('Grooveshark XBMC', 'Delete this song from', 'the Grooveshark playlist?') == True: + if dialog.yesno(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30062), xbmc.getLocalizedString(30063)) == True: userid = self._get_login() if (userid != 0): songs = groovesharkApi.getPlaylistSongs(playlistID) @@ -605,14 +631,14 @@ class Groveshark: ret = groovesharkApi.setPlaylistSongs(playlistID, songIDs) if ret == False: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'Failed to remove', 'song from Grooveshark playlist.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30064), xbmc.getLocalizedString(30065)) else: # Refresh to remove item from directory - xbmc.executebuiltin('XBMC.Notification(Grooveshark XBMC, Removed song from Grooveshark playlist, 1000, ' + thumbDef + ')') + xbmc.executebuiltin('XBMC.Notification(' + xbmc.getLocalizedString(30008) + ',' + xbmc.getLocalizedString(30066)+ ', 1000, ' + thumbDef + ')') xbmc.executebuiltin("Container.Update(" + playlistUrl + "&id="+str(playlistid) + "&name=" + playlistname + ")") else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'You must be logged in', 'to delete a song from a Grooveshark playlist.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30034), xbmc.getLocalizedString(30067)) # Find similar artists to searched artist def similarArtists(self, artistId): @@ -621,7 +647,7 @@ class Groveshark: self._add_artists_directory(similar) else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'No similar artists.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30068)) self.categories() # Get keyboard input @@ -636,7 +662,7 @@ class Groveshark: def _get_login(self): if (self.username == "" or self.password == ""): dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'Unable to login.', 'Check username and password in settings.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30069), xbmc.getLocalizedString(30070)) return 0 else: if self.userid == 0: @@ -645,7 +671,7 @@ class Groveshark: return uid else: dialog = xbmcgui.Dialog() - dialog.ok('Grooveshark XBMC', 'Unable to login.', 'Check username and password in settings.') + dialog.ok(xbmc.getLocalizedString(30008), xbmc.getLocalizedString(30069), xbmc.getLocalizedString(30070)) return 0 # Get a song directory item @@ -714,14 +740,14 @@ class Groveshark: if isFavorites == True: unfav = unfav +str(MODE_FAVORITES) else: - menuItems.append(("Grooveshark favorite", "XBMC.RunPlugin("+fav+")")) - menuItems.append(("Not Grooveshark favorite", "XBMC.RunPlugin("+unfav+")")) + menuItems.append((xbmc.getLocalizedString(30071), "XBMC.RunPlugin("+fav+")")) + menuItems.append((xbmc.getLocalizedString(30072), "XBMC.RunPlugin("+unfav+")")) if playlistid > 0: rmplaylstsong=sys.argv[0]+"?playlistid="+str(playlistid)+"&id="+str(songid)+"&mode="+str(MODE_REMOVE_PLAYLIST_SONG)+"&name="+playlistname - menuItems.append(("Remove from Grooveshark playlist", "XBMC.RunPlugin("+rmplaylstsong+")")) + menuItems.append((xbmc.getLocalizedString(30073), "XBMC.RunPlugin("+rmplaylstsong+")")) else: addplaylstsong=sys.argv[0]+"?id="+str(songid)+"&mode="+str(MODE_ADD_PLAYLIST_SONG) - menuItems.append(("Add to Grooveshark playlist", "XBMC.RunPlugin("+addplaylstsong+")")) + menuItems.append((xbmc.getLocalizedString(30074), "XBMC.RunPlugin("+addplaylstsong+")")) item.addContextMenuItems(menuItems, replaceItems=False) xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=item,isFolder=False, totalItems=len(songs)) id = id + 1 @@ -729,7 +755,7 @@ class Groveshark: page = page + 1 if totalSongs > page * self.songspagelimit: u=sys.argv[0]+"?mode="+str(MODE_SONG_PAGE)+"&id=playlistid"+"&page="+str(page)+"&label="+str(trackLabelFormat)+"&name="+playlistname - self._add_dir('More songs...', u, MODE_SONG_PAGE, self.songImg, 0, totalSongs - (page * self.songspagelimit)) + self._add_dir(xbmc.getLocalizedString(30075) + '...', u, MODE_SONG_PAGE, self.songImg, 0, totalSongs - (page * self.songspagelimit)) xbmcplugin.setContent(self._handle, 'songs') xbmcplugin.setPluginFanart(int(sys.argv[1]), self.fanImg) @@ -798,13 +824,13 @@ class Groveshark: menuItems = [] if mode == MODE_ALBUM: mkplaylst=sys.argv[0]+"?mode="+str(MODE_MAKE_PLAYLIST)+"&name="+name+"&id="+str(id) - menuItems.append(("Make Grooveshark playlist", "XBMC.RunPlugin("+mkplaylst+")")) + menuItems.append((xbmc.getLocalizedString(30076), "XBMC.RunPlugin("+mkplaylst+")")) # Broken rename/delete are broken in API if mode == MODE_PLAYLIST: rmplaylst=sys.argv[0]+"?mode="+str(MODE_REMOVE_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id) - menuItems.append(("Delete Grooveshark playlist", "XBMC.RunPlugin("+rmplaylst+")")) + menuItems.append((xbmc.getLocalizedString(30077), "XBMC.RunPlugin("+rmplaylst+")")) mvplaylst=sys.argv[0]+"?mode="+str(MODE_RENAME_PLAYLIST)+"&name="+urllib.quote_plus(name)+"&id="+str(id) - menuItems.append(("Rename Grooveshark playlist", "XBMC.RunPlugin("+mvplaylst+")")) + menuItems.append((xbmc.getLocalizedString(30078), "XBMC.RunPlugin("+mvplaylst+")")) dir.addContextMenuItems(menuItems, replaceItems=False) return xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),url=u,listitem=dir,isFolder=True, totalItems=items) diff --git a/description.xml b/description.xml index 832f3aa..cddbd90 100644 --- a/description.xml +++ b/description.xml @@ -18,7 +18,7 @@ Grooveshark XBMC - 0.5.4 + 0.6.0