From: Niki Roo Date: Wed, 26 Feb 2020 14:28:16 +0000 (+0100) Subject: make it subtree X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=0fc81e6465aa9c1f1dfc19b532082220d609768a;p=nikiroo-utils.git make it subtree --- diff --git a/src/be/nikiroo/fanfix/DataLoader.java b/DataLoader.java similarity index 100% rename from src/be/nikiroo/fanfix/DataLoader.java rename to DataLoader.java diff --git a/src/be/nikiroo/fanfix/Instance.java b/Instance.java similarity index 100% rename from src/be/nikiroo/fanfix/Instance.java rename to Instance.java diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 9cecc1d..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - 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/src/be/nikiroo/fanfix/Main.java b/Main.java similarity index 100% rename from src/be/nikiroo/fanfix/Main.java rename to Main.java diff --git a/Makefile.base b/Makefile.base deleted file mode 100644 index 0d365b8..0000000 --- a/Makefile.base +++ /dev/null @@ -1,243 +0,0 @@ -# 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/README-fr.md b/README-fr.md deleted file mode 100644 index 777840a..0000000 --- a/README-fr.md +++ /dev/null @@ -1,157 +0,0 @@ -[English](README.md) Français - -# Fanfix -Fanfix est un petit programme Java qui peut télécharger des histoires sur internet et les afficher hors ligne. - -## Synopsis - -- ```fanfix``` --import [*URL*] -- ```fanfix``` --export [*id*] [*output_type*] [*target*] -- ```fanfix``` --convert [*URL*] [*output_type*] [*target*] (+info) -- ```fanfix``` --read [*id*] ([*chapter number*]) -- ```fanfix``` --read-url [*URL*] ([*chapter number*]) -- ```fanfix``` --search -- ```fanfix``` --search [*where*] [*keywords*] (page [*page*]) (item [*item*]) -- ```fanfix``` --search-tag -- ```fanfix``` --search-tag [*index 1*]... (page [*page*]) (item [*item*]) -- ```fanfix``` --list -- ```fanfix``` --set-reader [*GUI* | *TUI* | *CLI*] -- ```fanfix``` --server [*key*] [*port*] -- ```fanfix``` --stop-server [*key*] [*port*] -- ```fanfix``` --remote [*key*] [*host*] [*port*] -- ```fanfix``` --help - -## Description - -(Si vous voulez juste voir les derniers changements, vous pouvez regarder le [Changelog](changelog-fr.md) -- remarquez que le programme affiche le changelog si une version plus récente est détectée depuis la version 1.4.0.) - -(Il y a aussi une [TODO list](TODO.md) sur le site parlant du futur du programme.) - -![Main GUI](screenshots/fanfix-1.3.2.png?raw=true "Main GUI") - -Une gallerie de screenshots est disponible [ici](screenshots/README-fr.md). - -Le fonctionnement du programme est assez simple : il converti une URL venant d'un site supporté en un fichier .epub pour les histoires ou .cbz pour les comics (d'autres options d'enregistrement sont disponibles, comme du texte simple, du HTML...) - -Pour vous aider à organiser vos histoires, il peut aussi servir de bibliothèque locale vous permettant : - -- d'importer une histoire depuis son URL (ou depuis un fichier) -- d'exporter une histoire dans un des formats supportés vers un fichier -- d'afficher une histoire en mode texte -- d'afficher une histoire en mode GUI **nativement** ou **en appelant un programme natif pour lire le fichier** (potentiellement converti en HTML avant, pour que n'importe quel navigateur web puisse l'afficher) - -### Sites supportés - -Pour le moment, les sites suivants sont supportés : - -- http://FimFiction.net/ : fanfictions dévouées à la série My Little Pony -- http://Fanfiction.net/ : fanfictions venant d'une multitude d'univers différents, depuis les shows télévisés aux livres en passant par les jeux-vidéos -- http://mangafox.me/ : un site répertoriant une quantité non négligeable de mangas -- https://e621.net/ : un site Furry proposant des comics, y compris de MLP -- https://sofurry.com/ : même chose, mais orienté sur les histoires plutôt que les images -- https://e-hentai.org/ : support ajouté sur demande : n'hésitez pas à demander un site ! -- http://mangas-lecture-en-ligne.fr/ : un site proposant beaucoup de mangas, en français - -### Types de fichiers supportés - -Nous supportons les types de fichiers suivants (aussi bien en entrée qu'en sortie) : - -- epub : les fichiers .epub créés avec Fanfix (nous ne supportons pas les autres fichiers .epub, du moins pour le moment) -- text : les histoires enregistrées en texte (.txt), avec quelques règles spécifiques : - - le titre doit être sur la première ligne - - l'auteur (précédé de rien, ```Par ```, ```De ``` ou ```©```) doit être sur la deuxième ligne, optionnellement suivi de la date de publication entre parenthèses (i.e., ```Par Quelqu'un (3 octobre 1998)```) - - les chapitres doivent être déclarés avec ```Chapitre x``` ou ```Chapitre x: NOM DU CHAPTITRE```, où ```x``` est le numéro du chapitre - - une description de l'histoire doit être donnée en tant que chaptire 0 - - une image de couverture peut être présente avec le même nom de fichier que l'histoire, mais une extension .png, .jpeg ou .jpg -- info_text : fort proche du format texte, mais avec un fichier .info accompagnant l'histoire pour y enregistrer quelques metadata (le fichier de metadata est supposé être créé par Fanfix, ou être compatible avec) -- cbz : les fichiers .cbz (une collection d'images zipées), de préférence créés avec Fanfix (même si les autres .cbz sont aussi supportés, mais sans la majorité des metadata de Fanfix dans ce cas) -- html : les fichiers HTML que vous pouvez ouvrir avec n'importe quel navigateur ; remarquez que Fanfix créera un répertoire pour y mettre les fichiers nécessaires, dont un fichier ```index.html``` pour afficher le tout -- nous ne supportons en entrée que les fichiers HTML créés par Fanfix - -### Plateformes supportées - -Toute plateforme supportant Java 1.6 devrait suffire. - -Le programme a été testé sur Linux (Debian, Slackware et Ubuntu), MacOS X et Windows pour le moment, mais n'hésitez pas à nous informer si vous l'essayez sur un autre système. - -Si vous avez des difficultés pour le compiler avec une version supportée de Java (1.6+), contactez-nous. - -## Options - -Vous pouvez démarrer le programme en mode graphique (comme dans le screenshot en haut) : - -- ```java -jar fanfix.jar``` -- ```fanfix``` (si vous avez utilisé *make install*) - -Les arguments suivants sont aussi supportés : - -- ```--import [URL]```: importer une histoire dans la librairie -- ```--export [id] [output_type] [target]```: exporter l'histoire "id" vers le fichier donné -- ```--convert [URL] [output_type] [target] (+info)```: convertir l'histoire vers le fichier donné, et forcer l'ajout d'un fichier .info si +info est utilisé -- ```--read [id] ([chapter number])```: afficher l'histoire "id" -- ```--read-url [URL] ([chapter number])```: convertir l'histoire et la lire à la volée, sans la sauver -- ```--search```: liste les sites supportés (```where```) -- ```--search [where] [keywords] (page [page]) (item [item])```: lance une recherche et affiche les résultats de la page ```page``` (page 1 par défaut), et de l'item ```item``` spécifique si demandé -- ```--tag [where]```: liste tous les tags supportés par ce site web -- ```--tag [index 1]... (page [page]) (item [item])```: affine la recherche, tag par tag, et affiche si besoin les sous-tags, les histoires ou les infos précises de l'histoire demandée -- ```--list```: lister les histoires presentes dans la librairie et leurs IDs -- ```--set-reader [reader type]```: changer le type de lecteur pour la commande en cours sur CLI, TUI ou GUI -- ```--server [key] [port]```: démarrer un serveur d'histoires sur ce port -- ```--stop-server [key] [port]```: arrêter le serveur distant sur ce port (key doit avoir la même valeur) -- ```--remote [key] [host] [port]```: contacter ce server au lieu de la librairie habituelle (key doit avoir la même valeur) -- ```--help```: afficher la liste des options disponibles -- ```--version```: retourne la version du programme - -### Environnement - -Certaines variables d'environnement sont reconnues par le programme : - -- ```LANG=en```: forcer la langue du programme en anglais -- ```CONFIG_DIR=$HOME/.fanfix```: utilise ce répertoire pour les fichiers de configuration du programme (et copie les fichiers de configuration par défaut si besoin) -- ```NOUTF=1```: essaye d'utiliser des caractères non-unicode quand possible (cela peut avoir un impact sur les fichiers générés, pas uniquement sur les messages à l'utilisateur) -- ```DEBUG=1```: force l'option ```DEBUG=true``` du fichier de configuration (pour afficher plus d'information en cas d'erreur) - -## Compilation - -```./configure.sh && make``` - -Vous pouvez aussi importer les sources java dans, par exemple, [Eclipse](https://eclipse.org/), et faire un JAR exécutable depuis celui-ci. - -Quelques tests unitaires sont disponibles : - -```./configure.sh && make build test run-test``` - -Si vous faites tourner les tests unitaires, sachez que certains fichiers flags peuvent les impacter: - -- ```test/VERBOSE``` : active le mode verbeux pour les erreurs -- ```test/OFFLINE``` : ne permet pas au programme de télécharger des données -- ```test/URLS``` : permet au programme de tester des URLs -- ```test/FORCE_REFRESH```: force le nettoyage du cache - -Notez que le répertoire ```test/CACHE``` peut rester en place; il contient tous les fichiers téléchargés au moins une fois depuis le réseau par les tests unitaires (si vous autorisez les tests d'URLs, lancez les tests au moins une fois pour peupler le CACHE, puis activez le mode OFFLINE, ça marchera toujours). - -Les fichiers de test seront: - -- ```test/*.url``` : des URLs à télécharger en fichier texte (le contenu du fichier est l'URL) -- ```test/*.story```: des histoires en mode texte (le contenu du fichier est l'histoire) - -### Librairies dépendantes (incluses) - -Nécessaires : - -- ```libs/nikiroo-utils-sources.jar```: quelques utilitaires partagés -- [```libs/unbescape-sources.jar```](https://github.com/unbescape/unbescape): une librairie sympathique pour convertir du texte depuis/vers beaucoup de formats ; utilisée ici pour la partie HTML -- [```libs/jsoup-sources.jar```](https://jsoup.org/): une libraririe pour parser du HTML - -Optionnelles : - -- [```libs/jexer-sources.jar```](https://github.com/klamonte/jexer): une petite librairie qui offre des widgets en mode TUI -- [```pandoc```](http://pandoc.org/): pour générer les man pages depuis les fichiers README - -Rien d'autre, si ce n'est Java 1.6+. - -À noter : ```make libs``` exporte ces librairies dans le répertoire src/. - -## Auteur - -Fanfix a été écrit par Niki Roo - diff --git a/README.md b/README.md deleted file mode 100644 index 43a0f40..0000000 --- a/README.md +++ /dev/null @@ -1,158 +0,0 @@ -English [Français](README-fr.md) - -# Fanfix -Fanfix is a small Java program that can download stories from some supported websites and render them offline. - -## Synopsis - -- ```fanfix``` --import [*URL*] -- ```fanfix``` --export [*id*] [*output_type*] [*target*] -- ```fanfix``` --convert [*URL*] [*output_type*] [*target*] (+info) -- ```fanfix``` --read [*id*] ([*chapter number*]) -- ```fanfix``` --read-url [*URL*] ([*chapter number*]) -- ```fanfix``` --search -- ```fanfix``` --search [*where*] [*keywords*] (page [*page*]) (item [*item*]) -- ```fanfix``` --search-tag -- ```fanfix``` --search-tag [*index 1*]... (page [*page*]) (item [*item*]) -- ```fanfix``` --list -- ```fanfix``` --set-reader [*GUI* | *TUI* | *CLI*] -- ```fanfix``` --server [*key*] [*port*] -- ```fanfix``` --stop-server [*key*] [*port*] -- ```fanfix``` --remote [*key*] [*host*] [*port*] -- ```fanfix``` --help - -## Description - -(If you are interested in the recent changes, please check the [Changelog](changelog.md) -- note that starting from version 1.4.0, the changelog is checked at startup.) - -(A [TODO list](TODO.md) is also available to know what is expected to come in the future.) - -![Main GUI](screenshots/fanfix-1.3.2.png?raw=true "Main GUI") - -A screenshots cgallery an be found [here](screenshots/README.md). - -It will convert from a (supported) URL to an .epub file for stories or a .cbz file for comics (a few other output types are also available, like Plain Text, LaTeX, HTML...). - -To help organize your stories, it can also work as a local library so you can: - -- Import a story from its URL (or just from a file) -- Export a story to a file (in any of the supported output types) -- Display a story from the local library in text format in the console -- Display a story from the local library graphically **natively** or **by calling a native program to handle it** (potentially converted into HTML before hand, so any browser can open it) - -### Supported websites - -Currently, the following websites are supported: - -- http://FimFiction.net/: fan fictions devoted to the My Little Pony show -- http://Fanfiction.net/: fan fictions of many, many different universes, from TV shows to novels to games -- http://mangafox.me/: a well filled repository of mangas, or, as their website states: most popular manga scanlations read online for free at mangafox, as well as a close-knit community to chat and make friends -- https://e621.net/: a Furry website supporting comics, including MLP -- https://sofurry.com/: same thing, but story-oriented -- https://e-hentai.org/: done upon request (so, feel free to ask for more websites!) -- http://mangas-lecture-en-ligne.fr/: a website offering a lot of mangas (in French) - -### Support file types - -We support a few file types for local story conversion (both as input and as output): - -- epub: .epub files created by this program (we do not support "all" .epub files, at least for now) -- text: local stories encoded in plain text format, with a few specific rules: - - the title must be on the first line - - the author (preceded by nothing, ```by ``` or ```©```) must be on the second line, possibly with the publication date in parenthesis (i.e., ```By Unknown (3rd October 1998)```) - - chapters must be declared with ```Chapter x``` or ```Chapter x: NAME OF THE CHAPTER```, where ```x``` is the chapter number - - a description of the story must be given as chapter number 0 - - a cover image may be present with the same filename as the story, but a .png, .jpeg or .jpg extension -- info_text: contains the same information as the text format, but with a companion .info file to store some metadata (the .info file is supposed to be created by Fanfix or compatible with it) -- cbz: .cbz (collection of images) files, preferably created with Fanfix (but any .cbz file is supported, though without most of Fanfix metadata, obviously) -- html: HTML files that you can open with any browser; note that it will create a directory structure with ```index.html``` as the main file -- we only support importing HTML files created by Fanfix - -### Supported platforms - -Any platform with at lest Java 1.6 on it should be ok. - -It has been tested on Linux (Debian, Slackware, Ubuntu), MacOS X and Windows for now, but feel free to inform us if you try it on another system. - -If you have any problems to compile it with a supported Java version (1.6+), please contact us. - -## Options - -You can start the program in GUI mode (as in the screenshot on top): - -- ```java -jar fanfix.jar``` -- ```fanfix``` (if you used *make install*) - -The following arguments are also allowed: - -- ```--import [URL]```: import the story at URL into the local library -- ```--export [id] [output_type] [target]```: export the story denoted by ID to the target file -- ```--convert [URL] [output_type] [target] (+info)```: convert the story at URL into target, and force-add the .info and cover if +info is passed -- ```--read [id] ([chapter number])```: read the given story denoted by ID from the library -- ```--read-url [URL] ([chapter number])```: convert on the fly and read the story at URL, without saving it -- ```--search```: list the supported websites (```where```) -- ```--search [where] [keywords] (page [page]) (item [item])```: search on the supported website and display the given results page of stories it found, or the story details if asked -- ```--tag [where]```: list all the tags supported by this website -- ```--tag [index 1]... (page [page]) (item [item])```: search for the given stories or subtags, tag by tag, and display information about a specific page of results or about a specific item if requested -- ```--list```: list the stories present in the library and their associated IDs -- ```--set-reader [reader type]```: set the reader type to CLI, TUI or GUI for this command -- ```--server [key] [port]```: start a story server on this port -- ```--stop-server [key] [port]```: stop the remote server running on this port (key must be set to the same value) -- ```--remote [key] [host] [port]```: contact this server instead of the usual library (key must be set to the same value) -- ```--help```: display the available options -- ```--version```: return the version of the program - -### Environment - -Some environment variables are recognized by the program: - -- ```LANG=en```: force the language to English -- ```CONFIG_DIR=$HOME/.fanfix```: use the given directory as a config directory (and copy the default configuration if needed) -- ```NOUTF=1```: try to fallback to non-unicode values when possible (can have an impact on the resulting files, not only on user messages) -- ```DEBUG=1```: force the ```DEBUG=true``` option of the configuration file (to show more information on errors) - -## Compilation - -```./configure.sh && make``` - -You can also import the java sources into, say, [Eclipse](https://eclipse.org/), and create a runnable JAR file from there. - -There are some unit tests you can run, too: - -```./configure.sh && make build test run-test``` - -If you run the unit tests, note that some flag files can impact them: - -- ```test/VERBOSE``` : enable verbose mode -- ```test/OFFLINE``` : to forbid any downloading -- ```test/URLS``` : to allow testing URLs -- ```test/FORCE_REFRESH```: to force a clear of the cache - -Note that ```test/CACHE``` can be kept, as it will contain all internet related files you need (if you allow URLs, run the test once which will populate the CACHE then go OFFLINE, it will still work). - -The test files will be: - -- ```test/*.url``` : URL to download in text format, content = URL -- ```test/*.story```: text mode story, content = story - - -### Dependant libraries (included) - -Required: - -- ```libs/nikiroo-utils-sources.jar```: some shared utility functions -- [```libs/unbescape-sources.jar```](https://github.com/unbescape/unbescape): a nice library to escape/unescape a lot of text formats; used here for HTML -- [```libs/jsoup-sources.jar```](https://jsoup.org/): a library to parse HTML - -Optional: - -- [```libs/jexer-sources.jar```](https://github.com/klamonte/jexer): a small library that offers TUI widgets -- [```pandoc```](http://pandoc.org/): to generate the man pages from the README files - -Nothing else but Java 1.6+. - -Note that calling ```make libs``` will export the libraries into the src/ directory. - -## Author - -Fanfix was written by Niki Roo - diff --git a/TODO.md b/TODO.md deleted file mode 100644 index af17b53..0000000 --- a/TODO.md +++ /dev/null @@ -1,95 +0,0 @@ -My current planning for Fanfix (but not everything appears on this list): - -- [ ] Support new websites - - [x] YiffStar - - [ ] [Two Kinds](http://twokinds.keenspot.com/) - - [ ] [Slightly damned](http://www.sdamned.com/) - - [x] New API on FimFiction.net (faster) - - [ ] Others? Any ideas? I'm open for requests - - [x] [e-Hentai](https://e-hentai.org/) requested - - [x] Find some FR comics/manga websites - - [ ] Find more FR thingies -- [ ] Support videos (anime)? -- [x] A GUI library - - [x] Make one - - [x] Make it run when no args passed - - [x] Fix the UI, it is ugly - - [x] Work on the UI thread is BAD - - [x] Allow export - - [x] Allow delete/refresh - - [x] Show a list of types - - [x] ..in the menu - - [x] ..as a screen view - - [x] options screen - - [x] support progress events - - [x] Real menus - - [x] Store the long lists in [A-B], [BA-BB], ... -- [ ] A TUI library - - [x] Choose an output (Jexer) - - [x] Implement it from --set-reader to the actual window - - [x] List the stories - - [x] Fix the UI layout - - [x] Status bar - - [x] Real menus - - [ ] Store the long lists in [A-B], [BA-BB], ... - - [x] Open a story in the reader and/or natively - - [ ] Update the screenshots - - [ ] Remember the current chapter and current read status of stories - - [ ] Support progress events - - [x] Add a properties pages - - [ ] Deal with comics - - [x] properties page - - [x] external launcher - - [ ] jexer sixels? -- [x] Network support - - [x] A server that can send the stories - - [x] A network implementation of the Library - - [x] Write access to the library - - [x] Access rights (a simple "key") - - [x] More tests, especially with the GUI - - [x] ..even more - - [x] support progress events -- [x] Check if it can work on Android - - [x] First checks: it should work, but with changes - - [x] Adapt work on images :( - - [x] Partial/Conditional compilation - - [x] APK export -- [ ] Android - - [x] Android support - - [x] Show current stories - - [x] Download new stories - - [ ] Sort stories by Source/Author - - [ ] Fix UI - - [ ] support progress events - - [x] give up and ask a friend... -- [ ] Translations - - [x] i18n system in place - - [x] Make use of it in text - - [x] Make use of it in gui - - [ ] Make use of it in tui - - [ ] Use it for all user output - - [x] French translation - - [x] French manual/readme -- [x] Install a mechanism to handle stories import/export progress update - - [x] Progress system - - [x] in support classes (import) - - [x] in output classes (export) -- [x] Version - - [x] Use a version number - - [x] Show it in UI - - [x] A check-update feature - - [x] ..translated -- [ ] Improve GUI library - - [x] Allow launching a custom application instead of Desktop.start - - [ ] Add the resume next to the cover icon if available (as an option) - - [ ] Add the resume in the Properties page (maybe a second tab?) -- [ ] Bugs - - [x] Fix "Redownload also reset the source" - - [x] Fix "Redownload remote does not show the new item before restart of client app" - - [x] Fix eHentai "content warning" access (see 455) - - [ ] Fix the configuration system (for new or changed options, new or changed languages) - - [x] remote import also download the file in cache, why? - - [x] import file in remote mode tries to import remote file!! - - [ ] import file does not find author in cbz with SUMMARY file - - [x] import file:// creates a tmp without auto-deletion in /tmp/fanfic-... - diff --git a/VERSION b/VERSION deleted file mode 100644 index 2468aa9..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.0.0-dev diff --git a/src/be/nikiroo/fanfix/VersionCheck.java b/VersionCheck.java similarity index 100% rename from src/be/nikiroo/fanfix/VersionCheck.java rename to VersionCheck.java diff --git a/src/be/nikiroo/fanfix/bundles/Config.java b/bundles/Config.java similarity index 100% rename from src/be/nikiroo/fanfix/bundles/Config.java rename to bundles/Config.java diff --git a/src/be/nikiroo/fanfix/bundles/ConfigBundle.java b/bundles/ConfigBundle.java similarity index 100% rename from src/be/nikiroo/fanfix/bundles/ConfigBundle.java rename to bundles/ConfigBundle.java diff --git a/src/be/nikiroo/fanfix/bundles/StringId.java b/bundles/StringId.java similarity index 100% rename from src/be/nikiroo/fanfix/bundles/StringId.java rename to bundles/StringId.java diff --git a/src/be/nikiroo/fanfix/bundles/StringIdBundle.java b/bundles/StringIdBundle.java similarity index 100% rename from src/be/nikiroo/fanfix/bundles/StringIdBundle.java rename to bundles/StringIdBundle.java diff --git a/src/be/nikiroo/fanfix/bundles/StringIdGui.java b/bundles/StringIdGui.java similarity index 100% rename from src/be/nikiroo/fanfix/bundles/StringIdGui.java rename to bundles/StringIdGui.java diff --git a/src/be/nikiroo/fanfix/bundles/StringIdGuiBundle.java b/bundles/StringIdGuiBundle.java similarity index 100% rename from src/be/nikiroo/fanfix/bundles/StringIdGuiBundle.java rename to bundles/StringIdGuiBundle.java diff --git a/src/be/nikiroo/fanfix/bundles/Target.java b/bundles/Target.java similarity index 100% rename from src/be/nikiroo/fanfix/bundles/Target.java rename to bundles/Target.java diff --git a/src/be/nikiroo/fanfix/bundles/UiConfig.java b/bundles/UiConfig.java similarity index 100% rename from src/be/nikiroo/fanfix/bundles/UiConfig.java rename to bundles/UiConfig.java diff --git a/src/be/nikiroo/fanfix/bundles/UiConfigBundle.java b/bundles/UiConfigBundle.java similarity index 100% rename from src/be/nikiroo/fanfix/bundles/UiConfigBundle.java rename to bundles/UiConfigBundle.java diff --git a/src/be/nikiroo/fanfix/bundles/UiConfigBundleDesc.java b/bundles/UiConfigBundleDesc.java similarity index 100% rename from src/be/nikiroo/fanfix/bundles/UiConfigBundleDesc.java rename to bundles/UiConfigBundleDesc.java diff --git a/src/be/nikiroo/fanfix/bundles/package-info.java b/bundles/package-info.java similarity index 100% rename from src/be/nikiroo/fanfix/bundles/package-info.java rename to bundles/package-info.java diff --git a/src/be/nikiroo/fanfix/bundles/resources_core.properties b/bundles/resources_core.properties similarity index 100% rename from src/be/nikiroo/fanfix/bundles/resources_core.properties rename to bundles/resources_core.properties diff --git a/src/be/nikiroo/fanfix/bundles/resources_core_fr.properties b/bundles/resources_core_fr.properties similarity index 100% rename from src/be/nikiroo/fanfix/bundles/resources_core_fr.properties rename to bundles/resources_core_fr.properties diff --git a/src/be/nikiroo/fanfix/bundles/resources_gui.properties b/bundles/resources_gui.properties similarity index 100% rename from src/be/nikiroo/fanfix/bundles/resources_gui.properties rename to bundles/resources_gui.properties diff --git a/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties b/bundles/resources_gui_fr.properties similarity index 100% rename from src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties rename to bundles/resources_gui_fr.properties diff --git a/src/be/nikiroo/fanfix/bundles/ui_description.properties b/bundles/ui_description.properties similarity index 100% rename from src/be/nikiroo/fanfix/bundles/ui_description.properties rename to bundles/ui_description.properties diff --git a/changelog-fr.md b/changelog-fr.md deleted file mode 100644 index 9409b81..0000000 --- a/changelog-fr.md +++ /dev/null @@ -1,260 +0,0 @@ -# Fanfix - -# Version 3.0.0 - -- new: maintenant compatible Android (voir [companion project](https://gitlab.com/Rayman22/fanfix-android)) -- new: recherche d'histoires (pas encore toutes les sources) -- new: support d'un proxy -- fix: support des CBZ contenant du texte -- fix: correction de DEBUG=0 -- fix: correction des histoires importées qui n'arrivent pas immédiatement à l'affichage -- gui: correction pour le focus -- gui: fix pour la couleur d'arrière plan -- gui: fix pour la navigation au clavier (haut et bas) -- gui: configuration beaucoup plus facile -- gui: peut maintenant télécharger toutes les histoires d'un groupe en cache en une fois -- MangaLEL: site web changé -- search: supporte MangaLEL -- search: supporte Fanfiction.net -- FimFictionAPI: correction d'une NPE -- remote: changement du chiffrement because Google -- remote: incompatible avec 2.x -- remote: moins bonnes perfs mais meilleure utilisation de la mémoire -- remote: le log inclus maintenant la date des évènements -- remote: le mot de passe se configure maintenant dans le fichier de configuration - -# Version 2.0.3 - -SoFurry: correction pour les histoires disponibles uniquement aux utilisateurs inscrits sur le site - -# Version 2.0.2 - -- i18n: changer la langue dans les options fonctionne aussi quand $LANG existe -- gui: traduction en français -- gui: ReDownloader ne supprime plus le livre original -- fix: corrections pour le visionneur interne -- fix: quelques corrections pour les traductions - -# Version 2.0.1 - -- core: un changement de titre/source/author n'était pas toujours visible en runtime -- gui: ne recharger les histoires que quand nécessaire - -# Version 2.0.0 - -- new: les sources peuvent contenir "/" (et utiliseront des sous-répertoires en fonction) -- gui: nouvelle page pour voir les propriétés d'une histoire -- gui: renommer les histoires, changer l'auteur -- gui: permet de lister les auteurs ou les sources en mode "tout" ou "listing" -- gui: lecteur intégré pour les histoires (texte et images) -- tui: fonctionne maintenant assez bien que pour être déclaré stable -- cli: permet maintenant de changer la source, le titre ou l'auteur -- remote: fix de setSourceCover (ce n'était pas vu par le client) -- remote: on peut maintenant importer un fichier local -- remote: meilleures perfs -- remote: incompatible avec 1.x -- fix: deadlock dans certains cas rares (nikiroo-utils) -- fix: le résumé n'était pas visibe dans certains cas -- fix: update de nikiroo-utils, meilleures perfs pour le remote -- fix: eHentai content warning - -# Version 1.8.1 - -- e621: les images étaient rangées à l'envers pour les recherches (/post/) -- e621: correction pour /post/search/ -- remote: correction de certains problèmes de timeout -- remote: amélioration des perfs -- fix: permettre les erreurs I/O pour les CBZ (ignore l'image) -- fix: corriger le répertoire des covers par défaut - -# Version 1.8.0 - -- FimfictionAPI: les noms des chapitres sont maintenant triés correctement -- e621: supporte aussi les recherches (/post/) -- remote: la cover est maintenant envoyée au client pour les imports -- MangaLel: support pour MangaLel - -# Version 1.7.1 - -- GUI: fichiers tmp supprimés trop vite en mode GUI -- fix: une histoire sans cover pouvait planter le programme -- ePub: erreur d'import pour un EPUB local sans cover - -# Version 1.7.0 - -- new: utilisation de jsoup pour parser le HTML (pas encore partout) -- update: mise à jour de nikiroo-utils -- android: compatibilité Android -- MangaFox: fix après une mise-à-jour du site -- MangaFox: l'ordre des tomes n'était pas toujours bon -- ePub: correction pour la compatibilité avec certains lecteurs ePub -- remote: correction pour l'utilisation du cache -- fix: TYPE= était parfois mauvais dans l'info-file -- fix: les guillemets n'étaient pas toujours bien ordonnés -- fix: amélioration du lanceur externe (lecteur natif) -- test: plus de tests unitaires -- doc: changelog disponible en français -- doc: man pages (en, fr) -- doc: SysV init script - -# Version 1.6.3 - -- fix: corrections de bugs -- remote: notification de l'état de progression des actions -- remote: possibilité d'envoyer des histoires volumineuses -- remote: détection de l'état du serveur -- remote: import and change source on server -- CBZ: meilleur support de certains CBZ (si SUMMARY ou URL est présent dans le CBZ) -- Library: correction pour les pages de couvertures qui n'étaient pas toujours effacées quand l'histoire l'était -- fix: correction pour certains cas où les images ne pouvaient pas être sauvées (quand on demande un jpeg mais que l'image n'est pas supportée, nous essayons maintenant ensuite en png) -- remote: correction pour certaines images de couvertures qui n'étaient pas trouvées (nikiroo-utils) -- remote: correction pour les images de couvertures qui n'étaient pas transmises - -## Version 1.6.2 - -- GUI: amélioration des barres de progression -- GUI: meilleures performances pour l'ouverture d'une histoire si le type de l'histoire est déjà le type demandé pour l'ouverture (CBZ -> CBZ ou HTML -> HTML par exemple) - -## Version 1.6.1 - -- GUI: nouvelle option (désactivée par défaut) pour afficher un élément par source (type) sur la page de démarrage au lieu de tous les éléments triés par source (type) -- fix: correction de la source (type) qui était remis à zéro après un re-téléchargement -- GUI: affichage du nombre d'images présentes au lieu du nombre de mots pour les histoires en images - -## Version 1.6.0 - -- TUI: un nouveau TUI (mode texte mais avec des fenêtres et des menus en texte) -- cette option n'est pas compilée par défaut (configure.sh) -- remote: un serveur pour offrir les histoires téléchargées sur le réseau -- remote: une Library qui reçoit les histoires depuis un serveur distant -- update: mise à jour de nikiroo-utils -- FimFiction: support for the new API -- new: mise à jour du cache (effacer le cache actuel serait une bonne idée) -- GUI: correction pour le déplacement d'une histoire qui n'est pas encore dans le cache - -## Version 1.5.3 - -- FimFiction: correction pour les tags dans les metadata et la gestion des chapitres pour certaines histoires - -## Version 1.5.2 - -- FimFiction: correction pour les tags dans les metadata - -## Version 1.5.1 - -- FimFiction: mise à jour pour supporter FimFiction 4 -- eHentai: correction pour quelques metadata qui n'étaient pas reprises - -## Version 1.5.0 - -- eHentai: nouveau site supporté sur demande (n'hésitez pas !) : e-hentai.org -- Library: amélioration des performances quand on récupère une histoire (la page de couverture n'est plus chargée quand cela n'est pas nécessaire) -- Library: correction pour les pages de couvertures qui n'étaient pas toujours effacées quand l'histoire l'était -- GUI: amélioration des performances pour l'affichage des histoires (la page de couverture est re-dimensionnée en cache) -- GUI: on peut maintenant éditer la source d'une histoire ("Déplacer vers...") - -## Version 1.4.2 - -- GUI: nouveau menu Options pour configurer le programme (très minimaliste pour le moment) -- new: gestion de la progression des actions plus fluide et avec plus de détails -- fix: meilleur support des couvertures pour les fichiers en cache - -## Version 1.4.1 - -- fix: correction de UpdateChecker qui affichait les nouveautés de TOUTES les versions du programme au lieu de se limiter aux versions plus récentes -- fix: correction de la gestion de certains sauts de ligne pour le support HTML (entre autres, FanFiction.net) -- GUI: les barres de progrès fonctionnent maintenant correctement -- update: mise à jour de nikiroo-utils pour récupérer toutes les étapes dans les barres de progrès -- ( --Fin des nouveautés de la version 1.4.1-- ) - -## Version 1.4.0 - -- new: sauvegarde du nombre de mots et de la date de création des histoires dans les fichiers mêmes -- GUI: nouvelle option pour afficher le nombre de mots plutôt que le nom de l'auteur sous le nom de l'histoire -- CBZ: la première page n'est plus doublée sur les sites n'offrant pas de page de couverture -- GUI: recherche de mise à jour (le programme cherche maintenant si une mise à jour est disponible pour en informer l'utilisateur) - -## Version 1.3.1 - -- GUI: on peut maintenant trier les histoires par auteur - -## Version 1.3.0 - -- YiffStar: le site YiffStar (SoFurry.com) est maintenant supporté -- new: support des sites avec login/password -- GUI: les URLs copiées (ctrl+C) sont maintenant directement proposées par défaut quand on importe une histoire -- GUI: la version est maintenant visible (elle peut aussi être récupérée avec --version) - -## Version 1.2.4 - -- GUI: nouvelle option re-télécharger -- GUI: les histoires sont maintenant triées (et ne changeront plus d'ordre après chaque re-téléchargement) -- fix: corrections sur l'utilisation des guillemets -- fix: corrections sur la détection des chapitres -- new: de nouveaux tests unitaires - -## Version 1.2.3 - -- HTML: les fichiers originaux (info_text) sont maintenant rajoutés quand on sauve -- HTML: support d'un nouveau type de fichiers à l'import: HTML (si fait par Fanfix) - -## Version 1.2.2 - -- GUI: nouvelle option "Sauver sous..." -- GUI: corrections (rafraîchissement des icônes) -- fix: correction de la gestion du caractère TAB dans les messages utilisateurs -- GUI: LocalReader supporte maintenant "--read" -- ePub: corrections sur le CSS - -## Version 1.2.1 - -- GUI: de nouvelles fonctions ont été ajoutées dans le menu -- GUI: popup avec un clic droit sur les histoires -- GUI: corrections, particulièrement pour LocalLibrary -- GUI: nouvelle icône (un rond vert) pour dénoter qu'une histoire est "cachée" (dans le LocalReader) - -## Version 1.2.0 - -- GUI: système de notification de la progression des actions -- ePub: changements sur le CSS -- new: de nouveaux tests unitaires -- GUI: de nouvelles fonctions ont été ajoutées dans le menu (supprimer, rafraîchir, un bouton exporter qui ne fonctionne pas encore) - -## Version 1.1.0 - -- CLI: nouveau système de notification de la progression des actions -- e621: correction pour les "pending pools" qui ne fonctionnaient pas avant -- new: système de tests unitaires ajouté (pas encore de tests propres à Fanfix) - -## Version 1.0.0 - -- GUI: état acceptable pour une 1.0.0 (l'export n'est encore disponible qu'en CLI) -- fix: bugs fixés -- GUI: (forte) amélioration -- new: niveau fonctionnel acceptable pour une 1.0.0 - -## Version 0.9.5 - -- fix: bugs fixés -- new: compatibilité avec WIN32 (testé sur Windows 10) - -## Version 0.9.4 - -- fix: (beaucoup de) bugs fixés -- new: amélioration des performances -- new: moins de fichiers cache utilisés -- GUI: amélioration (pas encore parfait, mais utilisable) - -## Version 0.9.3 - -- fix: (beaucoup de) bugs fixés -- GUI: première implémentation graphique (laide et buggée) - -## Version 0.9.2 - -- new: version minimum de la JVM : Java 1.6 (tous les JAR binaires ont été compilés en Java 1.6) -- fix: bugs fixés - -## Version 0.9.1 - -- version initiale - diff --git a/changelog.md b/changelog.md deleted file mode 100644 index f3033b5..0000000 --- a/changelog.md +++ /dev/null @@ -1,260 +0,0 @@ -# Fanfix - -# Version 3.0.0 - -- new: now Android-compatible (see [companion project](https://gitlab.com/Rayman22/fanfix-android)) -- new: story search (not all sources yet) -- new: proxy support -- fix: support hybrid CBZ (with text) -- fix: fix DEBUG=0 -- fix: fix imported stories that don't immediatly appear on screen -- gui: focus fix -- gui: bg colour fix -- gui: fix keyboard navigation support (up and down) -- gui: configuration is now much easier -- gui: can now prefetch to cache all the sories of a group at once -- MangaLEL: website has changed -- search: Fanfiction.net support -- search: MangaLEL support -- FimFictionAPI: fix NPE -- remote: encryption mode changed because Google -- remote: not compatible with 2.x -- remote: can now use password from config file -- remote: worse perfs but much better memory usage -- remote: log now includes the time of events - -# Version 2.0.3 - -SoFurry: fix for stories only available to registrated users - -# Version 2.0.2 - -- i18n: setting the language in the option panel now works even with $LANG set -- gui: translated into French -- gui: ReDownload does not delete the original book anymore -- gui: internal viewer fixes -- gui: some translation fixes - -# Version 2.0.1 - -- core: a change of title/source/author was not always visible at runtime -- gui: only reload the stoies when needed - -# Version 2.0.0 - -- new: sources can contain "/" (and will use subdirectories) -- gui: new Properties page for stories -- gui: rename stories, change author -- gui: allow "all" and "listing" modes for sources and authors -- gui: integrated viewer for stories (both text and images) -- tui: now working well enough to be considered stable -- cli: now allow changing the source, title and author -- remote: fix setSourceCover (was not seen by client) -- remote: can now import local files into a remote library -- remote: better perfs -- remote: not compatible with 1.x -- fix: deadlock in some rare cases (nikiroo-utils) -- fix: the resume was not visible in some cases -- fix: update nikiroo-utils, better remote perfs -- fix: eHentai content warning - -# Version 1.8.1 - -- e621: the images were stored in reverse order for searches (/post/) -- e621: fix for /post/search/ -- remote: fix some timeout issues -- remote: improve perfs -- fix: allow I/O errors on CBZ files (skip image) -- fix: fix the default covers directory - -# Version 1.8.0 - -- FimfictionAPI: chapter names are now correctly ordered -- e621: now supports searches (/post/) -- remote: cover is now sent over the network for imported stories -- MangaLel: new support for MangaLel - -# Version 1.7.1 - -- GUI: tmp files deleted too soon in GUI mode -- fix: unavailable cover could cause a crash -- ePub: local EPUB import error when no cover - -# Version 1.7.0 - -- new: use jsoup for parsing HTML (not everywhere yet) -- update nikiroo-utils -- android: Android compatibility -- MangaFox: fix after website update -- MangaFox: tomes order was not always correct -- ePub: fix for compatibility with some ePub viewers -- remote: cache usage fix -- fix: TYPE= not always correct in info-file -- fix: quotes error -- fix: improve external launcher (native viewer) -- test: more unit tests -- doc: changelog available in French -- doc: man pages (en, fr) -- doc: SysV init script - -# Version 1.6.3 - -- fix: bug fixes -- remote: progress report -- remote: can send large files -- remote: detect server state -- remote: import and change source on server -- CBZ: better support for some CBZ files (if SUMMARY or URL files are present in it) -- Library: fix cover images not deleted on story delete -- fix: some images not supported because not jpeg-able (now try again in png) -- remote: fix some covers not found over the wire (nikiroo-utils) -- remote: fix cover image files not sent over the wire - -## Version 1.6.2 - -- GUI: better progress bars -- GUI: can now open files much quicker if they are stored in both library and cache with the same output type - -## Version 1.6.1 - -- GUI: new option (disabled by default) to show one item per source type instead of one item per story when showing ALL sources (which is also the start page) -- fix: source/type reset when redownloading -- GUI: show the number of images instead of the number of words for images documents - -## Version 1.6.0 - -- TUI: new TUI (text with windows and menus) -- not compiled by default (configure.sh) -- remote: a server option to offer stories on the network -- remote: a remote library to get said stories from the network -- update to latest version of nikiroo-utils -- FimFiction: support for the new API -- new: cache update (you may want to clear your current cache) -- GUI: bug fixed (moving an unopened book does not fail any more) - -## Version 1.5.3 - -- FimFiction: Fix tags and chapter handling for some stories - -## Version 1.5.2 - -- FimFiction: Fix tags metadata on FimFiction 4 - -## Version 1.5.1 - -- FimFiction: Update to FimFiction 4 -- eHentai: Fix some meta data that were missing - -## Version 1.5.0 - -- eHentai: new website supported on request (do not hesitate!): e-hentai.org -- Library: perf improvement when retrieving the stories (cover not loaded when not needed) -- Library: fix the covers that were not always removed when deleting a story -- GUI: perf improvement when displaying books (cover resized then cached) -- GUI: sources are now editable ("Move to...") - -## Version 1.4.2 - -- GUI: new Options menu to configure the program (minimalist for now) -- new: improve progress reporting (smoother updates, more details) -- fix: better cover support for local files - -## Version 1.4.1 - -- fix: UpdateChecker which showed the changes of ALL versions instead of the newer ones only -- fix: some bad line breaks on HTML support (including FanFiction.net) -- GUI: progress bar now working correctly -- update: nikiroo-utils update to show all steps in the progress bars -- ( --End of changes for version 1.4.1-- ) - -## Version 1.4.0 - -- new: remember the word count and the date of creation of Fanfix stories -- GUI: option to show the word count instead of the author below the book title -- CBZ: do not include the first page twice anymore for no-cover websites -- GUI: update version check (we now check for new versions) - -## Version 1.3.1 - -- GUI: can now display books by Author - -## Version 1.3.0 - -- YiffStar: YiffStar (SoFurry.com) is now supported -- new: supports login/password websites -- GUI: copied URLs (ctrl+C) are selected by default when importing a URL -- GUI: version now visible (also with --version) - -## Version 1.2.4 - -- GUI: new option: Re-download -- GUI: books are now sorted (will not jump around after refresh/redownload) -- fix: quote character handling -- fix: chapter detection -- new: more tests included - -## Version 1.2.3 - -- HTML: include the original (info_text) files when saving -- HTML: new input type supported: HTML files made by Fanfix - -## Version 1.2.2 - -- GUI: new "Save as..." option -- GUI: fixes (icon refresh) -- fix: handling of TABs in user messages -- GUI: LocalReader can now be used with --read -- ePub: CSS style fixes - -## Version 1.2.1 - -- GUI: some menu functions added -- GUI: right-click popup menu added -- GUI: fixes, especially for the LocalReader library -- GUI: new green round icon to denote "cached" (into LocalReader library) files - -## Version 1.2.0 - -- GUI: progress reporting system -- ePub: CSS style changes -- new: unit tests added -- GUI: some menu functions added (delete, refresh, a place-holder for export) - -## Version 1.1.0 - -- CLI: new Progress reporting system -- e621: fix on "pending" pools, which were not downloaded before -- new: unit tests system added (but no test yet, as all tests were moved into nikiroo-utils) - -## Version 1.0.0 - -- GUI: it is now good enough to be released (export is still CLI-only though) -- fix: bug fixes -- GUI: improved (a lot) -- new: should be good enough for 1.0.0 - -## Version 0.9.5 - -- fix: bug fixes -- new: WIN32 compatibility (tested on Windows 10) - -## Version 0.9.4 - -- fix: bug fixes (lots of) -- new: perf improved -- new: use less cache files -- GUI: improvement (still not really OK, but OK enough I guess) - -## Version 0.9.3 - -- fix: bug fixes (lots of) -- GUI: first implementation (which is ugly and buggy -- the buggly GUI) - -## Version 0.9.2 - -- new: minimum JVM version: Java 1.6 (all binary JAR files will be released in 1.6) -- fix: bug fixes - -## Version 0.9.1 - -- initial version - diff --git a/configure.sh b/configure.sh deleted file mode 100755 index 15ae180..0000000 --- a/configure.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh - -# default: -PREFIX=/usr/local -PROGS="java javac jar make sed" - -IMG=be/nikiroo/utils/ui/ImageUtilsAwt -CLI=be/nikiroo/fanfix/reader/cli/CliReader -TUI=be/nikiroo/fanfix/reader/tui/TuiReader -GUI=be/nikiroo/fanfix/reader/ui/GuiReader -JIMG= -JCLI= -JTUI="-C bin/ jexer" -JGUI= - -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" - ;; - --cli) #=no Disable CLI support (System.out) - [ "$val" = no -o "$val" = false ] && CLI= && JCLI= - ;; - --tui) #=no Enable TUI support (Jexer) - [ "$val" = no -o "$val" = false ] && TUI= && JTUI= - ;; - --gui) #=no Disable GUI support (Swing) - [ "$val" = no -o "$val" = false ] && GUI= && JGUI= - ;; - *) - echo "Unsupported parameter: '$1'" >&2 - echo >&2 - sh "$0" --help >&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`"'; - ok='"`tput bold`[`tput setaf 2` OK `tput init``tput bold`]`tput init`"'; - ko='"`tput bold`[`tput setaf 1` !! `tput init``tput bold`]`tput init`"'; - cols='"`tput cols`"'; -fi; - -echo "MAIN = be/nikiroo/fanfix/Main" > Makefile -echo "MORE = $CLI $TUI $GUI $IMG" >> Makefile -echo "TEST = be/nikiroo/fanfix/test/Test" >> Makefile -echo "TEST_PARAMS = $cols $ok $ko" >> Makefile -echo "NAME = fanfix" >> Makefile -echo "PREFIX = $PREFIX" >> Makefile -echo "JAR_FLAGS += -C bin/ org $JCLI $JTUI $JGUI -C bin/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile -#echo "SJAR_FLAGS += -C src/ org -C src/ jexer -C src/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile - -cat Makefile.base >> Makefile - diff --git a/src/be/nikiroo/fanfix/data/Chapter.java b/data/Chapter.java similarity index 100% rename from src/be/nikiroo/fanfix/data/Chapter.java rename to data/Chapter.java diff --git a/src/be/nikiroo/fanfix/data/MetaData.java b/data/MetaData.java similarity index 100% rename from src/be/nikiroo/fanfix/data/MetaData.java rename to data/MetaData.java diff --git a/src/be/nikiroo/fanfix/data/Paragraph.java b/data/Paragraph.java similarity index 100% rename from src/be/nikiroo/fanfix/data/Paragraph.java rename to data/Paragraph.java diff --git a/src/be/nikiroo/fanfix/data/Story.java b/data/Story.java similarity index 100% rename from src/be/nikiroo/fanfix/data/Story.java rename to data/Story.java diff --git a/src/be/nikiroo/fanfix/data/package-info.java b/data/package-info.java similarity index 100% rename from src/be/nikiroo/fanfix/data/package-info.java rename to data/package-info.java diff --git a/docs/android/android.md b/docs/android/android.md deleted file mode 100644 index f3d2775..0000000 --- a/docs/android/android.md +++ /dev/null @@ -1,289 +0,0 @@ -# Android UI mock-up - -## Concepts - -### Story - -We have **Stories** in Fanfix, which represent a story (an "epub", ...) or a comics (a "CBZ" file, ...). - -A story is written by an author, comes from a source and is dentified by a LUID (Local Unique ID). -It can be a text story or an image story. - -The source can actually be changed by the user (this is the main sorting key). - -### Book - -We also have **Books**. - -Books can be used to display: - -- All the sources present in the library -- All the authors known in the lbrary -- Stories sharing a source or an author - -### All and Listing modes - -When representing sources or authors, books can be arranged in two modes: - -- "All" mode : all the sources/authors are represented by a book and displayed in the UI -- "Listing" mode : for each source/author, a group of books representing the corresponding story is present with the name of the source/author to group them (for instance, a JLabel on top of the group) - -Note: Listing mode can be left out of the Android version if needed (but the all mode is really needed). - -### Destination - -What I call here a destination is a specific group of books. - -Examples : - -- All the sources -- All the books of author "Tulipe, F." -- A listing of all the authors and their stories - -## Core - -### Library (main screen) - -![Main library](screens/main_lib.jpg) - -#### Header - -The header has a title, a navigation icon on the left and a search icon. - -Title can vary upon the current displayed books: - -- All sources -- Sources listing -- Source: xxx -- All authors -- Authors listing -- Author: xxx - -The navigation icon open the Navigation drawer. - -##### Search - -![Search/Filter](screens/search.jpg) - -The search icon is actually a filter: it will hide all the books that don't contain the given text (search on LUID, title and author). - -#### List - -This list will hold books. Each item will be represented by : - -- a cover image (which is provided by fanfix.jar) -- a main info, which can be: - - for stories, the story title - - for source books, the source name - - for author books, the author name -- a secondary info, which can vary via a setting (see the Options page) between: - - author name (for a book representing an author, it is left blank) - - a count (a word count for text stories, an image count for images stories, a stories count for sources and authors books) - -#### UI - -Material.IO: - -- Title, navigation icon, search icon : [App bar top](https://material.io/design/components/app-bars-top.html) -- List : [Cards](https://material.io/design/components/cards.html) - -A tap will open the target book in full-screen mode (i.e., the details about the card). - -On the detailed card, you will see the description (see Description Page) and 3 buttons : - -- Open -- Delete -- "..." for a menu - -### Navigation drawer - -![Navigation Drawer](screens/navigation.jpg) - -The navigation drawer will list 4 destinations: - -- All the sources -- Listing of the sources -- All the authors -- Listing of the authors -- By source - -...and 2 foldable "panels" with more destinations: - -- By source -- By author - -Those subpanels will either contain the sources/authors **or** sub-subpanels with sources/authors. -See fanfix.jar (BasicLibrary.getSourcesGrouped() and BasicLibrary.getAuthorsGrouped()). - -Note: if those last two cause problems, they can be removed; the first four options would be enough to cover the main use cases. - -#### UI - -Material.IO: - -- Navigation drawer: navigation drawer - -### Context menu - -![Context Menu](screens/menu.jpg) - -The context menu options are as follow for stories: - -- Open : open the book (= internal or external reader) -- Rename... : ask the user for a new title for the story (default is current name) -- Move to >> : show a "new source..." option as well as the current ones fo quick select (BasicLibrary.getSourcesGrouped() will return all the sources on only one level if their number is small enough) - - * - - [new source...] - - [A-H] - - Anima - - Fanfiction.NET - - [I-Z] - - MangaFox -- Change author to >> : show a "new author..." option as well as the current ones fo quick select (BasicLibrary.getAuthorsGrouped() will return all the authors on only one level if their number is small enough) - - * - - [new author...] - - [0-9] - - 5-stars - - [A-H] - - Albert - - Béatrice - - Hakan - - [I-Z] - - Irma - - Zoul -- Delete : delete the story -- Redownload : redownload the story (will **not** delete the original) -- Properties : open the properties page - -For other books (sources and authors): - -- Open: open the book (= go to the selected destination) - -#### UI - -Material.IO: - -- menu: [menu](https://developer.android.com/guide/topics/ui/menus.html) - -The menu will NOT use sublevels but link to a [list](https://material.io/design/components/lists.html) instead. - -### Description page - -![Description Page](screens/desc.jpg) - -#### Header - -Use the same cover image as the books, and the description key/values comes from BasicReader.getMetaDesc(MetaData). - -#### Description - -Simply display Story.getMeta().getResume(), without adding the chapter number (it is always 0 for description). - -An example can be seen in be.nikiroo.fanfix.ui.GuiReaderViewerTextOutput.java. - -### Options page - -![Options Page](screens/options.jpg) - -It consists of a "Remote Library" panel: - -- enable : an option to enable/disable the remote library (if disabled, use the local library instead) -- server : (only enabled if the remote library is) the remote server host -- port : (only enabled if the remote library is) the remote server port -- key : (only enabled if the remote library is) the remote server secret key - -...and 5 other options: - -- Open CBZ files internally : open CBZ files with the internal viewer -- Open epub files internally : open EPUB files with the internal viewer -- Show handles on image viewer : can hide the handles used as cues in the image viewer to know where to click -- Startup screen : select the destination to show on application startup -- Language : select the language to use - -#### Startup screen - -Can be: - -- Sources - - All - - Listing -- Authors - - All - - Listing - -...but will have to be presented in a better way to the user (i.e., better names). - -#### UI - -Material.IO: - -- the page itself : Temporary UI Region -- the options : Switch -- the languages : Exposed Dropdown Menu -- the text fields : the default for text fields -- the scret key field : the default for passwords (with * * * ) - -## Internal viewer - -The program will have an internal viewer that will be able to display the 2 kinds of stories (images and text). - -### Base viewer - -This is common to both of the viewer (this is **not** an architectural directives, I only speak about the concept here). - -![Base Viewer](screens/viewer.jpg) - -#### Header - -The title is the title of the story, shortened with "..." if too long. - -#### Content - -This area will host the text viewer or the image viewer. - -#### Navigator - -It contains 4 action buttons (first, previous, next and last chapter) and the title of the current chapter: - -- Descripton : for the properties page (same layout as the actual Properties page) -- Chapter X/Y: title : for the normal chapters (note that "Chapter X/Y" should be bold, and "X" should be coloured) - -#### UI - -Matrial.IO: - -- Header : Header -- Navigator : [Sheets bottom](https://material.io/design/components/sheets-bottom.html) - -### Text viewer - -![Text Viewer](screens/viewer-text.jpg) - -It will contain the content of the current chapter (Story.getChapters().get(index - 1)). - -Same layout as the Properties page uses for the resume, with just a small difference: the chapter name is now prefixed by "Chaper X: ". - -### Image viewer - -![Image Viewer](screens/viewer-image.jpg) - -#### Image - -Auto-zoom and fit (keep aspect ratio). - -#### Image counter - -Just display "Image X/Y" - -#### Handles - -This is a simple cue to show the user where to click. - -It can be hidden via the option "Show handles on image viewer" from the Options page. - -#### UI - -Pinch & Zoom should be allowed. - -Drag-to-pan should be allowed. - diff --git a/docs/android/screens/desc.jpg b/docs/android/screens/desc.jpg deleted file mode 100755 index 766b746..0000000 Binary files a/docs/android/screens/desc.jpg and /dev/null differ diff --git a/docs/android/screens/main_lib.jpg b/docs/android/screens/main_lib.jpg deleted file mode 100755 index e105824..0000000 Binary files a/docs/android/screens/main_lib.jpg and /dev/null differ diff --git a/docs/android/screens/menu.jpg b/docs/android/screens/menu.jpg deleted file mode 100755 index ea67163..0000000 Binary files a/docs/android/screens/menu.jpg and /dev/null differ diff --git a/docs/android/screens/navigation.jpg b/docs/android/screens/navigation.jpg deleted file mode 100755 index 997cb32..0000000 Binary files a/docs/android/screens/navigation.jpg and /dev/null differ diff --git a/docs/android/screens/options.jpg b/docs/android/screens/options.jpg deleted file mode 100755 index b4ad836..0000000 Binary files a/docs/android/screens/options.jpg and /dev/null differ diff --git a/docs/android/screens/search.jpg b/docs/android/screens/search.jpg deleted file mode 100755 index f32257e..0000000 Binary files a/docs/android/screens/search.jpg and /dev/null differ diff --git a/docs/android/screens/viewer-image.jpg b/docs/android/screens/viewer-image.jpg deleted file mode 100755 index 8f5c742..0000000 Binary files a/docs/android/screens/viewer-image.jpg and /dev/null differ diff --git a/docs/android/screens/viewer-text.jpg b/docs/android/screens/viewer-text.jpg deleted file mode 100755 index 574f688..0000000 Binary files a/docs/android/screens/viewer-text.jpg and /dev/null differ diff --git a/docs/android/screens/viewer.jpg b/docs/android/screens/viewer.jpg deleted file mode 100755 index d8b130a..0000000 Binary files a/docs/android/screens/viewer.jpg and /dev/null differ diff --git a/fanfix.sysv b/fanfix.sysv deleted file mode 100755 index 5ab6912..0000000 --- a/fanfix.sysv +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -# -# fanfix This starts the Fanfix remote service. -# -# description: Starts the Fanfix remote service -# -### BEGIN INIT INFO -# Default-Start: 3 4 5 -# Short-Description: Fanfix service -# Description: Starts the Fanfix remote service -### END INIT INFO - -ENABLED=true -USER=fanfix -JAR=/path/to/fanfix.jar - -FPID=/tmp/fanfix.pid -OUT=/var/log/fanfix -ERR=/var/log/fanfix.err - -if [ "$ENABLED" != true ]; then - [ "$1" != status ] - exit $? -fi - -if [ ! -e "$JAR" ]; then - echo "Canot find main jar file: $JAR" >&2 - exit 4 -fi - -case "$1" in -start) - if sh "$0" status --quiet; then - echo "Fanfix is already running." >&2 - false - else - [ -e "$OUT" ] && mv "$OUT" "$OUT".previous - [ -e "$ERR" ] && mv "$ERR" "$ERR".previous - sudo -u "$USER" -- java -jar "$JAR" --server > "$OUT" 2> "$ERR" & - echo $! > "$FPID" - fi - - sleep 0.1 - sh "$0" status --quiet -;; -stop) - if sh "$0" status --quiet; then - sudo -u "$USER" -- java -jar "$JAR" --stop-server - fi - - i=1 - while [ $i -lt 100 ]; do - if sh "$0" status --quiet; then - echo -n . >&2 - sleep 1 - fi - i=`expr $i + 1` - done - echo >&2 - - if sh "$0" status --quiet; then - echo "Process not responding, killing it..." >&2 - kill "`cat "$FPID"`" - sleep 10 - kill -9 "`cat "$FPID"`" 2>/dev/null - fi - - rm -f "$FPID" -;; -restart) - sh "$0" stop - sh "$0" start -;; -status) - if [ -e "$FPID" ]; then - if [ "$2" = "--quiet" ]; then - ps "`cat "$FPID"`" >/dev/null - else - ps "`cat "$FPID"`" >/dev/null \ - && echo service is running >&2 - fi - else - false - fi -;; -*) - echo $"Usage: $0 {start|stop|status|restart}" >&2 - false -;; -esac - diff --git a/icons/fanfix-alt.png b/icons/fanfix-alt.png deleted file mode 100644 index 4ab0957..0000000 Binary files a/icons/fanfix-alt.png and /dev/null differ diff --git a/icons/fanfix.png b/icons/fanfix.png deleted file mode 100644 index 983b344..0000000 Binary files a/icons/fanfix.png and /dev/null differ diff --git a/icons/mlpfim-icons.deviantart.com/janswer.deviantart.com/fanfix-d.png b/icons/mlpfim-icons.deviantart.com/janswer.deviantart.com/fanfix-d.png deleted file mode 100644 index 1798dd3..0000000 Binary files a/icons/mlpfim-icons.deviantart.com/janswer.deviantart.com/fanfix-d.png and /dev/null differ diff --git a/icons/mlpfim-icons.deviantart.com/laceofthemoon.deviantart.com/fanfix-e.png b/icons/mlpfim-icons.deviantart.com/laceofthemoon.deviantart.com/fanfix-e.png deleted file mode 100644 index fb6fe0d..0000000 Binary files a/icons/mlpfim-icons.deviantart.com/laceofthemoon.deviantart.com/fanfix-e.png and /dev/null differ diff --git a/icons/mlpfim-icons.deviantart.com/pink618.deviantart.com/fanfix-c.png b/icons/mlpfim-icons.deviantart.com/pink618.deviantart.com/fanfix-c.png deleted file mode 100644 index a56a4d2..0000000 Binary files a/icons/mlpfim-icons.deviantart.com/pink618.deviantart.com/fanfix-c.png and /dev/null differ diff --git a/src/be/nikiroo/fanfix/library/BasicLibrary.java b/library/BasicLibrary.java similarity index 100% rename from src/be/nikiroo/fanfix/library/BasicLibrary.java rename to library/BasicLibrary.java diff --git a/src/be/nikiroo/fanfix/library/CacheLibrary.java b/library/CacheLibrary.java similarity index 100% rename from src/be/nikiroo/fanfix/library/CacheLibrary.java rename to library/CacheLibrary.java diff --git a/src/be/nikiroo/fanfix/library/LocalLibrary.java b/library/LocalLibrary.java similarity index 100% rename from src/be/nikiroo/fanfix/library/LocalLibrary.java rename to library/LocalLibrary.java diff --git a/src/be/nikiroo/fanfix/library/RemoteLibrary.java b/library/RemoteLibrary.java similarity index 100% rename from src/be/nikiroo/fanfix/library/RemoteLibrary.java rename to library/RemoteLibrary.java diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryException.java b/library/RemoteLibraryException.java similarity index 100% rename from src/be/nikiroo/fanfix/library/RemoteLibraryException.java rename to library/RemoteLibraryException.java diff --git a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java b/library/RemoteLibraryServer.java similarity index 100% rename from src/be/nikiroo/fanfix/library/RemoteLibraryServer.java rename to library/RemoteLibraryServer.java diff --git a/src/be/nikiroo/fanfix/library/package-info.java b/library/package-info.java similarity index 100% rename from src/be/nikiroo/fanfix/library/package-info.java rename to library/package-info.java diff --git a/libs.txt b/libs.txt new file mode 100644 index 0000000..091daf5 --- /dev/null +++ b/libs.txt @@ -0,0 +1,6 @@ +# Required librairies: + +They are available in the other branches if needed: +- libs/jsoup-1.10.3-sources.jar +- libs/unbescape-1.1.4-sources.jar + diff --git a/libs/jexer-0.0.4_README.md b/libs/jexer-0.0.4_README.md deleted file mode 100644 index 7cfe9b4..0000000 --- a/libs/jexer-0.0.4_README.md +++ /dev/null @@ -1,220 +0,0 @@ -Jexer - Java Text User Interface library -======================================== - -This library implements a text-based windowing system reminiscient of -Borland's [Turbo Vision](http://en.wikipedia.org/wiki/Turbo_Vision) -system. (For those wishing to use the actual C++ Turbo Vision -library, see [Sergio Sigala's C++ version based on the public domain -sources released by Borland.](http://tvision.sourceforge.net/) ) - -Jexer currently supports three backends: - -* System.in/out to a command-line ECMA-48 / ANSI X3.64 type terminal - (tested on Linux + xterm). I/O is handled through terminal escape - sequences generated by the library itself: ncurses is not required - or linked to. xterm mouse tracking using UTF8 and SGR coordinates - are supported. For the demo application, this is the default - backend on non-Windows/non-Mac platforms. - -* The same command-line ECMA-48 / ANSI X3.64 type terminal as above, - but to any general InputStream/OutputStream or Reader/Writer. See - the file jexer.demos.Demo2 for an example of running the demo over a - TCP socket. jexer.demos.Demo3 demonstrates how one might use a - character encoding than the default UTF-8. - -* Java Swing UI. This backend can be selected by setting - jexer.Swing=true. The default window size for Swing is 80x25, which - is set in jexer.session.SwingSession. For the demo application, - this is the default backend on Windows and Mac platforms. - -Additional backends can be created by subclassing -jexer.backend.Backend and passing it into the TApplication -constructor. - -The Jexer homepage, which includes additional information and binary -release downloads, is at: https://jexer.sourceforge.io . The Jexer -source code is hosted at: https://github.com/klamonte/jexer . - - - -License -------- - -This project is licensed under the MIT License. See the file LICENSE -for the full license text. - - - -Acknowledgements ----------------- - -Jexer makes use of the Terminus TrueType font [made available -here](http://files.ax86.net/terminus-ttf/) . - - - -Usage ------ - -Simply subclass TApplication and then run it in a new thread: - -```Java -import jexer.*; - -class MyApplication extends TApplication { - - public MyApplication() throws Exception { - super(BackendType.SWING); // Could also use BackendType.XTERM - - // Create standard menus for File and Window - addFileMenu(); - addWindowMenu(); - - // Add a custom window, see below for its code. - addWindow(new MyWindow(this)); - } - - public static void main(String [] args) { - try { - MyApplication app = new MyApplication(); - (new Thread(app)).start(); - } catch (Throwable t) { - t.printStackTrace(); - } - } -} -``` - -Similarly, subclass TWindow and add some widgets: - -```Java -class MyWindow extends TWindow { - - public MyWindow(TApplication application) { - // See TWindow's API for several constructors. This one uses the - // application, title, width, and height. Note that the window width - // and height include the borders. The widgets inside the window - // will see (0, 0) as the top-left corner inside the borders, - // i.e. what the window would see as (1, 1). - super(application, "My Window", 30, 20); - - // See TWidget's API for convenience methods to add various kinds of - // widgets. Note that ANY widget can be a container for other - // widgets: TRadioGroup for example has TRadioButtons as child - // widgets. - - // We will add a basic label, text entry field, and button. - addLabel("This is a label", 5, 3); - addField(5, 5, 20, false, "enter text here"); - // For the button, we will pop up a message box if the user presses - // it. - addButton("Press &Me!", 5, 8, new TAction() { - public void DO() { - MyWindow.this.messageBox("Box Title", "You pressed me, yay!"); - } - } ); - } -} -``` - -Put these into a file, compile it with jexer.jar in the classpath, run -it and you'll see an application like this: - -![The Example Code Above](/screenshots/readme_application.png?raw=true "The application in the text of README.md") - -See the files in jexer.demos for many more detailed examples showing -all of the existing UI controls. The demo can be run in three -different ways: - - * 'java -jar jexer.jar' . This will use System.in/out with - xterm-like sequences on non-Windows platforms. On Windows it will - use a Swing JFrame. - - * 'java -Djexer.Swing=true -jar jexer.jar' . This will always use - Swing on any platform. - - * 'java -cp jexer.jar jexer.demos.Demo2 PORT' (where PORT is a - number to run the TCP daemon on). This will use the telnet - protocol to establish an 8-bit clean channel and be aware of - screen size changes. - - - -More Screenshots ----------------- - -![Several Windows Open Including A Terminal](/screenshots/screenshot1.png?raw=true "Several Windows Open Including A Terminal") - -![Yo Dawg...](/screenshots/yodawg.png?raw=true "Yo Dawg, I heard you like text windowing systems, so I ran a text windowing system inside your text windowing system so you can have a terminal in your terminal.") - - - -System Properties ------------------ - -The following properties control features of Jexer: - - jexer.Swing - ----------- - - Used only by jexer.demos.Demo1. If true, use the Swing interface - for the demo application. Default: true on Windows platforms - (os.name starts with "Windows"), false on non-Windows platforms. - - jexer.Swing.cursorStyle - ----------------------- - - Used by jexer.io.SwingScreen. Selects the cursor style to draw. - Valid values are: underline, block, outline. Default: underline. - - - -Known Issues / Arbitrary Decisions ----------------------------------- - -Some arbitrary design decisions had to be made when either the -obviously expected behavior did not happen or when a specification was -ambiguous. This section describes such issues. - - - See jexer.tterminal.ECMA48 for more specifics of terminal - emulation limitations. - - - TTerminalWindow uses cmd.exe on Windows. Output will not be seen - until enter is pressed, due to cmd.exe's use of line-oriented - input (see the ENABLE_LINE_INPUT flag for GetConsoleMode() and - SetConsoleMode()). - - - TTerminalWindow launches 'script -fqe /dev/null' or 'script -q -F - /dev/null' on non-Windows platforms. This is a workaround for the - C library behavior of checking for a tty: script launches $SHELL - in a pseudo-tty. This works on Linux and Mac but might not on - other Posix-y platforms. - - - Closing a TTerminalWindow without exiting the process inside it - may result in a zombie 'script' process. - - - Java's InputStreamReader as used by the ECMA48 backend requires a - valid UTF-8 stream. The default X10 encoding for mouse - coordinates outside (160,94) can corrupt that stream, at best - putting garbage keyboard events in the input queue but at worst - causing the backend reader thread to throw an Exception and exit - and make the entire UI unusable. Mouse support therefore requires - a terminal that can deliver either UTF-8 coordinates (1005 mode) - or SGR coordinates (1006 mode). Most modern terminals can do - this. - - - jexer.session.TTYSession calls 'stty size' once every second to - check the current window size, performing the same function as - ioctl(TIOCGWINSZ) but without requiring a native library. - - - jexer.io.ECMA48Terminal calls 'stty' to perform the equivalent of - cfmakeraw() when using System.in/out. System.out is also - (blindly!) put in 'stty sane cooked' mode when exiting. - - - -Roadmap -------- - -Many tasks remain before calling this version 1.0. See docs/TODO.md -for the complete list of tasks. diff --git a/libs/jsoup-1.10.3-sources.jar b/libs/jsoup-1.10.3-sources.jar deleted file mode 100644 index 1fe0db4..0000000 Binary files a/libs/jsoup-1.10.3-sources.jar and /dev/null differ diff --git a/libs/licenses/jexer-0.0.4_LICENSE.txt b/libs/licenses/jexer-0.0.4_LICENSE.txt deleted file mode 100644 index 09bbfe0..0000000 --- a/libs/licenses/jexer-0.0.4_LICENSE.txt +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Kevin Lamonte - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/libs/licenses/unbescape-1.1.4_LICENSE.txt b/libs/licenses/unbescape-1.1.4_LICENSE.txt deleted file mode 100644 index d645695..0000000 --- a/libs/licenses/unbescape-1.1.4_LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - 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 deleted file mode 100644 index 01ddb56..0000000 Binary files a/libs/unbescape-1.1.4-sources.jar and /dev/null differ diff --git a/libs/unbescape-1.1.4_ChangeLog.txt b/libs/unbescape-1.1.4_ChangeLog.txt deleted file mode 100644 index 9cec6ec..0000000 --- a/libs/unbescape-1.1.4_ChangeLog.txt +++ /dev/null @@ -1,32 +0,0 @@ -1.1.4.RELEASE -============= -- Added ampersand (&) to the list of characters to be escaped in LEVEL 1 for JSON, JavaScript and CSS literals - in order to make escaped code safe against code injection attacks in XHTML scenarios (browsers using XHTML - processing mode) performed by means of including XHTML escape codes in literals. - -1.1.3.RELEASE -============= -- Improved performance of String-based unescape methods for HTML, XML, JS, JSON and others when the - text to be unescaped actually needs no unescaping. - -1.1.2.RELEASE -============= -- Added support for stream-based (String-to-Writer and Reader-to-Writer) escape and unescape operations. - -1.1.1.RELEASE -============= -- Fixed HTML unescape for codepoints > U+10FFFF (was throwing IllegalArgumentException). -- Fixed HTML unescape for codepoints > Integer.MAX_VALUE (was throwing ArrayIndexOutOfBounds). -- Simplified and improved performance of codepoint-computing code by using Character.codePointAt(...) instead - of a complex conditional structure based on Character.isHighSurrogate(...) and Character.isLowSurrogate(...). -- [doc] Fixed description of MSExcel-compatible CSV files. - - -1.1.0.RELEASE -============= -- Added URI/URL escape and unescape operations. - - -1.0 -=== -- First release of unbescape. diff --git a/src/be/nikiroo/fanfix/output/BasicOutput.java b/output/BasicOutput.java similarity index 100% rename from src/be/nikiroo/fanfix/output/BasicOutput.java rename to output/BasicOutput.java diff --git a/src/be/nikiroo/fanfix/output/Cbz.java b/output/Cbz.java similarity index 100% rename from src/be/nikiroo/fanfix/output/Cbz.java rename to output/Cbz.java diff --git a/src/be/nikiroo/fanfix/output/Epub.java b/output/Epub.java similarity index 100% rename from src/be/nikiroo/fanfix/output/Epub.java rename to output/Epub.java diff --git a/src/be/nikiroo/fanfix/output/Html.java b/output/Html.java similarity index 100% rename from src/be/nikiroo/fanfix/output/Html.java rename to output/Html.java diff --git a/src/be/nikiroo/fanfix/output/InfoCover.java b/output/InfoCover.java similarity index 100% rename from src/be/nikiroo/fanfix/output/InfoCover.java rename to output/InfoCover.java diff --git a/src/be/nikiroo/fanfix/output/InfoText.java b/output/InfoText.java similarity index 100% rename from src/be/nikiroo/fanfix/output/InfoText.java rename to output/InfoText.java diff --git a/src/be/nikiroo/fanfix/output/LaTeX.java b/output/LaTeX.java similarity index 100% rename from src/be/nikiroo/fanfix/output/LaTeX.java rename to output/LaTeX.java diff --git a/src/be/nikiroo/fanfix/output/Sysout.java b/output/Sysout.java similarity index 100% rename from src/be/nikiroo/fanfix/output/Sysout.java rename to output/Sysout.java diff --git a/src/be/nikiroo/fanfix/output/Text.java b/output/Text.java similarity index 100% rename from src/be/nikiroo/fanfix/output/Text.java rename to output/Text.java diff --git a/src/be/nikiroo/fanfix/output/epub.style.css b/output/epub.style.css similarity index 100% rename from src/be/nikiroo/fanfix/output/epub.style.css rename to output/epub.style.css diff --git a/src/be/nikiroo/fanfix/output/html.style.css b/output/html.style.css similarity index 100% rename from src/be/nikiroo/fanfix/output/html.style.css rename to output/html.style.css diff --git a/src/be/nikiroo/fanfix/output/package-info.java b/output/package-info.java similarity index 100% rename from src/be/nikiroo/fanfix/output/package-info.java rename to output/package-info.java diff --git a/src/be/nikiroo/fanfix/package-info.java b/package-info.java similarity index 100% rename from src/be/nikiroo/fanfix/package-info.java rename to package-info.java diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/reader/BasicReader.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/BasicReader.java rename to reader/BasicReader.java diff --git a/src/be/nikiroo/fanfix/reader/Reader.java b/reader/Reader.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/Reader.java rename to reader/Reader.java diff --git a/src/be/nikiroo/fanfix/reader/cli/CliReader.java b/reader/cli/CliReader.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/cli/CliReader.java rename to reader/cli/CliReader.java diff --git a/src/be/nikiroo/fanfix/reader/tui/ConfigItem.java b/reader/tui/ConfigItem.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/tui/ConfigItem.java rename to reader/tui/ConfigItem.java diff --git a/src/be/nikiroo/fanfix/reader/tui/ConfigItemString.java b/reader/tui/ConfigItemString.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/tui/ConfigItemString.java rename to reader/tui/ConfigItemString.java diff --git a/src/be/nikiroo/fanfix/reader/tui/TOptionWindow.java b/reader/tui/TOptionWindow.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/tui/TOptionWindow.java rename to reader/tui/TOptionWindow.java diff --git a/src/be/nikiroo/fanfix/reader/tui/TSimpleScrollableWindow.java b/reader/tui/TSimpleScrollableWindow.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/tui/TSimpleScrollableWindow.java rename to reader/tui/TSimpleScrollableWindow.java diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReader.java b/reader/tui/TuiReader.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/tui/TuiReader.java rename to reader/tui/TuiReader.java diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java b/reader/tui/TuiReaderApplication.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java rename to reader/tui/TuiReaderApplication.java diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java b/reader/tui/TuiReaderMainWindow.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java rename to reader/tui/TuiReaderMainWindow.java diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderOptionWindow.java b/reader/tui/TuiReaderOptionWindow.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/tui/TuiReaderOptionWindow.java rename to reader/tui/TuiReaderOptionWindow.java diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java b/reader/tui/TuiReaderStoryWindow.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java rename to reader/tui/TuiReaderStoryWindow.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/reader/ui/GuiReader.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReader.java rename to reader/ui/GuiReader.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderBook.java b/reader/ui/GuiReaderBook.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderBook.java rename to reader/ui/GuiReaderBook.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderBookInfo.java b/reader/ui/GuiReaderBookInfo.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderBookInfo.java rename to reader/ui/GuiReaderBookInfo.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderCoverImager.java b/reader/ui/GuiReaderCoverImager.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderCoverImager.java rename to reader/ui/GuiReaderCoverImager.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java b/reader/ui/GuiReaderFrame.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java rename to reader/ui/GuiReaderFrame.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderGroup.java b/reader/ui/GuiReaderGroup.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderGroup.java rename to reader/ui/GuiReaderGroup.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java b/reader/ui/GuiReaderMainPanel.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java rename to reader/ui/GuiReaderMainPanel.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderNavBar.java b/reader/ui/GuiReaderNavBar.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderNavBar.java rename to reader/ui/GuiReaderNavBar.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderPropertiesFrame.java b/reader/ui/GuiReaderPropertiesFrame.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderPropertiesFrame.java rename to reader/ui/GuiReaderPropertiesFrame.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderPropertiesPane.java b/reader/ui/GuiReaderPropertiesPane.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderPropertiesPane.java rename to reader/ui/GuiReaderPropertiesPane.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchAction.java b/reader/ui/GuiReaderSearchAction.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchAction.java rename to reader/ui/GuiReaderSearchAction.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchByNamePanel.java b/reader/ui/GuiReaderSearchByNamePanel.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchByNamePanel.java rename to reader/ui/GuiReaderSearchByNamePanel.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchByPanel.java b/reader/ui/GuiReaderSearchByPanel.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchByPanel.java rename to reader/ui/GuiReaderSearchByPanel.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchByTagPanel.java b/reader/ui/GuiReaderSearchByTagPanel.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchByTagPanel.java rename to reader/ui/GuiReaderSearchByTagPanel.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchFrame.java b/reader/ui/GuiReaderSearchFrame.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderSearchFrame.java rename to reader/ui/GuiReaderSearchFrame.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewer.java b/reader/ui/GuiReaderViewer.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderViewer.java rename to reader/ui/GuiReaderViewer.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java b/reader/ui/GuiReaderViewerPanel.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java rename to reader/ui/GuiReaderViewerPanel.java diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerTextOutput.java b/reader/ui/GuiReaderViewerTextOutput.java similarity index 100% rename from src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerTextOutput.java rename to reader/ui/GuiReaderViewerTextOutput.java diff --git a/res/drawable-v24/ic_launcher_foreground.xml b/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c7bd21d..0000000 --- a/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 01f0af0..0000000 --- a/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml deleted file mode 100644 index e576892..0000000 --- a/res/layout/activity_main.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - -