Parse cbr files

__main__.py

@@ -55,6 +55,7 @@
         ✓ Include icons for emblems
 """
 
+import os
 import sys
 
 from PyQt5 import QtWidgets, QtGui, QtCore
@@ -204,9 +205,10 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
 
         my_file = QtWidgets.QFileDialog.getOpenFileNames(
             self, 'Open file', self.last_open_path,
-            "eBooks (*.epub *.mobi *.aws *.txt *.pdf *.fb2 *.djvu *.cbz)")
+            "eBooks (*.epub *.cbz *.cbr)")
 
         if my_file[0]:
+            self.last_open_path = os.path.dirname(my_file[0][0])
             self.thread = BackGroundBookAddition(self, my_file[0], self.database_path)
             self.thread.finished.connect(self.lib_ref.create_proxymodel)
             self.thread.start()

ebooklib/LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are 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.
+
+  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.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  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 AGPL, see
+<http://www.gnu.org/licenses/>.

library.py

@@ -83,9 +83,6 @@ class Library:
                 'tags': tags,
                 'hash': i[8]}
 
-            # import pprint
-            # pprint.pprint(all_metadata)
-
             tooltip_string = title + '\nAuthor: ' + author + '\nYear: ' + str(year)
             if tags:
                 tooltip_string += ('\nTags: ' + tags)

parsers/cbr.py

@@ -0,0 +1,91 @@
+#!/usr/bin/env python3
+
+import os
+import time
+import collections
+from rarfile import rarfile
+
+
+class ParseCBR:
+    def __init__(self, filename, temp_dir, file_md5):
+        self.filename = filename
+        self.book = None
+        self.temp_dir = temp_dir
+        self.file_md5 = file_md5
+
+    def read_book(self):
+        try:
+            self.book = rarfile.RarFile(self.filename)
+        except:  # Specifying no exception types might be warranted here
+            print('Cannot parse ' + self.filename)
+            return
+
+    def get_title(self):
+        filename = os.path.basename(self.filename)
+        filename_proper = os.path.splitext(filename)[0]
+        return filename_proper
+
+    def get_author(self):
+        return None
+
+    def get_year(self):
+        creation_time = time.ctime(os.path.getctime(self.filename))
+        creation_year = creation_time.split()[-1]
+        return creation_year
+
+    def get_cover_image(self):
+        # The first image in the archive may not be the cover
+        # It is implied, however, that the first image in order
+        # will be the cover
+
+        image_list = [i.filename for i in self.book.infolist() if not i.isdir()]
+        image_list.sort()
+        cover_image_filename = image_list[0]
+
+        for i in self.book.infolist():
+            if not i.isdir():
+                if i.filename == cover_image_filename:
+                    cover_image = self.book.read(i)
+                    return cover_image
+
+    def get_isbn(self):
+        return None
+
+    def get_contents(self):
+        # TODO
+        # CBR files containing multiple directories for multiple chapters
+
+        file_settings = {
+            'images_only': True}
+
+        extract_path = os.path.join(self.temp_dir, self.file_md5)
+        contents = collections.OrderedDict()
+        # This is a brute force approach
+        # Maybe try reading from the file as everything
+        # matures a little bit more
+
+        contents = collections.OrderedDict()
+
+        # I'm currently choosing not to keep multiple files in memory
+        self.book.extractall(extract_path)
+
+        found_images = []
+        for i in os.walk(extract_path):
+            if i[2]:  # Implies files were found
+                image_dir = i[0]
+                found_images = i[2]
+                break
+
+        if not found_images:
+            print('Found nothing in ' + self.filename)
+            return None, file_settings
+
+        found_images.sort()
+
+        for count, i in enumerate(found_images):
+            page_name = 'Page ' + str(count + 1)
+            image_path = os.path.join(extract_path, image_dir, i)
+
+            contents[page_name] = image_path
+
+        return contents, file_settings

parsers/cbz.py

@@ -56,13 +56,9 @@ class ParseCBZ:
 
     def get_contents(self):
         # TODO
-        # Image resizing, formatting
-        # Include this as a collection of absolute paths only
-        # Post processing can be carried out by the program
         # CBZ files containing multiple directories for multiple chapters
 
         file_settings = {
-            'temp_dir': self.temp_dir,
             'images_only': True}
 
         extract_path = os.path.join(self.temp_dir, self.file_md5)
@@ -90,10 +86,9 @@ class ParseCBZ:
         found_images.sort()
 
         for count, i in enumerate(found_images):
-            page_name = 'Page ' + str(count)
+            page_name = 'Page ' + str(count + 1)
             image_path = os.path.join(extract_path, image_dir, i)
 
             contents[page_name] = image_path
-            # contents[page_name] = "<img src='%s' align='middle'/>" % image_path
 
         return contents, file_settings

parsers/epub.py

@@ -144,7 +144,6 @@ class ParseEPUB:
         # Special settings that have to be returned with the file
         # Referenced in sorter.py
         file_settings = {
-            'temp_dir': extract_path,
             'images_only': False}
 
         return contents, file_settings

rarfile/LICENSE

@@ -0,0 +1,15 @@
+
+Copyright (c) 2005-2016 Marko Kreen <markokr@gmail.com>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+

rarfile/dumprar.py

@@ -0,0 +1,556 @@
+#! /usr/bin/env python
+
+"""Dump archive contents, test extraction."""
+
+from __future__ import division, absolute_import, print_function
+
+import io
+import sys
+import getopt
+
+from datetime import datetime
+
+import rarfile as rf
+
+
+usage = """
+dumprar [switches] [ARC1 ARC2 ...] [@ARCLIST]
+switches:
+  @file      read archive names from file
+  -pPSW      set password
+  -Ccharset  set fallback charset
+  -v         increase verbosity
+  -t         attempt to read all files
+  -x         write read files out
+  -c         show archive comment
+  -h         show usage
+  --         stop switch parsing
+""".strip()
+
+os_list = ['DOS', 'OS2', 'WIN', 'UNIX', 'MACOS', 'BEOS']
+
+block_strs = ['MARK', 'MAIN', 'FILE', 'OLD_COMMENT', 'OLD_EXTRA',
+              'OLD_SUB', 'OLD_RECOVERY', 'OLD_AUTH', 'SUB', 'ENDARC']
+
+r5_block_types = {
+    rf.RAR5_BLOCK_MAIN: 'R5_MAIN',
+    rf.RAR5_BLOCK_FILE: 'R5_FILE',
+    rf.RAR5_BLOCK_SERVICE: 'R5_SVC',
+    rf.RAR5_BLOCK_ENCRYPTION: 'R5_ENC',
+    rf.RAR5_BLOCK_ENDARC: 'R5_ENDARC',
+}
+
+
+def rar3_type(btype):
+    """RAR3 type code as string."""
+    if btype < rf.RAR_BLOCK_MARK or btype > rf.RAR_BLOCK_ENDARC:
+        return "*UNKNOWN*"
+    return block_strs[btype - rf.RAR_BLOCK_MARK]
+
+
+def rar5_type(btype):
+    """RAR5 type code as string."""
+    return r5_block_types.get(btype, '*UNKNOWN*')
+
+
+main_bits = (
+    (rf.RAR_MAIN_VOLUME, "VOL"),
+    (rf.RAR_MAIN_COMMENT, "COMMENT"),
+    (rf.RAR_MAIN_LOCK, "LOCK"),
+    (rf.RAR_MAIN_SOLID, "SOLID"),
+    (rf.RAR_MAIN_NEWNUMBERING, "NEWNR"),
+    (rf.RAR_MAIN_AUTH, "AUTH"),
+    (rf.RAR_MAIN_RECOVERY, "RECOVERY"),
+    (rf.RAR_MAIN_PASSWORD, "PASSWORD"),
+    (rf.RAR_MAIN_FIRSTVOLUME, "FIRSTVOL"),
+    (rf.RAR_SKIP_IF_UNKNOWN, "SKIP"),
+    (rf.RAR_LONG_BLOCK, "LONG"),
+)
+
+endarc_bits = (
+    (rf.RAR_ENDARC_NEXT_VOLUME, "NEXTVOL"),
+    (rf.RAR_ENDARC_DATACRC, "DATACRC"),
+    (rf.RAR_ENDARC_REVSPACE, "REVSPACE"),
+    (rf.RAR_ENDARC_VOLNR, "VOLNR"),
+    (rf.RAR_SKIP_IF_UNKNOWN, "SKIP"),
+    (rf.RAR_LONG_BLOCK, "LONG"),
+)
+
+file_bits = (
+    (rf.RAR_FILE_SPLIT_BEFORE, "SPLIT_BEFORE"),
+    (rf.RAR_FILE_SPLIT_AFTER, "SPLIT_AFTER"),
+    (rf.RAR_FILE_PASSWORD, "PASSWORD"),
+    (rf.RAR_FILE_COMMENT, "COMMENT"),
+    (rf.RAR_FILE_SOLID, "SOLID"),
+    (rf.RAR_FILE_LARGE, "LARGE"),
+    (rf.RAR_FILE_UNICODE, "UNICODE"),
+    (rf.RAR_FILE_SALT, "SALT"),
+    (rf.RAR_FILE_VERSION, "VERSION"),
+    (rf.RAR_FILE_EXTTIME, "EXTTIME"),
+    (rf.RAR_FILE_EXTFLAGS, "EXTFLAGS"),
+    (rf.RAR_SKIP_IF_UNKNOWN, "SKIP"),
+    (rf.RAR_LONG_BLOCK, "LONG"),
+)
+
+generic_bits = (
+    (rf.RAR_SKIP_IF_UNKNOWN, "SKIP"),
+    (rf.RAR_LONG_BLOCK, "LONG"),
+)
+
+file_parms = ("D64", "D128", "D256", "D512",
+              "D1024", "D2048", "D4096", "DIR")
+
+r5_block_flags = (
+    (rf.RAR5_BLOCK_FLAG_EXTRA_DATA, 'EXTRA'),
+    (rf.RAR5_BLOCK_FLAG_DATA_AREA, 'DATA'),
+    (rf.RAR5_BLOCK_FLAG_SKIP_IF_UNKNOWN, 'SKIP'),
+    (rf.RAR5_BLOCK_FLAG_SPLIT_BEFORE, 'SPLIT_BEFORE'),
+    (rf.RAR5_BLOCK_FLAG_SPLIT_AFTER, 'SPLIT_AFTER'),
+    (rf.RAR5_BLOCK_FLAG_DEPENDS_PREV, 'DEPENDS'),
+    (rf.RAR5_BLOCK_FLAG_KEEP_WITH_PARENT, 'KEEP'),
+)
+
+r5_main_flags = (
+    (rf.RAR5_MAIN_FLAG_ISVOL, 'ISVOL'),
+    (rf.RAR5_MAIN_FLAG_HAS_VOLNR, 'VOLNR'),
+    (rf.RAR5_MAIN_FLAG_SOLID, 'SOLID'),
+    (rf.RAR5_MAIN_FLAG_RECOVERY, 'RECOVERY'),
+    (rf.RAR5_MAIN_FLAG_LOCKED, 'LOCKED'),
+)
+
+r5_file_flags = (
+    (rf.RAR5_FILE_FLAG_ISDIR, 'DIR'),
+    (rf.RAR5_FILE_FLAG_HAS_MTIME, 'MTIME'),
+    (rf.RAR5_FILE_FLAG_HAS_CRC32, 'CRC32'),
+    (rf.RAR5_FILE_FLAG_UNKNOWN_SIZE, 'NOSIZE'),
+)
+
+r5_enc_flags = (
+    (rf.RAR5_ENC_FLAG_HAS_CHECKVAL, 'CHECKVAL'),
+)
+
+r5_endarc_flags = (
+    (rf.RAR5_ENDARC_FLAG_NEXT_VOL, 'NEXTVOL'),
+)
+
+r5_file_enc_flags = (
+    (rf.RAR5_XENC_CHECKVAL, 'CHECKVAL'),
+    (rf.RAR5_XENC_TWEAKED, 'TWEAKED'),
+)
+
+r5_file_redir_types = {
+    rf.RAR5_XREDIR_UNIX_SYMLINK: 'UNIX_SYMLINK',
+    rf.RAR5_XREDIR_WINDOWS_SYMLINK: 'WINDOWS_SYMLINK',
+    rf.RAR5_XREDIR_WINDOWS_JUNCTION: 'WINDOWS_JUNCTION',
+    rf.RAR5_XREDIR_HARD_LINK: 'HARD_LINK',
+    rf.RAR5_XREDIR_FILE_COPY: 'FILE_COPY',
+}
+
+r5_file_redir_flags = (
+    (rf.RAR5_XREDIR_ISDIR, 'DIR'),
+)
+
+
+def xprint(m, *args):
+    """Print string to stdout.
+
+    Format unicode safely.
+    """
+    if sys.hexversion < 0x3000000:
+        m = m.decode('utf8')
+    if args:
+        m = m % args
+    if sys.hexversion < 0x3000000:
+        m = m.encode('utf8')
+    sys.stdout.write(m)
+    sys.stdout.write('\n')
+
+
+def render_flags(flags, bit_list):
+    """Show bit names.
+    """
+    res = []
+    known = 0
+    for bit in bit_list:
+        known = known | bit[0]
+        if flags & bit[0]:
+            res.append(bit[1])
+    unknown = flags & ~known
+    n = 0
+    while unknown:
+        if unknown & 1:
+            res.append("UNK_%04x" % (1 << n))
+        unknown = unknown >> 1
+        n += 1
+
+    if not res:
+        return '-'
+
+    return ",".join(res)
+
+
+def get_file_flags(flags):
+    """Show flag names and handle dict size.
+    """
+    res = render_flags(flags & ~rf.RAR_FILE_DICTMASK, file_bits)
+
+    xf = (flags & rf.RAR_FILE_DICTMASK) >> 5
+    res += "," + file_parms[xf]
+    return res
+
+
+def fmt_time(t):
+    """Format time.
+    """
+    if t is None:
+        return '(-)'
+    if isinstance(t, datetime):
+        return t.isoformat('T')
+    return "%04d-%02d-%02d %02d:%02d:%02d" % t
+
+
+def show_item(h):
+    """Show any RAR3/5 record.
+    """
+    if isinstance(h, rf.Rar3Info):
+        show_item_v3(h)
+    elif isinstance(h, rf.Rar5Info):
+        show_item_v5(h)
+    else:
+        xprint('Unknown info record')
+
+
+def show_item_v3(h):
+    """Show any RAR3 record.
+    """
+    st = rar3_type(h.type)
+    xprint("%s: hdrlen=%d datlen=%d", st, h.header_size, h.add_size)
+    if h.type in (rf.RAR_BLOCK_FILE, rf.RAR_BLOCK_SUB):
+        if h.host_os == rf.RAR_OS_UNIX:
+            s_mode = "0%o" % h.mode
+        else:
+            s_mode = "0x%x" % h.mode
+        xprint("  flags=0x%04x:%s", h.flags, get_file_flags(h.flags))
+        if h.host_os >= 0 and h.host_os < len(os_list):
+            s_os = os_list[h.host_os]
+        else:
+            s_os = "?"
+        xprint("  os=%d:%s ver=%d mode=%s meth=%c cmp=%d dec=%d vol=%d",
+               h.host_os, s_os,
+               h.extract_version, s_mode, h.compress_type,
+               h.compress_size, h.file_size, h.volume)
+        ucrc = (h.CRC + (1 << 32)) & ((1 << 32) - 1)
+        xprint("  crc=0x%08x (%d) date_time=%s", ucrc, h.CRC, fmt_time(h.date_time))
+        xprint("  name=%s", h.filename)
+        if h.mtime:
+            xprint("  mtime=%s", fmt_time(h.mtime))
+        if h.ctime:
+            xprint("  ctime=%s", fmt_time(h.ctime))
+        if h.atime:
+            xprint("  atime=%s", fmt_time(h.atime))
+        if h.arctime:
+            xprint("  arctime=%s", fmt_time(h.arctime))
+    elif h.type == rf.RAR_BLOCK_MAIN:
+        xprint("  flags=0x%04x:%s", h.flags, render_flags(h.flags, main_bits))
+    elif h.type == rf.RAR_BLOCK_ENDARC:
+        xprint("  flags=0x%04x:%s", h.flags, render_flags(h.flags, endarc_bits))
+    elif h.type == rf.RAR_BLOCK_MARK:
+        xprint("  flags=0x%04x:", h.flags)
+    else:
+        xprint("  flags=0x%04x:%s", h.flags, render_flags(h.flags, generic_bits))
+
+    if h.comment is not None:
+        cm = repr(h.comment)
+        if cm[0] == 'u':
+            cm = cm[1:]
+        xprint("  comment=%s", cm)
+
+
+def show_item_v5(h):
+    """Show any RAR5 record.
+    """
+    st = rar5_type(h.block_type)
+    xprint("%s: hdrlen=%d datlen=%d hdr_extra=%d", st, h.header_size,
+           h.compress_size, h.block_extra_size)
+    xprint("  block_flags=0x%04x:%s", h.block_flags, render_flags(h.block_flags, r5_block_flags))
+    if h.block_type in (rf.RAR5_BLOCK_FILE, rf.RAR5_BLOCK_SERVICE):
+        xprint("  name=%s", h.filename)
+        if h.file_host_os == rf.RAR5_OS_UNIX:
+            s_os = 'UNIX'
+            s_mode = "0%o" % h.mode
+        else:
+            s_os = 'WINDOWS'
+            s_mode = "0x%x" % h.mode
+        xprint("  file_flags=0x%04x:%s", h.file_flags, render_flags(h.file_flags, r5_file_flags))
+
+        cmp_flags = h.file_compress_flags
+        xprint("  cmp_algo=%d cmp_meth=%d dict=%d solid=%r",
+               cmp_flags & 0x3f,
+               (cmp_flags >> 7) & 0x07,
+               cmp_flags >> 10,
+               cmp_flags & rf.RAR5_COMPR_SOLID > 0)
+        xprint("  os=%d:%s mode=%s cmp=%r dec=%r vol=%r",
+               h.file_host_os, s_os, s_mode,
+               h.compress_size, h.file_size, h.volume)
+        if h.CRC is not None:
+            xprint("  crc=0x%08x (%d)", h.CRC, h.CRC)
+        if h.blake2sp_hash is not None:
+            xprint("  blake2sp=%s", rf.tohex(h.blake2sp_hash))
+        if h.date_time is not None:
+            xprint("  date_time=%s", fmt_time(h.date_time))
+        if h.mtime:
+            xprint("  mtime=%s", fmt_time(h.mtime))
+        if h.ctime:
+            xprint("  ctime=%s", fmt_time(h.ctime))
+        if h.atime:
+            xprint("  atime=%s", fmt_time(h.atime))
+        if h.arctime:
+            xprint("  arctime=%s", fmt_time(h.arctime))
+        if h.flags & rf.RAR_FILE_PASSWORD:
+            enc_algo, enc_flags, kdf_count, salt, iv, checkval = h.file_encryption
+            algo_name = 'AES256' if enc_algo == rf.RAR5_XENC_CIPHER_AES256 else 'UnknownAlgo'
+            xprint('  algo=%d:%s enc_flags=%04x:%s kdf_lg=%d kdf_count=%d salt=%s iv=%s checkval=%s',
+                   enc_algo, algo_name, enc_flags, render_flags(enc_flags, r5_file_enc_flags),
+                   kdf_count, 1 << kdf_count, rf.tohex(salt), rf.tohex(iv),
+                   checkval and rf.tohex(checkval) or '-')
+        if h.file_redir:
+            redir_type, redir_flags, redir_name = h.file_redir
+            xprint('  redir: type=%s flags=%d:%s destination=%s',
+                   r5_file_redir_types.get(redir_type, 'Unknown'),
+                   redir_flags, render_flags(redir_flags, r5_file_redir_flags),
+                   redir_name)
+        if h.file_owner:
+            uname, gname, uid, gid = h.file_owner
+            xprint('  owner: name=%r group=%r uid=%r gid=%r',
+                   uname, gname, uid, gid)
+        if h.file_version:
+            flags, version = h.file_version
+            xprint('  version: flags=%r version=%r', flags, version)
+    elif h.block_type == rf.RAR5_BLOCK_MAIN:
+        xprint("  flags=0x%04x:%s", h.flags, render_flags(h.main_flags, r5_main_flags))
+    elif h.block_type == rf.RAR5_BLOCK_ENDARC:
+        xprint("  flags=0x%04x:%s", h.flags, render_flags(h.endarc_flags, r5_endarc_flags))
+    elif h.block_type == rf.RAR5_BLOCK_ENCRYPTION:
+        algo_name = 'AES256' if h.encryption_algo == rf.RAR5_XENC_CIPHER_AES256 else 'UnknownAlgo'
+        xprint("  algo=%d:%s flags=0x%04x:%s", h.encryption_algo, algo_name, h.flags,
+               render_flags(h.encryption_flags, r5_enc_flags))
+        xprint("  kdf_lg=%d kdf_count=%d", h.encryption_kdf_count, 1 << h.encryption_kdf_count)
+        xprint("  salt=%s", rf.tohex(h.encryption_salt))
+    else:
+        xprint("  - missing info -")
+
+    if h.comment is not None:
+        cm = repr(h.comment)
+        if cm[0] == 'u':
+            cm = cm[1:]
+        xprint("  comment=%s", cm)
+
+
+cf_show_comment = 0
+cf_verbose = 0
+cf_charset = None
+cf_extract = 0
+cf_test_read = 0
+cf_test_unrar = 0
+cf_test_memory = 0
+
+
+def check_crc(f, inf, desc):
+    """Compare result crc to expected value.
+    """
+    exp = inf._md_expect
+    if exp is None:
+        return
+    ucrc = f._md_context.digest()
+    if ucrc != exp:
+        print('crc error - %s - exp=%r got=%r' % (desc, exp, ucrc))
+
+
+def test_read_long(r, inf):
+    """Test read and readinto.
+    """
+    md_class = inf._md_class or rf.NoHashContext
+    bctx = md_class()
+    f = r.open(inf.filename)
+    total = 0
+    while 1:
+        data = f.read(8192)
+        if not data:
+            break
+        bctx.update(data)
+        total += len(data)
+    if total != inf.file_size:
+        xprint("\n *** %s has corrupt file: %s ***", r.rarfile, inf.filename)
+        xprint(" *** short read: got=%d, need=%d ***\n", total, inf.file_size)
+    check_crc(f, inf, 'read')
+    bhash = bctx.hexdigest()
+    if cf_verbose > 1:
+        if f._md_context.digest() == inf._md_expect:
+            #xprint("  checkhash: %r", bhash)
+            pass
+        else:
+            xprint("  checkhash: %r  got=%r exp=%r cls=%r\n",
+                   bhash, f._md_context.digest(), inf._md_expect, inf._md_class)
+
+    # test .seek() & .readinto()
+    if cf_test_read > 1:
+        f.seek(0, 0)
+
+        total = 0
+        buf = bytearray(rf.ZERO * 1024)
+        while 1:
+            res = f.readinto(buf)
+            if not res:
+                break
+            total += res
+        if inf.file_size != total:
+            xprint(" *** readinto failed: got=%d, need=%d ***\n", total, inf.file_size)
+        #check_crc(f, inf, 'readinto')
+    f.close()
+
+
+def test_read(r, inf):
+    """Test file read."""
+    test_read_long(r, inf)
+
+
+def test_real(fn, psw):
+    """Actual archive processing.
+    """
+    xprint("Archive: %s", fn)
+
+    cb = None
+    if cf_verbose > 1:
+        cb = show_item
+
+    rfarg = fn
+    if cf_test_memory:
+        rfarg = io.BytesIO(open(fn, 'rb').read())
+
+    # check if rar
+    if not rf.is_rarfile(rfarg):
+        xprint(" --- %s is not a RAR file ---", fn)
+        return
+
+    # open
+    r = rf.RarFile(rfarg, charset=cf_charset, info_callback=cb)
+    # set password
+    if r.needs_password():
+        if psw:
+            r.setpassword(psw)
+        else:
+            xprint(" --- %s requires password ---", fn)
+            return
+
+    # show comment
+    if cf_show_comment and r.comment:
+        for ln in r.comment.split('\n'):
+            xprint("    %s", ln)
+    elif cf_verbose > 0 and r.comment:
+        cm = repr(r.comment)
+        if cm[0] == 'u':
+            cm = cm[1:]
+        xprint("  comment=%s", cm)
+
+    # process
+    for n in r.namelist():
+        inf = r.getinfo(n)
+        if inf.isdir():
+            continue
+        if cf_verbose == 1:
+            show_item(inf)
+        if cf_test_read:
+            test_read(r, inf)
+
+    if cf_extract:
+        r.extractall()
+        for inf in r.infolist():
+            r.extract(inf)
+
+    if cf_test_unrar:
+        r.testrar()
+
+
+def test(fn, psw):
+    """Process one archive with error handling.
+    """
+    try:
+        test_real(fn, psw)
+    except rf.NeedFirstVolume:
+        xprint(" --- %s is middle part of multi-vol archive ---", fn)
+    except rf.Error:
+        exc, msg, tb = sys.exc_info()
+        xprint("\n *** %s: %s ***\n", exc.__name__, msg)
+        del tb
+    except IOError:
+        exc, msg, tb = sys.exc_info()
+        xprint("\n *** %s: %s ***\n", exc.__name__, msg)
+        del tb
+
+
+def main():
+    """Program entry point.
+    """
+    global cf_verbose, cf_show_comment, cf_charset
+    global cf_extract, cf_test_read, cf_test_unrar
+    global cf_test_memory
+
+    psw = None
+
+    # parse args
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], 'p:C:hvcxtRM')
+    except getopt.error as ex:
+        print(str(ex), file=sys.stderr)
+        sys.exit(1)
+
+    for o, v in opts:
+        if o == '-p':
+            psw = v
+        elif o == '-h':
+            xprint(usage)
+            return
+        elif o == '-v':
+            cf_verbose += 1
+        elif o == '-c':
+            cf_show_comment = 1
+        elif o == '-x':
+            cf_extract = 1
+        elif o == '-t':
+            cf_test_read += 1
+        elif o == '-T':
+            cf_test_unrar = 1
+        elif o == '-M':
+            cf_test_memory = 1
+        elif o == '-C':
+            cf_charset = v
+        else:
+            raise Exception("unhandled switch: " + o)
+
+    args2 = []
+    for a in args:
+        if a[0] == "@":
+            for ln in open(a[1:], 'r'):
+                fn = ln[:-1]
+                args2.append(fn)
+        else:
+            args2.append(a)
+    args = args2
+
+    if not args:
+        xprint(usage)
+
+    # pypy .readinto()+memoryview() is buggy
+    #if cf_test_read > 1 and hasattr(sys, 'pypy_version_info'):
+    #    cf_test_read = 1
+
+    for fn in args:
+        test(fn, psw)
+
+
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+

sorter.py

@@ -19,9 +19,12 @@ import database
 # get_cover_image()
 # get_isbn()
 # get_contents() - Should return a tuple with 0: TOC 1: Deletable temp_directory
+# Parsers for files containing only images need to return only
+# the image path, and images_only = True
 
 from parsers.epub import ParseEPUB
 from parsers.cbz import ParseCBZ
+from parsers.cbr import ParseCBR
 
 
 class BookSorter:
@@ -95,6 +98,8 @@ class BookSorter:
                 book_ref = ParseEPUB(filename, self.temp_dir, file_md5)
             if file_extension == 'cbz':
                 book_ref = ParseCBZ(filename, self.temp_dir, file_md5)
+            if file_extension == 'cbr':
+                book_ref = ParseCBR(filename, self.temp_dir, file_md5)
         except IndexError:
             return
 
@@ -128,12 +133,10 @@ class BookSorter:
                 # get_contents() returns a tuple. Index 1 is a collection of
                 # special settings that depend on the kind of data being parsed.
                 # Currently, this includes:
-                # Temporary Directory       temp_dir        STR     Deleted upon exit
                 # Only images included      images_only     BOOL    Specify only paths to images
                 #                                                   File will not be cached on exit
 
                 content = all_content[0]
-                temp_dir = all_content[1]['temp_dir']
                 images_only = all_content[1]['images_only']
 
                 if not content.keys():
@@ -149,7 +152,6 @@ class BookSorter:
                     'path': filename,
                     'position': position,
                     'content': content,
-                    'temp_dir': temp_dir,
                     'images_only': images_only}
 
 

widgets.py

@@ -307,7 +307,8 @@ class Tab(QtWidgets.QWidget):
         else:
             self.contentView = PliantQTextBrowser(self.window())
 
-            relative_path_root = self.metadata['temp_dir']
+            relative_path_root = os.path.join(
+                self.window().temp_dir.path(), self.metadata['hash'])
             relative_paths = []
             for i in os.walk(relative_path_root):
                 relative_paths.append(os.path.join(relative_path_root, i[0]))
@@ -517,7 +518,8 @@ class PliantWidgetsCommonFunctions():
                 self.pw.verticalScrollBar().setValue(
                     self.pw.verticalScrollBar().maximum())
 
-            self.pw.ignore_wheel_event = True
+            if not was_button_pressed:
+                self.pw.ignore_wheel_event = True
 
 
 class LibraryDelegate(QtWidgets.QStyledItemDelegate):