Updated README

Make sure that KindleGen have execute permissions
Updated OS X libraries
2026-04-15 05:28:49 +00:00 · 2014-06-08 07:52:19 +02:00 · 2014-06-05 07:37:32 +02:00 · 2014-06-04 10:00:45 +02:00 · 2014-06-03 19:26:24 +02:00 · 2014-06-02 20:31:48 +02:00
26 changed files with 652 additions and 712 deletions
--- a/KCC-Linux.ui
+++ b/KCC-Linux.ui
@@ -110,7 +110,7 @@
        <enum>Qt::NoFocus</enum>
       </property>
       <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Enable auto-splitting of webtoons like &lt;span style=&quot; font-style:italic;&quot;&gt;Tower of God&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;.&lt;br/&gt;Pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable auto-splitting of webtoons like &lt;span style=&quot; font-style:italic;&quot;&gt;Tower of God&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;.&lt;br/&gt;This mode was created for pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
       <property name="text">
        <string>Webtoon mode</string>
@@ -386,7 +386,7 @@
      <enum>Qt::NoFocus</enum>
     </property>
     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Use it when Panel View support is not needed.&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Poor quality when zoom is enabled.&lt;br/&gt;- Lowest file size.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Not zoomed images &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;might&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt; be blurry.&lt;br/&gt;&lt;/span&gt;- High quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Maximum possible quality.&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;br/&gt;- Very high file size.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;/span&gt;&lt;br/&gt;Maximal quality of images but very poor magnification quality.&lt;br/&gt;Use it only when zoom is not needed or output files needs to be small.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;/span&gt;&lt;br/&gt;In most cases high quality of images and magnification.&lt;br/&gt;Overall quality highly depends on the resolution of source files.&lt;br/&gt;On Kindle models older than Paperwhite non-zoomed images might be a little blurred.&lt;br/&gt;&lt;br/&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;/span&gt;&lt;br/&gt;Highest possible quality. Output files will be big.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
     <property name="text">
      <string>High/Ultra quality</string>
--- a/KCC-OSX.ui
+++ b/KCC-OSX.ui
@@ -110,7 +110,7 @@
        <enum>Qt::NoFocus</enum>
       </property>
       <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Enable auto-splitting of webtoons like &lt;span style=&quot; font-style:italic;&quot;&gt;Tower of God&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;.&lt;br/&gt;Pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable auto-splitting of webtoons like &lt;span style=&quot; font-style:italic;&quot;&gt;Tower of God &lt;/span&gt;or &lt;span style=&quot; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;.&lt;br/&gt;This mode was created for pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
       <property name="text">
        <string>Webtoon mode</string>
@@ -391,7 +391,7 @@
      <enum>Qt::NoFocus</enum>
     </property>
     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Use it when Panel View support is not needed.&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Poor quality when zoom is enabled.&lt;br/&gt;- Lowest file size.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Not zoomed image &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;might&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt; be a little blurry.&lt;br/&gt;&lt;/span&gt;- High quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Maximum possible quality.&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;br/&gt;- Very high file size.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;/span&gt;&lt;br/&gt;Maximal quality of images but very poor magnification quality.&lt;br/&gt;Use it only when zoom is not needed or output files needs to be small.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;/span&gt;&lt;br/&gt;In most cases high quality of images and magnification.&lt;br/&gt;Overall quality highly depends on the resolution of source files.&lt;br/&gt;On Kindle models older than Paperwhite non-zoomed images might be a little blurred.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;/span&gt;&lt;br/&gt;Highest possible quality. Output files will be big.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
     <property name="text">
      <string>High/Ultra quality</string>
--- a/KCC.ui
+++ b/KCC.ui
@@ -94,7 +94,7 @@
        <enum>Qt::NoFocus</enum>
       </property>
       <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Enable auto-splitting of webtoons like &lt;span style=&quot; font-style:italic;&quot;&gt;Tower of God&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;.&lt;br/&gt;Pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style=&quot;white-space:pre&quot;&gt;Enable auto-splitting of webtoons like &lt;span style=&quot; font-style:italic;&quot;&gt;Tower of God&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;.&lt;br/&gt;This mode is created for pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
       <property name="text">
        <string>Webtoon mode</string>
@@ -338,7 +338,7 @@
      <enum>Qt::NoFocus</enum>
     </property>
     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Use it when Panel View support is not needed.&lt;/span&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Poor quality when zoom is enabled.&lt;br/&gt;- Lowest file size.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Not zoomed images &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;might &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;be blurry.&lt;/span&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br/&gt;&lt;/span&gt;- High quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Maximum possible quality.&lt;/span&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;br/&gt;- Very high file size.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style=&quot;white-space:pre&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;br/&gt;&lt;/span&gt;Maximal quality of images but very poor magnification quality.&lt;br/&gt;Use it only when zoom is not needed or output files needs to be small.&lt;/p&gt;&lt;p style=&quot;white-space:pre&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;br/&gt;&lt;/span&gt;In most cases high quality of images and magnification.&lt;br/&gt;Overall quality highly depends on the resolution of source files.&lt;br/&gt;On Kindle models older than Paperwhite non-zoomed images might be a little blurred.&lt;/p&gt;&lt;p style=&quot;white-space:pre&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;br/&gt;&lt;/span&gt;Highest possible quality. Output files will be big.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
     <property name="text">
      <string>High/Ultra quality</string>
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
 ISC LICENSE

 Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-Copyright (c) 2013-2014 Paweł Jastrzębski <pawelj@vulturis.eu>
+Copyright (c) 2013-2014 Paweł Jastrzębski <pawelj@iosphe.re>

 Permission to use, copy, modify, and/or distribute this software for
 any purpose with or without fee is hereby granted, provided that the
--- a/README.md
+++ b/README.md
@@ -17,14 +17,18 @@ If you can fix an open issue, fork & make a pull request.
 If you want more chances an issue is fixes or your wanted feature added, consider [placing a bounty](https://www.bountysource.com/trackers/65571-ciromattia-kcc)!  

 If you find **KCC** valuable you can consider donating to the authors:
-  * Ciro Mattia Gonano: [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D8WNYNPBGDAS2) [![Flattr this](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/2260449/ciromattiakcc-on-GitHub)
-  * Paweł Jastrzębski: [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YTTJ4LK2JDHPS) [![1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b](http://s30.postimg.org/6z3kwvdlp/BC_Rnd.png)](bitcoin:1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b?label=KCC) [1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b](bitcoin:1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b?label=KCC)
+- Ciro Mattia Gonano:
+ - [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D8WNYNPBGDAS2)
+ - [![Flattr this](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/2260449/ciromattiakcc-on-GitHub)
+- Paweł Jastrzębski:
+ - [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YTTJ4LK2JDHPS)
+ - Bitcoin: 1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b

 ## BINARY RELEASES
 You can find the latest released binary at the following links:
- **Windows:** [http://kcc.vulturis.eu/Windows/](http://kcc.vulturis.eu/Windows/)
- **Linux:** [http://kcc.vulturis.eu/Linux/](http://kcc.vulturis.eu/Linux/)
- **OS X (10.8+):** [http://kcc.vulturis.eu/OSX/](http://kcc.vulturis.eu/OSX/)
+- **Windows:** [http://kcc.iosphe.re/Windows/](http://kcc.iosphe.re/Windows/)
+- **Linux:** [http://kcc.iosphe.re/Linux/](http://kcc.iosphe.re/Linux/)
+- **OS X (10.8+):** [http://kcc.iosphe.re/OSX/](http://kcc.iosphe.re/OSX/)

 ## INPUT FORMATS
 **KCC** can understand and convert, at the moment, the following input types:
@@ -40,8 +44,8 @@ You can find the latest released binary at the following links:
 - [7za](http://www.7-zip.org/download.html) *(For 7z/CB7 support)*

 ### For running from source:
- Python 3.3
- [PyQt5](http://www.riverbankcomputing.co.uk/software/pyqt/download5)
+- Python 3.3+
+- [PyQt5](http://www.riverbankcomputing.co.uk/software/pyqt/download5) 5.2.0+
 - [Pillow](http://pypi.python.org/pypi/Pillow/) 2.3.0+
 - [psutil](https://pypi.python.org/pypi/psutil) 2.0+
 - [python-slugify](http://pypi.python.org/pypi/python-slugify)
@@ -53,8 +57,8 @@ sudo pip3 install pillow python-slugify psutil
 ```

 ### For freezing code:
- Windows - [cx_Freeze](https://bitbucket.org/anthony_tuininga/cx_freeze) HEAD version with [this](https://bitbucket.org/anthony_tuininga/cx_freeze/pull-request/29/conversions-to-support-untranslated-wide) patchset.
- OS X - [py2app](https://bitbucket.org/ronaldoussoren/py2app) 0.8+
+- Windows - [py2exe](https://pypi.python.org/pypi/py2exe) 0.9.2+
+- OS X - [py2app](https://bitbucket.org/ronaldoussoren/py2app) 0.8.0+

 ## USAGE

@@ -126,29 +130,29 @@ Options:
 ```

 ## CREDITS
-**KCC** is made by [Ciro Mattia Gonano](http://github.com/ciromattia) and [Paweł Jastrzębski](http://github.com/AcidWeb)
+**KCC** is made by [Ciro Mattia Gonano](http://github.com/ciromattia) and [Paweł Jastrzębski](http://github.com/AcidWeb).

-This script born as a cross-platform alternative to `KindleComicParser` by **Dc5e** (published [here](http://www.mobileread.com/forums/showthread.php?t=192783))
+This script born as a cross-platform alternative to `KindleComicParser` by **Dc5e** (published [here](http://www.mobileread.com/forums/showthread.php?t=192783)).

 The app relies and includes the following scripts/binaries:

- - `KindleUnpack` script by Charles **M. Hannum, P. Durrant, K. Hendricks, S. Siebert, fandrieu, DiapDealer, nickredding**. Released with GPLv3 License.
+ - `DualMetaFix` script by **K. Hendricks**. Released with GPL-3 License.
 - `rarfile.py` script &copy; 2005-2011 **Marko Kreen** <markokr@gmail.com>. Released with ISC License.
- - `image.py` class from **Alex Yatskov**'s [Mangle](http://foosoft.net/mangle/) with subsequent [proDOOMman](https://github.com/proDOOMman/Mangle)'s and [Birua](https://github.com/Birua/Mangle)'s patches.
+ - `image.py` class from **Alex Yatskov**'s [Mangle](https://github.com/FooSoft/mangle/) with subsequent [proDOOMman](https://github.com/proDOOMman/Mangle)'s and [Birua](https://github.com/Birua/Mangle)'s patches.
 - Icon is by **Nikolay Verin** ([http://ncrow.deviantart.com/](http://ncrow.deviantart.com/)) and released under [CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/) License.

 ## SAMPLE FILES CREATED BY KCC
-* [Kindle Paperwhite](http://kcc.vulturis.eu/Samples/Ubunchu!-KPW.mobi)
-* [Kindle](http://kcc.vulturis.eu/Samples/Ubunchu!-K345.mobi)
-* [Kindle DX/DXG](http://kcc.vulturis.eu/Samples/Ubunchu!-KDX.mobi)
-* [Kindle Fire HD](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHD.mobi)
-* [Kindle Fire HD 8.9"](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHD8.mobi)
-* [Kindle Fire HDX](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHDX.mobi)
-* [Kindle Fire HDX 8.9"](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHDX8.mobi)
-* [Kobo Mini/Touch](http://kcc.vulturis.eu/Samples/Ubunchu!-KoMT.cbz)
-* [Kobo Glow](http://kcc.vulturis.eu/Samples/Ubunchu!-KoG.cbz)
-* [Kobo Aura](http://kcc.vulturis.eu/Samples/Ubunchu!-KoA.cbz)
-* [Kobo Aura HD](http://kcc.vulturis.eu/Samples/Ubunchu!-KoAHD.cbz)
+* [Kindle Paperwhite](http://kcc.iosphe.re/Samples/Ubunchu!-KPW.mobi)
+* [Kindle](http://kcc.iosphe.re/Samples/Ubunchu!-K345.mobi)
+* [Kindle DX/DXG](http://kcc.iosphe.re/Samples/Ubunchu!-KDX.mobi)
+* [Kindle Fire HD](http://kcc.iosphe.re/Samples/Ubunchu!-KFHD.mobi)
+* [Kindle Fire HD 8.9"](http://kcc.iosphe.re/Samples/Ubunchu!-KFHD8.mobi)
+* [Kindle Fire HDX](http://kcc.iosphe.re/Samples/Ubunchu!-KFHDX.mobi)
+* [Kindle Fire HDX 8.9"](http://kcc.iosphe.re/Samples/Ubunchu!-KFHDX8.mobi)
+* [Kobo Mini/Touch](http://kcc.iosphe.re/Samples/Ubunchu!-KoMT.cbz)
+* [Kobo Glow](http://kcc.iosphe.re/Samples/Ubunchu!-KoG.cbz)
+* [Kobo Aura](http://kcc.iosphe.re/Samples/Ubunchu!-KoA.cbz)
+* [Kobo Aura HD](http://kcc.iosphe.re/Samples/Ubunchu!-KoAHD.cbz)

 ## CHANGELOG
 ####1.0
@@ -343,6 +347,13 @@ The app relies and includes the following scripts/binaries:
 * Fixed some Windows and OSX specific bugs
 * Fixed problem with marigns when using HQ mode

+####4.1:
+* Thanks to code contributed by Kevin Hendricks speed of MOBI creation was greatly increased
+* Improved performance on Windows
+* Improved MOBI splitting and changed maximal size of output file
+* Fixed _No optimization_ mode
+* Multiple small tweaks nad minor bug fixes
+
 ## KNOWN ISSUES
 Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).

--- a/kcc-c2e.py
+++ b/kcc-c2e.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -18,9 +18,9 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-__version__ = '4.0.2'
+__version__ = '4.1'
 __license__ = 'ISC'
-__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

 import sys
@@ -28,25 +28,27 @@ if sys.version_info[0] != 3:
    print('ERROR: This is Python 3 script!')
    exit(1)

-# Dependiences check
+# Dependency check
 missing = []
 try:
    # noinspection PyUnresolvedReferences
-    from psutil import virtual_memory, Popen
+    import psutil
+    if tuple(map(int, ('2.0.0'.split(".")))) > tuple(map(int, psutil.version_info)):
+        missing.append('psutil 2.0.0+')
 except ImportError:
-    missing.append('psutil')
+    missing.append('psutil 2.0.0+')
 try:
    # noinspection PyUnresolvedReferences
-    from slugify import slugify
-except ImportError:
-    missing.append('python-slugify')
-try:
-    # noinspection PyUnresolvedReferences
-    from PIL import Image, ImageOps, ImageStat, ImageChops
-    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
+    import PIL
+    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (PIL.PILLOW_VERSION.split(".")))):
        missing.append('Pillow 2.3.0+')
 except ImportError:
    missing.append('Pillow 2.3.0+')
+try:
+    # noinspection PyUnresolvedReferences
+    import slugify
+except ImportError:
+    missing.append('python-slugify')
 if len(missing) > 0:
    try:
        # noinspection PyUnresolvedReferences
--- a/kcc-c2p.py
+++ b/kcc-c2p.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -18,22 +18,22 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

+__version__ = '4.1'
+__license__ = 'ISC'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
+__docformat__ = 'restructuredtext en'
+
 import sys
 if sys.version_info[0] != 3:
    print('ERROR: This is Python 3 script!')
    exit(1)

-__version__ = '4.0.2'
-__license__ = 'ISC'
-__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
-__docformat__ = 'restructuredtext en'
-
-# Dependiences check
+# Dependency check
 missing = []
 try:
    # noinspection PyUnresolvedReferences
-    from PIL import Image, ImageOps, ImageStat, ImageChops
-    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
+    import PIL
+    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (PIL.PILLOW_VERSION.split(".")))):
        missing.append('Pillow 2.3.0+')
 except ImportError:
    missing.append('Pillow 2.3.0+')
--- a/kcc.iss
+++ b/kcc.iss
@@ -1,7 +1,7 @@
 #define MyAppName "Kindle Comic Converter"
-#define MyAppVersion "4.0.2"
+#define MyAppVersion "4.1"
 #define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski"
-#define MyAppURL "http://kcc.vulturis.eu/"
+#define MyAppURL "http://kcc.iosphe.re/"
 #define MyAppExeName "KCC.exe"

 [Setup]
@@ -42,18 +42,16 @@ Name: "CB7association"; Description: "CB7"; GroupDescription: "File associations

 [Files]
 ; x64 files
-Source: "build\exe.win-amd64-3.3\imageformats\*"; DestDir: "{app}\imageformats\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-3.3\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-3.3\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-3.3\*.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-3.3\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "dist_64\imageformats\*"; DestDir: "{app}\imageformats\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "dist_64\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "dist_64\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "dist_64\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "other\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: Is64BitInstallMode
 ; x86 files
-Source: "build\exe.win32-3.3\imageformats\*"; DestDir: "{app}\imageformats\"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-3.3\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-3.3\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-3.3\*.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-3.3\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "dist\imageformats\*"; DestDir: "{app}\imageformats\"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "dist\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "dist\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "dist\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "other\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: not Is64BitInstallMode
 ; Common files
 Source: "LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion solidbreak
--- a/kcc.py
+++ b/kcc.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -18,9 +18,9 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-__version__ = '4.0.2'
+__version__ = '4.1'
 __license__ = 'ISC'
-__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

 import sys
@@ -28,30 +28,34 @@ if sys.version_info[0] != 3:
    print('ERROR: This is Python 3 script!')
    exit(1)

-# Dependiences check
+# Dependency check
 missing = []
 try:
    # noinspection PyUnresolvedReferences
-    from PyQt5 import QtCore, QtGui, QtNetwork, QtWidgets
+    from PyQt5 import QtCore, QtNetwork, QtWidgets
+    if tuple(map(int, ('5.2.0'.split(".")))) > tuple(map(int, (QtCore.qVersion().split(".")))):
+        missing.append('PyQt5 5.2.0+')
 except ImportError:
-    missing.append('PyQt5')
+    missing.append('PyQt5 5.2.0+')
 try:
    # noinspection PyUnresolvedReferences
-    from psutil import virtual_memory, Popen
+    import psutil
+    if tuple(map(int, ('2.0.0'.split(".")))) > tuple(map(int, psutil.version_info)):
+        missing.append('psutil 2.0.0+')
 except ImportError:
-    missing.append('psutil')
+    missing.append('psutil 2.0.0+')
 try:
    # noinspection PyUnresolvedReferences
-    from slugify import slugify
-except ImportError:
-    missing.append('python-slugify')
-try:
-    # noinspection PyUnresolvedReferences
-    from PIL import Image, ImageOps, ImageStat, ImageChops
-    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
+    import PIL
+    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (PIL.PILLOW_VERSION.split(".")))):
        missing.append('Pillow 2.3.0+')
 except ImportError:
    missing.append('Pillow 2.3.0+')
+try:
+    # noinspection PyUnresolvedReferences
+    import slugify
+except ImportError:
+    missing.append('python-slugify')
 if len(missing) > 0:
    try:
        # noinspection PyUnresolvedReferences
@@ -110,10 +114,11 @@ class QApplicationMessaging(QtWidgets.QApplication):
        self._timeout = 1000
        self._server = QtNetwork.QLocalServer(self)
        if not self.isRunning():
+            # noinspection PyUnresolvedReferences
            self._server.newConnection.connect(self.handleMessage)
            self._server.listen(self._key)

-    def __del__(self):
+    def shutdown(self):
        if self._memory.isAttached():
            self._memory.detach()
            self._server.close()
--- a/kcc/KCC_gui.py
+++ b/kcc/KCC_gui.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -17,9 +17,9 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-__version__ = '4.0.2'
+__version__ = '4.1'
 __license__ = 'ISC'
-__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

 import os
@@ -36,10 +36,11 @@ from subprocess import STDOUT, PIPE
 from PyQt5 import QtGui, QtCore, QtWidgets
 from xml.dom.minidom import parse
 from html.parser import HTMLParser
-from psutil import virtual_memory, Popen
+from psutil import virtual_memory, Popen, Process
+from uuid import uuid4
 from .shared import md5Checksum
 from . import comic2ebook
-from . import kindlesplit
+from . import dualmetafix
 from . import KCC_rc_web
 if sys.platform.startswith('darwin'):
    from . import KCC_ui_osx as KCC_ui
@@ -196,7 +197,7 @@ class VersionThread(QtCore.QThread):
    def run(self):
        try:
            sleep(1)
-            XML = urlopen('http://kcc.vulturis.eu/Version.php')
+            XML = urlopen('http://kcc.iosphe.re/Version.php')
            XML = parse(XML)
        except Exception:
            return
@@ -210,7 +211,7 @@ class VersionThread(QtCore.QThread):
                                   '<br/>Current version: ' + latestVersion +
                                   '<br/><br/>Would you like to start automatic update?', 'question')
            else:
-                MW.addMessage.emit('<a href="http://kcc.vulturis.eu/">'
+                MW.addMessage.emit('<a href="http://kcc.iosphe.re/">'
                                   '<b>New version is available!</b></a> '
                                   '(<a href="https://github.com/ciromattia/kcc/releases/">'
                                   'Changelog</a>)', 'warning', False)
@@ -220,7 +221,7 @@ class VersionThread(QtCore.QThread):
            try:
                MW.modeConvert.emit(-1)
                MW.progressBarTick.emit('Downloading update')
-                path = urlretrieve('http://kcc.vulturis.eu/Windows/KindleComicConverter_win_'
+                path = urlretrieve('http://kcc.iosphe.re/Windows/KindleComicConverter_win_'
                                   + self.newVersion + '.exe', reporthook=self.getNewVersionTick)
                if self.md5 != md5Checksum(path[0]):
                    raise Exception
@@ -278,8 +279,9 @@ class KindleGenThread(QtCore.QRunnable):
        kindlegenErrorCode = 0
        kindlegenError = ''
        try:
-            if os.path.getsize(self.work) < 367001600:
-                output = Popen('kindlegen -locale en "' + self.work + '"', stdout=PIPE, stderr=STDOUT, shell=True)
+            if os.path.getsize(self.work) < 629145600:
+                output = Popen('kindlegen -dont_append_source -locale en "' + self.work + '"', stdout=PIPE,
+                               stderr=STDOUT, shell=True)
                for line in output.stdout:
                    line = line.decode('utf-8')
                    # ERROR: Generic error
@@ -302,27 +304,20 @@ class KindleGenThread(QtCore.QRunnable):
            self.signals.result.emit([kindlegenErrorCode, kindlegenError, self.work])


-class KindleUnpackThread(QtCore.QRunnable):
+class DualMetaFixThread(QtCore.QRunnable):
    def __init__(self, batch):
-        super(KindleUnpackThread, self).__init__()
+        super(DualMetaFixThread, self).__init__()
        self.signals = WorkerSignals()
        self.work = batch

    def run(self):
-        item = self.work[0]
-        profile = self.work[1]
+        item = self.work
        os.remove(item)
        mobiPath = item.replace('.epub', '.mobi')
        move(mobiPath, mobiPath + '_toclean')
        try:
-            # MOBI file produced by KindleGen is hybrid. KF8 + M7 + Source header
-            # KindleSplit is removing redundant data as we need only KF8 part for new Kindle models
-            if profile in ['K345', 'KHD', 'KF', 'KFHD', 'KFHD8', 'KFHDX', 'KFHDX8', 'KFA']:
-                newKindle = True
-            else:
-                newKindle = False
-            mobisplit = kindlesplit.mobi_split(mobiPath + '_toclean', newKindle)
-            open(mobiPath, 'wb').write(mobisplit.getResult())
+            # noinspection PyArgumentList
+            dualmetafix.DualMobiMetaFix(mobiPath + '_toclean', mobiPath, bytes(str(uuid4()), 'UTF-8'))
            self.signals.result.emit([True])
        except Exception as err:
            self.signals.result.emit([False, format(err)])
@@ -372,49 +367,64 @@ class WorkerThread(QtCore.QThread):

    def run(self):
        MW.modeConvert.emit(0)
+
+        parser = comic2ebook.makeParser()
+        options, _ = parser.parse_args()
+
        profile = GUI.profiles[str(GUI.DeviceBox.currentText())]['Label']
-        argv = ["--profile=" + profile]
+        options.profile = profile
+        argv = ''
        currentJobs = []
+
+        # Basic mode settings
        if GUI.MangaBox.isChecked():
-            argv.append("--manga-style")
+            options.righttoleft = True
        if GUI.RotateBox.isChecked():
-            argv.append("--rotate")
+            options.rotate = True
        if GUI.QualityBox.checkState() == 1:
-            argv.append("--quality=1")
+            options.quality = 1
        elif GUI.QualityBox.checkState() == 2:
-            argv.append("--quality=2")
+            options.quality = 2
        if str(GUI.FormatBox.currentText()) == 'CBZ':
-            argv.append("--cbz-output")
+            options.cbzoutput = True
        if GUI.currentMode == 1:
            if profile in ['KFHD', 'KFHD8', 'KFHDX', 'KFHDX8']:
-                argv.append("--upscale")
+                options.upscale = True
+
+        # Advanced mode settings
        if GUI.currentMode > 1:
            if GUI.ProcessingBox.isChecked():
-                argv.append("--noprocessing")
+                options.imgproc = False
            if GUI.NoRotateBox.isChecked():
-                argv.append("--nosplitrotate")
+                options.nosplitrotate = True
            if GUI.UpscaleBox.checkState() == 1:
-                argv.append("--stretch")
+                options.stretch = True
            elif GUI.UpscaleBox.checkState() == 2:
-                argv.append("--upscale")
+                options.upscale = True
            if GUI.BorderBox.checkState() == 1:
-                argv.append("--whiteborders")
+                options.white_borders = True
            elif GUI.BorderBox.checkState() == 2:
-                argv.append("--blackborders")
+                options.black_borders = True
            if GUI.NoDitheringBox.isChecked():
-                argv.append("--forcepng")
+                options.forcepng = True
            if GUI.WebtoonBox.isChecked():
-                argv.append("--webtoon")
+                options.webtoon = True
            if float(GUI.GammaValue) > 0.09:
                # noinspection PyTypeChecker
-                argv.append("--gamma=" + GUI.GammaValue)
+                options.gamma = float(GUI.GammaValue)
            if str(GUI.FormatBox.currentText()) == 'MOBI':
-                argv.append("--batchsplit")
+                options.batchsplit = True
+
+        # Other/custom settings.
        if GUI.currentMode > 2:
-            argv.append("--customwidth=" + str(GUI.customWidth.text()))
-            argv.append("--customheight=" + str(GUI.customHeight.text()))
+            options.customwidth = str(GUI.customWidth.text())
+            options.customheight = str(GUI.customHeight.text())
            if GUI.ColorBox.isChecked():
-                argv.append("--forcecolor")
+                options.forcecolor = True
+
+        comic2ebook.options = options
+        comic2ebook.checkOptions()
+
        for i in range(GUI.JobList.count()):
            # Make sure that we don't consider any system message as job to do
            if GUI.JobList.item(i).icon().isNull():
@@ -436,7 +446,8 @@ class WorkerThread(QtCore.QThread):
            jobargv = list(argv)
            jobargv.append(job)
            try:
-                outputPath = comic2ebook.main(jobargv, self)
+                comic2ebook.options.title = 'defaulttitle'
+                outputPath = comic2ebook.makeBook(job, self)
                MW.hideProgressBar.emit()
            except UserWarning as warn:
                if not self.conversionAlive:
@@ -492,6 +503,7 @@ class WorkerThread(QtCore.QThread):
                        for item in outputPath:
                            if os.path.exists(item):
                                os.remove(item)
+                            sleep(1)
                            if os.path.exists(item.replace('.epub', '.mobi')):
                                os.remove(item.replace('.epub', '.mobi'))
                        self.clean()
@@ -499,20 +511,19 @@ class WorkerThread(QtCore.QThread):
                    if self.kindlegenErrorCode[0] == 0:
                        GUI.progress.content = ''
                        MW.addMessage.emit('Creating MOBI files... <b>Done!</b>', 'info', True)
-                        MW.addMessage.emit('Cleaning MOBI files', 'info', False)
-                        GUI.progress.content = 'Cleaning MOBI files'
+                        MW.addMessage.emit('Processing MOBI files', 'info', False)
+                        GUI.progress.content = 'Processing MOBI files'
                        self.workerOutput = []
-                        # Multithreading KindleUnpack in current form is a waste of resources.
-                        # Unless we higly optimise KindleUnpack or drop 32bit support this will not change.
+                        # DualMetaFix is very fast and there is not reason to use multithreading.
                        self.pool.setMaxThreadCount(1)
                        for item in outputPath:
-                            worker = KindleUnpackThread([item, profile])
+                            worker = DualMetaFixThread(item)
                            worker.signals.result.connect(self.addResult)
                            self.pool.start(worker)
                        self.pool.waitForDone()
                        sleep(0.5)
                        for success in self.workerOutput:
-                            if not success:
+                            if not success[0]:
                                self.errors = True
                                break
                        if not self.errors:
@@ -527,7 +538,7 @@ class WorkerThread(QtCore.QThread):
                                    except Exception:
                                        pass
                                GUI.completedWork[os.path.basename(mobiPath)] = mobiPath
-                            MW.addMessage.emit('Cleaning MOBI files... <b>Done!</b>', 'info', True)
+                            MW.addMessage.emit('Processing MOBI files... <b>Done!</b>', 'info', True)
                        else:
                            GUI.progress.content = ''
                            for item in outputPath:
@@ -536,14 +547,15 @@ class WorkerThread(QtCore.QThread):
                                    os.remove(mobiPath)
                                if os.path.exists(mobiPath + '_toclean'):
                                    os.remove(mobiPath + '_toclean')
-                            MW.addMessage.emit('KindleUnpack failed to clean MOBI file!', 'error', False)
-                            MW.addTrayMessage.emit('KindleUnpack failed to clean MOBI file!', 'Critical')
+                            MW.addMessage.emit('Failed to process MOBI file!', 'error', False)
+                            MW.addTrayMessage.emit('Failed to process MOBI file!', 'Critical')
                    else:
                        GUI.progress.content = ''
-                        epubSize = (os.path.getsize(self.kindlegenErrorCode[2]))/1024/1024
+                        epubSize = (os.path.getsize(self.kindlegenErrorCode[2]))//1024//1024
                        for item in outputPath:
                            if os.path.exists(item):
                                os.remove(item)
+                            sleep(1)
                            if os.path.exists(item.replace('.epub', '.mobi')):
                                os.remove(item.replace('.epub', '.mobi'))
                        MW.addMessage.emit('KindleGen failed to create MOBI!', 'error', False)
@@ -552,7 +564,7 @@ class WorkerThread(QtCore.QThread):
                            MW.showDialog.emit("KindleGen error:\n\n" + self.kindlegenErrorCode[1], 'error')
                        if self.kindlegenErrorCode[0] == 23026:
                            MW.addMessage.emit('Created EPUB file was too big.', 'error', False)
-                            MW.addMessage.emit('EPUB file: ' + str(epubSize) + 'MB. Supported size: ~300MB.', 'error',
+                            MW.addMessage.emit('EPUB file: ' + str(epubSize) + 'MB. Supported size: ~350MB.', 'error',
                                               False)
                else:
                    for item in outputPath:
@@ -576,6 +588,7 @@ class SystemTrayIcon(QtWidgets.QSystemTrayIcon):
    def __init__(self):
        if self.isSystemTrayAvailable():
            QtWidgets.QSystemTrayIcon.__init__(self, GUI.icons.programIcon, MW)
+            # noinspection PyUnresolvedReferences
            self.activated.connect(self.catchClicks)

    def catchClicks(self):
@@ -997,8 +1010,8 @@ class KCCGUI(KCC_ui.Ui_KCC):
                                           'customHeight': GUI.customHeight.text(),
                                           'GammaSlider': float(self.GammaValue)*100})
        self.settings.sync()
-        if not sys.platform.startswith('linux'):
-            self.tray.hide()
+        self.tray.hide()
+        APP.shutdown()

    def handleMessage(self, message):
        MW.raise_()
@@ -1073,6 +1086,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
        self.versionCheck = VersionThread()
        self.contentServer = WebServerThread()
        self.progress = ProgressThread()
+        self.tray = SystemTrayIcon()
        self.conversionAlive = False
        self.needClean = True
        self.GammaValue = 1.0
@@ -1083,9 +1097,6 @@ class KCCGUI(KCC_ui.Ui_KCC):
            self.statusBarFontSize = 10
            self.statusBarStyle = 'QLabel{padding-top:2px;padding-bottom:3px;}'
            self.ProgressBar.setStyleSheet('QProgressBar{padding-top:5px;text-align:center;}')
-            self.tray = SystemTrayIcon()
-            self.tray.show()
-            MW.addTrayMessage.connect(self.tray.addTrayMessage)
        elif sys.platform.startswith('linux'):
            self.listFontSize = 8
            self.statusBarFontSize = 8
@@ -1096,9 +1107,11 @@ class KCCGUI(KCC_ui.Ui_KCC):
            self.statusBarFontSize = 8
            self.statusBarStyle = 'QLabel{padding-top:3px;padding-bottom:3px}'
            self.statusBar.setStyleSheet('QStatusBar::item{border:0px;border-top:2px solid #C2C7CB;}')
-            self.tray = SystemTrayIcon()
-            self.tray.show()
-            MW.addTrayMessage.connect(self.tray.addTrayMessage)
+            # Decrease priority to increase system responsiveness during conversion
+            from psutil import BELOW_NORMAL_PRIORITY_CLASS
+            self.p = Process(os.getpid())
+            self.p.nice(BELOW_NORMAL_PRIORITY_CLASS)
+            self.p.ionice(1)

        self.profiles = {
            "Kindle Paperwhite": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
@@ -1157,7 +1170,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
            "Kindle 2",
        ]

-        statusBarLabel = QtWidgets.QLabel('<b><a href="http://kcc.vulturis.eu/">HOMEPAGE</a> - <a href="https://github.'
+        statusBarLabel = QtWidgets.QLabel('<b><a href="http://kcc.iosphe.re/">HOMEPAGE</a> - <a href="https://github.'
                                          'com/ciromattia/kcc/blob/master/README.md#issues--new-features--donations">DO'
                                          'NATE</a> - <a href="https://github.com/ciromattia/kcc/wiki">WIKI</a> - <a hr'
                                          'ef="http://www.mobileread.com/forums/showthread.php?t=207461">FORUM</a></b>')
@@ -1175,6 +1188,11 @@ class KCCGUI(KCC_ui.Ui_KCC):
            self.addMessage('Since you are new user of <b>KCC</b> please see few '
                            '<a href="https://github.com/ciromattia/kcc/wiki/Important-tips">important tips</a>.',
                            'info')
+        if not sys.platform.startswith('win'):
+            try:
+                os.chmod('/usr/local/bin/kindlegen', 0o755)
+            except Exception:
+                pass
        kindleGenExitCode = Popen('kindlegen -locale en', stdout=PIPE, stderr=STDOUT, shell=True)
        if kindleGenExitCode.wait() == 0:
            self.KindleGen = True
@@ -1238,6 +1256,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
        MW.forceShutdown.connect(self.forceShutdown)
        MW.dialogAnswer.connect(self.versionCheck.getNewVersion)
        MW.closeEvent = self.saveSettings
+        MW.addTrayMessage.connect(self.tray.addTrayMessage)

        GUI.Form.setAcceptDrops(True)
        GUI.Form.dragEnterEvent = self.dragAndDrop
@@ -1280,6 +1299,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
        self.worker.sync()
        self.versionCheck.start()
        self.contentServer.start()
+        self.tray.show()
        MW.setWindowTitle("Kindle Comic Converter " + __version__)
        MW.show()
        MW.raise_()
--- a/kcc/KCC_ui.py
+++ b/kcc/KCC_ui.py
@@ -2,8 +2,8 @@

 # Form implementation generated from reading ui file 'KCC.ui'
 #
-# Created: Sat Jan 25 17:36:53 2014
-#      by: PyQt5 UI code generator 5.2
+# Created: Sun May 18 09:08:27 2014
+#      by: PyQt5 UI code generator 5.2.1
 #
 # WARNING! All changes made in this file will be lost!

@@ -264,7 +264,7 @@ class Ui_KCC(object):
        self.ProcessingBox.setText(_translate("KCC", "No optimisation"))
        self.UpscaleBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>"))
        self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale"))
-        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God</span> or <span style=\" font-style:italic;\">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html>"))
+        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\"white-space:pre\">Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God</span> or <span style=\" font-style:italic;\">Noblesse</span>.<br/>This mode is created for pages with a low width, high height and vertical panel flow.</p></body></html>"))
        self.WebtoonBox.setText(_translate("KCC", "Webtoon mode"))
        self.NoDitheringBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>"))
        self.NoDitheringBox.setText(_translate("KCC", "PNG output"))
@@ -281,7 +281,7 @@ class Ui_KCC(object):
        self.ClearButton.setText(_translate("KCC", "Clear list"))
        self.MangaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>"))
        self.MangaBox.setText(_translate("KCC", "Manga mode"))
-        self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode<br/></span><span style=\" font-style:italic;\">Use it when Panel View support is not needed.</span><span style=\" font-weight:600; text-decoration: underline;\"><br/></span>- Maximum quality when zoom is not enabled.<br/>- Poor quality when zoom is enabled.<br/>- Lowest file size.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode<br/></span><span style=\" font-style:italic;\">Not zoomed images </span><span style=\" font-weight:600; font-style:italic;\">might </span><span style=\" font-style:italic;\">be blurry.</span><span style=\" font-weight:600; text-decoration: underline;\"><br/></span>- High quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode<br/></span><span style=\" font-style:italic;\">Maximum possible quality.</span><span style=\" font-weight:600; text-decoration: underline;\"><br/></span>- Maximum quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.<br/>- Very high file size.</p></body></html>"))
+        self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\"white-space:pre\"><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode<br/></span>Maximal quality of images but very poor magnification quality.<br/>Use it only when zoom is not needed or output files needs to be small.</p><p style=\"white-space:pre\"><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode<br/></span>In most cases high quality of images and magnification.<br/>Overall quality highly depends on the resolution of source files.<br/>On Kindle models older than Paperwhite non-zoomed images might be a little blurred.</p><p style=\"white-space:pre\"><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode<br/></span>Highest possible quality. Output files will be big.</p></body></html>"))
        self.QualityBox.setText(_translate("KCC", "High/Ultra quality"))
        self.RotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting of two-page spreads.<br/>They will be rotated instead.</p></body></html>"))
        self.RotateBox.setText(_translate("KCC", "Horizontal mode"))
--- a/kcc/KCC_ui_linux.py
+++ b/kcc/KCC_ui_linux.py
@@ -2,8 +2,8 @@

 # Form implementation generated from reading ui file 'KCC-Linux.ui'
 #
-# Created: Sat Jan 25 17:37:02 2014
-#      by: PyQt5 UI code generator 5.2
+# Created: Sun May 18 09:08:37 2014
+#      by: PyQt5 UI code generator 5.2.1
 #
 # WARNING! All changes made in this file will be lost!

@@ -333,7 +333,7 @@ class Ui_KCC(object):
        self.ProcessingBox.setText(_translate("KCC", "No optimisation"))
        self.UpscaleBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>"))
        self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale"))
-        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God</span> or <span style=\" font-style:italic;\">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html>"))
+        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God</span> or <span style=\" font-style:italic;\">Noblesse</span>.<br/>This mode was created for pages with a low width, high height and vertical panel flow.</p></body></html>"))
        self.WebtoonBox.setText(_translate("KCC", "Webtoon mode"))
        self.NoDitheringBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>"))
        self.NoDitheringBox.setText(_translate("KCC", "PNG output"))
@@ -350,7 +350,7 @@ class Ui_KCC(object):
        self.ClearButton.setText(_translate("KCC", "Clear list"))
        self.MangaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>"))
        self.MangaBox.setText(_translate("KCC", "Manga mode"))
-        self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode<br/></span><span style=\" font-style:italic;\">Use it when Panel View support is not needed.<br/></span>- Maximum quality when zoom is not enabled.<br/>- Poor quality when zoom is enabled.<br/>- Lowest file size.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode<br/></span><span style=\" font-style:italic;\">Not zoomed images </span><span style=\" font-weight:600; font-style:italic;\">might</span><span style=\" font-style:italic;\"> be blurry.<br/></span>- High quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode<br/></span><span style=\" font-style:italic;\">Maximum possible quality.<br/></span>- Maximum quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.<br/>- Very high file size.</p></body></html>"))
+        self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode</span><br/>Maximal quality of images but very poor magnification quality.<br/>Use it only when zoom is not needed or output files needs to be small.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode</span><br/>In most cases high quality of images and magnification.<br/>Overall quality highly depends on the resolution of source files.<br/>On Kindle models older than Paperwhite non-zoomed images might be a little blurred.<br/><br/><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode</span><br/>Highest possible quality. Output files will be big.</p></body></html>"))
        self.QualityBox.setText(_translate("KCC", "High/Ultra quality"))
        self.RotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting of two-page spreads.<br/>They will be rotated instead.</p></body></html>"))
        self.RotateBox.setText(_translate("KCC", "Horizontal mode"))
--- a/kcc/KCC_ui_osx.py
+++ b/kcc/KCC_ui_osx.py
@@ -2,8 +2,8 @@

 # Form implementation generated from reading ui file 'KCC-OSX.ui'
 #
-# Created: Sat Jan 25 17:37:10 2014
-#      by: PyQt5 UI code generator 5.2
+# Created: Sun May 18 09:08:44 2014
+#      by: PyQt5 UI code generator 5.2.1
 #
 # WARNING! All changes made in this file will be lost!

@@ -356,7 +356,7 @@ class Ui_KCC(object):
        self.ProcessingBox.setText(_translate("KCC", "No optimisation"))
        self.UpscaleBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>"))
        self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale"))
-        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God</span> or <span style=\" font-style:italic;\">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html>"))
+        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God </span>or <span style=\" font-style:italic;\">Noblesse</span>.<br/>This mode was created for pages with a low width, high height and vertical panel flow.</p><p><br/></p></body></html>"))
        self.WebtoonBox.setText(_translate("KCC", "Webtoon mode"))
        self.NoDitheringBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>"))
        self.NoDitheringBox.setText(_translate("KCC", "PNG output"))
@@ -373,7 +373,7 @@ class Ui_KCC(object):
        self.ClearButton.setText(_translate("KCC", "Clear list"))
        self.MangaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>"))
        self.MangaBox.setText(_translate("KCC", "Manga mode"))
-        self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode<br/></span><span style=\" font-style:italic;\">Use it when Panel View support is not needed.<br/></span>- Maximum quality when zoom is not enabled.<br/>- Poor quality when zoom is enabled.<br/>- Lowest file size.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode<br/></span><span style=\" font-style:italic;\">Not zoomed image </span><span style=\" font-weight:600; font-style:italic;\">might</span><span style=\" font-style:italic;\"> be a little blurry.<br/></span>- High quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode<br/></span><span style=\" font-style:italic;\">Maximum possible quality.<br/></span>- Maximum quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.<br/>- Very high file size.</p></body></html>"))
+        self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode</span><br/>Maximal quality of images but very poor magnification quality.<br/>Use it only when zoom is not needed or output files needs to be small.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode</span><br/>In most cases high quality of images and magnification.<br/>Overall quality highly depends on the resolution of source files.<br/>On Kindle models older than Paperwhite non-zoomed images might be a little blurred.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode</span><br/>Highest possible quality. Output files will be big.</p></body></html>"))
        self.QualityBox.setText(_translate("KCC", "High/Ultra quality"))
        self.RotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting of two-page spreads.<br/>They will be rotated instead.</p></body></html>"))
        self.RotateBox.setText(_translate("KCC", "Horizontal mode"))
--- a/kcc/init.py
+++ b/kcc/init.py
@@ -1,4 +1,4 @@
-__version__ = '4.0.2'
+__version__ = '4.1'
 __license__ = 'ISC'
-__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'
--- a/kcc/cbxarchive.py
+++ b/kcc/cbxarchive.py
@@ -1,5 +1,5 @@
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -17,7 +17,7 @@
 #

 __license__ = 'ISC'
-__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

 import sys
--- a/kcc/comic2ebook.py
+++ b/kcc/comic2ebook.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -18,9 +18,9 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #

-__version__ = '4.0.2'
+__version__ = '4.1'
 __license__ = 'ISC'
-__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

 import os
@@ -29,7 +29,7 @@ from re import split, sub
 from stat import S_IWRITE, S_IREAD, S_IEXEC
 from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
 from tempfile import mkdtemp
-from shutil import move, copyfile, copytree, rmtree
+from shutil import move, copytree, rmtree
 from optparse import OptionParser, OptionGroup
 from multiprocessing import Pool
 from xml.dom.minidom import parse
@@ -51,21 +51,27 @@ def buildHTML(path, imgfile, imgfilepath):
    imgfilepath = md5Checksum(imgfilepath)
    filename = getImageFileName(imgfile)
    if filename is not None:
-        if "Rotated" in theGreatIndex[imgfilepath]:
-            rotatedPage = True
+        if options.imgproc:
+            if "Rotated" in theGreatIndex[imgfilepath]:
+                rotatedPage = True
+            else:
+                rotatedPage = False
+            if "NoPanelView" in theGreatIndex[imgfilepath]:
+                noPV = True
+            else:
+                noPV = False
+            if "NoHorizontalPanelView" in theGreatIndex[imgfilepath]:
+                noHorizontalPV = True
+            else:
+                noHorizontalPV = False
+            if "NoVerticalPanelView" in theGreatIndex[imgfilepath]:
+                noVerticalPV = True
+            else:
+                noVerticalPV = False
        else:
            rotatedPage = False
-        if "NoPanelView" in theGreatIndex[imgfilepath]:
-            noPV = True
-        else:
            noPV = False
-        if "NoHorizontalPanelView" in theGreatIndex[imgfilepath]:
-            noHorizontalPV = True
-        else:
            noHorizontalPV = False
-        if "NoVerticalPanelView" in theGreatIndex[imgfilepath]:
-            noVerticalPV = True
-        else:
            noVerticalPV = False
        htmlpath = ''
        postfix = ''
@@ -163,30 +169,31 @@ def buildHTML(path, imgfile, imgfilepath):


 def checkMargins(path):
-    for flag in theGreatIndex[path]:
-        if "Margins-" in flag:
-            flag = flag.split('-')
-            xl = flag[1]
-            yu = flag[2]
-            xr = flag[3]
-            yd = flag[4]
-            if xl != "0":
-                xl = "-" + str(float(xl)/100) + "%"
-            else:
-                xl = "0%"
-            if xr != "0":
-                xr = "-" + str(float(xr)/100) + "%"
-            else:
-                xr = "0%"
-            if yu != "0":
-                yu = "-" + str(float(yu)/100) + "%"
-            else:
-                yu = "0%"
-            if yd != "0":
-                yd = "-" + str(float(yd)/100) + "%"
-            else:
-                yd = "0%"
-            return xl, yu, xr, yd
+    if options.imgproc:
+        for flag in theGreatIndex[path]:
+            if "Margins-" in flag:
+                flag = flag.split('-')
+                xl = flag[1]
+                yu = flag[2]
+                xr = flag[3]
+                yd = flag[4]
+                if xl != "0":
+                    xl = "-" + str(float(xl)/100) + "%"
+                else:
+                    xl = "0%"
+                if xr != "0":
+                    xr = "-" + str(float(xr)/100) + "%"
+                else:
+                    xr = "0%"
+                if yu != "0":
+                    yu = "-" + str(float(yu)/100) + "%"
+                else:
+                    yu = "0%"
+                if yd != "0":
+                    yd = "-" + str(float(yd)/100) + "%"
+                else:
+                    yd = "0%"
+                return xl, yu, xr, yd
    return '0%', '0%', '0%', '0%'


@@ -218,13 +225,15 @@ def buildNCX(dstdir, title, chapters, chapterNames):
                + ".html\"/></navPoint>\n")
    f.write("</navMap>\n</ncx>")
    f.close()
-    return


 def buildOPF(dstdir, title, filelist, cover=None):
    opffile = os.path.join(dstdir, 'OEBPS', 'content.opf')
    profilelabel, deviceres, palette, gamma, panelviewsize = options.profileData
-    imgres = str(deviceres[0]) + "x" + str(deviceres[1])
+    if options.quality == 1:
+        imgres = str(panelviewsize[0]) + "x" + str(panelviewsize[1])
+    else:
+        imgres = str(deviceres[0]) + "x" + str(deviceres[1])
    if options.righttoleft:
        writingmode = "horizontal-rl"
    else:
@@ -294,14 +303,13 @@ def buildOPF(dstdir, title, filelist, cover=None):
                  "</rootfiles>\n",
                  "</container>"])
    f.close()
-    return


 def applyImgOptimization(img, opt, hqImage=None):
    if not img.fill:
        img.getImageFill(opt.webtoon)
    if not opt.webtoon:
-        img.cropWhiteSpace(10.0)
+        img.cropWhiteSpace()
    if opt.cutpagenumbers and not opt.webtoon:
        img.cutPageNumber()
    img.optimizeImage(opt.gamma)
@@ -551,7 +559,7 @@ def genEpubStruct(path, chapterNames):
                if cover is None:
                    cover = os.path.join(os.path.join(path, 'OEBPS', 'Images'),
                                         'cover' + getImageFileName(filelist[-1][1])[1])
-                    copyfile(os.path.join(filelist[-1][0], filelist[-1][1]), cover)
+                    image.Cover(os.path.join(filelist[-1][0], filelist[-1][1]), cover)
    buildNCX(path, options.title, chapterlist, chapterNames)
    # Ensure we're sorting files alphabetically
    convert = lambda text: int(text) if text.isdigit() else text
@@ -722,7 +730,7 @@ def splitDirectory(path, mode):
        for root, dirs, files in walkLevel(path, 0):
            for name in files:
                size = os.path.getsize(os.path.join(root, name))
-                if currentSize + size > 262144000:
+                if currentSize + size > 419430400:
                    currentTarget, pathRoot = createNewTome()
                    output.append(pathRoot)
                    currentSize = size
@@ -734,7 +742,7 @@ def splitDirectory(path, mode):
        for root, dirs, files in walkLevel(path, 0):
            for name in dirs:
                size = getDirectorySize(os.path.join(root, name))
-                if currentSize + size > 262144000:
+                if currentSize + size > 419430400:
                    currentTarget, pathRoot = createNewTome()
                    output.append(pathRoot)
                    currentSize = size
@@ -748,7 +756,7 @@ def splitDirectory(path, mode):
            for name in dirs:
                size = getDirectorySize(os.path.join(root, name))
                currentSize = 0
-                if size > 262144000:
+                if size > 419430400:
                    if not firstTome:
                        currentTarget, pathRoot = createNewTome()
                        output.append(pathRoot)
@@ -757,7 +765,7 @@ def splitDirectory(path, mode):
                    for rootInside, dirsInside, filesInside in walkLevel(os.path.join(root, name), 0):
                        for nameInside in dirsInside:
                            size = getDirectorySize(os.path.join(rootInside, nameInside))
-                            if currentSize + size > 262144000:
+                            if currentSize + size > 419430400:
                                currentTarget, pathRoot = createNewTome()
                                output.append(pathRoot)
                                currentSize = size
@@ -777,65 +785,61 @@ def splitDirectory(path, mode):

 #noinspection PyUnboundLocalVariable
 def preSplitDirectory(path):
-    if getDirectorySize(os.path.join(path, 'OEBPS', 'Images')) > 262144000:
-        # Detect directory stucture
-        for root, dirs, files in walkLevel(os.path.join(path, 'OEBPS', 'Images'), 0):
-            subdirectoryNumber = len(dirs)
-            filesNumber = len(files)
-        if subdirectoryNumber == 0:
-            # No subdirectories
-            mode = 0
-        else:
-            if filesNumber > 0:
-                print('\nWARNING: Automatic output splitting failed.')
-                if GUI:
-                    GUI.addMessage.emit('Automatic output splitting failed. <a href='
-                                        '"https://github.com/ciromattia/kcc/wiki'
-                                        '/Automatic-output-splitting">'
-                                        'More details.</a>', 'warning', False)
-                    GUI.addMessage.emit('', '', False)
-                return [path]
-            detectedSubSubdirectories = False
-            detectedFilesInSubdirectories = False
-            for root, dirs, files in walkLevel(os.path.join(path, 'OEBPS', 'Images'), 1):
-                if root != os.path.join(path, 'OEBPS', 'Images'):
-                    if len(dirs) != 0:
-                        detectedSubSubdirectories = True
-                    elif len(dirs) == 0 and detectedSubSubdirectories:
-                        print('\nWARNING: Automatic output splitting failed.')
-                        if GUI:
-                            GUI.addMessage.emit('Automatic output splitting failed. <a href='
-                                                '"https://github.com/ciromattia/kcc/wiki'
-                                                '/Automatic-output-splitting">'
-                                                'More details.</a>', 'warning', False)
-                            GUI.addMessage.emit('', '', False)
-                        return [path]
-                    if len(files) != 0:
-                        detectedFilesInSubdirectories = True
-            if detectedSubSubdirectories:
-                # Two levels of subdirectories
-                mode = 2
-            else:
-                # One level of subdirectories
-                mode = 1
-            if detectedFilesInSubdirectories and detectedSubSubdirectories:
-                print('\nWARNING: Automatic output splitting failed.')
-                if GUI:
-                    GUI.addMessage.emit('Automatic output splitting failed. <a href='
-                                        '"https://github.com/ciromattia/kcc/wiki'
-                                        '/Automatic-output-splitting">'
-                                        'More details.</a>', 'warning', False)
-                    GUI.addMessage.emit('', '', False)
-                return [path]
-        # Split directories
-        splitter = splitDirectory(os.path.join(path, 'OEBPS', 'Images'), mode)
-        path = [path]
-        for tome in splitter:
-            path.append(tome)
-        return path
+    # Detect directory stucture
+    for root, dirs, files in walkLevel(os.path.join(path, 'OEBPS', 'Images'), 0):
+        subdirectoryNumber = len(dirs)
+        filesNumber = len(files)
+    if subdirectoryNumber == 0:
+        # No subdirectories
+        mode = 0
    else:
-        # No splitting is necessary
-        return [path]
+        if filesNumber > 0:
+            print('\nWARNING: Automatic output splitting failed.')
+            if GUI:
+                GUI.addMessage.emit('Automatic output splitting failed. <a href='
+                                    '"https://github.com/ciromattia/kcc/wiki'
+                                    '/Automatic-output-splitting">'
+                                    'More details.</a>', 'warning', False)
+                GUI.addMessage.emit('', '', False)
+            return [path]
+        detectedSubSubdirectories = False
+        detectedFilesInSubdirectories = False
+        for root, dirs, files in walkLevel(os.path.join(path, 'OEBPS', 'Images'), 1):
+            if root != os.path.join(path, 'OEBPS', 'Images'):
+                if len(dirs) != 0:
+                    detectedSubSubdirectories = True
+                elif len(dirs) == 0 and detectedSubSubdirectories:
+                    print('\nWARNING: Automatic output splitting failed.')
+                    if GUI:
+                        GUI.addMessage.emit('Automatic output splitting failed. <a href='
+                                            '"https://github.com/ciromattia/kcc/wiki'
+                                            '/Automatic-output-splitting">'
+                                            'More details.</a>', 'warning', False)
+                        GUI.addMessage.emit('', '', False)
+                    return [path]
+                if len(files) != 0:
+                    detectedFilesInSubdirectories = True
+        if detectedSubSubdirectories:
+            # Two levels of subdirectories
+            mode = 2
+        else:
+            # One level of subdirectories
+            mode = 1
+        if detectedFilesInSubdirectories and detectedSubSubdirectories:
+            print('\nWARNING: Automatic output splitting failed.')
+            if GUI:
+                GUI.addMessage.emit('Automatic output splitting failed. <a href='
+                                    '"https://github.com/ciromattia/kcc/wiki'
+                                    '/Automatic-output-splitting">'
+                                    'More details.</a>', 'warning', False)
+                GUI.addMessage.emit('', '', False)
+            return [path]
+    # Split directories
+    splitter = splitDirectory(os.path.join(path, 'OEBPS', 'Images'), mode)
+    path = [path]
+    for tome in splitter:
+        path.append(tome)
+    return path


 def detectCorruption(tmpPath, orgPath):
@@ -881,14 +885,16 @@ def Usage():
    parser.print_help()


-def main(argv=None, qtGUI=None):
-    global parser, options, GUI
-    parser = OptionParser(usage="Usage: kcc-c2e [options] comic_file|comic_folder", add_help_option=False)
-    mainOptions = OptionGroup(parser, "MAIN")
-    processingOptions = OptionGroup(parser, "PROCESSING")
-    outputOptions = OptionGroup(parser, "OUTPUT SETTINGS")
-    customProfileOptions = OptionGroup(parser, "CUSTOM PROFILE")
-    otherOptions = OptionGroup(parser, "OTHER")
+def makeParser():
+    """Create and return an option parser set up with kcc's options."""
+    psr = OptionParser(usage="Usage: kcc-c2e [options] comic_file|comic_folder", add_help_option=False)
+
+    mainOptions = OptionGroup(psr, "MAIN")
+    processingOptions = OptionGroup(psr, "PROCESSING")
+    outputOptions = OptionGroup(psr, "OUTPUT SETTINGS")
+    customProfileOptions = OptionGroup(psr, "CUSTOM PROFILE")
+    otherOptions = OptionGroup(psr, "OTHER")
+
    mainOptions.add_option("-p", "--profile", action="store", dest="profile", default="KHD",
                           help="Device profile (Choose one among K1, K2, K345, KDX, KHD, KF, KFHD, KFHD8, KFHDX,"
                                " KFHDX8, KFA, KoMT, KoG, KoA, KoAHD) [Default=KHD]")
@@ -898,6 +904,7 @@ def main(argv=None, qtGUI=None):
                           help="Manga style (Right-to-left reading and splitting)")
    mainOptions.add_option("-w", "--webtoon", action="store_true", dest="webtoon", default=False,
                           help="Webtoon processing mode"),
+
    outputOptions.add_option("-o", "--output", action="store", dest="output", default=None,
                             help="Output generated file to specified directory or file")
    outputOptions.add_option("-t", "--title", action="store", dest="title", default="defaulttitle",
@@ -906,6 +913,7 @@ def main(argv=None, qtGUI=None):
                             help="Outputs a CBZ archive and does not generate EPUB")
    outputOptions.add_option("--batchsplit", action="store_true", dest="batchsplit", default=False,
                             help="Split output into multiple files"),
+
    processingOptions.add_option("--blackborders", action="store_true", dest="black_borders", default=False,
                                 help="Disable autodetection and force black borders")
    processingOptions.add_option("--whiteborders", action="store_true", dest="white_borders", default=False,
@@ -928,17 +936,26 @@ def main(argv=None, qtGUI=None):
                                 help="Stretch images to device's resolution")
    processingOptions.add_option("--upscale", action="store_true", dest="upscale", default=False,
                                 help="Resize images smaller than device's resolution")
+
    customProfileOptions.add_option("--customwidth", type="int", dest="customwidth", default=0,
                                    help="Replace screen width provided by device profile")
    customProfileOptions.add_option("--customheight", type="int", dest="customheight", default=0,
                                    help="Replace screen height provided by device profile")
+
    otherOptions.add_option("-h", "--help", action="help",
                            help="Show this help message and exit")
-    parser.add_option_group(mainOptions)
-    parser.add_option_group(outputOptions)
-    parser.add_option_group(processingOptions)
-    parser.add_option_group(customProfileOptions)
-    parser.add_option_group(otherOptions)
+
+    psr.add_option_group(mainOptions)
+    psr.add_option_group(outputOptions)
+    psr.add_option_group(processingOptions)
+    psr.add_option_group(customProfileOptions)
+    psr.add_option_group(otherOptions)
+    return psr
+
+
+def main(argv=None, qtGUI=None):
+    global parser, options, GUI
+    parser = makeParser()
    options, args = parser.parse_args(argv)
    checkOptions()
    if qtGUI:
@@ -949,29 +966,44 @@ def main(argv=None, qtGUI=None):
    if len(args) != 1:
        parser.print_help()
        return
-    path = getWorkFolder(args[0])
+    outputPath = makeBook(args[0], qtGUI=qtGUI)
+    return outputPath
+
+
+def makeBook(source, qtGUI=None):
+    """Generates EPUB/CBZ comic ebook from a bunch of images."""
+    global GUI
+    GUI = qtGUI
+    path = getWorkFolder(source)
    print("\nChecking images...")
-    detectCorruption(os.path.join(path, "OEBPS", "Images"), args[0])
-    checkComicInfo(os.path.join(path, "OEBPS", "Images"), args[0])
+    detectCorruption(os.path.join(path, "OEBPS", "Images"), source)
+    checkComicInfo(os.path.join(path, "OEBPS", "Images"), source)
+
    if options.webtoon:
        if options.customheight > 0:
            comic2panel.main(['-y ' + str(options.customheight), '-i', '-m', path], qtGUI)
        else:
            comic2panel.main(['-y ' + str(image.ProfileData.Profiles[options.profile][1][1]), '-i', '-m', path], qtGUI)
+
    if options.imgproc:
        print("\nProcessing images...")
        if GUI:
            GUI.progressBarTick.emit('Processing images')
        dirImgProcess(os.path.join(path, "OEBPS", "Images"))
+
    if GUI:
        GUI.progressBarTick.emit('1')
+
    chapterNames = sanitizeTree(os.path.join(path, 'OEBPS', 'Images'))
+
    if options.batchsplit:
        tomes = preSplitDirectory(path)
    else:
        tomes = [path]
+
    filepath = []
    tomeNumber = 0
+
    if GUI:
        if options.cbzoutput:
            GUI.progressBarTick.emit('Compressing CBZ files')
@@ -979,36 +1011,43 @@ def main(argv=None, qtGUI=None):
            GUI.progressBarTick.emit('Compressing EPUB files')
        GUI.progressBarTick.emit(str(len(tomes) + 1))
        GUI.progressBarTick.emit('tick')
+
    options.baseTitle = options.title
+
    for tome in tomes:
        if len(tomes) > 1:
            tomeNumber += 1
            options.title = options.baseTitle + ' [' + str(tomeNumber) + '/' + str(len(tomes)) + ']'
+
        if options.cbzoutput:
            # if CBZ output wanted, compress all images and return filepath
            print("\nCreating CBZ file...")
            if len(tomes) > 1:
-                filepath.append(getOutputFilename(args[0], options.output, '.cbz', ' ' + str(tomeNumber)))
+                filepath.append(getOutputFilename(source, options.output, '.cbz', ' ' + str(tomeNumber)))
            else:
-                filepath.append(getOutputFilename(args[0], options.output, '.cbz', ''))
+                filepath.append(getOutputFilename(source, options.output, '.cbz', ''))
            makeZIP(tome + '_comic', os.path.join(tome, "OEBPS", "Images"))
        else:
            print("\nCreating EPUB structure...")
            genEpubStruct(tome, chapterNames)
            # actually zip the ePub
            if len(tomes) > 1:
-                filepath.append(getOutputFilename(args[0], options.output, '.epub', ' ' + str(tomeNumber)))
+                filepath.append(getOutputFilename(source, options.output, '.epub', ' ' + str(tomeNumber)))
            else:
-                filepath.append(getOutputFilename(args[0], options.output, '.epub', ''))
+                filepath.append(getOutputFilename(source, options.output, '.epub', ''))
            makeZIP(tome + '_comic', tome, True)
+
        move(tome + '_comic.zip', filepath[-1])
        rmtree(tome, True)
+
        if GUI:
            GUI.progressBarTick.emit('tick')
    return filepath


 def getOutputFilename(srcpath, wantedname, ext, tomeNumber):
+    if srcpath[-1] == os.path.sep:
+        srcpath = srcpath[:-1]
    if not ext.startswith('.'):
        ext = '.' + ext
    if wantedname is not None:
@@ -1083,4 +1122,4 @@ def checkOptions():
                      (int(X*1.5), int(Y*1.5)))
        image.ProfileData.Profiles["Custom"] = newProfile
        options.profile = "Custom"
-    options.profileData = image.ProfileData.Profiles[options.profile]
+    options.profileData = image.ProfileData.Profiles[options.profile]
--- a/kcc/comic2panel.py
+++ b/kcc/comic2panel.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -18,9 +18,9 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #

-__version__ = '4.0.2'
+__version__ = '4.1'
 __license__ = 'ISC'
-__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

 import os
@@ -124,7 +124,7 @@ def splitImage(work):
        path = work[0]
        name = work[1]
        opt = work[2]
-        # Harcoded opttions
+        # Hardcoded options
        threshold = 1.0
        delta = 15
        fileExpanded = os.path.splitext(name)
--- a/kcc/dualmetafix.py
+++ b/kcc/dualmetafix.py
@@ -0,0 +1,184 @@
+# -*- coding: utf-8 -*-
+#
+# Based on initial version of DualMetaFix. Copyright (C) 2013 Kevin Hendricks
+# Changes for KCC Copyright (C) 2014 Pawel Jastrzebski <pawelj@iosphe.re>
+#
+# 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 <http://www.gnu.org/licenses/>.
+
+import struct
+import mmap
+import shutil
+
+
+class DualMetaFixException(Exception):
+    pass
+
+# palm database offset constants
+number_of_pdb_records = 76
+first_pdb_record = 78
+
+# important rec0 offsets
+mobi_header_base = 16
+mobi_header_length = 20
+mobi_version = 36
+title_offset = 84
+
+
+def getint(data, ofs, sz='L'):
+    i, = struct.unpack_from('>'+sz, data, ofs)
+    return i
+
+
+def writeint(data, ofs, n, slen='L'):
+    if slen == 'L':
+        return data[:ofs]+struct.pack('>L', n)+data[ofs+4:]
+    else:
+        return data[:ofs]+struct.pack('>H', n)+data[ofs+2:]
+
+
+def getsecaddr(datain, secno):
+    nsec = getint(datain, number_of_pdb_records, 'H')
+    if (secno < 0) | (secno >= nsec):
+        emsg = 'requested section number %d out of range (nsec=%d)' % (secno, nsec)
+        raise DualMetaFixException(emsg)
+    secstart = getint(datain, first_pdb_record+secno*8)
+    if secno == nsec-1:
+        secend = len(datain)
+    else:
+        secend = getint(datain, first_pdb_record+(secno+1)*8)
+    return secstart, secend
+
+
+def readsection(datain, secno):
+    secstart, secend = getsecaddr(datain, secno)
+    return datain[secstart:secend]
+
+
+# overwrite section - must be exact same length as original
+def replacesection(datain, secno, secdata):
+    secstart, secend = getsecaddr(datain, secno)
+    seclen = secend - secstart
+    if len(secdata) != seclen:
+        raise DualMetaFixException('section length change in replacesection')
+    datain[secstart:secstart+seclen] = secdata
+
+
+def get_exth_params(rec0):
+    ebase = mobi_header_base + getint(rec0, mobi_header_length)
+    if rec0[ebase:ebase+4] != b'EXTH':
+        raise DualMetaFixException('EXTH tag not found where expected')
+    elen = getint(rec0, ebase+4)
+    enum = getint(rec0, ebase+8)
+    rlen = len(rec0)
+    return ebase, elen, enum, rlen
+
+
+def add_exth(rec0, exth_num, exth_bytes):
+    ebase, elen, enum, rlen = get_exth_params(rec0)
+    newrecsize = 8+len(exth_bytes)
+    newrec0 = rec0[0:ebase+4]+struct.pack('>L', elen+newrecsize)+struct.pack('>L', enum+1)+struct.pack('>L', exth_num)\
+        + struct.pack('>L', newrecsize)+exth_bytes+rec0[ebase+12:]
+    newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)+newrecsize)
+    # keep constant record length by removing newrecsize null bytes from end
+    sectail = newrec0[-newrecsize:]
+    if sectail != b'\0'*newrecsize:
+        raise DualMetaFixException('add_exth: trimmed non-null bytes at end of section')
+    newrec0 = newrec0[0:rlen]
+    return newrec0
+
+
+def read_exth(rec0, exth_num):
+    exth_values = []
+    ebase, elen, enum, rlen = get_exth_params(rec0)
+    ebase += 12
+    while enum > 0:
+        exth_id = getint(rec0, ebase)
+        if exth_id == exth_num:
+            # We might have multiple exths, so build a list.
+            exth_values.append(rec0[ebase+8:ebase+getint(rec0, ebase+4)])
+        enum -= 1
+        ebase = ebase+getint(rec0, ebase+4)
+    return exth_values
+
+
+def del_exth(rec0, exth_num):
+    ebase, elen, enum, rlen = get_exth_params(rec0)
+    ebase_idx = ebase+12
+    enum_idx = 0
+    while enum_idx < enum:
+        exth_id = getint(rec0, ebase_idx)
+        exth_size = getint(rec0, ebase_idx+4)
+        if exth_id == exth_num:
+            newrec0 = rec0
+            newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)-exth_size)
+            newrec0 = newrec0[:ebase_idx]+newrec0[ebase_idx+exth_size:]
+            newrec0 = newrec0[0:ebase+4]+struct.pack('>L', elen-exth_size)+struct.pack('>L', enum-1)+newrec0[ebase+12:]
+            newrec0 += b'\0'*exth_size
+            if rlen != len(newrec0):
+                raise DualMetaFixException('del_exth: incorrect section size change')
+            return newrec0
+        enum_idx += 1
+        ebase_idx = ebase_idx+exth_size
+    return rec0
+
+
+class DualMobiMetaFix:
+    def __init__(self, infile, outfile, asin):
+        shutil.copyfile(infile, outfile)
+        f = open(outfile, "r+b")
+        self.datain = mmap.mmap(f.fileno(), 0)
+        self.datain_rec0 = readsection(self.datain, 0)
+
+        # in the first mobi header
+        # add 501 to "EBOK", add 113 as asin, add 504 as asin
+        rec0 = self.datain_rec0
+        rec0 = del_exth(rec0, 501)
+        rec0 = del_exth(rec0, 113)
+        rec0 = del_exth(rec0, 504)
+        rec0 = add_exth(rec0, 501, b'EBOK')
+        rec0 = add_exth(rec0, 113, asin)
+        rec0 = add_exth(rec0, 504, asin)
+        replacesection(self.datain, 0, rec0)
+
+        ver = getint(self.datain_rec0, mobi_version)
+        self.combo = (ver != 8)
+        if not self.combo:
+            return
+
+        exth121 = read_exth(self.datain_rec0, 121)
+        if len(exth121) == 0:
+            self.combo = False
+            return
+        else:
+            # only pay attention to first exth121
+            # (there should only be one)
+            datain_kf8, = struct.unpack_from('>L', exth121[0], 0)
+            if datain_kf8 == 0xffffffff:
+                self.combo = False
+                return
+        self.datain_kfrec0 = readsection(self.datain, datain_kf8)
+
+        # in the second header
+        # add 501 to "EBOK", add 113 as asin, add 504 as asin
+        rec0 = self.datain_kfrec0
+        rec0 = del_exth(rec0, 501)
+        rec0 = del_exth(rec0, 113)
+        rec0 = del_exth(rec0, 504)
+        rec0 = add_exth(rec0, 501, b'EBOK')
+        rec0 = add_exth(rec0, 113, asin)
+        rec0 = add_exth(rec0, 504, asin)
+        replacesection(self.datain, datain_kf8, rec0)
+
+        self.datain.flush()
+        self.datain.close()
--- a/kcc/image.py
+++ b/kcc/image.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2010  Alex Yatskov
 # Copyright (C) 2011  Stanislav (proDOOMman) Kosolapov <prodoomman@gmail.com>
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # 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
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 __license__ = 'ISC'
-__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

 import os
@@ -144,7 +144,7 @@ class ComicPage:
                                     + str(self.border[2]) + "-" + str(self.border[3]))
                if forcepng:
                    filename += ".png"
-                    self.image.save(filename,  "PNG", optimize=1)
+                    self.image.save(filename, "PNG", optimize=1)
                else:
                    filename += ".jpg"
                    self.image.save(filename, "JPEG", optimize=1)
@@ -362,27 +362,28 @@ class ComicPage:
            self.image = self.image.crop((0, 0, widthImg, heightImg - diff))
        return self.image

-    def cropWhiteSpace(self, threshold):
+    def cropWhiteSpace(self):
        if ImageChops.invert(self.image).getbbox() is not None:
            widthImg, heightImg = self.image.size
            delta = 10
            diff = delta
+            fixedThreshold = 0.1
            # top
-            while ImageStat.Stat(self.image.crop((0, 0, widthImg, diff))).var[0] < threshold and diff < heightImg:
+            while ImageStat.Stat(self.image.crop((0, 0, widthImg, diff))).var[0] < fixedThreshold and diff < heightImg:
                diff += delta
            diff -= delta
            self.image = self.image.crop((0, diff, widthImg, heightImg))
            widthImg, heightImg = self.image.size
            diff = delta
            # left
-            while ImageStat.Stat(self.image.crop((0, 0, diff, heightImg))).var[0] < threshold and diff < widthImg:
+            while ImageStat.Stat(self.image.crop((0, 0, diff, heightImg))).var[0] < fixedThreshold and diff < widthImg:
                diff += delta
            diff -= delta
            self.image = self.image.crop((diff, 0, widthImg, heightImg))
            widthImg, heightImg = self.image.size
            diff = delta
            # down
-            while ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg, heightImg))).var[0] < threshold\
+            while ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg, heightImg))).var[0] < fixedThreshold\
                    and diff < heightImg:
                diff += delta
            diff -= delta
@@ -390,7 +391,7 @@ class ComicPage:
            widthImg, heightImg = self.image.size
            diff = delta
            # right
-            while ImageStat.Stat(self.image.crop((widthImg - diff, 0, widthImg, heightImg))).var[0] < threshold\
+            while ImageStat.Stat(self.image.crop((widthImg - diff, 0, widthImg, heightImg))).var[0] < fixedThreshold\
                    and diff < widthImg:
                diff += delta
            diff -= delta
@@ -468,3 +469,35 @@ class ComicPage:
            else:
                # Detection failed
                return False
+
+
+class Cover:
+    def __init__(self, source, target):
+        self.source = source
+        self.target = target
+        self.image = Image.open(source)
+        self.image = self.image.convert('RGB')
+        self.process()
+        self.save()
+
+    def trim(self):
+        bg = Image.new(self.image.mode, self.image.size, self.image.getpixel((0, 0)))
+        diff = ImageChops.difference(self.image, bg)
+        diff = ImageChops.add(diff, diff, 2.0, -100)
+        bbox = diff.getbbox()
+        if bbox:
+            return self.image.crop(bbox)
+        else:
+            return self.image
+
+    def process(self):
+        self.image = self.trim()
+
+    def save(self):
+        try:
+            if os.path.splitext(self.source)[1].lower() == '.png':
+                self.image.save(self.target, "PNG", optimize=1)
+            else:
+                self.image.save(self.target, "JPEG", optimize=1)
+        except IOError:
+            raise RuntimeError('Failed to save cover')
--- a/kcc/kindlesplit.py
+++ b/kcc/kindlesplit.py
@@ -1,382 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Based on initial version of KindleUnpack. Copyright (C) 2009 Charles M. Hannum <root@ihack.net>
-# Improvements Copyright (C) 2009-2012 P. Durrant, K. Hendricks, S. Siebert, fandrieu, DiapDealer, nickredding
-# Changes for KCC Copyright (C) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
-#
-# 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 <http://www.gnu.org/licenses/>.
-
-import struct
-# from uuid import uuid4
-
-# important  pdb header offsets
-unique_id_seed = 68
-number_of_pdb_records = 76
-
-# important palmdoc header offsets
-book_length = 4
-book_record_count = 8
-first_pdb_record = 78
-
-# important rec0 offsets
-length_of_book = 4
-mobi_header_base = 16
-mobi_header_length = 20
-mobi_type = 24
-mobi_version = 36
-first_non_text = 80
-title_offset = 84
-first_image_record = 108
-first_content_index = 192
-last_content_index = 194
-kf8_last_content_index = 192  # for KF8 mobi headers
-fcis_index = 200
-flis_index = 208
-srcs_index = 224
-srcs_count = 228
-primary_index = 244
-datp_index = 256
-huffoff = 112
-hufftbloff = 120
-
-
-def getint(datain, ofs, sz='L'):
-    i, = struct.unpack_from('>'+sz, datain, ofs)
-    return i
-
-
-def writeint(datain, ofs, n, length='L'):
-    if length == 'L':
-        return datain[:ofs]+struct.pack('>L', n)+datain[ofs+4:]
-    else:
-        return datain[:ofs]+struct.pack('>H', n)+datain[ofs+2:]
-
-
-def getsecaddr(datain, secno):
-    nsec = getint(datain, number_of_pdb_records, 'H')
-    assert secno >= 0 & secno < nsec, 'secno %d out of range (nsec=%d)' % (secno, nsec)
-    secstart = getint(datain, first_pdb_record+secno*8)
-    if secno == nsec-1:
-        secend = len(datain)
-    else:
-        secend = getint(datain, first_pdb_record+(secno+1)*8)
-    return secstart, secend
-
-
-def readsection(datain, secno):
-    secstart, secend = getsecaddr(datain, secno)
-    return datain[secstart:secend]
-
-
-def writesection(datain, secno, secdata):  # overwrite, accounting for different length
-    dataout = deletesectionrange(datain, secno, secno)
-    return insertsection(dataout, secno, secdata)
-
-
-def nullsection(datain, secno):  # make it zero-length without deleting it
-    datalst = []
-    nsec = getint(datain, number_of_pdb_records, 'H')
-    secstart, secend = getsecaddr(datain, secno)
-    zerosecstart, zerosecend = getsecaddr(datain, 0)
-    dif = secend-secstart
-    datalst.append(datain[:first_pdb_record])
-    for i in range(0, secno+1):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
-    for i in range(secno+1, nsec):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        ofs -= dif
-        datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
-    lpad = zerosecstart - (first_pdb_record + 8*nsec)
-    if lpad > 0:
-        datalst.append(b'\0' * lpad)
-    datalst.append(datain[zerosecstart: secstart])
-    datalst.append(datain[secend:])
-    dataout = b"".join(datalst)
-    return dataout
-
-
-def deletesectionrange(datain, firstsec, lastsec):  # delete a range of sections
-    datalst = []
-    firstsecstart, firstsecend = getsecaddr(datain, firstsec)
-    lastsecstart, lastsecend = getsecaddr(datain, lastsec)
-    zerosecstart, zerosecend = getsecaddr(datain, 0)
-    dif = lastsecend - firstsecstart + 8*(lastsec-firstsec+1)
-    nsec = getint(datain, number_of_pdb_records, 'H')
-    datalst.append(datain[:unique_id_seed])
-    datalst.append(struct.pack('>L', 2*(nsec-(lastsec-firstsec+1))+1))
-    datalst.append(datain[unique_id_seed+4:number_of_pdb_records])
-    datalst.append(struct.pack('>H', nsec-(lastsec-firstsec+1)))
-    newstart = zerosecstart - 8*(lastsec-firstsec+1)
-    for i in range(0, firstsec):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        ofs -= 8 * (lastsec - firstsec + 1)
-        datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
-    for i in range(lastsec+1, nsec):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        ofs -= dif
-        flgval = 2*(i-(lastsec-firstsec+1))
-        datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
-    lpad = newstart - (first_pdb_record + 8*(nsec - (lastsec - firstsec + 1)))
-    if lpad > 0:
-        datalst.append(b'\0' * lpad)
-    datalst.append(datain[zerosecstart:firstsecstart])
-    datalst.append(datain[lastsecend:])
-    dataout = b"".join(datalst)
-    return dataout
-
-
-def insertsection(datain, secno, secdata):  # insert a new section
-    datalst = []
-    nsec = getint(datain, number_of_pdb_records, 'H')
-    secstart, secend = getsecaddr(datain, secno)
-    zerosecstart, zerosecend = getsecaddr(datain, 0)
-    dif = len(secdata)
-    datalst.append(datain[:unique_id_seed])
-    datalst.append(struct.pack('>L', 2*(nsec+1)+1))
-    datalst.append(datain[unique_id_seed+4:number_of_pdb_records])
-    datalst.append(struct.pack('>H', nsec+1))
-    newstart = zerosecstart + 8
-    for i in range(0, secno):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        ofs += 8
-        datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
-    datalst.append(struct.pack('>L', secstart + 8) + struct.pack('>L', (2*secno)))
-    for i in range(secno, nsec):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        ofs = ofs + dif + 8
-        flgval = 2*(i+1)
-        datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
-    lpad = newstart - (first_pdb_record + 8*(nsec + 1))
-    if lpad > 0:
-        datalst.append(b'\0' * lpad)
-    datalst.append(datain[zerosecstart:secstart])
-    datalst.append(secdata)
-    datalst.append(datain[secstart:])
-    dataout = b"".join(datalst)
-    return dataout
-
-
-def insertsectionrange(sectionsource, firstsec, lastsec, sectiontarget, targetsec):  # insert a range of sections
-    dataout = sectiontarget
-    for idx in range(lastsec, firstsec-1, -1):
-        dataout = insertsection(dataout, targetsec, readsection(sectionsource, idx))
-    return dataout
-
-
-def get_exth_params(rec0):
-    ebase = mobi_header_base + getint(rec0, mobi_header_length)
-    elen = getint(rec0, ebase+4)
-    enum = getint(rec0, ebase+8)
-    return ebase, elen, enum
-
-
-def add_exth(rec0, exth_num, exth_bytes):
-    ebase, elen, enum = get_exth_params(rec0)
-    newrecsize = 8+len(exth_bytes)
-    newrec0 = rec0[0:ebase+4]+struct.pack('>L', elen+newrecsize)+struct.pack('>L', enum+1) +\
-        struct.pack('>L', exth_num) + struct.pack('>L', newrecsize)+exth_bytes+rec0[ebase+12:]
-    newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)+newrecsize)
-    return newrec0
-
-
-def read_exth(rec0, exth_num):
-    exth_values = []
-    ebase, elen, enum = get_exth_params(rec0)
-    ebase += 12
-    while enum > 0:
-        exth_id = getint(rec0, ebase)
-        if exth_id == exth_num:
-            # We might have multiple exths, so build a list.
-            exth_values.append(rec0[ebase+8:ebase+getint(rec0, ebase+4)])
-        enum -= 1
-        ebase = ebase+getint(rec0, ebase+4)
-    return exth_values
-
-
-def write_exth(rec0, exth_num, exth_bytes):
-    ebase, elen, enum = get_exth_params(rec0)
-    ebase_idx = ebase+12
-    enum_idx = enum
-    while enum_idx > 0:
-        exth_id = getint(rec0, ebase_idx)
-        if exth_id == exth_num:
-            dif = len(exth_bytes)+8-getint(rec0, ebase_idx+4)
-            newrec0 = rec0
-            if dif != 0:
-                newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)+dif)
-            return newrec0[:ebase+4]+struct.pack('>L', elen+len(exth_bytes)+8-getint(rec0, ebase_idx+4)) +\
-                struct.pack('>L', enum)+rec0[ebase+12:ebase_idx+4] +\
-                struct.pack('>L', len(exth_bytes)+8)+exth_bytes +\
-                rec0[ebase_idx+getint(rec0, ebase_idx+4):]
-        enum_idx -= 1
-        ebase_idx = ebase_idx+getint(rec0, ebase_idx+4)
-    return rec0
-
-
-def del_exth(rec0, exth_num):
-    ebase, elen, enum = get_exth_params(rec0)
-    ebase_idx = ebase+12
-    enum_idx = 0
-    while enum_idx < enum:
-        exth_id = getint(rec0, ebase_idx)
-        exth_size = getint(rec0, ebase_idx+4)
-        if exth_id == exth_num:
-            newrec0 = rec0
-            newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)-exth_size)
-            newrec0 = newrec0[:ebase_idx]+newrec0[ebase_idx+exth_size:]
-            newrec0 = newrec0[0:ebase+4]+struct.pack('>L', elen-exth_size)+struct.pack('>L', enum-1)+newrec0[ebase+12:]
-            return newrec0
-        enum_idx += 1
-        ebase_idx = ebase_idx+exth_size
-    return rec0
-
-
-class mobi_split:
-    def __init__(self, infile, newKindle):
-        try:
-            datain = open(infile, 'rb').read()
-            datain_rec0 = readsection(datain, 0)
-            ver = getint(datain_rec0, mobi_version)
-            # fake_asin = str(uuid4())
-            self.combo = (ver != 8)
-            if not self.combo:
-                return
-            exth121 = read_exth(datain_rec0, 121)
-            if len(exth121) == 0:
-                self.combo = False
-                return
-            else:
-                # only pay attention to first exth121
-                # (there should only be one)
-                datain_kf8, = struct.unpack_from('>L', exth121[0], 0)
-                if datain_kf8 == 0xffffffff:
-                    self.combo = False
-                    return
-            datain_kfrec0 = readsection(datain, datain_kf8)
-            firstimage = getint(datain_rec0, first_image_record)
-            lastimage = getint(datain_rec0, last_content_index, 'H')
-
-            if not newKindle:
-                # create the standalone mobi7
-                num_sec = getint(datain, number_of_pdb_records, 'H')
-                # remove BOUNDARY up to but not including ELF record
-                self.result_file = deletesectionrange(datain, datain_kf8-1, num_sec-2)
-                # check if there are SRCS records and delete them
-                srcs = getint(datain_rec0, srcs_index)
-                num_srcs = getint(datain_rec0, srcs_count)
-                if srcs != 0xffffffff and num_srcs > 0:
-                    self.result_file = deletesectionrange(self.result_file, srcs, srcs+num_srcs-1)
-                    datain_rec0 = writeint(datain_rec0, srcs_index, 0xffffffff)
-                    datain_rec0 = writeint(datain_rec0, srcs_count, 0)
-                # reset the EXTH 121 KF8 Boundary meta data to 0xffffffff
-                datain_rec0 = write_exth(datain_rec0, 121, struct.pack('>L', 0xffffffff))
-                # datain_rec0 = del_exth(datain_rec0,121)
-                # datain_rec0 = del_exth(datain_rec0,534)
-                # don't remove the EXTH 125 KF8 Count of Resources, seems to be present in mobi6 files as well
-                # set the EXTH 129 KF8 Masthead / Cover Image string to the null string
-                datain_rec0 = write_exth(datain_rec0, 129, b'')
-                # don't remove the EXTH 131 KF8 Unidentified Count, seems to be present in mobi6 files as well
-
-                # Make sure we have an ASIN & cdeType set...
-                # if len(read_exth(datain_rec0, 113)) == 0:
-                #     datain_rec0 = add_exth(datain_rec0, 113, fake_asin)
-                # if len(read_exth(datain_rec0, 504)) == 0:
-                #     datain_rec0 = add_exth(datain_rec0, 504, fake_asin)
-                if len(read_exth(datain_rec0, 501)) == 0:
-                    datain_rec0 = add_exth(datain_rec0, 501, b'EBOK')
-
-                # need to reset flags stored in 0x80-0x83
-                # old mobi with exth: 0x50, mobi7 part with exth: 0x1850, mobi8 part with exth: 0x1050
-                # Bit Flags
-                # 0x1000 = Bit 12 indicates if embedded fonts are used or not
-                # 0x0800 = means this Header points to *shared* images/resource/fonts ??
-                # 0x0080 = unknown new flag, why is this now being set by Kindlegen 2.8?
-                # 0x0040 = exth exists
-                # 0x0010 = Not sure but this is always set so far
-                fval, = struct.unpack_from('>L', datain_rec0, 0x80)
-                # need to remove flag 0x0800 for KindlePreviewer 2.8 and unset Bit 12 for embedded fonts
-                fval &= 0x07FF
-                datain_rec0 = datain_rec0[:0x80] + struct.pack('>L', fval) + datain_rec0[0x84:]
-                self.result_file = writesection(self.result_file, 0, datain_rec0)
-                if lastimage == 0xffff:
-                    # find the lowest of the next sections and copy up to that.
-                    ofs_list = [(kf8_last_content_index, 'L'), (fcis_index, 'L'), (flis_index, 'L'), (datp_index, 'L'),
-                                (hufftbloff, 'L')]
-                    for ofs, sz in ofs_list:
-                        n = getint(datain_kfrec0, ofs, sz)
-                        if 0 < n < lastimage:
-                            lastimage = n-1
-
-                # Try to null out FONT and RES, but leave the (empty) PDB record so image refs remain valid
-                for i in range(firstimage, lastimage):
-                    imgsec = readsection(self.result_file, i)
-                    if imgsec[0:4] in ['RESC', 'FONT']:
-                        self.result_file = nullsection(self.result_file, i)
-                # mobi7 finished
-            else:
-                # create standalone mobi8
-                self.result_file = deletesectionrange(datain, 0, datain_kf8-1)
-                target = getint(datain_kfrec0, first_image_record)
-                self.result_file = insertsectionrange(datain, firstimage, lastimage, self.result_file, target)
-                datain_kfrec0 = readsection(self.result_file, 0)
-
-                # Only keep the correct EXTH 116 StartOffset, KG 2.5 carries over the one from the mobi7 part,
-                # which then points at garbage in the mobi8 part, and confuses FW 3.4
-                kf8starts = read_exth(datain_kfrec0, 116)
-                # If we have multiple StartOffset, keep only the last one
-                kf8start_count = len(kf8starts)
-                while kf8start_count > 1:
-                    kf8start_count -= 1
-                    datain_kfrec0 = del_exth(datain_kfrec0, 116)
-
-                # update the EXTH 125 KF8 Count of Images/Fonts/Resources
-                datain_kfrec0 = write_exth(datain_kfrec0, 125, struct.pack('>L', lastimage-firstimage+1))
-
-                # Same dance for the KF8, we want an ASIN & cdeType :)
-                # if len(read_exth(datain_kfrec0, 113)) == 0:
-                #     datain_kfrec0 = add_exth(datain_kfrec0, 113, fake_asin)
-                # if len(read_exth(datain_kfrec0, 504)) == 0:
-                #     datain_kfrec0 = add_exth(datain_kfrec0, 504, fake_asin)
-                if len(read_exth(datain_kfrec0, 501)) == 0:
-                    datain_kfrec0 = add_exth(datain_kfrec0, 501, b'EBOK')
-
-                # need to reset flags stored in 0x80-0x83
-                # old mobi with exth: 0x50, mobi7 part with exth: 0x1850, mobi8 part with exth: 0x1050
-                # standalone mobi8 with exth: 0x0050
-                # Bit Flags
-                # 0x1000 = Bit 12 indicates if embedded fonts are used or not
-                # 0x0800 = means this Header points to *shared* images/resource/fonts ??
-                # 0x0080 = unknown new flag, why is this now being set by Kindlegen 2.8?
-                # 0x0040 = exth exists
-                # 0x0010 = Not sure but this is always set so far
-                fval, = struct.unpack_from('>L', datain_kfrec0, 0x80)
-                fval &= 0x1FFF
-                fval |= 0x0800
-                datain_kfrec0 = datain_kfrec0[:0x80] + struct.pack('>L', fval) + datain_kfrec0[0x84:]
-
-                # properly update other index pointers that have been shifted by the insertion of images
-                ofs_list = [(kf8_last_content_index, 'L'), (fcis_index, 'L'), (flis_index, 'L'), (datp_index, 'L'),
-                            (hufftbloff, 'L')]
-                for ofs, sz in ofs_list:
-                    n = getint(datain_kfrec0, ofs, sz)
-                    if n != 0xffffffff:
-                        datain_kfrec0 = writeint(datain_kfrec0, ofs, n+lastimage-firstimage+1, sz)
-                self.result_file = writesection(self.result_file, 0, datain_kfrec0)
-                # mobi8 finished
-        except Exception:
-                raise
-
-    def getResult(self):
-        return self.result_file
--- a/kcc/pdfjpgextract.py
+++ b/kcc/pdfjpgextract.py
@@ -1,5 +1,5 @@
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Based upon the code snippet by Ned Batchelder
 # (http://nedbatchelder.com/blog/200712/extracting_jpgs_from_pdfs.html)
@@ -20,7 +20,7 @@
 #

 __license__ = 'ISC'
-__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

 import os
--- a/kcc/shared.py
+++ b/kcc/shared.py
@@ -1,5 +1,5 @@
 # Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -17,7 +17,7 @@
 #

 __license__ = 'ISC'
-__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

 import os
--- a/other/libEGL32.dll
+++ b/other/libEGL32.dll
--- a/other/libEGL64.dll
+++ b/other/libEGL64.dll
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
 """
-cx_Freeze build script for KCC.
+cx_Freeze/py2app build script for KCC.

 Usage (Mac OS X):
    python setup.py py2app

 Usage (Windows):
-    python setup.py build
+    python setup.py py2exe
 """
 from sys import platform, version_info
 if version_info[0] != 3:
@@ -14,7 +14,7 @@ if version_info[0] != 3:
    exit(1)

 NAME = "KindleComicConverter"
-VERSION = "4.0.2"
+VERSION = "4.1"
 MAIN = "kcc.py"

 if platform == "darwin":
@@ -55,31 +55,61 @@ if platform == "darwin":
        )
    )
 elif platform == "win32":
+    # noinspection PyUnresolvedReferences
+    import py2exe
    import platform as arch
-    from cx_Freeze import setup, Executable
+    from distutils.core import setup
    if arch.architecture()[0] == '64bit':
-        library = 'libEGL64.dll'
+        suffix = '_64'
    else:
-        library = 'libEGL32.dll'
-    base = "Win32GUI"
+        suffix = ''
+    additional_files = [('imageformats', ['C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qgif.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qico.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qjpeg.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qmng.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qsvg.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qtga.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qtiff.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qwbmp.dll']),
+                        ('platforms', ['C:\Python34' + suffix +
+                                       '\Lib\site-packages\PyQt5\plugins\platforms\qminimal.dll',
+                                       'C:\Python34' + suffix +
+                                       '\Lib\site-packages\PyQt5\plugins\platforms\qoffscreen.dll',
+                                       'C:\Python34' + suffix +
+                                       '\Lib\site-packages\PyQt5\plugins\platforms\qwindows.dll']),
+                        ('', ['LICENSE.txt',
+                              'other\\7za.exe',
+                              'other\\UnRAR.exe',
+                              'other\\Additional-LICENSE.txt',
+                              'other\\7za.exe',
+                              'C:\Python34' + suffix + '\Lib\site-packages\PyQt5\libEGL.dll'])]
    extra_options = dict(
-        options={"build_exe": {"optimize": 2,
-                               "include_files": ['LICENSE.txt',
-                                                 ['other/UnRAR.exe', 'UnRAR.exe'],
-                                                 ['other/7za.exe', '7za.exe'],
-                                                 ['other/Additional-LICENSE.txt', 'Additional-LICENSE.txt'],
-                                                 ['other/' + library, 'libEGL.dll']
-                                                 ],
-                               "copy_dependent_files": True,
-                               "create_shared_zip": False,
-                               "append_script_to_exe": True,
-                               "replace_paths": '*=',
-                               "excludes": ['tkinter']}},
-        executables=[Executable(MAIN,
-                                base=base,
-                                targetName="KCC.exe",
-                                icon="icons/comic2ebook.ico",
-                                compress=False)])
+        options={'py2exe': {"bundle_files": 2,
+                            "dll_excludes": ["tcl85.dll", "tk85.dll"],
+                            "dist_dir": "dist" + suffix,
+                            "compressed": True,
+                            "includes": ["sip"],
+                            "excludes": ["tkinter"],
+                            "optimize": 2}},
+        windows=[{"script": "kcc.py",
+                  "dest_base": "KCC",
+                  "version": VERSION,
+                  "copyright": "Ciro Mattia Gonano, Pawel Jastrzebski © 2014",
+                  "legal_copyright": "ISC License (ISCL)",
+                  "product_version": VERSION,
+                  "product_name": "Kindle Comic Converter",
+                  "file_description": "Kindle Comic Converter",
+                  "icon_resources": [(1, "icons\comic2ebook.ico")]}],
+        zipfile=None,
+        data_files=additional_files)
 else:
    print('Please use setup.sh to build Linux package.')
    exit()
@@ -89,8 +119,8 @@ setup(
    name=NAME,
    version=VERSION,
    author="Ciro Mattia Gonano, Pawel Jastrzebski",
-    author_email="ciromattia@gmail.com, pawelj@vulturis.eu",
-    description="A tool to convert comics (CBR/CBZ/PDFs/image folders) to MOBI.",
+    author_email="ciromattia@gmail.com, pawelj@iosphe.re",
+    description="Kindle Comic Converter",
    license="ISC License (ISCL)",
    keywords="kindle comic mobipocket mobi cbz cbr manga",
    url="http://github.com/ciromattia/kcc",
--- a/setup.sh
+++ b/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Linux Python package build script

-VERSION="4.0.2"
+VERSION="4.1"

 cp kcc.py __main__.py
 zip kcc.zip __main__.py kcc/*.py
Author	SHA1	Message	Date
Paweł Jastrzębski	5450502c2a	Updated README	2014-06-08 07:52:19 +02:00
Paweł Jastrzębski	c976b06413	Make sure that KindleGen have execute permissions	2014-06-05 07:37:32 +02:00
Paweł Jastrzębski	b6facda95b	Updated OS X libraries	2014-06-04 10:00:45 +02:00
Paweł Jastrzębski	3f608eb602	Version bump	2014-06-03 19:26:24 +02:00
Paweł Jastrzębski	104cd04994	Fixed title parsing	2014-06-02 20:31:48 +02:00
Paweł Jastrzębski	b323204628	Added additional cover processing	2014-06-02 19:55:20 +02:00
Paweł Jastrzębski	56195d301d	Tweaked merge	2014-05-29 22:01:21 +02:00
Paweł Jastrzębski	287723ca6f	Updated UnRAR	2014-05-29 21:56:14 +02:00
Paweł Jastrzębski	90490149c7	Merge branch 'theaquamarine-kindlegen'	2014-05-29 18:54:38 +02:00
blue	2210f484df	Use makeBook to create book from GUI Call comic2ebook.makeBook() rather than comic2ebook.main()	2014-05-29 18:28:38 +02:00
blue	d5502e85b0	Use makeParser() for options in KCC_gui KCC_gui now uses comic2ebook.makeParser() and setting global variable in comic2ebook to handle options for ebook creation.	2014-05-29 18:28:33 +02:00
blue	59b26cfc8b	Split comic2ebook.py main in two again Now has main() which initialises the program and makeParser() which sets up the option parser.	2014-05-29 18:28:27 +02:00
blue	a722e5fa49	Split comic2ebook.py main in two Now has main() which initialises program and makeBook which does the actual work.	2014-05-29 18:28:14 +02:00
Paweł Jastrzębski	fce3072dca	Updated to Python 3.4 and PyQt 5.3 (close #94 )	2014-05-29 18:23:28 +02:00
Paweł Jastrzębski	f53cdf9cd7	Implemented new DualMetaFix version	2014-05-28 06:57:37 +02:00
Paweł Jastrzębski	de74318c69	Replaced cx_Freeze with py2exe	2014-05-25 11:08:28 +02:00
Paweł Jastrzębski	b137e69510	Dependency tweak	2014-05-25 07:29:03 +02:00
Paweł Jastrzębski	888663fa4c	Miscellaneous processing tweaks	2014-05-18 09:09:38 +02:00
Paweł Jastrzębski	8a2ba96ac5	Tiny tweaks for Linux	2014-05-17 19:12:54 +02:00
Paweł Jastrzębski	cb6b0e0a7b	Updated tooltips	2014-05-15 19:38:34 +02:00
Paweł Jastrzębski	49d2a7fbab	Changed domain	2014-05-14 20:23:12 +02:00
Paweł Jastrzębski	3d84b27d58	Fixed tiny bugs	2014-05-05 18:32:46 +02:00
Paweł Jastrzębski	e98a23d0c0	Updated README	2014-05-05 12:08:15 +02:00
Paweł Jastrzębski	7f80dacea8	Finished implementation of DualMetaFix	2014-05-05 10:42:16 +02:00
Paweł Jastrzębski	6efb3dcef3	Preliminary implementation of DualMetaFix	2014-05-04 21:45:03 +02:00
Paweł Jastrzębski	942a828b7e	Revert "Changed output extension to AZW3" This reverts commit `64b199ef74`.	2014-05-04 21:37:26 +02:00
Paweł Jastrzębski	df5ee1badf	Overhauled dependency check	2014-04-30 20:38:23 +02:00
Paweł Jastrzębski	e3ab28642d	Re-enabled tray icon on Linux	2014-04-30 20:11:25 +02:00
Ciro Mattia Gonano	a1831c45d5	Revert to ISC License	2014-04-30 03:00:03 +02:00
Paweł Jastrzębski	52bea9957a	Updated README	2014-04-29 13:12:27 +02:00
Paweł Jastrzębski	a71339ec34	Changed license to GNU General Public License v3 (GPL-3)	2014-04-29 13:00:32 +02:00
Paweł Jastrzębski	c5f09c44b8	Bumped a little MOBI file size limit	2014-04-24 22:11:37 +02:00
Paweł Jastrzębski	64b199ef74	Changed output extension to AZW3 This is cosmetic change. All profiles for new Kindle models already created KF8/AZW3 files but used generic extension.	2014-04-21 08:39:16 +02:00
Paweł Jastrzębski	8dd0b0e694	Tweaked whitespace cropping + other small tweaks	2014-04-18 11:47:51 +02:00
Paweł Jastrzębski	181a2e8ab4	GUI tweak: Fixed rounding	2014-04-17 18:46:25 +02:00
Paweł Jastrzębski	3fdff845b7	Tiny code cleanup	2014-04-10 13:42:29 +02:00
Paweł Jastrzębski	2ee5dc310b	Fixed No optimization mode (close #88 )	2014-04-08 13:10:34 +02:00
Paweł Jastrzębski	f32e9560b5	Fixed Linux/OSX crash	2014-03-26 10:23:20 +01:00
Paweł Jastrzębski	621827c1c2	Performance tweaks for Windows	2014-03-22 11:16:25 +01:00