From c5e4da9dd52e9e9402f68ae50b9b5043ead86ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=92riks=20Karls?= <20837290+eeriks@users.noreply.github.com> Date: Fri, 27 Aug 2021 19:20:21 +0300 Subject: [PATCH 01/11] Change LICENCE --- LICENSE | 687 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 670 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 3b5eaf6..f288702 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,674 @@ -MIT License + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 -Copyright (c) 2019, Eriks Karls + 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. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + Preamble -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + The GNU General Public License is a free, copyleft license for +software and other kinds of works. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + 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 +. From 843f02c7f01bff1876c053ff9c6c281f946502a8 Mon Sep 17 00:00:00 2001 From: KEriks Date: Fri, 27 Aug 2021 19:24:52 +0300 Subject: [PATCH 02/11] bugfix --- erepublik/citizen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index c4749c8..657e474 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -182,7 +182,7 @@ class BaseCitizen(access_points.CitizenAPI): promos = utils.json_loads(utils.normalize_html_json(ugly_js)) self.promos = {} if promos: - self.promos = {k: v for k, v in self.promos.items() if v > self.now} + self.promos = {k: v for k, v in promos.items() if v > self.now} for kind, time_until in self.promos.items(): self.reporter.report_promo(kind, time_until) From 68f40fd4ab6411c68e48707789cabe57dc034638 Mon Sep 17 00:00:00 2001 From: KEriks Date: Fri, 27 Aug 2021 19:24:59 +0300 Subject: [PATCH 03/11] =?UTF-8?q?Bump=20version:=200.25.1.5=20=E2=86=92=20?= =?UTF-8?q?0.26.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erepublik/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 86f5418..446cefa 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = "eriks@72.lv" -__version__ = "0.25.1.5" +__version__ = "0.26.0" from erepublik.citizen import Citizen diff --git a/setup.cfg b/setup.cfg index 7a327bc..119f5c8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.25.1.5 +current_version = 0.26.0 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index 71476c0..51bc6fd 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ setup( test_suite="tests", tests_require=test_requirements, url="https://github.com/eeriks/erepublik/", - version="0.25.1.5", + version="0.26.0", zip_safe=False, ) From 421b6fa919c998aca3c9490309629aa89f95b5b2 Mon Sep 17 00:00:00 2001 From: KEriks Date: Fri, 27 Aug 2021 19:29:52 +0300 Subject: [PATCH 04/11] Licence changes --- docs/conf.py | 47 ++++++++++------------------ examples/battle_launcher.py | 42 ++++++++++++------------- examples/eat_work_train.py | 62 ++++++++++++++++++------------------- setup.py | 4 +-- 4 files changed, 70 insertions(+), 85 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 40ebcc0..72c9f80 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,7 +20,8 @@ # import os import sys -sys.path.insert(0, os.path.abspath('..')) + +sys.path.insert(0, os.path.abspath("..")) import erepublik import edx_theme @@ -33,24 +34,24 @@ import edx_theme # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'edx_theme'] +extensions = ["sphinx.ext.autodoc", "sphinx.ext.viewcode", "edx_theme"] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # The suffix(es) of source filenames. # You can specify multiple suffix as a list of string: # # source_suffix = ['.rst', '.md'] -source_suffix = '.rst' +source_suffix = ".rst" # The master toctree document. -master_doc = 'index' +master_doc = "index" # General information about the project. -project = u'eRepublik script' -copyright = u"2019, Eriks Karls" -author = u"Eriks Karls" +project = "eRepublik script" +copyright = "2019, Eriks Karls" +author = "Eriks Karls" # The version info for the project you're documenting, acts as replacement # for |version| and |release|, also used in various other places throughout @@ -71,10 +72,10 @@ language = None # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This patterns also effect to html_static_path and html_extra_path -exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] +exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = "sphinx" # If true, `todo` and `todoList` produce output, else they produce nothing. todo_include_todos = False @@ -85,7 +86,7 @@ todo_include_todos = False # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -html_theme = 'edx_theme' +html_theme = "edx_theme" html_theme_path = [edx_theme.get_html_theme_path()] # Theme options are theme-specific and customize the look and feel of a @@ -97,13 +98,13 @@ html_theme_path = [edx_theme.get_html_theme_path()] # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = ["_static"] # -- Options for HTMLHelp output --------------------------------------- # Output file base name for HTML help builder. -htmlhelp_basename = 'erepublikdoc' +htmlhelp_basename = "erepublikdoc" # -- Options for LaTeX output ------------------------------------------ @@ -112,15 +113,12 @@ latex_elements = { # The paper size ('letterpaper' or 'a4paper'). # # 'papersize': 'letterpaper', - # The font size ('10pt', '11pt' or '12pt'). # # 'pointsize': '10pt', - # Additional stuff for the LaTeX preamble. # # 'preamble': '', - # Latex figure (float) alignment # # 'figure_align': 'htbp', @@ -130,9 +128,7 @@ latex_elements = { # (source start file, target name, title, author, documentclass # [howto, manual, or own class]). latex_documents = [ - (master_doc, 'erepublik.tex', - u'eRepublik script Documentation', - u'Eriks Karls', 'manual'), + (master_doc, "erepublik.tex", "eRepublik script Documentation", "Eriks Karls", "manual"), ] @@ -140,11 +136,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). -man_pages = [ - (master_doc, 'erepublik', - u'eRepublik script Documentation', - [author], 1) -] +man_pages = [(master_doc, "erepublik", "eRepublik script Documentation", [author], 1)] # -- Options for Texinfo output ---------------------------------------- @@ -153,10 +145,5 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'erepublik', - u'eRepublik script Documentation', - author, - 'erepublik', - 'One line description of project.', - 'Miscellaneous'), + (master_doc, "erepublik", "eRepublik script Documentation", author, "erepublik", "One line description of project.", "Miscellaneous"), ] diff --git a/examples/battle_launcher.py b/examples/battle_launcher.py index 2fb5c83..579080e 100644 --- a/examples/battle_launcher.py +++ b/examples/battle_launcher.py @@ -4,18 +4,18 @@ from datetime import timedelta from erepublik import Citizen, utils CONFIG = { - 'email': 'player@email.com', - 'password': 'Pa$5w0rd!', - 'interactive': True, - 'fight': True, - 'debug': True, - 'battle_launcher': { + "email": "player@email.com", + "password": "Pa$5w0rd!", + "interactive": True, + "fight": True, + "debug": True, + "battle_launcher": { # War id: {auto_attack: bool (attack asap when region is available), regions: [region_ids allowed to attack]} 121672: {"auto_attack": False, "regions": [661]}, 125530: {"auto_attack": False, "regions": [259]}, 125226: {"auto_attack": True, "regions": [549]}, - 124559: {"auto_attack": True, "regions": [176]} - } + 124559: {"auto_attack": True, "regions": [176]}, + }, } @@ -29,7 +29,7 @@ def _battle_launcher(player: Citizen): """ global CONFIG finished_war_ids = {*[]} - war_data = CONFIG.get('battle_launcher', {}) + war_data = CONFIG.get("battle_launcher", {}) war_ids = {int(war_id) for war_id in war_data.keys()} next_attack_time = player.now next_attack_time = next_attack_time.replace(minute=next_attack_time.minute // 5 * 5, second=0) @@ -40,23 +40,23 @@ def _battle_launcher(player: Citizen): running_wars = {b.war_id for b in player.all_battles.values()} for war_id in war_ids - finished_war_ids - running_wars: war = war_data[war_id] - war_regions = set(war.get('regions')) - auto_attack = war.get('auto_attack') + war_regions = set(war.get("regions")) + auto_attack = war.get("auto_attack") status = player.get_war_status(war_id) - if status.get('ended', False): - CONFIG['battle_launcher'].pop(war_id, None) + if status.get("ended", False): + CONFIG["battle_launcher"].pop(war_id, None) finished_war_ids.add(war_id) continue - elif not status.get('can_attack'): + elif not status.get("can_attack"): continue if auto_attack or (player.now.hour > 20 or player.now.hour < 2): for reg in war_regions: if attacked: break - if reg in status.get('regions', {}).keys(): - player.launch_attack(war_id, reg, status.get('regions', {}).get(reg)) + if reg in status.get("regions", {}).keys(): + player.launch_attack(war_id, reg, status.get("regions", {}).get(reg)) attacked = True hits = 100 if player.energy.food_fights >= hits and player.config.fight: @@ -91,12 +91,12 @@ def _battle_launcher(player: Citizen): # noinspection DuplicatedCode def main(): - player = Citizen(email=CONFIG['email'], password=CONFIG['password'], auto_login=False) - player.config.interactive = CONFIG['interactive'] - player.config.fight = CONFIG['fight'] - player.set_debug(CONFIG.get('debug', False)) + player = Citizen(email=CONFIG["email"], password=CONFIG["password"], auto_login=False) + player.config.interactive = CONFIG["interactive"] + player.config.fight = CONFIG["fight"] + player.set_debug(CONFIG.get("debug", False)) player.login() - if CONFIG.get('battle_launcher'): + if CONFIG.get("battle_launcher"): name = f"{player.name}-battle_launcher-{threading.active_count() - 1}" state_thread = threading.Thread(target=_battle_launcher, args=(player,), name=name) state_thread.start() diff --git a/examples/eat_work_train.py b/examples/eat_work_train.py index eecdea5..0816b77 100644 --- a/examples/eat_work_train.py +++ b/examples/eat_work_train.py @@ -3,71 +3,70 @@ from datetime import timedelta from erepublik import Citizen, constants, utils CONFIG = { - 'email': 'player@email.com', - 'password': 'Pa$5w0rd!', - 'interactive': True, - 'debug': True, - 'work': True, - 'ot': True, # Work OverTime - 'wam': True, # WorkAsManager - 'train': True + "email": "player@email.com", + "password": "Pa$5w0rd!", + "interactive": True, + "debug": True, + "work": True, + "ot": True, # Work OverTime + "wam": True, # WorkAsManager + "train": True, } # noinspection DuplicatedCode def main(): - player = Citizen(email=CONFIG['email'], password=CONFIG['password'], auto_login=False) - player.config.interactive = CONFIG['interactive'] - player.config.work = CONFIG['work'] - player.config.train = CONFIG['train'] - player.config.ot = CONFIG['ot'] - player.config.wam = CONFIG['wam'] - player.set_debug(CONFIG.get('debug', False)) + player = Citizen(email=CONFIG["email"], password=CONFIG["password"], auto_login=False) + player.config.interactive = CONFIG["interactive"] + player.config.work = CONFIG["work"] + player.config.train = CONFIG["train"] + player.config.ot = CONFIG["ot"] + player.config.wam = CONFIG["wam"] + player.set_debug(CONFIG.get("debug", False)) player.login() now = player.now.replace(second=0, microsecond=0) dt_max = constants.max_datetime tasks = {} if player.config.work: - tasks.update({'work': now}) + tasks.update({"work": now}) if player.config.train: - tasks.update({'train': now}) + tasks.update({"train": now}) if player.config.ot: - tasks.update({'ot': now}) + tasks.update({"ot": now}) if player.config.wam: - tasks.update({'wam': now.replace(hour=14, minute=0)}) + tasks.update({"wam": now.replace(hour=14, minute=0)}) while True: try: player.update_all() - if tasks.get('work', dt_max) <= now: + if tasks.get("work", dt_max) <= now: player.write_log("Doing task: work") player.update_citizen_info() player.work() if player.config.ot: - tasks['ot'] = now + tasks["ot"] = now player.collect_daily_task() next_time = utils.good_timedelta(now.replace(hour=0, minute=0, second=0), timedelta(days=1)) - tasks.update({'work': next_time}) + tasks.update({"work": next_time}) - if tasks.get('train', dt_max) <= now: + if tasks.get("train", dt_max) <= now: player.write_log("Doing task: train") player.update_citizen_info() player.train() player.collect_daily_task() next_time = utils.good_timedelta(now.replace(hour=0, minute=0, second=0), timedelta(days=1)) - tasks.update({'train': next_time}) + tasks.update({"train": next_time}) - if tasks.get('wam', dt_max) <= now: + if tasks.get("wam", dt_max) <= now: player.write_log("Doing task: Work as manager") success = player.work_as_manager() if success: - next_time = utils.good_timedelta(now.replace(hour=14, minute=0, second=0, microsecond=0), - timedelta(days=1)) + next_time = utils.good_timedelta(now.replace(hour=14, minute=0, second=0, microsecond=0), timedelta(days=1)) else: next_time = utils.good_timedelta(now.replace(second=0, microsecond=0), timedelta(minutes=30)) - tasks.update({'wam': next_time}) + tasks.update({"wam": next_time}) - if tasks.get('ot', dt_max) <= now: + if tasks.get("ot", dt_max) <= now: player.update_job_info() player.write_log("Doing task: work overtime") if now > player.my_companies.next_ot_time: @@ -75,7 +74,7 @@ def main(): next_time = now + timedelta(minutes=60) else: next_time = player.my_companies.next_ot_time - tasks.update({'ot': next_time}) + tasks.update({"ot": next_time}) closest_next_time = dt_max next_tasks = [] @@ -87,8 +86,7 @@ def main(): if sleep_seconds <= 0: player.write_log(f"Loop detected! Offending task: '{next_tasks[0]}'") player.write_log("My next Tasks and there time:\n" + "\n".join(sorted(next_tasks))) - player.write_log(f"Sleeping until (eRep): {closest_next_time.strftime('%F %T')}" - f" (sleeping for {sleep_seconds}s)") + player.write_log(f"Sleeping until (eRep): {closest_next_time.strftime('%F %T')}" f" (sleeping for {sleep_seconds}s)") seconds_to_sleep = sleep_seconds if sleep_seconds > 0 else 0 player.sleep(seconds_to_sleep) except Exception as e: diff --git a/setup.py b/setup.py index 51bc6fd..931dc72 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ setup( classifiers=[ "Development Status :: 4 - Beta", "Intended Audience :: Developers", - "License :: OSI Approved :: MIT License", + "License :: OSI Approved :: GPLv3 License", "Natural Language :: English", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.8", @@ -39,7 +39,7 @@ setup( description="Python package for automated eRepublik playing", entry_points={}, install_requires=requirements, - license="MIT license", + license="GPLv3 license", long_description=readme + "\n\n" + history, include_package_data=True, keywords="erepublik", From 211df419691aef4c47ddb60d7489baf78895ee35 Mon Sep 17 00:00:00 2001 From: KEriks Date: Fri, 27 Aug 2021 19:31:20 +0300 Subject: [PATCH 05/11] =?UTF-8?q?Bump=20version:=200.26.0=20=E2=86=92=200.?= =?UTF-8?q?26.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erepublik/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 446cefa..8e167b3 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = "eriks@72.lv" -__version__ = "0.26.0" +__version__ = "0.26.0.1" from erepublik.citizen import Citizen diff --git a/setup.cfg b/setup.cfg index 119f5c8..f656ae8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.26.0 +current_version = 0.26.0.1 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index 931dc72..d82c568 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ setup( test_suite="tests", tests_require=test_requirements, url="https://github.com/eeriks/erepublik/", - version="0.26.0", + version="0.26.0.1", zip_safe=False, ) From 7773b63520f4fd74fef560832c644c14a4a18e24 Mon Sep 17 00:00:00 2001 From: KEriks Date: Fri, 27 Aug 2021 19:33:18 +0300 Subject: [PATCH 06/11] fix fix --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index d82c568..98bc609 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ setup( classifiers=[ "Development Status :: 4 - Beta", "Intended Audience :: Developers", - "License :: OSI Approved :: GPLv3 License", + "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Natural Language :: English", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.8", @@ -39,7 +39,7 @@ setup( description="Python package for automated eRepublik playing", entry_points={}, install_requires=requirements, - license="GPLv3 license", + license="GPLv3", long_description=readme + "\n\n" + history, include_package_data=True, keywords="erepublik", From c8f9ac9768bb657eb3b46270bfbe73959d6c2db3 Mon Sep 17 00:00:00 2001 From: KEriks Date: Sat, 28 Aug 2021 10:41:44 +0300 Subject: [PATCH 07/11] PromoFixup --- erepublik/citizen.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 657e474..a688580 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -181,11 +181,11 @@ class BaseCitizen(access_points.CitizenAPI): ugly_js = ugly_js_match.group(1) if ugly_js_match else "null" promos = utils.json_loads(utils.normalize_html_json(ugly_js)) self.promos = {} - if promos: - self.promos = {k: v for k, v in promos.items() if v > self.now} - for kind, time_until in self.promos.items(): - self.reporter.report_promo(kind, time_until) - + try: + if promos: + self.promos = {p['typeId']: p for p in promos} + except: + pass new_date = re.search(r"var new_date = '(\d*)';", html) if new_date: self.energy.set_reference_time(utils.good_timedelta(self.now, timedelta(seconds=int(new_date.group(1))))) From 1746f271933479597efe0aef62691b5408950274 Mon Sep 17 00:00:00 2001 From: KEriks Date: Sat, 28 Aug 2021 10:41:47 +0300 Subject: [PATCH 08/11] =?UTF-8?q?Bump=20version:=200.26.0.1=20=E2=86=92=20?= =?UTF-8?q?0.26.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erepublik/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 8e167b3..3f8b607 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = "eriks@72.lv" -__version__ = "0.26.0.1" +__version__ = "0.26.0.2" from erepublik.citizen import Citizen diff --git a/setup.cfg b/setup.cfg index f656ae8..da44db7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.26.0.1 +current_version = 0.26.0.2 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index 98bc609..bdce239 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ setup( test_suite="tests", tests_require=test_requirements, url="https://github.com/eeriks/erepublik/", - version="0.26.0.1", + version="0.26.0.2", zip_safe=False, ) From dfa6f7e0beee94c2447485f1fc8d1165354de0db Mon Sep 17 00:00:00 2001 From: KEriks Date: Mon, 30 Aug 2021 16:36:05 +0300 Subject: [PATCH 09/11] Changed linting make command --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2e9d3ee..5047a96 100644 --- a/Makefile +++ b/Makefile @@ -52,8 +52,9 @@ clean-test: ## remove test and coverage artifacts rm -fr .pytest_cache lint: ## check style with flake8 - black erepublik tests - flake8 erepublik tests + isort erepublik examples tests + black erepublik examples tests + flake8 erepublik examples tests test: ## run tests quickly with the default Python python -m unittest From 2288fe01ea2a86437d978001877555d774d2f93b Mon Sep 17 00:00:00 2001 From: KEriks Date: Mon, 30 Aug 2021 16:36:25 +0300 Subject: [PATCH 10/11] Fixed promo reporting --- erepublik/citizen.py | 17 +++++++++++++---- tests/test_erepublik_script.py | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index a688580..1755731 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -180,12 +180,21 @@ class BaseCitizen(access_points.CitizenAPI): ugly_js_match = re.search(r'"promotions":\s*(\[{?.*?}?])', html) ugly_js = ugly_js_match.group(1) if ugly_js_match else "null" promos = utils.json_loads(utils.normalize_html_json(ugly_js)) - self.promos = {} + if self.promos: + self.promos = {k: v for k, v in self.promos.items() if v > self.now} + else: + self.promos = {} + try: if promos: - self.promos = {p['typeId']: p for p in promos} - except: - pass + for promo in promos: + kind = promo["typeId"] + time_until = utils.localize_timestamp(promo["expiresAt"]) + if kind not in self.promos: + self.reporter.report_promo(kind, time_until) + self.promos[kind] = time_until + except Exception: + self.process_error() new_date = re.search(r"var new_date = '(\d*)';", html) if new_date: self.energy.set_reference_time(utils.good_timedelta(self.now, timedelta(seconds=int(new_date.group(1))))) diff --git a/tests/test_erepublik_script.py b/tests/test_erepublik_script.py index d830d5e..38efb6f 100644 --- a/tests/test_erepublik_script.py +++ b/tests/test_erepublik_script.py @@ -3,10 +3,10 @@ """Tests for `erepublik` package.""" -from erepublik import Citizen - import unittest +from erepublik import Citizen + class TestErepublik(unittest.TestCase): """Tests for `erepublik` package.""" From 7054ae2b05c0cdc8ef8f03dde28c0ea3fe02585f Mon Sep 17 00:00:00 2001 From: KEriks Date: Mon, 30 Aug 2021 16:36:35 +0300 Subject: [PATCH 11/11] =?UTF-8?q?Bump=20version:=200.26.0.2=20=E2=86=92=20?= =?UTF-8?q?0.27.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erepublik/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 3f8b607..1c411fa 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = "eriks@72.lv" -__version__ = "0.26.0.2" +__version__ = "0.27.0" from erepublik.citizen import Citizen diff --git a/setup.cfg b/setup.cfg index da44db7..9dc0353 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.26.0.2 +current_version = 0.27.0 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index bdce239..f5e3bef 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ setup( test_suite="tests", tests_require=test_requirements, url="https://github.com/eeriks/erepublik/", - version="0.26.0.2", + version="0.27.0", zip_safe=False, )