From: Niki Roo Date: Sat, 25 Apr 2020 13:11:32 +0000 (+0200) Subject: Merge branch 'subtree' X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=bc4db23ff5c21d7d4716f9b7f97de73b15a6fc21;hp=ee020e75a5de0c1e54557db79f77edc50e05ea04 Merge branch 'subtree' --- diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9cecc1d --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Makefile.base b/Makefile.base new file mode 100644 index 0000000..0d365b8 --- /dev/null +++ b/Makefile.base @@ -0,0 +1,243 @@ +# Makefile base template +# +# Version: +# - 1.0.0: add a version comment +# - 1.1.0: add 'help', 'sjar' +# - 1.2.0: add 'apk' +# - 1.2.1: improve 'apk' and add 'android' +# - 1.3.0: add 'man' for man(ual) pages +# - 1.4.0: remove android stuff (not working anyway) +# - 1.5.0: include sources and readme/changelog in jar +# - 1.5.1: include binaries from libs/bin/ into the jar + +# Required parameters (the commented out ones are supposed to be per project): + +#MAIN = path to main java source to compile +#MORE = path to supplementary needed resources not linked from MAIN +#NAME = name of project (used for jar output file) +#PREFIX = usually /usr/local (where to install the program) +#TEST = path to main test source to compile +#JAR_FLAGS += a list of things to pack, each usually prefixed with "-C bin/" +#SJAR_FLAGS += a list of things to pack, each usually prefixed with "-C src/", +# for *-sources.jar files +#TEST_PARAMS = any parameter to pass to the test runnable when "test-run" + +JAVAC = javac +JAVAC_FLAGS += -encoding UTF-8 -d ./bin/ -cp ./src/ +JAVA = java +JAVA_FLAGS += -cp ./bin/ +JAR = jar +RJAR = java +RJAR_FLAGS += -jar + +all: build jar man + +help: + @echo "Usual options:" + @echo "==============" + @echo " make : to build the jar file and man pages IF possible" + @echo " make help : to get this help screen" + @echo " make libs : to update the libraries into src/" + @echo " make build : to update the binaries (not the jar)" + @echo " make test : to update the test binaries" + @echo " make build jar : to update the binaries and jar file" + @echo " make sjar : to create the sources jar file" + @echo " make clean : to clean the directory of intermediate files" + @echo " make mrpropre : to clean the directory of all outputs" + @echo " make run : to run the program from the binaries" + @echo " make run-test : to run the test program from the binaries" + @echo " make jrun : to run the program from the jar file" + @echo " make install : to install the application into $$PREFIX" + @echo " make ifman : to make the manual pages (if pandoc is found)" + @echo " make man : to make the manual pages (requires pandoc)" + +.PHONY: all clean mrproper mrpropre build run jrun jar sjar resources test-resources install libs ifman man love + +bin: + @mkdir -p bin + +jar: $(NAME).jar + +sjar: $(NAME)-sources.jar + +build: resources + @echo Compiling program... + @echo " src/$(MAIN)" + @$(JAVAC) $(JAVAC_FLAGS) "src/$(MAIN).java" + @[ "$(MORE)" = "" ] || for sup in $(MORE); do \ + echo " src/$$sup" ;\ + $(JAVAC) $(JAVAC_FLAGS) "src/$$sup.java" ; \ + done + +test: test-resources + @[ -e bin/$(MAIN).class ] || echo You need to build the sources + @[ -e bin/$(MAIN).class ] + @echo Compiling test program... + @[ "$(TEST)" != "" ] || echo No test sources defined. + @[ "$(TEST)" = "" ] || for sup in $(TEST); do \ + echo " src/$$sup" ;\ + $(JAVAC) $(JAVAC_FLAGS) "src/$$sup.java" ; \ + done + +clean: + rm -rf bin/ + @echo Removing sources taken from libs... + @for lib in libs/*-sources.jar libs/*-sources.patch.jar; do \ + if [ "$$lib" != 'libs/*-sources.jar' -a "$$lib" != 'libs/*-sources.patch.jar' ]; then \ + basename "$$lib"; \ + jar tf "$$lib" | while read -r ln; do \ + [ -f "src/$$ln" ] && rm "src/$$ln"; \ + done; \ + jar tf "$$lib" | tac | while read -r ln; do \ + [ -d "src/$$ln" ] && rmdir "src/$$ln" 2>/dev/null || true; \ + done; \ + fi \ + done + +mrproper: mrpropre + +mrpropre: clean + rm -f $(NAME).jar + rm -f $(NAME)-sources.jar + rm -f $(NAME).apk + rm -f $(NAME)-debug.apk + [ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`.jar" + [ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`-sources.jar" + +love: + @echo " ...not war." + +resources: libs + @echo Copying resources into bin/... + @cd src && find . | grep -v '\.java$$' | grep -v '/test/' | while read -r ln; do \ + if [ -f "$$ln" ]; then \ + dir="`dirname "$$ln"`"; \ + mkdir -p "../bin/$$dir" ; \ + cp "$$ln" "../bin/$$ln" ; \ + fi ; \ + done + @cp VERSION bin/ + +test-resources: resources + @echo Copying test resources into bin/... + @cd src && find . | grep -v '\.java$$' | grep '/test/' | while read -r ln; do \ + if [ -f "$$ln" ]; then \ + dir="`dirname "$$ln"`"; \ + mkdir -p "../bin/$$dir" ; \ + cp "$$ln" "../bin/$$ln" ; \ + fi ; \ + done + +libs: bin + @[ -e bin/libs -o ! -d libs ] || echo Extracting sources from libs... + @[ -e bin/libs -o ! -d libs ] || (cd src && for lib in ../libs/*-sources.jar ../libs/*-sources.patch.jar; do \ + if [ "$$lib" != '../libs/*-sources.jar' -a "$$lib" != '../libs/*-sources.patch.jar' ]; then \ + basename "$$lib"; \ + jar xf "$$lib"; \ + fi \ + done ) + @[ ! -d libs ] || touch bin/libs + +$(NAME)-sources.jar: libs + @ls *.md >/dev/null || cp VERSION README.md + @echo Making sources JAR file... + @echo > bin/manifest + @[ "$(SJAR_FLAGS)" != "" ] || echo No sources JAR file defined, skipping + @[ "$(SJAR_FLAGS)" = "" ] || echo Creating $(NAME)-sources.jar... + @[ "$(SJAR_FLAGS)" = "" ] || $(JAR) cfm $(NAME)-sources.jar bin/manifest -C ./ *.md $(SJAR_FLAGS) + @[ "$(SJAR_FLAGS)" = "" ] || [ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`-sources.jar"... + @[ "$(SJAR_FLAGS)" = "" ] || [ ! -e VERSION ] || cp $(NAME)-sources.jar "$(NAME)-`cat VERSION`-sources.jar" + +$(NAME).jar: resources + @[ -e bin/$(MAIN).class ] || echo You need to build the sources + @[ -e bin/$(MAIN).class ] + @ls *.md >/dev/null || cp VERSION README.md + @echo "Copying documentation into bin/..." + @cp -r *.md bin/ || cp VERSION bin/no-documentation.md + @[ ! -d libs/bin/ ] || echo "Copying additional binaries from libs/bin/ into bin/..." + @[ ! -d libs/bin/ ] || cp -r libs/bin/* bin/ + @echo "Copying sources into bin/..." + @cp -r src/* bin/ + @echo "Making jar..." + @echo "Main-Class: `echo "$(MAIN)" | sed 's:/:.:g'`" > bin/manifest + @echo >> bin/manifest + $(JAR) cfm $(NAME).jar bin/manifest -C ./ *.md $(JAR_FLAGS) + @[ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`.jar"... + @[ ! -e VERSION ] || cp $(NAME).jar "$(NAME)-`cat VERSION`.jar" + +run: + @[ -e bin/$(MAIN).class ] || echo You need to build the sources + @[ -e bin/$(MAIN).class ] + @echo Running "$(NAME)"... + $(JAVA) $(JAVA_FLAGS) $(MAIN) + +jrun: + @[ -e $(NAME).jar ] || echo You need to build the jar + @[ -e $(NAME).jar ] + @echo Running "$(NAME).jar"... + $(RJAR) $(RJAR_FLAGS) $(NAME).jar + +run-test: + @[ "$(TEST)" = "" -o -e "bin/$(TEST).class" ] || echo You need to build the test sources + @[ "$(TEST)" = "" -o -e "bin/$(TEST).class" ] + @echo Running tests for "$(NAME)"... + @[ "$(TEST)" != "" ] || echo No test sources defined. + [ "$(TEST)" = "" ] || ( clear ; $(JAVA) $(JAVA_FLAGS) $(TEST) $(TEST_PARAMS) ) + +install: + @[ -e $(NAME).jar ] || echo You need to build the jar + @[ -e $(NAME).jar ] + mkdir -p "$(PREFIX)/lib" "$(PREFIX)/bin" + cp $(NAME).jar "$(PREFIX)/lib/" + echo "#!/bin/sh" > "$(PREFIX)/bin/$(NAME)" + echo "$(RJAR) $(RJAR_FLAGS) \"$(PREFIX)/lib/$(NAME).jar\" \"\$$@\"" >> "$(PREFIX)/bin/$(NAME)" + chmod a+rx "$(PREFIX)/bin/$(NAME)" + if [ -e "man/man1/$(NAME).1" ]; then \ + cp -r man/ "$(PREFIX)"/share/; \ + fi + +ifman: + @if pandoc -v >/dev/null 2>&1; then \ + make man; \ + else \ + echo "man pages not generated: "'`'"pandoc' required"; \ + fi + +man: + @echo Checking for possible manual pages... + @if [ -e README.md ]; then \ + echo Sources found for man pages; \ + if pandoc -v >/dev/null 2>&1; then \ + ls README*.md 2>/dev/null \ + | grep 'README\(-..\|\)\.md' \ + | while read man; do \ + echo " Processing page $$lang..."; \ + lang="`echo "$$man" \ + | sed 's:README\.md:en:' \ + | sed 's:README-\(.*\)\.md:\1:'`"; \ + mkdir -p man/"$$lang"/man1; \ + ( \ + echo ".TH \"${NAME}\" 1 `\ + date +%Y-%m-%d\ + ` \"version `cat VERSION`\""; \ + echo; \ + UNAME="`echo "${NAME}" \ + | sed 's:\(.*\):\U\1:g'`"; \ + ( \ + cat "$$man" | head -n1 \ + | sed 's:.*(README\(-fr\|\)\.md).*::g'; \ + cat "$$man" | tail -n+2; \ + ) | sed 's:^#\(#.*\):\1:g' \ + | sed 's:^\(#.*\):\U\1:g;s:# *'"$$UNAME"':# NAME\n'"${NAME}"' \\- :g' \ + | sed 's:--:——:g' \ + | pandoc -f markdown -t man | sed 's:——:--:g' ; \ + ) > man/"$$lang"/man1/"${NAME}.1"; \ + done; \ + mkdir -p "man/man1"; \ + cp man/en/man1/"${NAME}".1 man/man1/; \ + else \ + echo "man pages generation: pandoc required" >&2; \ + false; \ + fi; \ + fi; + diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..831446c --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +5.1.0 diff --git a/bridge b/bridge new file mode 100755 index 0000000..a937348 --- /dev/null +++ b/bridge @@ -0,0 +1,19 @@ +#!/bin/sh +NAME=nikiroo-utils.jar + +jar="$NAME" +if [ ! -e "$jar" ]; then + jar="`dirname "$0"`/$NAME" +fi + +if [ ! -e "$jar" ]; then + jar="`whereis "$NAME" | sed 's: :\n:g' | grep "$NAME" | head -n1`" +fi + +if [ ! -e "$jar" ]; then + echo "$NAME not found." >&2 + exit 1 +fi + +exec java -cp "$jar" be.nikiroo.utils.main.bridge "$@" + diff --git a/changelog.md b/changelog.md new file mode 100644 index 0000000..21f865f --- /dev/null +++ b/changelog.md @@ -0,0 +1,375 @@ +# nikiroo-utils + +## Version WIP + +- new: IOUtils: openResource with anchor class +- new: ConfigItem: easier to extend +- fix: CacheMemory: fix stackoverflow bug +- fix: Bundles/TransBundles: def values + +## Version 5.1.0 + +- Downloader: new Offline mode for cache accesses only +- Cache: make sure an immedate SAVE/LOAD always work, even with 0 retention delays + +## Version 5.0.0 + +- new: server: count the bytes we rec/send +- new: CryptUtils +- new: stream classes +- new: Bundles can now also set Boolean, Integer... and not just get them +- new: Bundles get/setList() +- new: Bundles can now use the default values provided by the Meta +- new: GUI presentation for Bundles is much improved +- fix: IOUtils.readSmallStream and \n at the end +- fix: Base64 implementation changed, no strange errors anymore +- android: binary code (.class) is now bundled in the jar, too +- change: StringUtils.unzip64(String) now returns a byte[] (StringUtils.unzip64s(String) can be used instead) +- change: be.nikiroo.utils.markableFileInputStream moved to be.nikiroo.utils.streams (old class still present in @Deprecated state for now) +- change: TestLauncher is now "silent" by default (no exception details, see setDetails(true)) +- runtime: serial: SSL -> CryptUtils (both are **runtime** incompatible and CryptUtils is slower) +- runtime: break **runtime** compat with package utils.serial (Objects) -- ServerString should still be compatible (if not SSL obviously) + +## Version 4.7.3 + +- fix: Downloader: POST and 302 redirects + +## Version 4.7.2 + +- fix: Downloader issue with caching (input was spent when returned the first time) +- fix: IOUtil.forceResetableStream + +## Version 4.7.1 + +- new: can now select the TempFiles root +- new: can now select the Image temporary root +- fix: Cache now offer some tracing when cleaning the cache +- fix: TemporaryFiles.close() was not indempotent (and was called in finalize!) + +## Version 4.7.0 + +- tracer: traces on stderr by default +- new: downloader one more public method +- fix: downloader use original URL for cache ID + +## Version 4.6.2 + +- fix: formatNumber/toNumber and decimals + +## Version 4.6.0 + +- new: proxy +- new: StringUtils formatNumber and toNumber +- fix: UI Desc (NPE) + +## Version 4.5.2 + +- Serial: fix b64/not b64 error +- Serial: perf improvement +- Base64: perf improvement +- new: Proxy selector + +## Version 4.5.1 + +- Progress: fix deadlock in rare cases + +## Version 4.5.0 + +- Base64: allow access to streams +- Deprecated: do not use our on deprecated functions +- Serial: fix ZIP/noZIP error + +## Version 4.4.5 + +- Base64: allow access to not-zipped Base64 utilities +- Justify text: better handling of full text lines +- jDoc: improve +- IOUtils: new convenience method for reading a File into bytes + +## Version 4.4.4 + +- Java 1.6: fix bad dependency so it can compiles on 1.6 again +- TempFilesTest: fix test +- Serial: fix for some constructors +- Serial: better default choice for ZIP/noZIP content + +## Version 4.4.3 + +- Test assertions: fix files/dir content comparison code + +## Version 4.4.2 + +- Test assertions: can now compare files/dir content + +## Version 4.4.1 + +- Image: fix undocumented exception on save images +- TempFiles: crash early on error + +## Version 4.4.0 + +- Text justification: now supports bullet lists and HR lines +- Text justification: fix a bug with dashes (-) and a crash +- Image to text converion fixes +- Serial: now supports anonymous inner classes +- Test: now allow an Exception argument to the "fail(..)" command +- Downloader: add an optional cache +- Cache: auto-clean when saving +- Bridge: fix a NPE when tracing +- New: justify, img2aa and bridge tools (see package Main) + + +## Version 4.3.0 + +- New: IOUtils.Unzip() +- TestCase: better message for lists comparisons + +## Version 4.2.1 + +- Fix small bug in Downloader + +## Version 4.2.0 + +- New getLanguage() in TransBundle + +## Version 4.1.0 + +- New TempFiles (Image.java now uses it instead of memory) +- Auto cache cleaning + better errors in ImageUtilsAndroid +- New String justification options + +## Version 4.0.1 + +- Android compatibility (see configure.sh --android=yes) + +## Version 4.0.0 + +- Deplace all dependencies on java.awt into its own package (ui) + +## Version 3.1.6 + +- Fix Serialiser issue with custom objects and String in a custom object +- Fix Progress/ProgressBar synchronisation issues +- Fix Bridge default maxPrintSize parameter + +## Version 3.1.5 + +- Fix Cache with no-parent file +- Fix Progress (Error <> RuntimeException) + +## Version 3.1.4 + +- Fix error handling for tracers in Server + +## Version 3.1.3 + +- Fix ImageUtils.fromStream with non-resetable streams + +## Version 3.1.2 + +- Fix Server regarding the client version passed to the handler +- Improve ServerBridge options + +## Version 3.1.1 + +- Some fixes and trace handling changes in ServerBridge +- Some fixes in Import/Export (objects serialisation) + +## Version 3.1.0 + +- New ServerBridge (including tests) + +## Version 3.0.0 + +- jDoc +- Fix bugs in Server (it was not possible to send objects back to client) +- Improve code in Server (including tests), breaks API +- Remove some deprecated things + +## Version 2.2.3 + +- Fix in readSmallStream +- Change traces handling + +## Version 2.2.2 + +- New method in Cache: manually delete items + +## Version 2.2.1 + +- Small fixes, especially in Progress + +## Version 2.2.0 + +- New classes: + - Downloader: download URL from recalcitrant websites + - Cache: manage a local cache + +## Version 2.1.0 + +- Better IOUtils + +## Version 2.0.0 + +- API change + - IOUtils is now split between itself and ImageUtils -- some changes required in dependant projects + - Some slight renaming in StringUtils/IOUtils/ImageUtils + +- New class ImageText + - To create ASCII art + +## Version 1.6.3 + +- Version.java + - Fix toString issues + test + update scripts + +## Version 1.6.2 + +- Version.java + - Now supports "tag" on the versions (i.e., 0.0.4-niki1 -> tag is "niki", tagVersion is 1) + +## Version 1.6.1 + +- Serialisation utilities + - Now supports enums and BufferedImages + +## Version 1.6.0 + +- Serialisation utilities + - Server class to send/receive objects via network easily + - Serialiser now supports Arrays + fixes + +## Version 1.5.1 + +- Serialisation utilities + - SerialUtils is now public and can be used to dynamically create an Object + - The Importer is now easier to use + +## Version 1.5.0 + +- Bundles: change in Bundles and meta data + - The meta data is more complete now, but it breaks compatibility with both Bundles and @Meta + - A description can now be added to a bundle item in the graphical editor as a tooltip + +- Serialisation utilities + - A new set of utilities to quickly serialise objects + +## Version 1.4.3 + +- Bugfix: unhtml + - Also replace non-breakable spaces by normal spaces + +## Version 1.4.2 + +- Bugfix: Deltree + - Deltree was not OK for files... + +## Version 1.4.1 + +- Progress + - Better handling of min==max case + - New methods .done() and .add(int step) + +## Version 1.4.0 + +- R/W Bundles + - Bundle is now Read/Write + +- Bundle Configuration + - New UI controls to configure the Bundles graphically + +## Version 1.3.6 + +- Fix for Java 1.6 compat + - Java 1.6 cannot compile it due to variables with ambigous names (which + - Java 1.8 can identify) + +## Version 1.3.5 + +- Improve ProgressBar UI + - It now shows all the progression bars of the different steps of progression at the same time + +## Version 1.3.4 + +- Improve TestCase error reporting + - We know display the full stack trace even for AssertionErrors + +- Extends Version + - ...with new methods: isOlderThan(Version) and isNewerThan(Version) + +## Version 1.3.3 + +- New Version class + - Which can parse versions from the running program + +## Version 1.2.3 + +- Add openResource and getVersion in IOUtils + - The file VERSION is supposed to exist + +- Give more informartion on AssertErrors + - The TestCase were not always helpful in case of AssertExceptions; they now print the stacktrace (they only used to do it for non-assert exceptions) + +- Fix configure.sh + - The VERSION file was not added, the Main method was not the correct one (so it was not producing working runnable JAR, yet it stated so) + +## Version 1.2.2 + +- Fix bug in Bundle regarding \t handling + - ...tests should be written (later) + +## Version 1.2.1 + +- New drawEllipse3D method + - ...in UIUtils + +## Version 1.1.1 + +- Add UI component for Progress + - Still a WIP, it only show the current progress bar, still not the children bars (it's planned) + +## Version 1.1.0 + +- Add progress reporting, move to ui package + - A new progress reporting system (and tests) in the new ui package (some other classes have been moved into ui, too: WrapLayout and UIUtils) + +## Version 1.0.0 + +- Add WrapLayout and UIUtils + - A FlowLayout that automatically wrap to the next line (from existing code found on internet) and a method to set a fake-native look & feel + +## Version 0.9.7 + +- Improve toImage and allow non-resetable InputStreams + - ...though they are then automatically saved onto disk then re-opened, then the file is deleted at the end of the process -- bad perfs + - Worse, it does it even if no EXIF metadata are present (because it cannot know that before reading the Stream, and cannot save a partially, non-resetable Stream to disk) + +- Reoarganize some methods from String to IO + +## Version 0.9.6 + +- New test system + - Now some unit tests have been added, as well as the support classes + +## Version 0.9.5 + +- Resource bundle bug + - UTF-8 strings were sometimes wrangled + - It is fixed by using a Bundle#Control, whih sadly is only available in Java 1.6+ + +## Version 0.9.4 + +- Compatibility bug + - Again... because of some useless imports made there for a wrong jDoc comment + +## Version 0.9.3 + +- Compatibility bug + - The library did not work with JDK versions prior to 1.8 because of a dependency on Base64 + - A new (public domain) class was used instead, which is compatible with Java 1.5 this time + +## Version 0.9.2 + +- Initial version + - ...on GIT + diff --git a/configure.sh b/configure.sh new file mode 100755 index 0000000..4256eb3 --- /dev/null +++ b/configure.sh @@ -0,0 +1,80 @@ +#!/bin/sh + +# default: +PREFIX=/usr/local +PROGS="java javac jar" + +UI=be/nikiroo/utils/ui/test/TestUI +ANDOIRD= + +valid=true +while [ "$*" != "" ]; do + key=`echo "$1" | cut -f1 -d=` + val=`echo "$1" | cut -f2 -d=` + case "$key" in + --help) # This help message + echo The following arguments can be used: + cat "$0" | grep '^\s*--' | grep '#' | while read ln; do + cmd=`echo "$ln" | cut -f1 -d')'` + msg=`echo "$ln" | cut -f2 -d'#'` + echo " $cmd$msg" + done + ;; + --prefix) #=PATH Change the prefix to the given path + PREFIX="$val" + ;; + --ui) #=no Disable UI (Swing/AWT) support + [ "$val" = no -o "$val" = false ] && UI= && JUI= + if [ "$val" = yes -o "$val" = true ]; then + UI=be/nikiroo/utils/ui/test/TestUI + fi + ;; + --android) #=yes Enable Android UI support + [ "$val" = no -o "$val" = false ] && ANDROID= && JANDROID= + if [ "$val" = yes -o "$val" = true ]; then + ANDROID=be/nikiroo/utils/android/test/TestAndroid + fi + ;; + *) + echo "Unsupported parameter: '$1'" >&2 + valid=false + ;; + esac + shift +done + +[ $valid = false ] && exit 1 + +MESS="A required program cannot be found:" +for prog in $PROGS; do + out="`whereis -b "$prog" 2>/dev/null`" + if [ "$out" = "$prog:" ]; then + echo "$MESS $prog" >&2 + valid=false + fi +done + +[ $valid = false ] && exit 2 + +if [ "`whereis tput`" = "tput:" ]; then + ok='"[ ok ]"'; + ko='"[ !! ]"'; + cols=80; +else + ok='"`tput bold`[`tput setf 2` OK `tput init``tput bold`]`tput init`"'; + ko='"`tput bold`[`tput setf 4` !! `tput init``tput bold`]`tput init`"'; + cols='"`tput cols`"'; +fi; + + +echo "MAIN = be/nikiroo/utils/test_code/Test" > Makefile +echo "MORE = $UI $ANDROID" >> Makefile +echo "TEST = be/nikiroo/utils/test_code/Test" >> Makefile +echo "TEST_PARAMS = $cols $ok $ko" >> Makefile +echo "NAME = nikiroo-utils" >> Makefile +echo "PREFIX = $PREFIX" >> Makefile +echo "JAR_FLAGS += -C bin/ be -C bin/ org -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile +echo "SJAR_FLAGS += -C src/ org -C src/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile + +cat Makefile.base >> Makefile + diff --git a/export.sh b/export.sh new file mode 100755 index 0000000..c99ae22 --- /dev/null +++ b/export.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +# Export script +# +# Version: +# - 1.1.1: use the new sjar command to make sources +# - 1.1.0: allow multiple targets +# - 1.0.0: add a version comment + +cd "`dirname "$0"`" + +if [ "$1" = "" ]; then + echo "You need to specify where to export it" >&2 + exit 1 +fi + +LIBNAME="`cat configure.sh | grep '^echo "NAME = ' | cut -d'"' -f2 | cut -d= -f2`" +LIBNAME="`echo $LIBNAME`" + +make mrpropre +./configure.sh && make && make sjar +if [ $? = 0 ]; then + while [ "$1" != "" ]; do + mkdir -p "$1"/libs/ + cp "$LIBNAME"-`cat VERSION`-sources.jar "$1"/libs/ + cp "$LIBNAME".jar "$1"/libs/ + shift + done +fi + diff --git a/img2aa b/img2aa new file mode 100755 index 0000000..8e5db09 --- /dev/null +++ b/img2aa @@ -0,0 +1,19 @@ +#!/bin/sh +NAME=nikiroo-utils.jar + +jar="$NAME" +if [ ! -e "$jar" ]; then + jar="`dirname "$0"`/$NAME" +fi + +if [ ! -e "$jar" ]; then + jar="`whereis "$NAME" | sed 's: :\n:g' | grep "$NAME" | head -n1`" +fi + +if [ ! -e "$jar" ]; then + echo "$NAME not found." >&2 + exit 1 +fi + +exec java -cp "$jar" be.nikiroo.utils.main.img2aa "$@" + diff --git a/justify b/justify new file mode 100755 index 0000000..8d94a60 --- /dev/null +++ b/justify @@ -0,0 +1,19 @@ +#!/bin/sh +NAME=nikiroo-utils.jar + +jar="$NAME" +if [ ! -e "$jar" ]; then + jar="`dirname "$0"`/$NAME" +fi + +if [ ! -e "$jar" ]; then + jar="`whereis "$NAME" | sed 's: :\n:g' | grep "$NAME" | head -n1`" +fi + +if [ ! -e "$jar" ]; then + echo "$NAME not found." >&2 + exit 1 +fi + +exec java -cp "$jar" be.nikiroo.utils.main.justify "$@" + diff --git a/libs/WrapLayout.java b/libs/WrapLayout.java new file mode 100644 index 0000000..da03c2f --- /dev/null +++ b/libs/WrapLayout.java @@ -0,0 +1,205 @@ +package be.nikiroo.utils; + +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Insets; + +import javax.swing.JScrollPane; +import javax.swing.SwingUtilities; + +/** + * FlowLayout subclass that fully supports wrapping of components. + * + * @author https://tips4java.wordpress.com/2008/11/06/wrap-layout/ + */ +public class WrapLayout extends FlowLayout { + private static final long serialVersionUID = 1L; + + /** + * Constructs a new WrapLayout with a left alignment and a + * default 5-unit horizontal and vertical gap. + */ + public WrapLayout() { + super(); + } + + /** + * Constructs a new FlowLayout with the specified alignment and + * a default 5-unit horizontal and vertical gap. The value of the alignment + * argument must be one of WrapLayout, WrapLayout, + * or WrapLayout. + * + * @param align + * the alignment value + */ + public WrapLayout(int align) { + super(align); + } + + /** + * Creates a new flow layout manager with the indicated alignment and the + * indicated horizontal and vertical gaps. + *

+ * The value of the alignment argument must be one of + * WrapLayout, WrapLayout, or + * WrapLayout. + * + * @param align + * the alignment value + * @param hgap + * the horizontal gap between components + * @param vgap + * the vertical gap between components + */ + public WrapLayout(int align, int hgap, int vgap) { + super(align, hgap, vgap); + } + + /** + * Returns the preferred dimensions for this layout given the visible + * components in the specified target container. + * + * @param target + * the component which needs to be laid out + * @return the preferred dimensions to lay out the subcomponents of the + * specified container + */ + @Override + public Dimension preferredLayoutSize(Container target) { + return layoutSize(target, true); + } + + /** + * Returns the minimum dimensions needed to layout the visible + * components contained in the specified target container. + * + * @param target + * the component which needs to be laid out + * @return the minimum dimensions to lay out the subcomponents of the + * specified container + */ + @Override + public Dimension minimumLayoutSize(Container target) { + Dimension minimum = layoutSize(target, false); + minimum.width -= (getHgap() + 1); + return minimum; + } + + /** + * Returns the minimum or preferred dimension needed to layout the target + * container. + * + * @param target + * target to get layout size for + * @param preferred + * should preferred size be calculated + * @return the dimension to layout the target container + */ + private Dimension layoutSize(Container target, boolean preferred) { + synchronized (target.getTreeLock()) { + // Each row must fit with the width allocated to the containter. + // When the container width = 0, the preferred width of the + // container + // has not yet been calculated so lets ask for the maximum. + + int targetWidth = target.getSize().width; + Container container = target; + + while (container.getSize().width == 0 + && container.getParent() != null) { + container = container.getParent(); + } + + targetWidth = container.getSize().width; + + if (targetWidth == 0) + targetWidth = Integer.MAX_VALUE; + + int hgap = getHgap(); + int vgap = getVgap(); + Insets insets = target.getInsets(); + int horizontalInsetsAndGap = insets.left + insets.right + + (hgap * 2); + int maxWidth = targetWidth - horizontalInsetsAndGap; + + // Fit components into the allowed width + + Dimension dim = new Dimension(0, 0); + int rowWidth = 0; + int rowHeight = 0; + + int nmembers = target.getComponentCount(); + + for (int i = 0; i < nmembers; i++) { + Component m = target.getComponent(i); + + if (m.isVisible()) { + Dimension d = preferred ? m.getPreferredSize() : m + .getMinimumSize(); + + // Can't add the component to current row. Start a new + // row. + + if (rowWidth + d.width > maxWidth) { + addRow(dim, rowWidth, rowHeight); + rowWidth = 0; + rowHeight = 0; + } + + // Add a horizontal gap for all components after the + // first + + if (rowWidth != 0) { + rowWidth += hgap; + } + + rowWidth += d.width; + rowHeight = Math.max(rowHeight, d.height); + } + } + + addRow(dim, rowWidth, rowHeight); + + dim.width += horizontalInsetsAndGap; + dim.height += insets.top + insets.bottom + vgap * 2; + + // When using a scroll pane or the DecoratedLookAndFeel we need + // to + // make sure the preferred size is less than the size of the + // target containter so shrinking the container size works + // correctly. Removing the horizontal gap is an easy way to do + // this. + + Container scrollPane = SwingUtilities.getAncestorOfClass( + JScrollPane.class, target); + + if (scrollPane != null && target.isValid()) { + dim.width -= (hgap + 1); + } + + return dim; + } + } + + /* + * A new row has been completed. Use the dimensions of this row to update + * the preferred size for the container. + * + * @param dim update the width and height when appropriate + * + * @param rowWidth the width of the row to add + * + * @param rowHeight the height of the row to add + */ + private void addRow(Dimension dim, int rowWidth, int rowHeight) { + dim.width = Math.max(dim.width, rowWidth); + + if (dim.height > 0) { + dim.height += getVgap(); + } + + dim.height += rowHeight; + } +} \ No newline at end of file diff --git a/android/ImageUtilsAndroid.class b/libs/bin/be/nikiroo/utils/android/ImageUtilsAndroid.class similarity index 100% rename from android/ImageUtilsAndroid.class rename to libs/bin/be/nikiroo/utils/android/ImageUtilsAndroid.class diff --git a/android/test/TestAndroid.class b/libs/bin/be/nikiroo/utils/android/test/TestAndroid.class similarity index 100% rename from android/test/TestAndroid.class rename to libs/bin/be/nikiroo/utils/android/test/TestAndroid.class diff --git a/libs/licenses/unbescape_1.1.4_LICENSE.txt b/libs/licenses/unbescape_1.1.4_LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/libs/licenses/unbescape_1.1.4_LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/libs/unbescape-1.1.4-sources.jar b/libs/unbescape-1.1.4-sources.jar new file mode 100644 index 0000000..01ddb56 Binary files /dev/null and b/libs/unbescape-1.1.4-sources.jar differ diff --git a/Cache.java b/src/be/nikiroo/utils/Cache.java similarity index 100% rename from Cache.java rename to src/be/nikiroo/utils/Cache.java diff --git a/CacheMemory.java b/src/be/nikiroo/utils/CacheMemory.java similarity index 100% rename from CacheMemory.java rename to src/be/nikiroo/utils/CacheMemory.java diff --git a/CryptUtils.java b/src/be/nikiroo/utils/CryptUtils.java similarity index 100% rename from CryptUtils.java rename to src/be/nikiroo/utils/CryptUtils.java diff --git a/Downloader.java b/src/be/nikiroo/utils/Downloader.java similarity index 100% rename from Downloader.java rename to src/be/nikiroo/utils/Downloader.java diff --git a/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java similarity index 100% rename from IOUtils.java rename to src/be/nikiroo/utils/IOUtils.java diff --git a/Image.java b/src/be/nikiroo/utils/Image.java similarity index 100% rename from Image.java rename to src/be/nikiroo/utils/Image.java diff --git a/ImageUtils.java b/src/be/nikiroo/utils/ImageUtils.java similarity index 100% rename from ImageUtils.java rename to src/be/nikiroo/utils/ImageUtils.java diff --git a/MarkableFileInputStream.java b/src/be/nikiroo/utils/MarkableFileInputStream.java similarity index 100% rename from MarkableFileInputStream.java rename to src/be/nikiroo/utils/MarkableFileInputStream.java diff --git a/Progress.java b/src/be/nikiroo/utils/Progress.java similarity index 100% rename from Progress.java rename to src/be/nikiroo/utils/Progress.java diff --git a/Proxy.java b/src/be/nikiroo/utils/Proxy.java similarity index 100% rename from Proxy.java rename to src/be/nikiroo/utils/Proxy.java diff --git a/StringJustifier.java b/src/be/nikiroo/utils/StringJustifier.java similarity index 100% rename from StringJustifier.java rename to src/be/nikiroo/utils/StringJustifier.java diff --git a/StringUtils.java b/src/be/nikiroo/utils/StringUtils.java similarity index 100% rename from StringUtils.java rename to src/be/nikiroo/utils/StringUtils.java diff --git a/TempFiles.java b/src/be/nikiroo/utils/TempFiles.java similarity index 100% rename from TempFiles.java rename to src/be/nikiroo/utils/TempFiles.java diff --git a/TraceHandler.java b/src/be/nikiroo/utils/TraceHandler.java similarity index 100% rename from TraceHandler.java rename to src/be/nikiroo/utils/TraceHandler.java diff --git a/Version.java b/src/be/nikiroo/utils/Version.java similarity index 100% rename from Version.java rename to src/be/nikiroo/utils/Version.java diff --git a/android/ImageUtilsAndroid.java b/src/be/nikiroo/utils/android/ImageUtilsAndroid.java similarity index 100% rename from android/ImageUtilsAndroid.java rename to src/be/nikiroo/utils/android/ImageUtilsAndroid.java diff --git a/android/test/TestAndroid.java b/src/be/nikiroo/utils/android/test/TestAndroid.java similarity index 100% rename from android/test/TestAndroid.java rename to src/be/nikiroo/utils/android/test/TestAndroid.java diff --git a/compat/DefaultListModel6.java b/src/be/nikiroo/utils/compat/DefaultListModel6.java similarity index 100% rename from compat/DefaultListModel6.java rename to src/be/nikiroo/utils/compat/DefaultListModel6.java diff --git a/compat/JList6.java b/src/be/nikiroo/utils/compat/JList6.java similarity index 100% rename from compat/JList6.java rename to src/be/nikiroo/utils/compat/JList6.java diff --git a/compat/ListCellRenderer6.java b/src/be/nikiroo/utils/compat/ListCellRenderer6.java similarity index 100% rename from compat/ListCellRenderer6.java rename to src/be/nikiroo/utils/compat/ListCellRenderer6.java diff --git a/compat/ListModel6.java b/src/be/nikiroo/utils/compat/ListModel6.java similarity index 100% rename from compat/ListModel6.java rename to src/be/nikiroo/utils/compat/ListModel6.java diff --git a/main/bridge.java b/src/be/nikiroo/utils/main/bridge.java similarity index 100% rename from main/bridge.java rename to src/be/nikiroo/utils/main/bridge.java diff --git a/main/img2aa.java b/src/be/nikiroo/utils/main/img2aa.java similarity index 100% rename from main/img2aa.java rename to src/be/nikiroo/utils/main/img2aa.java diff --git a/main/justify.java b/src/be/nikiroo/utils/main/justify.java similarity index 100% rename from main/justify.java rename to src/be/nikiroo/utils/main/justify.java diff --git a/resources/Bundle.java b/src/be/nikiroo/utils/resources/Bundle.java similarity index 100% rename from resources/Bundle.java rename to src/be/nikiroo/utils/resources/Bundle.java diff --git a/resources/BundleHelper.java b/src/be/nikiroo/utils/resources/BundleHelper.java similarity index 100% rename from resources/BundleHelper.java rename to src/be/nikiroo/utils/resources/BundleHelper.java diff --git a/resources/Bundles.java b/src/be/nikiroo/utils/resources/Bundles.java similarity index 100% rename from resources/Bundles.java rename to src/be/nikiroo/utils/resources/Bundles.java diff --git a/resources/FixedResourceBundleControl.java b/src/be/nikiroo/utils/resources/FixedResourceBundleControl.java similarity index 100% rename from resources/FixedResourceBundleControl.java rename to src/be/nikiroo/utils/resources/FixedResourceBundleControl.java diff --git a/resources/Meta.java b/src/be/nikiroo/utils/resources/Meta.java similarity index 100% rename from resources/Meta.java rename to src/be/nikiroo/utils/resources/Meta.java diff --git a/resources/MetaInfo.java b/src/be/nikiroo/utils/resources/MetaInfo.java similarity index 100% rename from resources/MetaInfo.java rename to src/be/nikiroo/utils/resources/MetaInfo.java diff --git a/resources/TransBundle.java b/src/be/nikiroo/utils/resources/TransBundle.java similarity index 100% rename from resources/TransBundle.java rename to src/be/nikiroo/utils/resources/TransBundle.java diff --git a/resources/TransBundle_ResourceList.java b/src/be/nikiroo/utils/resources/TransBundle_ResourceList.java similarity index 100% rename from resources/TransBundle_ResourceList.java rename to src/be/nikiroo/utils/resources/TransBundle_ResourceList.java diff --git a/resources/package-info.java b/src/be/nikiroo/utils/resources/package-info.java similarity index 100% rename from resources/package-info.java rename to src/be/nikiroo/utils/resources/package-info.java diff --git a/serial/CustomSerializer.java b/src/be/nikiroo/utils/serial/CustomSerializer.java similarity index 100% rename from serial/CustomSerializer.java rename to src/be/nikiroo/utils/serial/CustomSerializer.java diff --git a/serial/Exporter.java b/src/be/nikiroo/utils/serial/Exporter.java similarity index 100% rename from serial/Exporter.java rename to src/be/nikiroo/utils/serial/Exporter.java diff --git a/serial/Importer.java b/src/be/nikiroo/utils/serial/Importer.java similarity index 100% rename from serial/Importer.java rename to src/be/nikiroo/utils/serial/Importer.java diff --git a/serial/SerialUtils.java b/src/be/nikiroo/utils/serial/SerialUtils.java similarity index 100% rename from serial/SerialUtils.java rename to src/be/nikiroo/utils/serial/SerialUtils.java diff --git a/serial/server/ConnectAction.java b/src/be/nikiroo/utils/serial/server/ConnectAction.java similarity index 100% rename from serial/server/ConnectAction.java rename to src/be/nikiroo/utils/serial/server/ConnectAction.java diff --git a/serial/server/ConnectActionClient.java b/src/be/nikiroo/utils/serial/server/ConnectActionClient.java similarity index 100% rename from serial/server/ConnectActionClient.java rename to src/be/nikiroo/utils/serial/server/ConnectActionClient.java diff --git a/serial/server/ConnectActionClientObject.java b/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java similarity index 100% rename from serial/server/ConnectActionClientObject.java rename to src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java diff --git a/serial/server/ConnectActionClientString.java b/src/be/nikiroo/utils/serial/server/ConnectActionClientString.java similarity index 100% rename from serial/server/ConnectActionClientString.java rename to src/be/nikiroo/utils/serial/server/ConnectActionClientString.java diff --git a/serial/server/ConnectActionServer.java b/src/be/nikiroo/utils/serial/server/ConnectActionServer.java similarity index 100% rename from serial/server/ConnectActionServer.java rename to src/be/nikiroo/utils/serial/server/ConnectActionServer.java diff --git a/serial/server/ConnectActionServerObject.java b/src/be/nikiroo/utils/serial/server/ConnectActionServerObject.java similarity index 100% rename from serial/server/ConnectActionServerObject.java rename to src/be/nikiroo/utils/serial/server/ConnectActionServerObject.java diff --git a/serial/server/ConnectActionServerString.java b/src/be/nikiroo/utils/serial/server/ConnectActionServerString.java similarity index 100% rename from serial/server/ConnectActionServerString.java rename to src/be/nikiroo/utils/serial/server/ConnectActionServerString.java diff --git a/serial/server/Server.java b/src/be/nikiroo/utils/serial/server/Server.java similarity index 100% rename from serial/server/Server.java rename to src/be/nikiroo/utils/serial/server/Server.java diff --git a/serial/server/ServerBridge.java b/src/be/nikiroo/utils/serial/server/ServerBridge.java similarity index 100% rename from serial/server/ServerBridge.java rename to src/be/nikiroo/utils/serial/server/ServerBridge.java diff --git a/serial/server/ServerObject.java b/src/be/nikiroo/utils/serial/server/ServerObject.java similarity index 100% rename from serial/server/ServerObject.java rename to src/be/nikiroo/utils/serial/server/ServerObject.java diff --git a/serial/server/ServerString.java b/src/be/nikiroo/utils/serial/server/ServerString.java similarity index 100% rename from serial/server/ServerString.java rename to src/be/nikiroo/utils/serial/server/ServerString.java diff --git a/streams/Base64.java b/src/be/nikiroo/utils/streams/Base64.java similarity index 100% rename from streams/Base64.java rename to src/be/nikiroo/utils/streams/Base64.java diff --git a/streams/Base64InputStream.java b/src/be/nikiroo/utils/streams/Base64InputStream.java similarity index 100% rename from streams/Base64InputStream.java rename to src/be/nikiroo/utils/streams/Base64InputStream.java diff --git a/streams/Base64OutputStream.java b/src/be/nikiroo/utils/streams/Base64OutputStream.java similarity index 100% rename from streams/Base64OutputStream.java rename to src/be/nikiroo/utils/streams/Base64OutputStream.java diff --git a/streams/BufferedInputStream.java b/src/be/nikiroo/utils/streams/BufferedInputStream.java similarity index 100% rename from streams/BufferedInputStream.java rename to src/be/nikiroo/utils/streams/BufferedInputStream.java diff --git a/streams/BufferedOutputStream.java b/src/be/nikiroo/utils/streams/BufferedOutputStream.java similarity index 100% rename from streams/BufferedOutputStream.java rename to src/be/nikiroo/utils/streams/BufferedOutputStream.java diff --git a/streams/MarkableFileInputStream.java b/src/be/nikiroo/utils/streams/MarkableFileInputStream.java similarity index 100% rename from streams/MarkableFileInputStream.java rename to src/be/nikiroo/utils/streams/MarkableFileInputStream.java diff --git a/streams/NextableInputStream.java b/src/be/nikiroo/utils/streams/NextableInputStream.java similarity index 100% rename from streams/NextableInputStream.java rename to src/be/nikiroo/utils/streams/NextableInputStream.java diff --git a/streams/NextableInputStreamStep.java b/src/be/nikiroo/utils/streams/NextableInputStreamStep.java similarity index 100% rename from streams/NextableInputStreamStep.java rename to src/be/nikiroo/utils/streams/NextableInputStreamStep.java diff --git a/streams/ReplaceInputStream.java b/src/be/nikiroo/utils/streams/ReplaceInputStream.java similarity index 100% rename from streams/ReplaceInputStream.java rename to src/be/nikiroo/utils/streams/ReplaceInputStream.java diff --git a/streams/ReplaceOutputStream.java b/src/be/nikiroo/utils/streams/ReplaceOutputStream.java similarity index 100% rename from streams/ReplaceOutputStream.java rename to src/be/nikiroo/utils/streams/ReplaceOutputStream.java diff --git a/streams/StreamUtils.java b/src/be/nikiroo/utils/streams/StreamUtils.java similarity index 100% rename from streams/StreamUtils.java rename to src/be/nikiroo/utils/streams/StreamUtils.java diff --git a/test/TestCase.java b/src/be/nikiroo/utils/test/TestCase.java similarity index 100% rename from test/TestCase.java rename to src/be/nikiroo/utils/test/TestCase.java diff --git a/test/TestLauncher.java b/src/be/nikiroo/utils/test/TestLauncher.java similarity index 100% rename from test/TestLauncher.java rename to src/be/nikiroo/utils/test/TestLauncher.java diff --git a/test_code/BufferedInputStreamTest.java b/src/be/nikiroo/utils/test_code/BufferedInputStreamTest.java similarity index 100% rename from test_code/BufferedInputStreamTest.java rename to src/be/nikiroo/utils/test_code/BufferedInputStreamTest.java diff --git a/test_code/BufferedOutputStreamTest.java b/src/be/nikiroo/utils/test_code/BufferedOutputStreamTest.java similarity index 100% rename from test_code/BufferedOutputStreamTest.java rename to src/be/nikiroo/utils/test_code/BufferedOutputStreamTest.java diff --git a/test_code/BundleTest.java b/src/be/nikiroo/utils/test_code/BundleTest.java similarity index 100% rename from test_code/BundleTest.java rename to src/be/nikiroo/utils/test_code/BundleTest.java diff --git a/test_code/CryptUtilsTest.java b/src/be/nikiroo/utils/test_code/CryptUtilsTest.java similarity index 100% rename from test_code/CryptUtilsTest.java rename to src/be/nikiroo/utils/test_code/CryptUtilsTest.java diff --git a/test_code/IOUtilsTest.java b/src/be/nikiroo/utils/test_code/IOUtilsTest.java similarity index 100% rename from test_code/IOUtilsTest.java rename to src/be/nikiroo/utils/test_code/IOUtilsTest.java diff --git a/test_code/NextableInputStreamTest.java b/src/be/nikiroo/utils/test_code/NextableInputStreamTest.java similarity index 100% rename from test_code/NextableInputStreamTest.java rename to src/be/nikiroo/utils/test_code/NextableInputStreamTest.java diff --git a/test_code/ProgressTest.java b/src/be/nikiroo/utils/test_code/ProgressTest.java similarity index 100% rename from test_code/ProgressTest.java rename to src/be/nikiroo/utils/test_code/ProgressTest.java diff --git a/test_code/ReplaceInputStreamTest.java b/src/be/nikiroo/utils/test_code/ReplaceInputStreamTest.java similarity index 100% rename from test_code/ReplaceInputStreamTest.java rename to src/be/nikiroo/utils/test_code/ReplaceInputStreamTest.java diff --git a/test_code/ReplaceOutputStreamTest.java b/src/be/nikiroo/utils/test_code/ReplaceOutputStreamTest.java similarity index 100% rename from test_code/ReplaceOutputStreamTest.java rename to src/be/nikiroo/utils/test_code/ReplaceOutputStreamTest.java diff --git a/test_code/SerialServerTest.java b/src/be/nikiroo/utils/test_code/SerialServerTest.java similarity index 100% rename from test_code/SerialServerTest.java rename to src/be/nikiroo/utils/test_code/SerialServerTest.java diff --git a/test_code/SerialTest.java b/src/be/nikiroo/utils/test_code/SerialTest.java similarity index 100% rename from test_code/SerialTest.java rename to src/be/nikiroo/utils/test_code/SerialTest.java diff --git a/test_code/StringUtilsTest.java b/src/be/nikiroo/utils/test_code/StringUtilsTest.java similarity index 100% rename from test_code/StringUtilsTest.java rename to src/be/nikiroo/utils/test_code/StringUtilsTest.java diff --git a/test_code/TempFilesTest.java b/src/be/nikiroo/utils/test_code/TempFilesTest.java similarity index 100% rename from test_code/TempFilesTest.java rename to src/be/nikiroo/utils/test_code/TempFilesTest.java diff --git a/test_code/Test.java b/src/be/nikiroo/utils/test_code/Test.java similarity index 100% rename from test_code/Test.java rename to src/be/nikiroo/utils/test_code/Test.java diff --git a/test_code/VersionTest.java b/src/be/nikiroo/utils/test_code/VersionTest.java similarity index 100% rename from test_code/VersionTest.java rename to src/be/nikiroo/utils/test_code/VersionTest.java diff --git a/test_code/bundle_test.properties b/src/be/nikiroo/utils/test_code/bundle_test.properties similarity index 100% rename from test_code/bundle_test.properties rename to src/be/nikiroo/utils/test_code/bundle_test.properties diff --git a/ui/BreadCrumbsBar.java b/src/be/nikiroo/utils/ui/BreadCrumbsBar.java similarity index 100% rename from ui/BreadCrumbsBar.java rename to src/be/nikiroo/utils/ui/BreadCrumbsBar.java diff --git a/ui/ConfigEditor.java b/src/be/nikiroo/utils/ui/ConfigEditor.java similarity index 100% rename from ui/ConfigEditor.java rename to src/be/nikiroo/utils/ui/ConfigEditor.java diff --git a/ui/ConfigItem.java b/src/be/nikiroo/utils/ui/ConfigItem.java similarity index 100% rename from ui/ConfigItem.java rename to src/be/nikiroo/utils/ui/ConfigItem.java diff --git a/ui/ConfigItemBase.java b/src/be/nikiroo/utils/ui/ConfigItemBase.java similarity index 100% rename from ui/ConfigItemBase.java rename to src/be/nikiroo/utils/ui/ConfigItemBase.java diff --git a/ui/ConfigItemBoolean.java b/src/be/nikiroo/utils/ui/ConfigItemBoolean.java similarity index 100% rename from ui/ConfigItemBoolean.java rename to src/be/nikiroo/utils/ui/ConfigItemBoolean.java diff --git a/ui/ConfigItemBrowse.java b/src/be/nikiroo/utils/ui/ConfigItemBrowse.java similarity index 100% rename from ui/ConfigItemBrowse.java rename to src/be/nikiroo/utils/ui/ConfigItemBrowse.java diff --git a/ui/ConfigItemColor.java b/src/be/nikiroo/utils/ui/ConfigItemColor.java similarity index 100% rename from ui/ConfigItemColor.java rename to src/be/nikiroo/utils/ui/ConfigItemColor.java diff --git a/ui/ConfigItemCombobox.java b/src/be/nikiroo/utils/ui/ConfigItemCombobox.java similarity index 100% rename from ui/ConfigItemCombobox.java rename to src/be/nikiroo/utils/ui/ConfigItemCombobox.java diff --git a/ui/ConfigItemInteger.java b/src/be/nikiroo/utils/ui/ConfigItemInteger.java similarity index 100% rename from ui/ConfigItemInteger.java rename to src/be/nikiroo/utils/ui/ConfigItemInteger.java diff --git a/ui/ConfigItemLocale.java b/src/be/nikiroo/utils/ui/ConfigItemLocale.java similarity index 100% rename from ui/ConfigItemLocale.java rename to src/be/nikiroo/utils/ui/ConfigItemLocale.java diff --git a/ui/ConfigItemPassword.java b/src/be/nikiroo/utils/ui/ConfigItemPassword.java similarity index 100% rename from ui/ConfigItemPassword.java rename to src/be/nikiroo/utils/ui/ConfigItemPassword.java diff --git a/ui/ConfigItemString.java b/src/be/nikiroo/utils/ui/ConfigItemString.java similarity index 100% rename from ui/ConfigItemString.java rename to src/be/nikiroo/utils/ui/ConfigItemString.java diff --git a/ui/DataNode.java b/src/be/nikiroo/utils/ui/DataNode.java similarity index 100% rename from ui/DataNode.java rename to src/be/nikiroo/utils/ui/DataNode.java diff --git a/ui/DataTree.java b/src/be/nikiroo/utils/ui/DataTree.java similarity index 100% rename from ui/DataTree.java rename to src/be/nikiroo/utils/ui/DataTree.java diff --git a/ui/DelayWorker.java b/src/be/nikiroo/utils/ui/DelayWorker.java similarity index 100% rename from ui/DelayWorker.java rename to src/be/nikiroo/utils/ui/DelayWorker.java diff --git a/ui/ImageTextAwt.java b/src/be/nikiroo/utils/ui/ImageTextAwt.java similarity index 100% rename from ui/ImageTextAwt.java rename to src/be/nikiroo/utils/ui/ImageTextAwt.java diff --git a/ui/ImageUtilsAwt.java b/src/be/nikiroo/utils/ui/ImageUtilsAwt.java similarity index 100% rename from ui/ImageUtilsAwt.java rename to src/be/nikiroo/utils/ui/ImageUtilsAwt.java diff --git a/ui/ListModel.java b/src/be/nikiroo/utils/ui/ListModel.java similarity index 100% rename from ui/ListModel.java rename to src/be/nikiroo/utils/ui/ListModel.java diff --git a/ui/ListenerPanel.java b/src/be/nikiroo/utils/ui/ListenerPanel.java similarity index 100% rename from ui/ListenerPanel.java rename to src/be/nikiroo/utils/ui/ListenerPanel.java diff --git a/ui/ProgressBar.java b/src/be/nikiroo/utils/ui/ProgressBar.java similarity index 100% rename from ui/ProgressBar.java rename to src/be/nikiroo/utils/ui/ProgressBar.java diff --git a/ui/TreeCellSpanner.java b/src/be/nikiroo/utils/ui/TreeCellSpanner.java similarity index 100% rename from ui/TreeCellSpanner.java rename to src/be/nikiroo/utils/ui/TreeCellSpanner.java diff --git a/ui/TreeModelTransformer.java b/src/be/nikiroo/utils/ui/TreeModelTransformer.java similarity index 100% rename from ui/TreeModelTransformer.java rename to src/be/nikiroo/utils/ui/TreeModelTransformer.java diff --git a/ui/TreeSnapshot.java b/src/be/nikiroo/utils/ui/TreeSnapshot.java similarity index 100% rename from ui/TreeSnapshot.java rename to src/be/nikiroo/utils/ui/TreeSnapshot.java diff --git a/ui/UIUtils.java b/src/be/nikiroo/utils/ui/UIUtils.java similarity index 100% rename from ui/UIUtils.java rename to src/be/nikiroo/utils/ui/UIUtils.java diff --git a/ui/WrapLayout.java b/src/be/nikiroo/utils/ui/WrapLayout.java similarity index 100% rename from ui/WrapLayout.java rename to src/be/nikiroo/utils/ui/WrapLayout.java diff --git a/ui/test/ProgressBarManualTest.java b/src/be/nikiroo/utils/ui/test/ProgressBarManualTest.java similarity index 100% rename from ui/test/ProgressBarManualTest.java rename to src/be/nikiroo/utils/ui/test/ProgressBarManualTest.java diff --git a/ui/test/TestUI.java b/src/be/nikiroo/utils/ui/test/TestUI.java similarity index 100% rename from ui/test/TestUI.java rename to src/be/nikiroo/utils/ui/test/TestUI.java