diff --git a/LICENSE b/LICENSE index d645695..08f4322 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,8 @@ +The code in fanficfare and webservice are under the Apache License. + +The code in calibre-plugin, because it derives from other GPLv3 code, +is also GPLv3. GPLv3 follows the Apache License. + Apache License Version 2.0, January 2004 @@ -200,3 +205,680 @@ 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. + + + 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. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index 31f2f5d..7423f26 100644 --- a/calibre-plugin/__init__.py +++ b/calibre-plugin/__init__.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) __license__ = 'GPL v3' -__copyright__ = '2014, Jim Miller' +__copyright__ = '2015, Jim Miller' __docformat__ = 'restructuredtext en' import sys @@ -32,7 +32,7 @@ class FanFicFareBase(InterfaceActionBase): ''' This class is a simple wrapper that provides information about the actual plugin class. The actual interface plugin class is called - InterfacePlugin and is defined in the ffdl_plugin.py file, as + InterfacePlugin and is defined in the fff_plugin.py file, as specified in the actual_plugin field below. The reason for having two classes is that it allows the command line @@ -48,7 +48,7 @@ class FanFicFareBase(InterfaceActionBase): #: This field defines the GUI plugin class that contains all the code #: that actually does something. Its format is module_path:class_name #: The specified class must be defined in the specified module. - actual_plugin = 'calibre_plugins.fanficfare_plugin.ffdl_plugin:FanFicFarePlugin' + actual_plugin = 'calibre_plugins.fanficfare_plugin.fff_plugin:FanFicFarePlugin' def is_customizable(self): ''' @@ -107,7 +107,7 @@ class FanFicFareBase(InterfaceActionBase): # CLI--it would load everytime anyway. from StringIO import StringIO from calibre.library import db - from calibre_plugins.fanficfare_plugin.downloader import main as ffdl_main + from calibre_plugins.fanficfare_plugin.cli import main as fff_main from calibre_plugins.fanficfare_plugin.prefs import PrefsFacade from calibre.utils.config import prefs as calibre_prefs from optparse import OptionParser @@ -122,10 +122,10 @@ class FanFicFareBase(InterfaceActionBase): or not x.startswith('-')] opts, args = parser.parse_args(pargs) - ffdl_prefs = PrefsFacade(db(path=opts.library_path, + fff_prefs = PrefsFacade(db(path=opts.library_path, read_only=True)) - ffdl_main(argv[1:], + fff_main(argv[1:], parser=parser, passed_defaultsini=StringIO(get_resources("defaults.ini")), - passed_personalini=StringIO(ffdl_prefs["personal.ini"])) + passed_personalini=StringIO(fff_prefs["personal.ini"])) diff --git a/calibre-plugin/basicinihighlighter.py b/calibre-plugin/basicinihighlighter.py index 75165bb..c4ea2c9 100644 --- a/calibre-plugin/basicinihighlighter.py +++ b/calibre-plugin/basicinihighlighter.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, print_function) __license__ = 'GPL v3' -__copyright__ = '2014, Jim Miller' +__copyright__ = '2015, Jim Miller' __docformat__ = 'restructuredtext en' import re diff --git a/calibre-plugin/common_utils.py b/calibre-plugin/common_utils.py index 2210bdb..9f135b4 100644 --- a/calibre-plugin/common_utils.py +++ b/calibre-plugin/common_utils.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) __license__ = 'GPL v3' -__copyright__ = '2011, Grant Drake ' +__copyright__ = '2011, Grant Drake , 2015, Jim Miller' __docformat__ = 'restructuredtext en' import os diff --git a/calibre-plugin/config.py b/calibre-plugin/config.py index 2b3f267..891cfe3 100644 --- a/calibre-plugin/config.py +++ b/calibre-plugin/config.py @@ -81,7 +81,7 @@ from calibre_plugins.fanficfare_plugin.fanficfare.adapters \ from calibre_plugins.fanficfare_plugin.common_utils \ import ( KeyboardConfigDialog, PrefsViewerDialog ) -from calibre_plugins.fanficfare_plugin.ffdl_util \ +from calibre_plugins.fanficfare_plugin.fff_util \ import (test_config) from calibre.gui2.complete2 import EditWithComplete #MultiCompleteLineEdit @@ -176,7 +176,12 @@ class ConfigWidget(QWidget): self.l = QVBoxLayout() self.setLayout(self.l) - label = QLabel(''+_('List of Supported Sites')+' -- '+_('FAQs')+'') + label = QLabel(''\ + +_('List of Supported Sites')+' -- '\ + +_('FAQs')+'') + label.setOpenExternalLinks(True) self.l.addWidget(label) @@ -452,12 +457,12 @@ class BasicTab(QWidget): self.l.addWidget(self.lookforurlinhtml) self.mark = QCheckBox(_("Mark added/updated books when finished?"),self) - self.mark.setToolTip(_("Mark added/updated books when finished. Use with option below.\nYou can also manually search for 'marked:ffdl_success'.\n'marked:ffdl_failed' is also available, or search 'marked:ffdl' for both.")) + self.mark.setToolTip(_("Mark added/updated books when finished. Use with option below.\nYou can also manually search for 'marked:fff_success'.\n'marked:fff_failed' is also available, or search 'marked:fff' for both.")) self.mark.setChecked(prefs['mark']) self.l.addWidget(self.mark) self.showmarked = QCheckBox(_("Show Marked books when finished?"),self) - self.showmarked.setToolTip(_("Show Marked added/updated books only when finished.\nYou can also manually search for 'marked:ffdl_success'.\n'marked:ffdl_failed' is also available, or search 'marked:ffdl' for both.")) + self.showmarked.setToolTip(_("Show Marked added/updated books only when finished.\nYou can also manually search for 'marked:fff_success'.\n'marked:fff_failed' is also available, or search 'marked:fff' for both.")) self.showmarked.setChecked(prefs['showmarked']) self.l.addWidget(self.showmarked) @@ -481,7 +486,7 @@ class BasicTab(QWidget): self.l.addWidget(self.urlsfromclip) self.updatedefault = QCheckBox(_('Default to Update when books selected?'),self) - self.updatedefault.setToolTip(_('The top FanFictionDownLoader plugin button will start Update if\nbooks are selected. If unchecked, it will always bring up \'Add New\'.')) + self.updatedefault.setToolTip(_('The top FanFicFare plugin button will start Update if\nbooks are selected. If unchecked, it will always bring up \'Add New\'.')) self.updatedefault.setChecked(prefs['updatedefault']) self.l.addWidget(self.updatedefault) @@ -576,7 +581,7 @@ class BasicTab(QWidget): title=_("Reject Reasons"), label=_("Customize Reject List Reasons"), tooltip=_("Customize the Reasons presented when Rejecting URLs"), - save_size_name='ffdl:Reject List Reasons') + save_size_name='fff:Reject List Reasons') d.exec_() if d.result() == d.Accepted: prefs['rejectreasons'] = d.get_plain_text() @@ -590,7 +595,7 @@ class BasicTab(QWidget): tooltip=_("One URL per line:\nhttp://...,note\nhttp://...,title by author - note"), rejectreasons=rejecturllist.get_reject_reasons(), reasonslabel=_('Add this reason to all URLs added:'), - save_size_name='ffdl:Add Reject List') + save_size_name='fff:Add Reject List') d.exec_() if d.result() == d.Accepted: rejecturllist.add_text(d.get_plain_text(),d.get_reason_text()) @@ -654,7 +659,7 @@ class PersonalIniTab(QWidget): label=_("Plugin Defaults (%s) (Read-Only)")%'plugin-defaults.ini', use_find=True, read_only=True, - save_size_name='ffdl:defaults.ini').exec_() + save_size_name='fff:defaults.ini').exec_() def add_ini_button(self): d = IniTextDialog(self, @@ -663,7 +668,7 @@ class PersonalIniTab(QWidget): title=_("Edit personal.ini"), label=_("Edit personal.ini"), use_find=True, - save_size_name='ffdl:personal.ini') + save_size_name='fff:personal.ini') d.exec_() if d.result() == d.Accepted: self.personalini = d.get_plain_text() @@ -880,7 +885,7 @@ class OtherTab(QWidget): self.l = QVBoxLayout() self.setLayout(self.l) - label = QLabel(_("These controls aren't plugin settings as such, but convenience buttons for setting Keyboard shortcuts and getting all the FanFictionDownLoader confirmation dialogs back again.")) + label = QLabel(_("These controls aren't plugin settings as such, but convenience buttons for setting Keyboard shortcuts and getting all the FanFicFare confirmation dialogs back again.")) label.setWordWrap(True) self.l.addWidget(label) self.l.addSpacing(5) @@ -891,7 +896,7 @@ class OtherTab(QWidget): self.l.addWidget(keyboard_shortcuts_button) reset_confirmation_button = QPushButton(_('Reset disabled &confirmation dialogs'), self) - reset_confirmation_button.setToolTip(_('Reset all show me again dialogs for the FanFictionDownLoader plugin')) + reset_confirmation_button.setToolTip(_('Reset all show me again dialogs for the FanFicFare plugin')) reset_confirmation_button.clicked.connect(self.reset_dialogs) self.l.addWidget(reset_confirmation_button) diff --git a/calibre-plugin/dialogs.py b/calibre-plugin/dialogs.py index c16733a..f3332e6 100644 --- a/calibre-plugin/dialogs.py +++ b/calibre-plugin/dialogs.py @@ -236,7 +236,7 @@ class AddNewDialog(SizePersistedDialog): go_signal = pyqtSignal(object, object, object, object) def __init__(self, gui, prefs, icon): - SizePersistedDialog.__init__(self, gui, 'FanFictionDownLoader plugin:add new dialog') + SizePersistedDialog.__init__(self, gui, 'fff:add new dialog') self.prefs = prefs self.setMinimumWidth(300) @@ -339,7 +339,7 @@ class AddNewDialog(SizePersistedDialog): def ok_clicked(self): self.dialog_closing(None) # save persistent size. self.hide() - self.go_signal.emit( self.get_ffdl_options(), + self.go_signal.emit( self.get_fff_options(), self.get_urlstext(), self.merge, self.extrapayload ) @@ -352,7 +352,7 @@ class AddNewDialog(SizePersistedDialog): newmerge=True, extraoptions={}, extrapayload=None): - # rather than mutex in ffdl_plugin, just bail here if it's + # rather than mutex in fff_plugin, just bail here if it's # already in use. if self.isVisible(): return @@ -434,7 +434,7 @@ class AddNewDialog(SizePersistedDialog): if i > -1: self.collision.setCurrentIndex(i) - def get_ffdl_options(self): + def get_fff_options(self): retval = { 'fileform': unicode(self.fileform.currentText()), 'collision': unicode(self.collision.currentText()), @@ -468,7 +468,7 @@ class CollectURLDialog(SizePersistedDialog): Collect single url for get urls. ''' def __init__(self, gui, title, url_text, epubmerge_plugin=None): - SizePersistedDialog.__init__(self, gui, 'FanFictionDownLoader plugin:get story urls') + SizePersistedDialog.__init__(self, gui, 'fff:get story urls') self.status=False self.anthology=False @@ -614,7 +614,7 @@ class LoopProgressDialog(QProgressDialog): book = self.book_list[self.i] try: - ## collision spec passed into getadapter by partial from ffdl_plugin + ## collision spec passed into getadapter by partial from fff_plugin ## no retval only if it exists, but collision is SKIP self.foreach_function(book) @@ -716,7 +716,7 @@ class AuthorTableWidgetItem(ReadOnlyTableWidgetItem): class UpdateExistingDialog(SizePersistedDialog): def __init__(self, gui, header, prefs, icon, books, - save_size_name='fanfictiondownloader_plugin:update list dialog'): + save_size_name='fff:update list dialog'): SizePersistedDialog.__init__(self, gui, save_size_name) self.prefs = prefs @@ -831,7 +831,7 @@ class UpdateExistingDialog(SizePersistedDialog): def get_books(self): return self.books_table.get_books() - def get_ffdl_options(self): + def get_fff_options(self): return { 'fileform': unicode(self.fileform.currentText()), 'collision': unicode(self.collision.currentText()), @@ -921,7 +921,7 @@ class StoryListTableWidget(QTableWidget): message = '

'+_('Are you sure you want to remove this book from the list?') if len(rows) > 1: message = '

'+_('Are you sure you want to remove the selected %d books from the list?')%len(rows) - if not confirm(message,'fanfictiondownloader_delete_item', self): + if not confirm(message,'fff_delete_item', self): return first_sel_row = self.currentRow() for selrow in reversed(rows): @@ -996,7 +996,7 @@ class RejectListTableWidget(QTableWidget): message = '

'+_('Are you sure you want to remove this URL from the list?') if len(rows) > 1: message = '

'+_('Are you sure you want to remove the %d selected URLs from the list?')%len(rows) - if not confirm(message,'ffdl_rejectlist_delete_item_again', self): + if not confirm(message,'fff_rejectlist_delete_item_again', self): return first_sel_row = self.currentRow() for selrow in reversed(rows): @@ -1017,7 +1017,7 @@ class RejectListDialog(SizePersistedDialog): icon='rotate-right.png', show_delete=True, show_all_reasons=True, - save_size_name='ffdl:reject list dialog'): + save_size_name='fff:reject list dialog'): SizePersistedDialog.__init__(self, gui, save_size_name) self.setWindowTitle(header) @@ -1121,7 +1121,7 @@ class EditTextDialog(SizePersistedDialog): def __init__(self, parent, text, icon=None, title=None, label=None, tooltip=None, rejectreasons=[],reasonslabel=None, - save_size_name='ffdl:edit text dialog', + save_size_name='fff:edit text dialog', ): SizePersistedDialog.__init__(self, parent, save_size_name) @@ -1182,7 +1182,7 @@ class IniTextDialog(SizePersistedDialog): icon=None, title=None, label=None, use_find=False, read_only=False, - save_size_name='ffdl:ini text dialog', + save_size_name='fff:ini text dialog', ): SizePersistedDialog.__init__(self, parent, save_size_name) @@ -1262,7 +1262,7 @@ class IniTextDialog(SizePersistedDialog): self.resize_dialog() def accept(self): - from ffdl_util import test_config + from fff_util import test_config # print("in accept") errors = test_config(self.get_plain_text()) @@ -1377,7 +1377,7 @@ class ViewLog(SizePersistedDialog): return self.lineno def __init__(self, parent, title, errors, - save_size_name='ffdl:view log dialog',): + save_size_name='fff:view log dialog',): SizePersistedDialog.__init__(self, parent,save_size_name) self.l = l = QVBoxLayout() self.setLayout(l) diff --git a/calibre-plugin/ffdl_plugin.py b/calibre-plugin/fff_plugin.py similarity index 98% rename from calibre-plugin/ffdl_plugin.py rename to calibre-plugin/fff_plugin.py index d25431a..3a5f115 100644 --- a/calibre-plugin/ffdl_plugin.py +++ b/calibre-plugin/fff_plugin.py @@ -55,7 +55,7 @@ from calibre_plugins.fanficfare_plugin.fanficfare import adapters, exceptions from calibre_plugins.fanficfare_plugin.fanficfare.epubutils import get_dcsource, get_dcsource_chaptercount, get_story_url_from_html from calibre_plugins.fanficfare_plugin.fanficfare.geturls import get_urls_from_page, get_urls_from_html, get_urls_from_text, get_urls_from_imap -from calibre_plugins.fanficfare_plugin.ffdl_util import (get_ffdl_adapter, get_ffdl_config, get_ffdl_personalini) +from calibre_plugins.fanficfare_plugin.fff_util import (get_fff_adapter, get_fff_config, get_fff_personalini) from calibre_plugins.fanficfare_plugin.config import (permitted_values, rejecturllist) from calibre_plugins.fanficfare_plugin.prefs import prefs from calibre_plugins.fanficfare_plugin.dialogs import ( @@ -154,7 +154,7 @@ class FanFicFarePlugin(InterfaceAction): return self.macmenuhack except: file_path = os.path.join(calibre_config_dir, - *("plugins/fanfictiondownloader_macmenuhack.txt".split('/'))) + *("plugins/fanficfare_macmenuhack.txt".split('/'))) file_path = os.path.abspath(file_path) logger.debug("Plugin %s macmenuhack file_path:%s"%(self.name,file_path)) self.macmenuhack = os.access(file_path, os.F_OK) @@ -461,7 +461,7 @@ class FanFicFarePlugin(InterfaceAction): def get_urls_from_page(self,url): logger.debug("get_urls_from_page URL:%s"%url) if 'archiveofourown.org' in url: - configuration = get_ffdl_config(url) + configuration = get_fff_config(url) else: configuration = None return get_urls_from_page(url,configuration) @@ -571,7 +571,7 @@ class FanFicFarePlugin(InterfaceAction): else: message="

"+_("Rejecting FFF URLs: None of the books selected have FanFiction URLs.")+"

"+_("Proceed to Remove?")+"

" - if confirm(message,'fanfictiondownloader_reject_non_fanfiction', self.gui): + if confirm(message,'fff_reject_non_fanfiction', self.gui): self.gui.iactions['Remove Books'].delete_books() def add_dialog(self,url_list_text=None,merge=False,anthology_url=None): @@ -612,7 +612,7 @@ class FanFicFarePlugin(InterfaceAction): self.gui.status_bar.show_message(_('Can only Update Epub Anthologies'), 3000) return - tdir = PersistentTemporaryDirectory(prefix='ffdl_anthology_') + tdir = PersistentTemporaryDirectory(prefix='fff_anthology_') logger.debug("tdir:\n%s"%tdir) bookepubio = StringIO(db.format(book_id,'EPUB',index_is_id=True)) @@ -744,10 +744,10 @@ class FanFicFarePlugin(InterfaceAction): update_books = d.get_books() #print("update_books:%s"%update_books) - #print("options:%s"%d.get_ffdl_options()) + #print("options:%s"%d.get_fff_options()) # only if there's some good ones. if 0 < len(filter(lambda x : x['good'], update_books)): - options = d.get_ffdl_options() + options = d.get_fff_options() self.prep_downloads( options, update_books ) def get_urls_clip(self,storyurls=True): @@ -780,13 +780,13 @@ class FanFicFarePlugin(InterfaceAction): options['version'] = self.version logger.debug(self.version) - options['personal.ini'] = get_ffdl_personalini() + options['personal.ini'] = get_fff_personalini() #print("prep_downloads:%s"%books) if 'tdir' not in options: # if merging an anthology, there's alread a tdir. # create and pass temp dir. - tdir = PersistentTemporaryDirectory(prefix='fanfictiondownloader_') + tdir = PersistentTemporaryDirectory(prefix='fanficfare_') options['tdir']=tdir if 0 < len(filter(lambda x : x['good'], books)): @@ -874,7 +874,7 @@ class FanFicFarePlugin(InterfaceAction): skip_date_update = False - adapter = get_ffdl_adapter(url,fileform) + adapter = get_fff_adapter(url,fileform) ## save and share cookiejar and pagecache between all ## downloads. if 'pagecache' not in options: @@ -1237,7 +1237,7 @@ class FanFicFarePlugin(InterfaceAction): description=desc) self.gui.jobs_pointer.start() - self.gui.status_bar.show_message(_('Starting %d FanFictionDownLoads')%len(book_list),3000) + self.gui.status_bar.show_message(_('Starting %d FanFicFare Downloads')%len(book_list),3000) def update_books_loop(self,book,db=None, options={'fileform':'epub', @@ -1310,11 +1310,11 @@ class FanFicFarePlugin(InterfaceAction): if showlist and prefs['mark']: # don't use with anthology db = self.gui.current_db marked_ids = dict() - marked_text = "ffdl_success" + marked_text = "fff_success" for index, book_id in enumerate(all_ids): marked_ids[book_id] = '%s_%04d' % (marked_text, index) for index, book_id in enumerate(failed_ids): - marked_ids[book_id] = 'ffdl_failed_%04d' % index + marked_ids[book_id] = 'fff_failed_%04d' % index # Mark the results in our database db.set_marked_ids(marked_ids) @@ -1677,7 +1677,7 @@ class FanFicFarePlugin(InterfaceAction): configuration = None if prefs['allow_custcol_from_ini']: - configuration = get_ffdl_config(book['url'],options['fileform']) + configuration = get_fff_config(book['url'],options['fileform']) # meta => custcol[,a|n|r] # cliches=>\#acolumn,r for line in configuration.getConfig('custom_columns_settings').splitlines(): @@ -1773,7 +1773,7 @@ class FanFicFarePlugin(InterfaceAction): setting_name = None if prefs['allow_gc_from_ini']: if not configuration: # might already have it from allow_custcol_from_ini - configuration = get_ffdl_config(book['url'],options['fileform']) + configuration = get_fff_config(book['url'],options['fileform']) # template => regexp to match => GC Setting to use. # generate_cover_settings: @@ -1841,7 +1841,7 @@ class FanFicFarePlugin(InterfaceAction): except: if prefs['addtolists'] or prefs['addtoreadlists']: message="

"+_("You configured FanFicFare to automatically update Reading Lists, but you don't have the %s plugin installed anymore?")%'Reading List'+"

" - confirm(message,'fanfictiondownloader_no_reading_list_plugin', self.gui) + confirm(message,'fff_no_reading_list_plugin', self.gui) return if prefs['addtoreadlists']: @@ -1853,7 +1853,7 @@ class FanFicFarePlugin(InterfaceAction): lists = self.get_clean_reading_lists(prefs['read_lists']) if len(lists) < 1 : message="

"+_("You configured FanFicFare to automatically update \"To Read\" Reading Lists, but you don't have any lists set?")+"

" - confirm(message,'fanfictiondownloader_no_read_lists', self.gui) + confirm(message,'fff_no_read_lists', self.gui) for l in lists: if l in rl_plugin.get_list_names(): #print("add good read l:(%s)"%l) @@ -1863,13 +1863,13 @@ class FanFicFarePlugin(InterfaceAction): else: if l != '': message="

"+_("You configured FanFicFare to automatically update Reading List '%s', but you don't have a list of that name?")%l+"

" - confirm(message,'fanfictiondownloader_no_reading_list_%s'%l, self.gui) + confirm(message,'fff_no_reading_list_%s'%l, self.gui) if prefs['addtolists'] and (add or (prefs['addtolistsonread'] and prefs['addtoreadlists']) ): lists = self.get_clean_reading_lists(prefs['send_lists']) if len(lists) < 1 : message="

"+_("You configured FanFicFare to automatically update \"Send to Device\" Reading Lists, but you don't have any lists set?")+"

" - confirm(message,'fanfictiondownloader_no_send_lists', self.gui) + confirm(message,'fff_no_send_lists', self.gui) for l in lists: if l in rl_plugin.get_list_names(): @@ -1881,7 +1881,7 @@ class FanFicFarePlugin(InterfaceAction): else: if l != '': message="

"+_("You configured FanFicFare to automatically update Reading List '%s', but you don't have a list of that name?")%l+"

" - confirm(message,'fanfictiondownloader_no_reading_list_%s'%l, self.gui) + confirm(message,'fff_no_reading_list_%s'%l, self.gui) def make_mi_from_book(self,book): mi = MetaInformation(book['title'],book['author']) # author is a list. @@ -2133,7 +2133,7 @@ class FanFicFarePlugin(InterfaceAction): book['anthology_meta_list'][k]=True logger.debug("book['url']:%s"%book['url']) - configuration = get_ffdl_config(book['url'],fileform) + configuration = get_fff_config(book['url'],fileform) if existingbook: book['title'] = deftitle = existingbook['title'] book['comments'] = existingbook['comments'] diff --git a/calibre-plugin/ffdl_util.py b/calibre-plugin/fff_util.py similarity index 78% rename from calibre-plugin/ffdl_util.py rename to calibre-plugin/fff_util.py index 7a161de..d7b0433 100644 --- a/calibre-plugin/ffdl_util.py +++ b/calibre-plugin/fff_util.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) __license__ = 'GPL v3' -__copyright__ = '2013, Jim Miller' +__copyright__ = '2015, Jim Miller' __docformat__ = 'restructuredtext en' from StringIO import StringIO @@ -17,7 +17,7 @@ from calibre_plugins.fanficfare_plugin.fanficfare import adapters, exceptions from calibre_plugins.fanficfare_plugin.fanficfare.configurable import Configuration from calibre_plugins.fanficfare_plugin.prefs import prefs -def get_ffdl_personalini(): +def get_fff_personalini(): if prefs['includeimages']: # this is a cheat to make it easier for users. return '''[epub] @@ -28,9 +28,9 @@ make_firstimage_cover:true else: return prefs['personal.ini'] -def get_ffdl_config(url,fileform="epub",personalini=None): +def get_fff_config(url,fileform="epub",personalini=None): if not personalini: - personalini = get_ffdl_personalini() + personalini = get_fff_personalini() site='unknown' try: site = adapters.getConfigSectionFor(url) @@ -42,12 +42,12 @@ def get_ffdl_config(url,fileform="epub",personalini=None): return configuration -def get_ffdl_adapter(url,fileform="epub",personalini=None): - return adapters.getAdapter(get_ffdl_config(url,fileform,personalini),url) +def get_fff_adapter(url,fileform="epub",personalini=None): + return adapters.getAdapter(get_fff_config(url,fileform,personalini),url) def test_config(initext): try: - configini = get_ffdl_config("test1.com?sid=555", + configini = get_fff_config("test1.com?sid=555", personalini=initext) errors = configini.test_config() except ParsingError as pe: diff --git a/calibre-plugin/inihighlighter.py b/calibre-plugin/inihighlighter.py index 8be745c..2f34198 100644 --- a/calibre-plugin/inihighlighter.py +++ b/calibre-plugin/inihighlighter.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, print_function) __license__ = 'GPL v3' -__copyright__ = '2014, Jim Miller' +__copyright__ = '2015, Jim Miller' __docformat__ = 'restructuredtext en' import re diff --git a/calibre-plugin/jobs.py b/calibre-plugin/jobs.py index 2805df3..c5d4a29 100644 --- a/calibre-plugin/jobs.py +++ b/calibre-plugin/jobs.py @@ -4,8 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) __license__ = 'GPL v3' -__copyright__ = '2015, Jim Miller' -__copyright__ = '2011, Grant Drake ' +__copyright__ = '2015, Jim Miller, 2011, Grant Drake ' __docformat__ = 'restructuredtext en' import logging @@ -96,26 +95,26 @@ def do_download_for_worker(book,options,notification=lambda x,y:x): ''' from calibre_plugins.fanficfare_plugin import FanFicFareBase - ffdlbase = FanFicFareBase(options['plugin_path']) - with ffdlbase: + fffbase = FanFicFareBase(options['plugin_path']) + with fffbase: from calibre_plugins.fanficfare_plugin.dialogs import (NotGoingToDownload, OVERWRITE, OVERWRITEALWAYS, UPDATE, UPDATEALWAYS, ADDNEW, SKIP, CALIBREONLY) from calibre_plugins.fanficfare_plugin.fanficfare import adapters, writers, exceptions from calibre_plugins.fanficfare_plugin.fanficfare.epubutils import get_update_data - from calibre_plugins.fanficfare_plugin.ffdl_util import (get_ffdl_adapter, get_ffdl_config) + from calibre_plugins.fanficfare_plugin.fff_util import (get_fff_adapter, get_fff_config) try: book['comment'] = _('Download started...') - configuration = get_ffdl_config(book['url'], + configuration = get_fff_config(book['url'], options['fileform'], options['personal.ini']) if configuration.getConfig('use_ssl_unverified_context'): ## monkey patch to avoid SSL bug. dupliated from - ## ffdl_plugin.py because bg jobs run in own process + ## fff_plugin.py because bg jobs run in own process ## space. import ssl if hasattr(ssl, '_create_unverified_context'): @@ -194,14 +193,14 @@ def do_download_for_worker(book,options,notification=lambda x,y:x): adapter.calibrebookmark, adapter.logfile) = get_update_data(book['epub_for_update']) - # dup handling from ffdl_plugin needed for anthology updates. + # dup handling from fff_plugin needed for anthology updates. if options['collision'] == UPDATE: if chaptercount == urlchaptercount: book['comment']=_("Already contains %d chapters. Reuse as is.")%chaptercount book['outfile'] = book['epub_for_update'] # for anthology merge ops. return book - # dup handling from ffdl_plugin needed for anthology updates. + # dup handling from fff_plugin needed for anthology updates. if chaptercount > urlchaptercount: raise NotGoingToDownload(_("Existing epub contains %d chapters, web site only has %d. Use Overwrite to force update.") % (chaptercount,urlchaptercount),'dialog_error.png') diff --git a/calibre-plugin/prefs.py b/calibre-plugin/prefs.py index 0cc988b..f832f2c 100644 --- a/calibre-plugin/prefs.py +++ b/calibre-plugin/prefs.py @@ -7,14 +7,21 @@ __license__ = 'GPL v3' __copyright__ = '2015, Jim Miller' __docformat__ = 'restructuredtext en' +import logging +logger = logging.getLogger(__name__) + import copy from calibre.utils.config import JSONConfig from calibre.gui2.ui import get_gui -from calibre_plugins.fanficfare_plugin.dialogs import OVERWRITE +from calibre_plugins.fanficfare_plugin.dialogs import UPDATE from calibre_plugins.fanficfare_plugin.common_utils import get_library_uuid -PREFS_NAMESPACE = 'FanFictionDownLoaderPlugin' + +# if don't have any settings for FanFicFarePlugin, copy from +# predecessor FanFictionDownLoaderPlugin. +FFDL_PREFS_NAMESPACE = 'FanFictionDownLoaderPlugin' +PREFS_NAMESPACE = 'FanFicFarePlugin' PREFS_KEY_SETTINGS = 'settings' # Set defaults used by all. Library specific settings continue to @@ -39,7 +46,7 @@ default_prefs['autoconvert'] = False default_prefs['urlsfromclip'] = True default_prefs['updatedefault'] = True default_prefs['fileform'] = 'epub' -default_prefs['collision'] = OVERWRITE +default_prefs['collision'] = UPDATE default_prefs['deleteotherforms'] = False default_prefs['adddialogstaysontop'] = False default_prefs['includeimages'] = False @@ -78,13 +85,6 @@ default_prefs['imapsessionpass'] = False default_prefs['imapfolder'] = 'INBOX' default_prefs['imapmarkread'] = True -# This is where all preferences for this plugin *were* stored -# Remember that this name (i.e. plugins/fanfictiondownloader_plugin) is also -# in a global namespace, so make it as unique as possible. -# You should always prefix your config file name with plugins/, -# so as to ensure you dont accidentally clobber a calibre config file -old_prefs = JSONConfig('plugins/fanfictiondownloader_plugin') - def set_library_config(library_config,db): db.prefs.set_namespaced(PREFS_NAMESPACE, PREFS_KEY_SETTINGS, @@ -93,19 +93,23 @@ def set_library_config(library_config,db): def get_library_config(db): library_id = get_library_uuid(db) library_config = None - # Check whether this is a configuration needing to be migrated - # from json into database. If so: get it, set it, rename it in json. - if library_id in old_prefs: - #print("get prefs from old_prefs") - library_config = old_prefs[library_id] - set_library_config(library_config,db) - old_prefs["migrated to library db %s"%library_id] = old_prefs[library_id] - del old_prefs[library_id] if library_config is None: #print("get prefs from db") - library_config = db.prefs.get_namespaced(PREFS_NAMESPACE, PREFS_KEY_SETTINGS, - copy.deepcopy(default_prefs)) + library_config = db.prefs.get_namespaced(PREFS_NAMESPACE, + PREFS_KEY_SETTINGS) + + # if don't have any settings for FanFicFarePlugin, copy from + # predecessor FanFictionDownLoaderPlugin. + if library_config is None: + logger.info("Attempting to read settings from predecessor--FFDL") + library_config = db.prefs.get_namespaced(FFDL_PREFS_NAMESPACE, + PREFS_KEY_SETTINGS) + if library_config is None: + # defaults. + logger.info("Using default settings") + library_config = copy.deepcopy(default_prefs) + return library_config # fake out so I don't have to change the prefs calls anywhere. The