diff --git a/.gitignore b/.gitignore index acf4f59..a30df11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,3 @@ -# Windows thumbnail cache files -Thumbs.db -ehthumbs.db -ehthumbs_vista.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# ========================= -# Operating System Files -# ========================= +*.pyc +*.pyo +*.zip diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..a7f061f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,33 @@ +language: python +env: + global: + - secure: C0Tqtj3OeCT25kIRhSw57eMMjaNn5vFbTqmpj6pvHlObDLqjliv8nbQXQvIZc5jxFhyiGfj+Ym0YNO3NnOk7yiOvHtpqyj0Q3tkev0GdECU7jszJg3FzYqTQ5PmJF1o++ecO9hDRgK2vtvg4lwFtovEj7BHr9Q+/Wph9KoymSTzT2Ufsg+8wQ3mqfC43FdEuiyZxAjbI/jVugs3jafC/7UmV9WlCMqJLebhB+lRLRTqesDOccO1aOwIO7nmWuqWnMX18se9J93aALMAp5rXH7r6LM5h6T/T6FyaZSacIwO+Mx/xYkB8n+b7rSc3eyGcks4wncuGYxBIjVNtLsmlTpr1E9YacQuzCPq4D2ktzEcBlBLJWpabruhetW1w4+tYI9MK8XTJhq1KWKukBjxJlELFReZWUvasQ4YrKox5mIgmCJ/1yiwLH2DkqX06W+Jqq2OHhNaFXcwwoEvMmoFgUtYyq2TOm1XmmV508sUd35gatmMTiT8eoD9zIusSx8NOCVUE91Zrt4j8kAcHipsHpcp1PbUV1jKPXEIeiYsALVd2rJqR1LJLAF6urdf1MVc40nVklBDYz7TjRNW/jesifVWvSeYYrI/LKUa3h86gay0n6ibsEBdoiDAtYhFh4sFSsF41dFbfMSd/tLG+vcf6L6go6yM5v9wGGYvZNaNXHv34= +install: + - pip install GitPython + - export TRAVIS_COMMIT_MSG="$TRAVIS_REPO_SLUG - $(git log --format=%B --no-merges -n 1)" +script: + - test "$TRAVIS_PULL_REQUEST" = "false" || travis_terminate 0 + - test "$TRAVIS_BRANCH" = "$TRAVIS_TAG" -o "$TRAVIS_BRANCH" = "master" || travis_terminate 0 + - git config --global user.email 'aussieaddons@aussieaddons.com' + - git config --global user.name 'Aussie Add-ons Bot' + - > + git clone https://github.com/xbmc-catchuptv-au/repo-devel.git $TRAVIS_BUILD_DIR/.deploy-devel && + cd $TRAVIS_BUILD_DIR/.deploy-devel && + ./manage_repo.py $TRAVIS_BUILD_DIR || travis_terminate 1 + - git config credential.helper "store --file=.git/credentials" + - echo "https://${GH_TOKEN}:@github.com" > .git/credentials + - > + git add . && + git commit --allow-empty -m "$TRAVIS_COMMIT_MSG" && + git push || travis_terminate 1 + - if [ -z "$TRAVIS_TAG" ]; then travis_terminate 0; fi + - > + git clone https://github.com/xbmc-catchuptv-au/repo.git $TRAVIS_BUILD_DIR/.deploy-prod && + cd $TRAVIS_BUILD_DIR/.deploy-prod && + ./manage_repo.py $TRAVIS_BUILD_DIR || travis_terminate 1 + - git config credential.helper "store --file=.git/credentials" + - echo "https://${GH_TOKEN}:@github.com" > .git/credentials + - > + git add . && + git commit --allow-empty -m "Update $(basename `git -C $TRAVIS_BUILD_DIR rev-parse --show-toplevel`) to $TRAVIS_TAG" && + git push || travis_terminate 1 \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9cecc1d --- /dev/null +++ b/LICENSE @@ -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. + + {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 . + +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: + + {project} Copyright (C) {year} {fullname} + 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/README.md b/README.md new file mode 100644 index 0000000..bcc95c5 --- /dev/null +++ b/README.md @@ -0,0 +1,23 @@ +#Soccer Live addon for Kodi + +## This add-on supports the free Live Pass offer for eligible Telstra customers. In-app subscriptions through the App Store/Google Play are NOT supported. + +##Requirements + +Kodi v17 is the minimum recommended version. If you are having SSL errors, upgrading Kodi should solve them. On some platforms earlier versions will work fine. + +You will need a Telstra ID account with an eligible service attached to use this add-on. Most Telstra Mobile customers are eligible for a free subscription with their plan. Please see their [website](https://www.telstra.com.au/tv-movies-music/sports-offer) for details. + +##How to install + +Soccer Live is available from the Catch Up TV AU repository located [here](https://github.com/aussieaddons/repo). Head on over and follow the instructions to install the repo, then install the add-on. + +##Settings + +You will need to enter your Telstra ID username and password to view videos. + +The live streaming bitrates reflect an average bitrate only, you should ideally have twice the bandwidth available to ensure buffer free viewing. + +##Issues + +Please let us know of any errors by opening an [issue](https://github.com/aussieaddons/plugin.video.soccer-live/issues) ticket. It would be great if you could attach a Kodi debug log file as well. Follow this [guide](http://kodi.wiki/view/Log_file/Easy). diff --git a/addon.xml b/addon.xml new file mode 100644 index 0000000..4e23bd7 --- /dev/null +++ b/addon.xml @@ -0,0 +1,18 @@ + + + + + + + + + + video + + + Soccer Live add-on + Soccer Live is an unofficial add-on for Australian soccer content + video + all + + \ No newline at end of file diff --git a/default.py b/default.py new file mode 100644 index 0000000..332a0c3 --- /dev/null +++ b/default.py @@ -0,0 +1,56 @@ +import os +import sys +import xbmc +import xbmcgui +import xbmcaddon +from urlparse import parse_qsl + +addon = xbmcaddon.Addon() +cwd = xbmc.translatePath(addon.getAddonInfo('path')).decode("utf-8") +BASE_RESOURCE_PATH = os.path.join(cwd, 'resources', 'lib') +sys.path.append(BASE_RESOURCE_PATH) + +import play # noqa: E402 +import menus # noqa: E402 +import ooyalahelper # noqa: E402 +import categories # noqa: E402 + +_url = sys.argv[0] +_handle = int(sys.argv[1]) +addonname = addon.getAddonInfo('name') +addonPath = xbmcaddon.Addon().getAddonInfo("path") +fanart = os.path.join(addonPath, 'fanart.jpg') + + +def router(paramstring): + """ + Router function that calls other functions + depending on the provided paramstring + :param paramstring: + """ + params = dict(parse_qsl(paramstring)) + if params: + if params['action'] == 'listcategories': + if params['category'] == 'Live Matches': + menus.make_live_list(params) + elif params['category'] == 'Videos': + menus.make_video_list(params) + elif params['category'] == 'Settings': + addon.openSettings() + elif params['action'] == 'listvideos': + play.play_video(params) + elif params['action'] == 'cleartoken': + ooyalahelper.clear_token() + else: + categories.list_categories() + + +if __name__ == '__main__': + if addon.getSetting('firstrun') == 'true': + xbmcgui.Dialog().ok(addonname, ('Please enter your My Football Live ' + 'Pass (Telstra ID) username and ' + 'password to access the content ' + 'in this service.')) + addon.openSettings() + addon.setSetting('firstrun', 'false') + router(sys.argv[2][1:]) diff --git a/icon.png b/icon.png new file mode 100644 index 0000000..99ebf19 Binary files /dev/null and b/icon.png differ diff --git a/resources/__init__.py b/resources/__init__.py new file mode 100644 index 0000000..b93054b --- /dev/null +++ b/resources/__init__.py @@ -0,0 +1 @@ +# Dummy file to make this directory a package. diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml new file mode 100644 index 0000000..b6657ac --- /dev/null +++ b/resources/language/English/strings.xml @@ -0,0 +1,14 @@ + + + Telstra Live Pass + Streaming Settings + Debugging + Settings + + firstrun + Remove stored login ticket + Live Match Stream Quality + Replay Stream Quality + Telstra ID Username + Telstra ID Password + diff --git a/resources/lib/__init__.py b/resources/lib/__init__.py new file mode 100644 index 0000000..b93054b --- /dev/null +++ b/resources/lib/__init__.py @@ -0,0 +1 @@ +# Dummy file to make this directory a package. diff --git a/resources/lib/categories.py b/resources/lib/categories.py new file mode 100644 index 0000000..2dfe74f --- /dev/null +++ b/resources/lib/categories.py @@ -0,0 +1,25 @@ +import xbmcgui +import xbmcplugin +import config +import sys +from aussieaddonscommon import utils + +_handle = int(sys.argv[1]) +_url = sys.argv[0] + + +def list_categories(): + try: + listing = [] + categories = config.CATEGORIES + for category in categories: + li = xbmcgui.ListItem(category) + urlString = '{0}?action=listcategories&category={1}' + url = urlString.format(_url, category) + is_folder = True + listing.append((url, li, is_folder)) + + xbmcplugin.addDirectoryItems(_handle, listing, len(listing)) + xbmcplugin.endOfDirectory(_handle) + except Exception: + utils.handle_error('Unable to display categories') diff --git a/resources/lib/classes.py b/resources/lib/classes.py new file mode 100644 index 0000000..1f18d98 --- /dev/null +++ b/resources/lib/classes.py @@ -0,0 +1,76 @@ +import datetime +import time +import urlparse +import unicodedata +import urllib + + +class Video(): + def __init__(self): + self.video_id = None + self.thumb = None + self.title = None + self.live = None + self.time = None + self.desc = None + self.dummy = None + self.account_id = None + self.url = None + self.home = None + self.away = None + self.ooyala_id = None + self.start_date = None + + def make_kodi_url(self): + d = self.__dict__ + for key, value in d.iteritems(): + if isinstance(value, unicode): + d[key] = unicodedata.normalize('NFKD', value).encode('ascii', + 'ignore') + url = '' + if d['thumb']: + d['thumb'] = urllib.quote_plus(d['thumb']) + for item in d.keys(): + url += '&{0}={1}'.format(item, d[item]) + return url + + def parse_kodi_url(self, url): + params = urlparse.parse_qsl(url) + for item in params.keys(): + setattr(self, item, urllib.unquote_plus(params[item])) + + def parse_params(self, params): + for item in params.keys(): + setattr(self, item, urllib.unquote_plus(params[item])) + + def get_live_title(self): + if self.home and self.away: + return '[COLOR green][LIVE NOW][/COLOR] {0} v {1}'.format( + self.home, self.away) + + def get_airtime(self): + try: + delta = ((time.mktime(time.localtime()) - + time.mktime(time.gmtime())) / 3600) + if time.localtime().tm_isdst: + delta += 1 + ts_format = "%Y-%m-%dT%H:%M:%S+00:00" + ts = datetime.datetime.fromtimestamp( + time.mktime(time.strptime(self.start_date, ts_format))) + ts += datetime.timedelta(hours=delta) + return ts.strftime("%A %d %b @ %I:%M %p").replace(' 0', ' ') + except OverflowError: + return timestamp + + def make_time_string(self): + try: + timestamp = time.mktime(time.strptime(self.start_date, + '%Y-%m-%dT%H:%M:%S+00:00')) + video.date = datetime.date.fromtimestamp(timestamp) + except Exception: + pass + + def get_upcoming_title(self): + if self.home and self.away: + return '[COLOR red][Upcoming][/COLOR] {0} v {1} - {2}'.format( + self.home, self.away, self.get_airtime()) diff --git a/resources/lib/comm.py b/resources/lib/comm.py new file mode 100644 index 0000000..db379a3 --- /dev/null +++ b/resources/lib/comm.py @@ -0,0 +1,75 @@ +import classes +import config +import json + +from aussieaddonscommon import utils +from aussieaddonscommon import session + + +def fetch_url(url, headers=None): + """ + HTTP GET on url, remove byte order mark + """ + with session.Session() as sess: + if headers: + sess.headers = headers + resp = sess.get(url) + return resp.text.encode("utf-8") + + +def list_videos(params): + data = json.loads(fetch_url(config.VIDEOS_URL)) + listing = [] + for video in data: + v = classes.Video() + v.title = video.get('name') + v.desc = video.get('name') + v.thumb = video.get('poster_small').get('url') + v.fanart = video.get('poster').get('url') + v.video_id = video.get('video_id') + v.account_id = video.get('account_id') + listing.append(v) + return listing + + +def list_live(params): + data = json.loads(fetch_url(config.HOME_URL)) + listing = [] + for match in data.get('upcoming_matches'): + match_data = match.get('match') + if not match: + continue + if match_data.get('status') == 'FullTime': + continue + broadcasters = match_data.get('broadcasters') + if not broadcasters: + continue + v = classes.Video() + v.home = match_data.get('home_team').get('name') + v.away = match_data.get('away_team').get('name') + if match_data.get('status') == 'Live': + v.live = True + v.title = v.get_live_title() + for broadcast in broadcasters: + if 'Telstra' in broadcast.get('name'): + v.ooyala_id = broadcast.get('stream_name') + #v.thumb = broadcast.get('logo') + break + else: + v.dummy = True + v.start_date = match_data.get('start_date') + v.title = v.get_upcoming_title() + listing.append(v) + return listing + + +def get_stream_url(account_id, video_id): + policy = config.BC_POLICYS[account_id] + bc_url = config.BC_URL.format(account_id, video_id) + data = json.loads(fetch_url(bc_url, {'BCOV-POLICY': policy})) + for source in data.get('sources'): + ext_ver = source.get('ext_x_version') + src = source.get('src') + if ext_ver == '4' and src: + if src.startswith('https'): + return src diff --git a/resources/lib/config.py b/resources/lib/config.py new file mode 100644 index 0000000..eeea1c4 --- /dev/null +++ b/resources/lib/config.py @@ -0,0 +1,119 @@ +# flake8: noqa + +NAME = 'Soccer Live' +ADDON_ID = 'plugin.video.soccer-live' + +GITHUB_API_URL = 'https://api.github.com/repos/aussieaddons/plugin.video.soccer-live' +ISSUE_API_URL = GITHUB_API_URL + '/issues' +ISSUE_API_AUTH = 'eGJtY2JvdDo1OTQxNTJjMTBhZGFiNGRlN2M0YWZkZDYwZGQ5NDFkNWY4YmIzOGFj' +GIST_API_URL = 'https://api.github.com/gists' + +MAX_LIVEQUAL = 4 +MAX_REPLAYQUAL = 7 + +CONFIG_URL = 'https://gateway.ffa.football/mobile/hub/config' + +HOME_URL = 'https://gateway.ffa.football/mobile/hub/home?preferences=aleague,socceroos,matildas,wleague,yleague,ffacup,npl' + +VIDEOS_URL = 'https://gateway.ffa.football/content/aleague/videos?offset=0&limit=50' + +BC_URL = 'https://edge.api.brightcove.com/playback/v1/accounts/{0}/videos/{1}' + +BC_POLICYS = {'5519514577001': 'BCpkADawqM0j7AXGHFi_Dwx883WcrB6UvwJHuWlGKbtxY-isLlgM48Ck0TfWgJvo38YKyAebRSKVM2eZ3aLBomKWx63vH4QEcFJqWBSCmidqcI2CJxSNYKkaW3S0KlPhQg2KcNx0oA_1VjAK', + '5519514578001': 'BCpkADawqM0r9EEGoAc_vGhRKzA9LNT8kbAUfWYmdoVVB1NlYGrCt58_3Ky50L_rVj4gcYjA4WWG7DP1lA4LBDrqik98PdHN9ivVl9mQ8l2jzkf7nQqeTFB-5FKxmuhBDZ5_9GwcNDJFO-V7', + '5519514571001': 'BCpkADawqM3SGkvPiiweCR4BrANOi6Wu3dtzOIZVrDGY_XcQuOAVEU5_ubheHLKzCmBBBcq3IsAyhWrKss_xIMIJj_hrIEovLg2xNmFDyR00ojao3McEmOMDwk36iK5v-9xVbkbCWabCNRaZ', + '5519514572001': 'BCpkADawqM3qdGnXQkUk1OiqcwLAl5pM5hbynJDi52VVRMyiWZqc0dPaCu55y1nJmH49BFSJNHj1lveEVvXH_BdX8G0MaP4Tb0wKk0GOuUU-q0P9eQZNZg52R_S7XkS4WhvxYZLbtLMzpQJs', + '5519514573001': 'BCpkADawqM0a2uwu4YiOyVlm9L9HcSCW8tFT3KhCYS-qD2vgsyy7SWALmQF6CsS8SjrMzsPT2qsrz8W4U5HItDvXvqSngrQftPe04YvJ3lVxvNl8TG5T3qWSzqtQHZxeo1Oo2gPMjXNGsxXt', + '5519514574001': 'BCpkADawqM03yDM88JKXMgU0sWi9CCFGZI-0W2a2DsKW3dLR8pl60Lp8w5mZ2KFoX4VRaKf2C0EAR2HTODKU-31SQL1sPadUHcCyitDS1nMfTGplN6nCobcx_eaI2y7vP0ZfM0roCwRifhdN', + '5519514575001': 'BCpkADawqM1qoT9hdCPQapbHacGAuZkTbXHrzsZrcJmLeO1O8iw4NxjWC5nr3IDfhZKX4BLcJxEYni79JlYTf96eC3tx0ldTNYYbL8Sk8EljSt_4j8Zc05YJ7PdHOw907E1pZl0Z2nzHfOcz', + '5472387882001': 'BCpkADawqM27fXg9qQmpIm67ZxQq_PcLYENoWW-3FiLR1QmXph9PM2HuYw_nkTvnCRU3djpjWHJ81IBsw5fRCYFtuFTAJoch_wxrqr1DsPpieYAv-3sXPakRUfMPbPUbqTYKF5jHSYyENMzX'} + +USER_AGENT = 'Dalvik/2.1.0 (Linux; U; Android 6.0.1; m8 Build/MOB31K)' + +USER_AGENT_LONG = 'Mozilla/5.0 (Linux; Android 6.0; HTC One_M8 Build/MRA58K.H15; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Mobile Safari/537.36' + +OOYALA_PCODE = 'xoNG0yOk4f4VR8pLKAKNukJ-gdEr' + +OOYALA_AUTH_URL = 'http://player.ooyala.com/sas/player_api/v1/authorization/embed_code/{0}/{1}?device=android_html&domain=http%3A%2F%2Fwww.ooyala.com&supportedFormats=dash%2Cakamai_hd2_vod_hls%2Cmp4%2Cm3u8%2Chls%2Cakamai_hd2_hls' + + +OAUTH_HEADERS = {'User-Agent': 'okhttp/3.10.0', + 'Accept-Encoding': 'gzip'} + +OAUTH_DATA = {'client_id': 'yGQTEDLGiWeVBogNzKuZAAt6x1yVk3Ot', + 'client_secret': 'zsbhQBtJ9Towbac7', + 'grant_type': 'client_credentials', + 'scope': 'MEDIA-ENTITLEMENTS-API MEDIA-PURCHASE-API', + 'x-user-idp': 'PARTNER'} + +OAUTH_URL = 'https://tapi.telstra.com/v1/media-entitlements/oauth/token' + +ENTITLEMENTS_URL = 'https://tapi.telstra.com/v1/media-entitlements/entitlements?tenantid=ffa' + +SPC_HEADERS = {'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8', + 'Accept-Encoding': 'gzip, ' + 'deflate', + 'Accept-Language': 'en-AU,en-US;q=0.9', + 'User-Agent': USER_AGENT_LONG, + 'X-Requested-With': 'com.ffa.hal'} + +SPC_URL = 'http://hub.telstra.com.au/sp2018-ffa-app?tpUID={0}&offerId=45d09e09-6472-43fa-9f24-d328d9b25ec7&type=SportPassConfirmation&device=mobile&cid=FFA_App' + +SSO_PARAMS = {'redirect_uri': 'https://hub.telstra.com.au/offers/content/cached/callback.html', + 'response_type': 'id_token token', + 'scope': 'openid email profile phone telstra.user.sso.profile'} + +SSO_URL = 'https://api.telstra.com/v1/sso/auth' + + + + +CATEGORIES = ['Live Matches', + 'Videos', + 'Settings'] + + +SIGNON_HEADERS = {'Host': 'signon.telstra.com', + 'Connection': 'keep-alive', + 'Cache-Control': 'max-age=0', + 'Origin': 'https://signon.telstra.com', + 'Upgrade-Insecure-Requests': '1', + 'User-Agent': 'Mozilla/5.0 (Linux; Android 6.0; HTC One_M8 Build/MRA58K.H15; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/56.0.2924.87 Mobile Safari/537.36', + 'Content-Type': 'application/x-www-form-urlencoded', + 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8', + 'Referer': 'https://signon.telstra.com/login?goto=https%3A%2F%2Fsignon.telstra.com%2Ffederation%2Fsaml2%3FSPID%3Dtelstramedia&gotoNoTok=', + 'Accept-Encoding': 'gzip, deflate', + 'Accept-Language': 'en-AU,en-US;q=0.8'} + +SIGNON_URL = 'https://signon.telstra.com/login' + +SIGNON_DATA = {'goto': 'https://signon.telstra.com/federation/saml2?SPID=telstramedia', 'gotoOnFail': '', 'username': None, 'password': None} + +OFFERS_URL = 'https://api.telstra.com/v1/media-products/catalogues/media/offers?category=ffa' + +HUB_URL = 'http://hub.telstra.com.au/sp2017-netball-app' + +SSO_HEADERS = {'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8', + 'Accept-Encoding': 'gzip, ' + 'deflate', + 'Accept-Language': 'en-AU,en-US;q=0.9', + 'Cache-Control': 'max-age=0', + 'Connection': 'keep-alive', + 'Referer': 'https://signon.telstra.com.au/login?goto=https%3A%2F%2Fapi.telstra.com%2Fv1%2Fsso%2Fidpcallback%3Fcbs%3DeyJhbGciOiJIUzI1NiJ9.eyJjYWxsYmFja19zdGF0ZSI6IjEyMjcyMDQ3LWU3N2ItNGRiZC1hNGZiLTBlYTcwMDMyYmRlMSIsImF1ZCI6InJhYSIsImV4cCI6MTUyMDczNTMyMTk0OCwiaWF0IjoxNTIwNjQ4OTIxOTQ4fQ.-I05HQE9eIpRS0LLSYB_pJ4iVKZZzyziVYarvjCe_2o%26app_name%3DOne%20Place%20portal', + 'Upgrade-Insecure-Requests': '1', + 'User-Agent': USER_AGENT_LONG, + 'X-Requested-With': 'au.com.netball'} + +MEDIA_ORDER_HEADERS = {'Content-Type': 'application/json', + 'Accept': 'application/json, text/plain, */*', + 'Host': 'api.telstra.com', + 'Connection': 'keep-alive', + 'Origin': 'https://hub.telstra.com.au', + 'User-Agent': USER_AGENT_LONG, + 'Accept-Encoding': 'gzip, deflate', + 'Accept-Language': 'en-AU,en-US;q=0.8', + 'X-Requested-With': 'au.com.netball'} + +MEDIA_ORDER_URL = 'https://api.telstra.com/v1/media-commerce/orders' + +MEDIA_ORDER_JSON = '{{"serviceId":"{0}","serviceType":"MSISDN","offer":{{"id":"{1}"}},"pai":"{2}"}}' diff --git a/resources/lib/menus.py b/resources/lib/menus.py new file mode 100644 index 0000000..e1de9f8 --- /dev/null +++ b/resources/lib/menus.py @@ -0,0 +1,59 @@ +import xbmcgui +import xbmcplugin +import xbmcaddon +import comm +import sys +from aussieaddonscommon import utils + +_url = sys.argv[0] +_handle = int(sys.argv[1]) +addon_path = xbmcaddon.Addon().getAddonInfo("path") + + +def make_video_list(params): + """ + Build video listing for Kodi + """ + try: + listing = [] + videos = comm.list_videos(params) + + for v in videos: + li = xbmcgui.ListItem(label=v.title, + iconImage=v.thumb, + thumbnailImage=v.thumb) + url = '{0}?action=listvideos{1}'.format(_url, v.make_kodi_url()) + is_folder = False + li.setProperty('IsPlayable', 'true') + li.setInfo('video', {'plot': v.desc, 'plotoutline': v.desc}) + listing.append((url, li, is_folder)) + + xbmcplugin.addDirectoryItems(_handle, listing, len(listing)) + xbmcplugin.endOfDirectory(_handle) + except Exception: + utils.handle_error('Unable to display matches') + + +def make_live_list(params): + """ + Build live match listing for Kodi + """ + try: + listing = [] + videos = comm.list_live(params) + + for v in videos: + li = xbmcgui.ListItem(label=v.title, + iconImage=v.thumb, + thumbnailImage=v.thumb) + url = '{0}?action=listvideos{1}'.format(_url, v.make_kodi_url()) + is_folder = False + if not v.dummy: + li.setProperty('IsPlayable', 'true') + li.setInfo('video', {'plot': v.desc, 'plotoutline': v.desc}) + listing.append((url, li, is_folder)) + + xbmcplugin.addDirectoryItems(_handle, listing, len(listing)) + xbmcplugin.endOfDirectory(_handle, cacheToDisc=False) + except Exception: + utils.handle_error('Unable to display matches') diff --git a/resources/lib/ooyalahelper.py b/resources/lib/ooyalahelper.py new file mode 100644 index 0000000..41764ba --- /dev/null +++ b/resources/lib/ooyalahelper.py @@ -0,0 +1,186 @@ +import urllib +import json +import base64 +import config +import re +import requests +import xbmcaddon +import telstra_auth + +from aussieaddonscommon.exceptions import AussieAddonsException +from aussieaddonscommon import session +from aussieaddonscommon import utils + +try: + import StorageServer +except: + utils.log("script.common.plugin.cache not found!") + import storageserverdummy as StorageServer +cache = StorageServer.StorageServer(config.ADDON_ID, 1) +sess = session.Session(force_tlsv1=False) +addon = xbmcaddon.Addon() +username = addon.getSetting('LIVE_USERNAME') +password = addon.getSetting('LIVE_PASSWORD') + + +def clear_ticket(): + """ + Remove stored ticket from cache storage + """ + cache.delete('SOCCERTICKET') + utils.dialog_message('Login token removed') + + +def get_user_ticket(): + """ + send user login info and retrieve ticket for session + """ + stored_ticket = cache.get('SOCCERTICKET') + if stored_ticket != '': + utils.log('Using ticket: {0}******'.format(stored_ticket[:-6])) + return stored_ticket + else: + ticket = telstra_auth.get_free_token(username, password) + cache.set('SOCCERTICKET', ticket) + return ticket + + +def get_embed_token(user_token, video_id): + """ + send our user token to get our embed token, including api key + """ + url = config.EMBED_TOKEN_URL.format(video_id) + sess.headers.update({'X-YinzCam-Ticket': user_token, + 'Accept': 'application/json'}) + try: + req = sess.get(url) + data = req.text + json_data = json.loads(data) + if json_data.get('ErrorCode') is not None: + raise AussieAddonsException() + video_token = json_data.get('VideoToken') + except requests.exceptions.HTTPError as e: + utils.log('Error getting embed token. ' + 'Response: {0}'.format(e.response.text)) + cache.delete('NETBALLTICKET') + if e.response.status_code == 401: + raise AussieAddonsException('Login token has expired, ' + 'please try again.') + else: + raise e + return urllib.quote(video_token) + + +def get_secure_token(secure_url, videoId): + """ + send our embed token back with a few other url encoded parameters + """ + res = sess.get(secure_url) + data = res.text + try: + parsed_json = json.loads(data) + token = (parsed_json['authorization_data'][videoId] + ['streams'][0]['url']['data']) + except KeyError: + utils.log('Video ID: {0}'.format(videoId)) + utils.log('Parsed json data: {0}'.format(parsed_json)) + try: + auth_msg = parsed_json['authorization_data'][videoId]['message'] + if auth_msg == 'unauthorized location': + country = parsed_json['user_info']['country'] + raise AussieAddonsException('Unauthorised location for ' + 'streaming. ' + 'Detected location is: {0}. ' + 'Please check VPN/smart DNS ' + 'settings ' + ' and try again'.format(country)) + except Exception as e: + raise e + return base64.b64decode(token) + + +def get_m3u8_streams(secure_token_url): + """ + fetch our m3u8 file which contains streams of various qualities + """ + res = sess.get(secure_token_url) + data = res.text.splitlines() + return data + + +def parse_m3u8_streams(data, live, secure_token_url): + """ + Parse the retrieved m3u8 stream list into a list of dictionaries + then return the url for the highest quality stream. Different + handling is required of live m3u8 files as they seem to only contain + the destination filename and not the domain/path. + """ + if live: + qual = int(addon.getSetting('LIVEQUALITY')) + if qual == config.MAX_LIVEQUAL: + qual = -1 + # fix for values too high from previous API config + if qual > config.MAX_LIVEQUAL: + addon.setSetting('LIVEQUALITY', str(config.MAX_LIVEQUAL)) + qual = -1 + else: + qual = int(addon.getSetting('REPLAYQUALITY')) + if qual == config.MAX_REPLAYQUAL: + qual = -1 + # fix for values too high from previous API config + if qual > config.MAX_REPLAYQUAL: + addon.setSetting('REPLAYQUALITY', str(config.MAX_REPLAYQUAL)) + qual = -1 + + m3u_list = [] + base_url = secure_token_url[:secure_token_url.rfind('/') + 1] + base_domain = secure_token_url[:secure_token_url.find('/', 8) + 1] + m3u8_lines = iter(data) + for line in m3u8_lines: + stream_inf = '#EXT-X-STREAM-INF:' + if line.startswith(stream_inf): + line = line[len(stream_inf):] + else: + continue + + csv_list = re.split(',(?=(?:(?:[^"]*"){2})*[^"]*$)', line) + linelist = [i.split('=') for i in csv_list] + + uri = next(m3u8_lines) + + if uri.startswith('/'): + linelist.append(['URL', base_domain + uri]) + elif uri.find('://') == -1: + linelist.append(['URL', base_url + uri]) + else: + linelist.append(['URL', uri]) + m3u_list.append(dict((i[0], i[1]) for i in linelist)) + sorted_m3u_list = sorted(m3u_list, key=lambda k: int(k['BANDWIDTH'])) + try: + stream = sorted_m3u_list[qual]['URL'] + except IndexError as e: + utils.log('Quality setting: {0}'.format(qual)) + utils.log('Sorted m3u8 list: {0}'.format(sorted_m3u_list)) + raise e + return stream + + +def get_m3u8_playlist(video_id): + """ Main function to call other functions that will return us our m3u8 HLS + playlist as a string, which we can then write to a file for Kodi + to use""" + #login_token = get_user_ticket() + #embed_token = get_embed_token(login_token, video_id) + get_user_ticket() + authorize_url = config.OOYALA_AUTH_URL.format(config.OOYALA_PCODE, + video_id) + secure_token_url = get_secure_token(authorize_url, video_id) + + if 'chunklist.m3u8' in secure_token_url: + return secure_token_url + + m3u8_data = get_m3u8_streams(secure_token_url) + m3u8_playlist_url = parse_m3u8_streams(m3u8_data, + live=True, + secure_token_url=secure_token_url) + return m3u8_playlist_url diff --git a/resources/lib/play.py b/resources/lib/play.py new file mode 100644 index 0000000..4d8c4eb --- /dev/null +++ b/resources/lib/play.py @@ -0,0 +1,40 @@ +import classes +import comm +import ooyalahelper +import sys +import xbmcaddon +import xbmcgui +import xbmcplugin +from aussieaddonscommon import utils + +addon = xbmcaddon.Addon() +_handle = int(sys.argv[1]) + + +def play_video(params): + """ + Play a video by the provided path. + :param path: str + """ + + try: + v = classes.Video() + v.parse_params(params) + if v.dummy == 'True': + xbmcgui.Dialog().ok( + 'Dummy item', + 'This item is not playable, it is used only to display ' + 'the upcoming schedule. Please check back once the match ' + 'has started. Playable matches will have "LIVE NOW" in ' + 'green next to the title.') + return + if v.live == 'True': + v.url = ooyalahelper.get_m3u8_playlist(v.ooyala_id) + else: + v.url = comm.get_stream_url(v.account_id, v.video_id) + play_item = xbmcgui.ListItem(path=v.url, + iconImage=v.thumb, + thumbnailImage=v.thumb) + xbmcplugin.setResolvedUrl(_handle, True, listitem=play_item) + except Exception: + utils.handle_error('Unable to play video') diff --git a/resources/lib/storageserverdummy.py b/resources/lib/storageserverdummy.py new file mode 100644 index 0000000..df2fc85 --- /dev/null +++ b/resources/lib/storageserverdummy.py @@ -0,0 +1,30 @@ +''' + StorageServer override. + Version: 1.0 +''' + + +class StorageServer: + def __init__(self, table, timeout=24): + return None + + def cacheFunction(self, funct=False, *args): + return funct(*args) + + def set(self, name, data): + return "" + + def get(self, name): + return "" + + def setMulti(self, name, data): + return "" + + def getMulti(self, name, items): + return "" + + def lock(self, name): + return False + + def unlock(self, name): + return False diff --git a/resources/lib/telstra_auth.py b/resources/lib/telstra_auth.py new file mode 100644 index 0000000..245772b --- /dev/null +++ b/resources/lib/telstra_auth.py @@ -0,0 +1,177 @@ +import binascii +import config +import json +import os +import re +import requests +import urlparse +import uuid +import xbmcgui + +from aussieaddonscommon.exceptions import AussieAddonsException +from aussieaddonscommon import session as custom_session +from aussieaddonscommon import utils + + +class TelstraAuthException(AussieAddonsException): + """Telstra Auth exception + This exception can be thrown with the reportable arg set which can + determine whether or not it is allowed to be sent as an automatic + error report + """ + pass + + +def get_free_token(username, password): + """ + Obtain a valid token from Telstra/Yinzcam, will be used to make + requests for Ooyala embed tokens + """ + session = custom_session.Session(force_tlsv1=False) + prog_dialog = xbmcgui.DialogProgress() + prog_dialog.create('Logging in with Telstra ID') + + # Send our first login request to Yinzcam, recieve (unactivated) ticket + prog_dialog.update(1, 'Obtaining oauth token') + userid = uuid.uuid4() + config.OAUTH_DATA.update({'x-user-id': userid}) + oauth_resp = session.post(config.OAUTH_URL, + data=config.OAUTH_DATA) + oauth_json = json.loads(oauth_resp.text) + access_token = oauth_json.get('access_token') + session.headers = {} + session.headers.update( + {'Authorization': 'Bearer {0}'.format(access_token)}) + + # Check entitlements (not sure if needed) + session.get(config.ENTITLEMENTS_URL) + + prog_dialog.update(16, 'Getting SSO Client ID') + # GET to our spc url and receive SSO client ID + session.headers = config.SPC_HEADERS # check if needed + spc_url = config.SPC_URL.format(userid) + spc_resp = session.get(spc_url) + sso_token_match = re.search('ssoClientId = "(\w+)"', spc_resp.text) + try: + sso_token = sso_token_match.group(1) + except AttributeError as e: + utils.log('SPC login response: {0}'.format(spc_resp.text)) + raise e + + # Sign in to telstra.com with our SSO client id to get the url + # for retrieving the bearer token for media orders + prog_dialog.update(33, 'Signing on to telstra.com') + sso_params = config.SSO_PARAMS + sso_params.update({'client_id': sso_token, + 'state': binascii.b2a_hex(os.urandom(16)), + 'nonce': binascii.b2a_hex(os.urandom(16))}) + + sso_auth_resp = session.get(config.SSO_URL, params=sso_params) + sso_url = dict(urlparse.parse_qsl( + urlparse.urlsplit(sso_auth_resp.url)[3])).get('goto') + + # login to telstra.com.au and get our BPSESSION cookie + session.headers.update(config.SIGNON_HEADERS) + signon_data = config.SIGNON_DATA + signon_data = {'username': username, 'password': password, 'goto': sso_url} + signon = session.post(config.SIGNON_URL, + data=signon_data, + allow_redirects=False) + bp_session = session.cookies.get_dict().get('BPSESSION') + + # check signon is valid (correct username/password) + + signon_pieces = urlparse.urlsplit(signon.headers.get('Location')) + signon_query = dict(urlparse.parse_qsl(signon_pieces.query)) + + utils.log('Sign-on result: %s' % signon_query) + + if 'errorcode' in signon_query: + if signon_query['errorcode'] == '0': + raise TelstraAuthException('Please enter your username ' + 'in the settings') + if signon_query['errorcode'] == '1': + raise TelstraAuthException('Please enter your password ' + 'in the settings') + if signon_query['errorcode'] == '2': + raise TelstraAuthException('Please enter your username and ' + 'password in the settings') + if signon_query['errorcode'] == '3': + raise TelstraAuthException('Invalid Telstra ID username/password. ' + 'Please check your username and ' + 'password in the settings') + + # Use BPSESSION cookie to ask for bearer token + sso_headers = config.SSO_HEADERS + sso_headers.update({'Cookie': 'BPSESSION={0}'.format(bp_session)}) + session.headers = sso_headers + sso_token_resp = session.get(sso_url) + bearer_token = dict(urlparse.parse_qsl( + urlparse.urlsplit(sso_token_resp.url)[4]))['access_token'] + + # First check if there are any eligible services attached to the account + prog_dialog.update(50, 'Determining eligible services') + offer_id = dict(urlparse.parse_qsl( + urlparse.urlsplit(spc_url)[3]))['offerId'] + media_order_headers = config.MEDIA_ORDER_HEADERS + media_order_headers.update( + {'Authorization': 'Bearer {0}'.format(bearer_token)}) + session.headers = media_order_headers + try: + offers = session.get(config.OFFERS_URL) + except requests.exceptions.HTTPError as e: + if e.response.status_code == 404: + message = json.loads(e.response.text).get('userMessage') + message += (' Please visit {0} '.format(config.HUB_URL) + + 'for further instructions to link your mobile ' + 'service to the supplied Telstra ID') + raise TelstraAuthException(message) + else: + raise TelstraAuthException(e.response.status_code) + try: + offer_data = json.loads(offers.text) + offers_list = offer_data['data']['offers'] + ph_no = None + for offer in offers_list: + if offer.get('name') != 'My Football Live Pass': + continue + data = offer.get('productOfferingAttributes') + ph_no = [x['value'] for x in data if x['name'] == 'ServiceId'][0] + if not ph_no: + raise TelstraAuthException( + 'Unable to determine if you have any eligible services. ' + 'Please ensure there is an eligible service linked to ' + 'your Telstra ID to redeem the free offer. Please visit ' + '{0} for further instructions'.format(config.HUB_URL)) + except Exception as e: + raise e + + # 'Order' the subscription package to activate the service + prog_dialog.update(66, 'Activating live pass on service') + order_data = config.MEDIA_ORDER_JSON.format(ph_no, offer_id, userid) + print order_data + order = session.post(config.MEDIA_ORDER_URL, data=order_data) + + # check to make sure order has been placed correctly + if order.status_code == 201: + try: + order_json = json.loads(order.text) + status = order_json['data'].get('status') == 'COMPLETE' + if status: + utils.log('Order status complete') + except: + utils.log('Unable to check status of order, continuing anyway') + + # Confirm activation + prog_dialog.update(83, 'Confirming activation') + session.headers = {} + session.headers.update( + {'Authorization': 'Bearer {0}'.format(access_token)}) + confirm = json.loads(session.get(config.ENTITLEMENTS_URL).text) + if len(confirm.get('entitlements')) < 1: + raise AussieAddonsException('Telstra ID activation failed') + + session.close() + prog_dialog.update(100, 'Finished!') + prog_dialog.close() + return userid diff --git a/resources/settings.xml b/resources/settings.xml new file mode 100644 index 0000000..993bf70 --- /dev/null +++ b/resources/settings.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file