diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..e2f707a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,22 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +# Set default charset +[*.{js,py,rst,json,yml,html,txt}] +charset = utf-8 + +[*.{py}] +indent_style = space +indent_size = 4 + +[*.{html,js,rst,scss}] +indent_style = tab +indent_size = 4 + +[*.{json,yml,css}] +indent_style = space +indent_size = 2 diff --git a/.gitignore b/.gitignore index da04d96..3e495dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ # pyCharm .idea/ +venv/ +venv_python27/ + +#python +*.pyc +*.pyo diff --git a/LICENSE b/LICENSE index af7fb9a..7dcd04d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,623 +1,12 @@ -see under +Copyright 2020 Günter Bailey - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +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: - 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. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - 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 +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. diff --git a/bin/__init__.py b/bin/__init__.py index af6c4d3..d2d34e4 100644 --- a/bin/__init__.py +++ b/bin/__init__.py @@ -1,5 +1,11 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- +from gettext import gettext as _ +from datetime import datetime -from findenv import osenv -from version import version +__version__ = '1.0a' +ABOUTPROGRAM = _("Kleiner Helfer für den Telefonsupport") +ABOUTTXT = _(f""" +Mit dem Support-Client kann man einfach bei einem Telefonsupport die Anweisungen folgen und z.B.: die Fernwartung starten. +Ohne dabei mit dem Browser on sonst irgendeinem Tool nach dem Fernwartungsprogramm zu suchen und Herunterladen versuchen. + +MIT @ {datetime.now().year} Bailey Solution""") +PROGRAM_NAME = "Support Client" diff --git a/bin/findenv.py b/bin/findenv.py index c71b08a..2250b8f 100644 --- a/bin/findenv.py +++ b/bin/findenv.py @@ -1,38 +1,13 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -############################################################################################################################## -# Support-Client . # -# Copyright (C) [2015] [Guenter Bailey] # -# # -# 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 . # -############################################################################################################################## -from sys import platform as _platform +import platform -class osenv(object): - def __init__(self): - self.text="Text" - - def __new__(self): - env=() - if _platform == "linux" or _platform == "linux2": - env=("linux") - elif _platform == "darwin" or _platform == "mac": - env=("macos") - elif _platform == "win32" or _platform == "win64": - env=("nt") - elif _platform == "nt" or _platform == "win": - env=("nt") - else: - env=("linux") - return (env) +def get_osname(): + env = 'linux' + if platform.system(): + if platform.system().lower() in ['linux', 'linux2']: + env = 'linux' + elif platform.system().lower() in ['mac', 'darwin']: + env = 'mac' + elif platform.system().lower() in ['win32', 'win64', 'windows', 'win', 'nt']: + env = 'nt' + return env diff --git a/bin/license.py b/bin/license.py new file mode 100644 index 0000000..1e9be74 --- /dev/null +++ b/bin/license.py @@ -0,0 +1,15 @@ +information = """ +Copyright 2020 Günter Bailey + +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: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +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. + +""" diff --git a/bin/update.py b/bin/update.py index db279d4..bbc644e 100644 --- a/bin/update.py +++ b/bin/update.py @@ -1,38 +1,16 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -############################################################################################################################## -# Support-Client . # -# Copyright (C) [2015] [Guenter Bailey] # -# # -# 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 . # -############################################################################################################################## -import os,zipfile,shutil +import os +import zipfile +import shutil from os import curdir,sep -from tkMessageBox import showinfo,showerror -from bin import osenv as _osenv -from lang import de_DE, en_EN -from conf import setlang -from conf import check as _check +from tkinter.messagebox import showinfo, showerror +from .findenv import get_osname as _osenv +from gettext import gettext as _ +from subprocess import Popen, PIPE support_cldir = "support-client" -ltrans = () -if setlang.langn == "de_DE": - ltrans = de_DE() -elif setlang.langn == "en_EN": - ltrans = en_EN() -else: - ltrans = de_DE() def chk_connection(): pingopt = '' @@ -52,6 +30,7 @@ def chk_connection(): stat = "Error" return stat + def forceMergeFlatDir(srcDir, dstDir): if not os.path.exists(dstDir): os.makedirs(dstDir) @@ -60,10 +39,12 @@ def forceMergeFlatDir(srcDir, dstDir): dstFile = os.path.join(dstDir, item) forceCopyFile(srcFile, dstFile) + def forceCopyFile (sfile, dfile): if os.path.isfile(sfile): shutil.copy2(sfile, dfile) + def isAFlatDir(sDir): for item in os.listdir(sDir): sItem = os.path.join(sDir, item) @@ -71,6 +52,7 @@ def isAFlatDir(sDir): return False return True + def copyTree(src, dst): for item in os.listdir(src): s = os.path.join(src, item) @@ -86,18 +68,21 @@ def copyTree(src, dst): else: forceMergeFlatDir(s, d) + def msdelupdate(srcDir): try: os.system("rmdir /s /q "+srcDir+sep) except: print("fehler bei update delete") + def mscopy(srcDir, dstDir): try: os.system("xcopy "+srcDir+sep+"*"+" "+dstDir+" /Y /E") except IOError: print("xcopy fehler") + def extract(fpath, fname): ext = (fpath+sep+fname) try: @@ -115,16 +100,12 @@ def extract(fpath, fname): class start_updater(): - def __init__(self): - if _osenv() == "nt": - updname = "scupdate_win.zip" - else: - updname = "scupdate_linux.zip" - - self.url = ("http://download.bailey-solution.com/Support-Client/"+updname) - self.dldir = (curdir+sep+"temp"+sep+"update") + def __init__(self, config): + self.cfg = config + self.url = f"{config['remote_app']['server']}/{config['remote_app'][_osenv()]}" + self.dldir = f"{config['tmpdir']}{sep}update" self.fname = self.url.split('/')[-1] - if chk_connection() == "OK": + if self.check_connection(): try: self.dlprogram() extract(self.dldir, self.fname) @@ -134,8 +115,26 @@ def __init__(self): else: showerror(ltrans.programm_name, ltrans.label_update_error) + def check_connection(self): + cmd = ['ping'] + if _osenv() == "nt": + cmd.append('-n') + elif _osenv() in ["linux", "macos"]: + cmd.append('-c') + else: + cmd.append('-c') + cmd.append(self.cfg['test']['ping']['repeat']) + cmd.append(self.cfg['test']['ping']['server']) + p1, error = Popen(cmd, stdout=PIPE) + if not error: + return True + else: + return False + def dlprogram(self): + import urllib import urllib2 + if not os.path.exists(self.dldir): os.makedirs(self.dldir) diff --git a/bin/version.py b/bin/version.py deleted file mode 100644 index b792379..0000000 --- a/bin/version.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -############################################################################################################################## -# Support-Client . # -# Copyright (C) [2015] [Guenter Bailey] # -# # -# 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 . # -############################################################################################################################## - -class version(): - versionnum = "0.9.5" diff --git a/conf/__init__.py b/conf/__init__.py deleted file mode 100644 index 25d9a8f..0000000 --- a/conf/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -from config import dlsource, setlang, check diff --git a/conf/config.py b/conf/config.py deleted file mode 100644 index 7295c98..0000000 --- a/conf/config.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -############################################################################################################################## -# Support-Client . # -# Copyright (C) [2015] [Guenter Bailey] # -# # -# 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 . # -############################################################################################################################## - - -class setlang(): - """ - langn="de_DE" oder "en_EN" - de_DE => Deutsch (German) - en_EN => Englisch (US) - """ - langn="de_DE" - -class dlsource(): - """ - Verschiedene downloads für verschiedene OS Systeme - """ - twclient_nt = "http://download.teamviewer.com/download/TeamViewerQS_de-hse.exe" - twsafe_nt = "teamviewer-quick-support.exe" - twclient_linux = "http://download.teamviewer.com/download/teamviewer_qs.tar.gz" - twsafe_linux = "teamviewer_qs.tar.gz" - twclient_macos = "http://download.teamviewer.com/download/TeamViewerQS.dmg" - twsafe_macos = "TeamViewerQS.dmg" - - -class check(): - # Minimal Ping bei Windows ab 1 - pingurl='www.google.at' - rate="2" diff --git a/lang/__init__.py b/lang/__init__.py deleted file mode 100644 index cdcea3b..0000000 --- a/lang/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -from lang import de_DE,en_EN \ No newline at end of file diff --git a/lang/lang.py b/lang/lang.py deleted file mode 100644 index b62a9d4..0000000 --- a/lang/lang.py +++ /dev/null @@ -1,139 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -############################################################################################################################## -# Support-Client . # -# Copyright (C) [2015] [Guenter Bailey] # -# # -# 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 . # -############################################################################################################################## -from bin import version - -class de_DE(): - programm_name = ("Support Client v" + version.versionnum) - programm_shortdesc = """ -1. Prüfe Internet Verbindung -2. Download Teamviewer -3. Starte Teamviewer -""" - label_update_error = "Fehler, konnte nicht updaten" - programm_description = """Falls Sie das Programm noch nicht verwendet haben gehen Sie bitte folgende Punkte nach der -Reihe durch: - -1.) Prüfe Internet Verbindung -2.) Download Teamviewer -3.) Starte Teamviewer - -Falls Teamviewer schon Heruntergeladen wurde, können Sie auch gleich mit Punkt 3 beginnen.""" - - # Menu Datei - button_filemenu_label = "Datei" - button_filemenu_end = "Beenden" - - # Menu Konfiguration - button_config_label = "Konfiguration" - button_config_editconf = "Einstellungen" - - # Menu Support - button_support_label = "Support" - button_support_teamviewer_download = "Download Teamviewer" - label_shortdesc_teamviewer_download = """Lade Teamviewer herunter.\nDies kann eine kurze Zeit dauern. - -Während des Downloads kann man das Programm nicht verwenden. - -Mit OK schließen Sie das Fenster""" - label_shortdesc_teamviewer_download_fertig = "Download von Teamviewer Beendet.\nWeiter mit Punkt 3." - button_support_teamviewer_start = "Starte Teamviewer" - label_update = "Nach dem Bestätigen startet der Update Prozess" - label_update_finish = "Update Beendet, Bitte starten Sie das Programm neu" - - - # Menu Help - button_help_label = "Hilfe" - button_help_steps = "Abblauf" - button_help_online = "Online Hilfe" - button_help_aboutus = "Über Uns" - button_update = "Update" - button_to_update_url = "Update Webseite" - aboutprogram = (""" Support Client - -Dieses Programm wurde Entwickelt damit Kunden einfach zur Zeit ein Fernwartungstool downloaden können und falls es ist auch noch zu starten. - -Copyright © 2015 Günter Bailey -""") - - # Display - button_connection = "Prüfe Internet Verbindung" - display_connection = "Internet Verbindung ?" - display_connection_true = "Verbindung OK" - display_connection_false = "Keine Verbindung" - - -class en_EN(): - programm_name = de_DE.programm_name - programm_shortdesc = (""" - -Check Internet Connection -Download Teamviewer -Start Teamviewer -""") - - programm_description = ("""If you have not used the program, please go to the following points after the -Series by: - -1.) Check Internet connection -2.) Download TeamViewer -3.) Start TeamViewer - -If TeamViewer was already downloaded, you might as well start with step 3.""") - - # Menu Datei - button_filemenu_label = "File" - button_filemenu_end = "Quit" - - # Menu Konfiguration - button_config_label = "Configuration" - button_config_editconf = "Settings" - - # Menu Support - button_support_label = "Support" - button_support_teamviewer_download = "Download Teamviewer" - label_shortdesc_teamviewer_download = ("""Downloading Teamviewer.\nThis may take a while. - -During the download, you can not use the program. - -Click OK to close the window""") - label_shortdesc_teamviewer_download_fertig = "Download TeamViewer Completed.\nClick to Point 3" - label_update = "After Accepts starting the update progress" - button_support_teamviewer_start = "Start Teamviewer" - - label_update_error = "Error, update fails" - label_update_finish = "Update finish, please restart the program" - # Menu Help - button_help_label = "Help" - button_help_steps = "Proceeding" - button_help_online = "Online Help" - button_help_aboutus = "About Us" - button_update = "Update" - button_to_update_url = "update website" - aboutprogram = (""" Support client - -This program was developed so that customers can easily download at the time a remote maintenance tool and if it is yet to be launched. - -Copyright © 2015 Günter Bailey -""") - - # Display - button_connection = "Check Internet Connection" - display_connection = "I-Net connection is ?" - display_connection_true = "Connection OK" - display_connection_false = "Connection fails" diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..783fed7 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +cx_freeze>=5.1 diff --git a/setup-linux.sh b/setup-linux.sh index 4e065b0..3602e15 100644 --- a/setup-linux.sh +++ b/setup-linux.sh @@ -1,31 +1,32 @@ #!/usr/bin/env bash sfile="Support-Client.desktop" lsfile="start.sh" -ver="0.9.5" +ver="1.0a" echo """ ############################################################################################## # Support-Client setup v$ver # #--------------------------------------------------------------------------------------------# -# by BS @2015 # +# by BS @2020 # #--------------------------------------------------------------------------------------------# # this tool configure the $sfile for easy starting the program # ############################################################################################## - """ +""" + echo """ ########################################################################################### -# Support-Client v$ver Copyright (C) 2015 Guenter Bailey # +# Support-Client v$ver Copyright (C) 2020 Guenter Bailey # # This program comes with ABSOLUTELY NO WARRANTY. # # This is free software, and you are welcome to redistribute it under certain conditions. # ########################################################################################### - """ +""" if [ -f $sfile ]; then echo "Datei $sfile vorhanden" echo "file $sfile exists" else echo "Starte Installation von Abhaengigkeiten" - apt-get install python2.7 python python-tk + apt-get install python3.6 python3 python3-tk echo """ Erstelle die Desktop Datei $sfile Die Sie nachher auf den Desktop kopieren koennen. @@ -36,22 +37,22 @@ after then, you can copy this file to the desktop Support-Client Pfad $PWD Support-Client path $PWD - """ - echo "[Desktop Entry]" >> $sfile - echo "Version=1.0" >> $sfile - echo "Type=Application" >> $sfile - echo "Name=Support-Client" >> $sfile - echo "Comment=Dieses Programm wurde Entwickelt damit Kunden einfach zur Zeit ein Fernwartungstool downloaden koennen und falls es ist auch noch zu starten." >> $sfile - echo "Exec=python support-client.py" >> $sfile - echo "Icon=$PWD/bin/image/support-client.PNG" >> $sfile - echo "Path=$PWD/" >> $sfile - echo "Terminal=false" >> $sfile - echo "StartupNotify=true" >> $sfile - echo "GenericName=" >> $sfile - sleep 1 - chmod +x $PWD/$sfile - sleep 1 - echo """ +""" +echo "[Desktop Entry]" >> $sfile +echo "Version=1.0" >> $sfile +echo "Type=Application" >> $sfile +echo "Name=Support-Client" >> $sfile +echo "Comment=Dieses Programm wurde Entwickelt damit Kunden einfach zur Zeit ein Fernwartungstool downloaden koennen und falls es ist auch noch zu starten." >> $sfile +echo "Exec=python support-client.py" >> $sfile +echo "Icon=$PWD/bin/image/support-client.PNG" >> $sfile +echo "Path=$PWD/" >> $sfile +echo "Terminal=false" >> $sfile +echo "StartupNotify=true" >> $sfile +echo "GenericName=" >> $sfile +sleep 1 +chmod +x $PWD/$sfile +sleep 1 +echo """ Desktop Datei $sfile erstellt desktop file $sfile created @@ -59,7 +60,5 @@ desktop file $sfile created Konfiguration erfolgreich, Sie koennen nun das Programm mit klick auf $sfile starten. configuration successfull, you can now starting the program with double click. - - """ - -fi \ No newline at end of file +""" +fi diff --git a/setup-macosx.sh b/setup-macosx.sh index b93e038..9b6f268 100644 --- a/setup-macosx.sh +++ b/setup-macosx.sh @@ -1,12 +1,11 @@ #!/usr/bin/env bash - sfile="support-client.command" -ver="0.9.5" +ver="1.0a" sfcontent=""" ############################################################################################################################## # Support-Client . # -# Copyright (C) [2015] [Guenter Bailey] # +# Copyright @ 2020 [Guenter Bailey] # # # # This program is free software; # # you can redistribute it and/or modify it under the terms of the GNU General Public License # @@ -26,14 +25,14 @@ echo """ ############################################################################################## # Support-Client setup v$ver # #--------------------------------------------------------------------------------------------# -# by BS @2015 # +# by BS @2020 # #--------------------------------------------------------------------------------------------# # this tool configure the $sfile for easy starting the program # ############################################################################################## """ echo """ ########################################################################################### -# Support-Client v$ver Copyright (C) 2015 Guenter Bailey # +# Support-Client v$ver Copyright (C) 2020 Guenter Bailey # # This program comes with ABSOLUTELY NO WARRANTY. # # This is free software, and you are welcome to redistribute it under certain conditions. # ########################################################################################### @@ -73,4 +72,4 @@ configuration successfull, you can now starting the program with double click. """ -fi \ No newline at end of file +fi diff --git a/setup.py b/setup.py index 46577ea..d0d916e 100644 --- a/setup.py +++ b/setup.py @@ -1,53 +1,66 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- -############################################################################################################################## -# Support-Client . # -# Copyright (C) [2015] [Guenter Bailey] # -# # -# 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 . # -############################################################################################################################## -from distutils.core import setup -from lang import de_DE as ltrans -from bin import version import os -from os import curdir,sep -import py2exe +from cx_Freeze import * +from bin import __version__, ABOUTPROGRAM, PROGRAM_NAME +from bin.license import information +from os import curdir, sep -imgdir = (curdir+sep+"bin"+sep+"image"+sep) -excludes = ['email'] +app_title = PROGRAM_NAME +main_python_file = "support-client.py" +icon = curdir+sep+"bin"+sep+"image"+sep+"support-client.ico" +copyright = information -Mydata_files = [] -for files in os.listdir(imgdir): - f1 = imgdir + files - if os.path.isfile(f1): # skip directories - f2 = (curdir+sep+"bin"+sep+"image"), [f1] - Mydata_files.append(f2) +include_files = [r'C:\Python36\DLLs\tcl86t.dll', r'C:\Python36\DLLs\tk86t.dll', "bin", "support-client.ico", + "LICENSE.txt", "config.json"] +#excludes = ["backup", "temp", "html", "email", "http", "logging", "unittest", "urllib"] +excludes = [] +packages = [] + +# http://msdn.microsoft.com/en-us/library/windows/desktop/aa371847(v=vs.85).aspx +shortcut_table = [ + ("DesktopShortcut", # Shortcut + "DesktopFolder", # Directory_ + "Support Client", # Name + "TARGETDIR", # Component_ + "[TARGETDIR]support-client.exe", # Target + None, # Arguments + ABOUTPROGRAM, # Description + None, # Hotkey + "support-client.ico", # Icon + None, # IconIndex + None, # ShowCmd + 'TARGETDIR' # WkDir + ) +] + +msi_data = {'Shortcut': shortcut_table} +# bdist_msi_options = {'data': msi_data} +bdist_msi_options = { + 'upgrade_code': '{C1168458-7459-4B4F-85A7-8B4D0387D17C}', + 'data': msi_data +} + +# GUI applications require a different base on Windows (the default is for a +# console application). +base = None +if sys.platform == "win32": + base = "Win32GUI" + os.environ['TCL_LIBRARY'] = r'C:\Python36\tcl\tcl8.6' + os.environ['TK_LIBRARY'] = r'C:\Python36\tcl\tk8.6' +else: + base = None setup( - name='Support-Client', - version=str(version.versionnum), - packages=['bin', 'conf', 'lang'], - url='http://wiki.pratznschutz.com/index.php/Support-Client', - license='GPLv3', - author='guenter', - author_email='office@bailey-solution.com', - description=ltrans.aboutprogram, - data_files = Mydata_files, - options = {"py2exe": {"optimize": 2, - "packages": ['bin', 'lang', 'conf'], - "excludes": excludes, - } - }, - windows=['support-client.py'], - zipfile="sclib.zip", + name=app_title, + description=ABOUTPROGRAM, + version=__version__, + url="https://www.bailey-solution.com", + license='MIT', + author='Bailey Solution', + author_email='guenter.bailey@bailey-solution.com', + options={'build_exe': {'packages': packages, 'include_files': include_files, 'excludes': excludes, + 'include_msvcr': True, 'optimize': 2, 'includes': packages}, + 'bdist_msi': bdist_msi_options}, + executables=[Executable("support-client.py", base=base)] ) diff --git a/support-client.ico b/support-client.ico new file mode 100644 index 0000000..9391997 Binary files /dev/null and b/support-client.ico differ diff --git a/support-client.py b/support-client.py index 7176990..9f1922b 100644 --- a/support-client.py +++ b/support-client.py @@ -1,213 +1,319 @@ -#!/usr/bin/python +#!/usr/bin/python3 # -*- coding: utf-8 -*- -####################################################################################################################### -# Support-Client . # -# Copyright (C) [2015] [Guenter Bailey] # -# # -# 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 . # -####################################################################################################################### -import os -import Tkinter as tk -from os import curdir, sep +############################################ +# MIT License Copyright 2020 Günter Bailey # +############################################ +import tkinter as tk +from tkinter import Menu +from tkinter.ttk import Progressbar +from tkinter import messagebox as mbox +from gettext import gettext as _ +from bin import __version__, ABOUTPROGRAM, ABOUTTXT, PROGRAM_NAME +from bin.findenv import get_osname as _osenv +from bin.license import information +from os import curdir, sep, path, mkdir +import threading from subprocess import Popen, PIPE -from tkMessageBox import showinfo -from lang import de_DE, en_EN -from conf import setlang, dlsource -from conf import check as _check -from bin import osenv as _osenv - -# set language -ltrans = () -if setlang.langn == "de_DE": - ltrans = de_DE() -elif setlang.langn == "en_EN": - ltrans = en_EN() -else: - ltrans = de_DE() - -programmtxt = ltrans.programm_name -savfilent = (curdir + sep + "temp" + sep + dlsource.twsafe_nt) -savfilelinux = (curdir + sep + "temp" + sep + dlsource.twsafe_linux) -savfilemacos = (curdir + sep + "temp" + sep + dlsource.twsafe_macos) -twstart_linux = (curdir + sep + "temp" + sep + "teamviewerqs" + sep + "teamviewer") - -def update_program(): - from bin import update - update.start_updater() - ende() - -def editconfiguration(): - editor = '' - if _osenv() == "nt": - editor = 'notepad' - elif _osenv() == "linux": - editor = 'notepad' - elif _osenv == "macos": - editor = 'notepad' - else: - editor = 'notepad' - - confopen = [editor, 'conf/config.py'] - p7 = Popen(confopen, stdout=PIPE) - cmdt = p7.communicate()[0] - -def aboutprogram(): - uebertxt = ltrans.aboutprogram - showinfo(programmtxt, uebertxt) - -def onlinehelp(): - import webbrowser - - webbrowser.open("http://wiki.pratznschutz.com/index.php/Support-Client") - -def updwebsite(): - import webbrowser - webbrowser.open("http://download.bailey-solution.com/Support-Client") - -def dlfernwartung(): - import urllib - - tempdir = (curdir + sep + "temp") - if not os.path.exists(tempdir): - os.makedirs(tempdir) - - if _osenv() == "nt": - showinfo(ltrans.button_support_teamviewer_download, ltrans.label_shortdesc_teamviewer_download) - urllib.urlretrieve(dlsource.twclient_nt, savfilent) - showinfo(ltrans.button_support_teamviewer_download, ltrans.label_shortdesc_teamviewer_download_fertig) - elif _osenv() == "linux": - showinfo(ltrans.button_support_teamviewer_download, ltrans.label_shortdesc_teamviewer_download) - urllib.urlretrieve(dlsource.twclient_linux, savfilelinux) - os.system("tar xfz " + savfilelinux + " -C " + curdir + sep + "temp" + sep) - showinfo(ltrans.button_support_teamviewer_download, ltrans.label_shortdesc_teamviewer_download_fertig) - elif _osenv() == "macos": - showinfo(ltrans.button_support_teamviewer_download, ltrans.label_shortdesc_teamviewer_download) - urllib.urlretrieve(dlsource.twclient_macos, savfilemacos) - showinfo(ltrans.button_support_teamviewer_download, ltrans.label_shortdesc_teamviewer_download_fertig) - return 0 - -def twstart(): - if _osenv() == "nt": - # appstart = [savfilent] - p1 = Popen(savfilent) - - elif _osenv() == "linux": - # appstart = twstart_linux - p1 = Popen(twstart_linux) - - elif _osenv() == "macos": - appstart = ['open', savfilemacos] - p1 = Popen(appstart) - return 0 - -def ende(): - main.destroy() - -def inetcon(): - pingopt = '' - - if _osenv() == "nt": - pingopt = '-n' - elif _osenv() == "linux": - pingopt = '-c' - elif _osenv() == "macos": - pingopt = '-c' - else: - pingopt = '-c' - - if os.system("ping " + pingopt + " " + _check.rate + " " + _check.pingurl) == 0: - lb2["text"] = ltrans.display_connection_true - lb2["bg"] = "#00FF00" - else: - lb2["text"] = ltrans.display_connection_false - lb2["bg"] = "#FF0000" - return 0 - -def helpsteps(): - showinfo(ltrans.button_help_steps, ltrans.programm_description) - - -# Main Window -main = tk.Tk() -# window Title -main.wm_title(ltrans.programm_name) - -main.grid_columnconfigure(0, weight=1) -main.resizable(True, True) - -# dropdown Menu -menu = tk.Menu(main) -main.config(menu=menu) -dateimenu = tk.Menu(menu) -menu.add_cascade(label=ltrans.button_filemenu_label, menu=dateimenu) - -if _osenv() != 'nt': - dateimenu.add_command(label=ltrans.button_config_editconf, command=editconfiguration) - -dateimenu.add_separator() -dateimenu.add_command(label=ltrans.button_filemenu_end, command=ende) - -toolmenu = tk.Menu(menu) -menu.add_cascade(label=ltrans.button_support_label, menu=toolmenu) -toolmenu.add_command(label=ltrans.button_connection, command=inetcon) -toolmenu.add_separator() -toolmenu.add_command(label=ltrans.button_support_teamviewer_download, command=dlfernwartung) -toolmenu.add_command(label=ltrans.button_support_teamviewer_start, command=twstart) - -hilfemenu = tk.Menu(menu) -menu.add_cascade(label=ltrans.button_help_label, menu=hilfemenu) -hilfemenu.add_command(label=ltrans.button_help_steps, command=helpsteps) -hilfemenu.add_command(label=ltrans.button_help_online, command=onlinehelp) -hilfemenu.add_command(label=ltrans.button_update, command=update_program) -hilfemenu.add_separator() -hilfemenu.add_command(label=ltrans.button_help_aboutus, command=aboutprogram) -hilfemenu.add_command(label=ltrans.button_to_update_url, command=updwebsite) - -#Image -imglogo = tk.PhotoImage(file=curdir + sep + "bin" + sep + "image" + sep + "support-client.gif") - -# Label -lbapp = tk.Label(main, text=programmtxt) -lbapp["font"] = "Courier 14 italic" -lbapp["height"] = 1 -lbapp["width"] = 25 -lbapp["borderwidth"] = 2 -lbapp["relief"] = "ridge" -lbapp["fg"] = "#000000" -lbapp["anchor"] = "center" -lbapp.grid(column=0, row=0, columnspan=6) - -lbspace = tk.Label(main, compound=tk.TOP, text=ltrans.programm_shortdesc, font="Courier 12", anchor="center", - fg="#000000", image=imglogo).grid(column=0, row=3, columnspan=6) - -lb2 = tk.Label(main) -lb2["text"] = ltrans.display_connection -lb2["bg"] = "#ffa500" -lb2["font"] = "Courier 12" -lb2["height"] = 2 -lb2["width"] = 22 -lb2["relief"] = "ridge" -lb2["fg"] = "#000000" -lb2["anchor"] = "center" -lb2.grid(column=0, row=6, columnspan=6) - -b_ende = tk.Button(main, text=ltrans.button_filemenu_end, command=ende, height=3, width=12).grid(column=0, row=12, - columnspan=6) -b_chkdb = tk.Button(main, text=ltrans.button_connection, command=inetcon, height=3, width=25).grid(column=0, row=7, - columnspan=6) -b_dlremotecontrol = tk.Button(main, text=ltrans.button_support_teamviewer_download, command=dlfernwartung, height=3, - width=25).grid(column=0, row=9, columnspan=6) -b_startremotecontrol = tk.Button(main, text=ltrans.button_support_teamviewer_start, command=twstart, height=3, - width=25).grid(column=0, row=11, columnspan=6) - -main.mainloop() +import json +from datetime import datetime + +try: + from urllib import urlretrieve +except ImportError: + from urllib.request import urlretrieve + +# +# def onlinehelp(): +# import webbrowser +# webbrowser.open("http://wiki.pratznschutz.com/index.php/Support-Client") +# +# +# def updwebsite(): +# import webbrowser +# webbrowser.open("http://download.bailey-solution.com/Support-Client") +# + +class App(tk.Tk): + def __init__(self, *args, **kwargs): + tk.Tk.__init__(self, *args, **kwargs) + self.wm_title(f"{PROGRAM_NAME} {__version__}") + self.grid_columnconfigure(0, weight=1) + self.resizable(True, True) + self.config = dict({'version': __version__, 'tmpdir': curdir + sep + 'tmp', + 'email': 'office@bailey-solution.com', 'phone': '+43(0)720/517219', + 'webpage': 'https://www.bailey-solution.com', + 'remote_app': dict({'server': 'https://download.b2go.cloud/Support-Client/bin/', + 'nt': 'TVQS.exe', 'macos': 'TVQS.dmg', 'linux': 'TVQS.exe'}), + 'test': dict({'ping': dict({'server': 'google.com', 'repeat': 4, 'result': 'no result', + 'ip': '8.8.8.8'}) + }) + }) + + self.setup(load=True) + self.check_folder() + self.child = None + # configuration + self.tmpdir = None + self.test_ping_server = None + self.test_ping_ip = None + self.test_ping_repeat = None + # start UI + self.initUI() + + def save_edit_configuration(self): + self.config.update({'tmpdir': self.tmpdir.get()}) + self.config['test']['ping'].update({'server': self.test_ping_server.get(), + 'repeat': int(self.test_ping_repeat.get()), + 'ip': self.test_ping_ip.get()}) + + if self.setup(write=True): + mbox.showinfo(title=f"{PROGRAM_NAME} {__version__}", message=_("Configuration saved")) + self.child.destroy() + + def edit_configuration(self): + win = tk.Toplevel() + win.wm_title(_(f"{PROGRAM_NAME} {__version__} Edit Configuration")) + win.grid_columnconfigure(0, weight=1) + win.resizable(True, True) + tk.Label(win, text=f"Version {self.config['version']}").grid(row=0, column=0, columnspan=6) + + self.child = win + self.tmpdir = tk.StringVar(value=self.config['tmpdir']) + tk.Label(win, text=_("Download Directory")).grid(row=1, column=0) + tk.Entry(win, bd=2, textvariable=self.tmpdir).grid(row=1, column=1) + + tk.Label(win, text=_("Connection Check Settings")).grid(row=2, column=1, columnspan=6) + + self.test_ping_server = tk.StringVar(value=self.config['test']['ping']['server']) + tk.Label(win, text=_("Server")).grid(row=5, column=0) + tk.Entry(win, bd=2, textvariable=self.test_ping_server).grid(row=5, column=1) + + self.test_ping_ip = tk.StringVar(value=self.config['test']['ping']['ip']) + tk.Label(win, text=_("IP")).grid(row=10, column=0) + tk.Entry(win, bd=2, textvariable=self.test_ping_ip).grid(row=10, column=1) + + self.test_ping_repeat = tk.IntVar(value=self.config['test']['ping']['repeat']) + tk.Label(win, text=_("Ping Repeat min. 2")).grid(row=20, column=0) + tk.Entry(win, bd=2, textvariable=self.test_ping_repeat).grid(row=20, column=1) + + remote_app_server_url = tk.StringVar(value=self.config['remote_app']['server']) + remote_app_tv = tk.StringVar(value=self.config['remote_app'][_osenv()]) + tk.Label(win, text=_("Remote Server")).grid(row=30, column=0) + tk.Entry(win, bd=2, state="readonly", textvariable=remote_app_server_url).grid(row=30, column=1) + + tk.Label(win, text=_("Program")).grid(row=40, column=0) + tk.Entry(win, bd=2, state="readonly", textvariable=remote_app_tv).grid(row=40, column=1) + + tk.Button(win, width=20, height=2, text=_("Close"), command=win.destroy).grid(row=50, column=0) + tk.Button(win, width=20, height=2, text=_("Save"), command=self.save_edit_configuration).grid(row=50, column=1) + + def check_folder(self): + if not path.exists(self.config['tmpdir']): + mkdir(self.config['tmpdir']) + + def setup(self, load=False, write=False): + jsonfile = curdir + sep + "config.json" + if not path.isfile(jsonfile): + with open(jsonfile, "w") as f: + f.write(json.dumps(self.config)) + + if load: + with open(jsonfile, "r") as f: + cfg = json.loads(f.read()) + if self.config['version'] > cfg.get('version', '0.1a'): + with open(jsonfile, "w") as f: + f.write(json.dumps(self.config)) + else: + self.config.update(cfg) + elif write: + with open(jsonfile, "w") as f: + f.write(json.dumps(self.config)) + return True + + def initUI(self): + self.windows = [] + label = tk.Label(self, text=PROGRAM_NAME) + label["font"] = "Courier 14 italic" + label["height"] = 1 + label["width"] = 25 + label["borderwidth"] = 2 + label["relief"] = "ridge" + label["fg"] = "#000000" + label["anchor"] = "center" + label.grid(row=0, column=0, columnspan=6) + + self.logo = tk.PhotoImage(file=curdir + sep + "bin" + sep + "image" + sep + "support-client.gif") + self.Artwork = tk.Label(self, compound=tk.TOP, + text=_("press the button \nstart remote support and \ntell the support the" + " \nTeamviewer ID and Password.\n"), font="Courier 12", anchor="center", + fg="#000000", image=self.logo).grid(row=1, column=0, columnspan=5, sticky="N", + rowspan=2) + tk.Label(self, text=_(f"Tech Support \n Phone: {self.config['phone']}\n E-Mail: {self.config['email']}"), + font="Courier 12", anchor="center", fg="#000000").grid(row=4, column=0, columnspan=5, sticky="N") + + menubar = Menu(self.master) + dateimenu = Menu(menubar) + supportmenu = Menu(menubar) + helpmenu = Menu(menubar) + self.configure(menu=menubar) + + menubar.add_cascade(label=_("File"), menu=dateimenu) + dateimenu.add_command(label=_("Edit Configuration"), command=self.edit_configuration) + dateimenu.add_command(label=_("Close"), command=self.quit) + + menubar.add_cascade(label=_("Support"), menu=supportmenu) + supportmenu.add_command(label=_("Check Internet Connection"), command=self.ping_tool) + supportmenu.add_command(label=_("Start Remotesupport"), command=self.tw_start) + supportmenu.add_command(label=_("Download Remotetool"), command=self.download_supporttool) + supportmenu.add_separator() + + menubar.add_cascade(label=_("Help"), menu=helpmenu) + helpmenu.add_command(label=_(f"About {PROGRAM_NAME}"), command=self.about_program) + helpmenu.add_separator() + helpmenu.add_command(label=_("License"), command=self.show_license) + helpmenu.add_command(label=_("Manual"), command=self.manual) + helpmenu.add_command(label=_("Update"), command=self.update_program) + + tk.Label(self, text='').grid(row=5, column=0) + + self.conntestlb = tk.Label(self) + self.conntestlb["text"] = _("Internet Connection ?") + self.conntestlb["bg"] = "#ffa500" + self.conntestlb["font"] = "Courier 12" + self.conntestlb["height"] = 2 + self.conntestlb["width"] = 22 + self.conntestlb["relief"] = "ridge" + self.conntestlb["fg"] = "#000000" + self.conntestlb["anchor"] = "center" + self.conntestlb.grid(column=0, row=6, columnspan=6) + + tk.Label(self, text='').grid(row=15, column=0) + self.progressbar = Progressbar(self, orient='horizontal', length=260, mode='indeterminate') + self.progressbar.grid(row=18, column=0, columnspan=3) + self.progressbar.grid_forget() + + tk.Label(self, text='').grid(row=20, column=0) + tk.Button(self, width=20, height=2, text=_("Start Remotesupport"), command=self.tw_start).grid(row=25, column=0) + tk.Label(self, text='').grid(row=30, column=0) + tk.Button(self, width=20, height=2, text=_("Close"), command=self.quit).grid(row=50, column=0) + tk.Label(self, text='').grid(row=60, column=0) + + tk.Label(self, text=f"Bailey-Solution @{datetime.now().year}").grid(row=70, column=0, columnspan=2) + + def download_supporttool(self, parentprocess=True): + def download(): + if parentprocess: + self.progressbar.grid(row=18, column=0, columnspan=3) + self.progressbar.start() + try: + self.check_folder() + urlretrieve(url=f"{self.config['remote_app']['server']}{self.config['remote_app'][_osenv()]}", + filename=f"{self.config['tmpdir']}{sep}{self.config['remote_app'][_osenv()]}") + if parentprocess: + mbox.showinfo(title=_("Download"), message=_(f"Image {self.config['remote_app'][_osenv()]} downloaded")) + except Exception as exp: + print("exception = ", exp) + mbox.showwarning(title=_("Download Error"), message=exp) + if parentprocess: + self.progressbar.stop() + self.progressbar.grid_forget() + return True + if parentprocess: + threading.Thread(target=download).start() + else: + download() + return True + + def tw_start(self): + def start(): + self.progressbar.grid(row=18, column=0, columnspan=3) + self.progressbar.start() + try: + fpath = self.config.get('tmpdir', curdir+sep+'tmp') + if not path.isfile(f"{fpath}{sep}{self.config['remote_app'][_osenv()]}"): + self.download_supporttool(parentprocess=False) + appstart = None + if _osenv() == "nt": + appstart = [fpath+sep+self.config['remote_app'][_osenv()]] + elif _osenv() == "macos": + appstart = ['open', fpath+sep+self.config['remote_app'][_osenv()]] + + if appstart: + Popen(appstart) + else: + mbox.showwarning(title=_("Start Remotesupport"), message=_("Programm not found")) + except Exception as exp: + print("error = ", exp) + mbox.showwarning(title=_("Start Remotesupport"), message=str(exp)) + self.progressbar.stop() + self.progressbar.grid_forget() + return True + threading.Thread(target=start).start() + return True + + def ping_tool(self): + def ping(): + self.progressbar.grid(row=18, column=0, columnspan=3) + self.progressbar.start() + try: + self.conntestlb["bg"] = "#00FF00" + self.conntestlb["text"] = _("Check Running...") + cmd = ['ping'] + if _osenv() == "nt": + cmd.append('-n') + elif _osenv() in ["linux", "macos"]: + cmd.append('-c') + else: + cmd.append('-c') + + cmd1 = cmd + cmd1.append(str(self.config['test']['ping']['repeat'])) + cmd1.append(self.config['test']['ping']['ip']) + p1 = Popen(cmd1, stdout=PIPE) + result, error = p1.communicate() + if error: + self.conntestlb["bg"] = "#FF0000" + self.conntestlb["text"] = _("DNS error") + + cmd2 = cmd + cmd2.append(str(self.config['test']['ping']['repeat'])) + cmd2.append(self.config['test']['ping']['server']) + p2 = Popen(cmd2, stdout=PIPE) + result2, error2 = p2.communicate() + if error2: + self.conntestlb["bg"] = "#FF0000" + self.conntestlb["text"] = _("no connection") + + if error or error2: + mbox.showwarning(title=_("Ping Error"), message=f"{error}\n{error2}") + else: + self.conntestlb["bg"] = "#00FF00" + self.conntestlb["text"] = _("connection OK") + mbox.showinfo(title=_("Ping Successful"), message=_("Ping Successful")) + except Exception as exp: + print("exception = ", exp) + mbox.showwarning(title=_("Error on PING Command"), message=exp) + self.progressbar.stop() + self.progressbar.grid_forget() + return True + threading.Thread(target=ping).start() + + def manual(self): + desc = _("To start the Remoteconnection for Tech Support, klick on Start Remotesupport.") + mbox.showinfo(title=_("Manual"), message=desc) + + def show_license(self): + mbox.showinfo(title=_("License"), message=information) + + def about_program(self): + mbox.showinfo(title=_(f"About {PROGRAM_NAME}"), message=ABOUTPROGRAM) + + def update_program(self): + # from bin import update + # update.start_updater() + mbox.showinfo(title=f"Update {PROGRAM_NAME} {__version__}", message=_("feature is comming soon.")) + + +if __name__ == "__main__": + app = App() + app.mainloop()