Merge pull request #119 from ciromattia/4.x

4.3.1

README.md

@@ -1,13 +1,13 @@
 # KCC
 
-**Kindle Comic Converter** is a Python app to convert comic files or folders to ePub, Panel View MOBI or E-Ink optimized CBZ.
-It was initally developed for Kindle but since v2.2 it outputs valid ePub 2.0 so _**despite its name, KCC is
-actually a comic to EPUB converter that every e-reader owner can happily use**_.
+**Kindle Comic Converter** is a Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ.
+It was initially developed for Kindle but since version 2.2 it outputs valid EPUB 2.0 so _**despite its name, KCC is
+actually a comic/manga to EPUB converter that every e-reader owner can happily use**_.
 It can also optionally optimize images by applying a number of transformations.
 
 ### A word of warning
 **KCC** _is not_ [Amazon's Kindle Comic Creator](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1001103761) nor is in any way endorsed by Amazon.  
-Amazon's tool is for comic publishers and involves a lot of manual effort, while **KCC** is for comic readers.
+Amazon's tool is for comic publishers and involves a lot of manual effort, while **KCC** is for comic/manga readers.
 _KC2_ in no way is a replacement for **KCC** so you can be quite confident we'll going to carry on developing our little monster ;-)
 
 ### Issues / new features / donations
@@ -36,7 +36,7 @@ You can find the latest released binary at the following links:
 - CBZ, ZIP
 - CBR, RAR *(With `unrar` executable)*
 - CB7, 7Z *(With `7za` executable)*
-- PDF *(Extracting only contained JPG images)*
+- PDF *(Only extracting JPG images)*
 
 ## OPTIONAL REQUIREMENTS
 - [KindleGen](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211) v2.9+ in a directory reachable by your _PATH_ or in _KCC_ directory *(For MOBI generation)*
@@ -67,6 +67,8 @@ After completed conversion you should find ready file alongside the original inp
 
 Please check [our wiki](https://github.com/ciromattia/kcc/wiki/) for more details.
 
+CLI version of **KCC** is intended for power users. It is not idiot-proof like GUI :-)
+
 ### Standalone `kcc-c2e.py` usage:
 
 ```
@@ -75,7 +77,9 @@ Usage: kcc-c2e [options] comic_file|comic_folder
 Options:
   MAIN:
     -p PROFILE, --profile=PROFILE
-                        Device profile (Choose one among K1, K2, K345, KDX, KHD, KF, KFHD, KFHD8, KFHDX, KFHDX8, KFA, KoMT, KoG, KoA, KoAHD) [Default=KHD]
+                        Device profile (Available options: K1, K2, K345, KDX,
+                        KPW, KV, KFHD, KFHDX, KFHDX8, KFA, KoMT, KoG, KoA,
+                        KoAHD, KoAH2O) [Default=KV]
     -q QUALITY, --quality=QUALITY
                         Quality of Panel View. 0 - Normal 1 - High 2 - Ultra [Default=0]
     -m, --manga-style   Manga style (Right-to-left reading and splitting)
@@ -86,7 +90,9 @@ Options:
                         Output generated file to specified directory or file
     -t TITLE, --title=TITLE
                         Comic title [Default=filename or directory name]
-    --cbz-output        Outputs a CBZ archive and does not generate EPUB
+    -f FORMAT, --format=FORMAT
+                        Output format (Available options: Auto, MOBI,
+						EPUB, CBZ) [Default=Auto]
     --batchsplit        Split output into multiple files
 
   PROCESSING:
@@ -134,7 +140,7 @@ Options:
 
 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:
+The app relies and includes the following scripts:
 
  - `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.
@@ -142,17 +148,15 @@ The app relies and includes the following scripts/binaries:
  - 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 Voyage](http://kcc.iosphe.re/Samples/Ubunchu!-KV.mobi)
 * [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)
+* [Kindle DX/DXG](http://kcc.iosphe.re/Samples/Ubunchu!-KDX.cbz)
 * [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)
+* [Kobo Aura H2O](http://kcc.iosphe.re/Samples/Ubunchu!-KoAH2O.cbz)
 
 ## CHANGELOG
 ####1.0
@@ -188,11 +192,11 @@ The app relies and includes the following scripts/binaries:
 * Added basic error reporting
 
 ####2.2:
-* Added (valid!) ePub 2.0 output  
+* Added (valid!) EPUB 2.0 output  
 * Rename .zip files to .cbz to avoid overwriting
 
 ####2.3
-* Fixed win32 ePub generation, folder handling, filenames with spaces and subfolders
+* Fixed win32 EPUB generation, folder handling, filenames with spaces and subfolders
 
 ####2.4
 * Use temporary directory as workdir (fixes converting from external volumes and zipfiles renaming)  
@@ -200,22 +204,22 @@ The app relies and includes the following scripts/binaries:
 
 ####2.5
 * Added --black-borders option to set added borders black when page's ratio is not the device's one (#11).  
-* Fixes epub containing zipped itself (#10)  
+* Fixes EPUB containing zipped itself (#10)  
 
 ####2.6
 * Added --rotate option to rotate landscape images instead of splitting them (#16, #24)  
-* Added --output option to customize ePub output dir/file (#22)  
-* Add rendition:layout and rendition:orientation ePub meta tags (supported by new kindlegen 2.8)  
+* Added --output option to customize EPUB output dir/file (#22)  
+* Add rendition:layout and rendition:orientation EPUB meta tags (supported by new kindlegen 2.8)  
 * Fixed natural sorting for files (#18)
 
 ####2.7
 * Lots of GUI improvements (#27, #13)  
 * Added gamma support within --gamma option (defaults to profile-specified gamma) (#26, #27)  
 * Added --nodithering option to prevent dithering optimizations (#27)  
-* Epub margins support (#30)  
+* EPUB margins support (#30)  
 * Fixed no file added if file has no spaces on Windows (#25)  
 * Gracefully exit if unrar missing (#15)  
-* Do not call kindlegen if source epub is bigger than 320MB (#17)  
+* Do not call kindlegen if source EPUB is bigger than 320MB (#17)  
 * Get filetype from magic number (#14)   
 * PDF conversion works again  
 
@@ -229,7 +233,7 @@ The app relies and includes the following scripts/binaries:
 * Optimized archive extraction for zip/rar files (#40)  
 
 ####2.9
-* Added support for generating a plain CBZ (skipping all the EPUB/Mobi generation) (#45)  
+* Added support for generating a plain CBZ (skipping all the EPUB/MOBI generation) (#45)  
 * Prevent output file overwriting the source one: if a duplicate name is detected, append _kcc to the name  
 * Rarfile library updated to 2.6  
 * Added GIF, TIFF and BMP to supported formats (#42)  
@@ -237,7 +241,7 @@ The app relies and includes the following scripts/binaries:
 
 ####2.10:
 * Multiprocessing support
-* Kindle Fire support (color ePub/Mobi)
+* Kindle Fire support (color EPUB/MOBI)
 * Panel View support for horizontal content
 * Fixed panel order for horizontal pages when --rotate is enabled
 * Disabled cropping and page number cutting for blank pages
@@ -361,6 +365,25 @@ The app relies and includes the following scripts/binaries:
 * Fixed problems with page order on stock KOBO CBZ reader
 * Many other small bug fixes and tweaks
 
+####4.2.1:
+* Improved margin color detection 
+* Fixed random crashes of MOBI processing step
+* Fixed resizing problems in high quality mode
+* Fixed some MCD support bugs
+* Default output format for Kindle DX is now CBZ
+
+####4.3:
+* Added profiles for Kindle Voyage and Kobo Aura H2O
+* Added missing features to CLI version
+* Other minor bug fixes
+
+####4.3.1:
+* Fixed Kindle Voyage profile
+* Fixed some bugs in OS X release
+* CLI version now support multiple input files at once
+* Disabled MCB support
+* Other minor tweaks
+
 ## KNOWN ISSUES
 Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).
 

kcc-c2e.py

@@ -18,7 +18,7 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-__version__ = '4.2'
+__version__ = '4.3.1'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

kcc-c2p.py

@@ -18,7 +18,7 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-__version__ = '4.2'
+__version__ = '4.3.1'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'

kcc.iss

@@ -1,5 +1,5 @@
 #define MyAppName "Kindle Comic Converter"
-#define MyAppVersion "4.2"
+#define MyAppVersion "4.3.1"
 #define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski"
 #define MyAppURL "http://kcc.iosphe.re/"
 #define MyAppExeName "KCC.exe"
@@ -43,13 +43,11 @@ Name: "CB7association"; Description: "CB7"; GroupDescription: "File associations
 
 [Files]
 ; x64 files
-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: "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

kcc.py

@@ -18,7 +18,7 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-__version__ = '4.2'
+__version__ = '4.3.1'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'
@@ -74,24 +74,21 @@ from multiprocessing import freeze_support
 from kcc import KCC_gui
 
 # OS specific PATH variable workarounds
-if sys.platform.startswith('darwin'):
-    if 'RESOURCEPATH' in os.environ:
-        os.environ['PATH'] = os.environ['RESOURCEPATH'] + ':' + os.environ['PATH']
-    else:
-        os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/:' + os.environ['PATH']
+if sys.platform.startswith('darwin') and 'RESOURCEPATH' not in os.environ:
+    os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/:' + os.environ['PATH']
 elif sys.platform.startswith('win'):
     if getattr(sys, 'frozen', False):
         os.chdir(os.path.dirname(os.path.abspath(sys.executable)))
 
         # Implementing dummy stdout and stderr for frozen Windows release
-        class fakestd(object):
+        class FakeSTD(object):
             def write(self, string):
                 pass
 
             def flush(self):
                 pass
-        sys.stdout = fakestd()
-        sys.stderr = fakestd()
+        sys.stdout = FakeSTD()
+        sys.stderr = FakeSTD()
     else:
         os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/;' + os.environ['PATH']
         os.chdir(os.path.dirname(os.path.abspath(__file__)))
@@ -103,36 +100,33 @@ class QApplicationMessaging(QtWidgets.QApplication):
 
     def __init__(self, argv):
         QtWidgets.QApplication.__init__(self, argv)
-        self._memory = QtCore.QSharedMemory(self)
-        self._memory.setKey('KCC')
-        if self._memory.attach():
-            self._running = True
-        else:
-            self._running = False
-            self._memory.create(1)
         self._key = 'KCC'
         self._timeout = 1000
-        self._server = QtNetwork.QLocalServer(self)
-        if not self.isRunning():
+        self._locked = False
+        socket = QtNetwork.QLocalSocket(self)
+        socket.connectToServer(self._key, QtCore.QIODevice.WriteOnly)
+        if not socket.waitForConnected(self._timeout):
+            self._server = QtNetwork.QLocalServer(self)
             # noinspection PyUnresolvedReferences
             self._server.newConnection.connect(self.handleMessage)
             self._server.listen(self._key)
+        else:
+            self._locked = True
+        socket.disconnectFromServer()
 
-    def shutdown(self):
-        if self._memory.isAttached():
-            self._memory.detach()
+    def __del__(self):
+        if not self._locked:
             self._server.close()
 
     def event(self, e):
         if e.type() == QtCore.QEvent.FileOpen:
-            # noinspection PyArgumentList
             self.messageFromOtherInstance.emit(bytes(e.file(), 'UTF-8'))
             return True
         else:
             return QtWidgets.QApplication.event(self, e)
 
     def isRunning(self):
-        return self._running
+        return self._locked
 
     def handleMessage(self):
         socket = self._server.nextPendingConnection()
@@ -140,18 +134,12 @@ class QApplicationMessaging(QtWidgets.QApplication):
             self.messageFromOtherInstance.emit(socket.readAll().data())
 
     def sendMessage(self, message):
-        if self.isRunning():
-            socket = QtNetwork.QLocalSocket(self)
-            socket.connectToServer(self._key, QtCore.QIODevice.WriteOnly)
-            if not socket.waitForConnected(self._timeout):
-                return False
-            # noinspection PyArgumentList
-            socket.write(bytes(message, 'UTF-8'))
-            if not socket.waitForBytesWritten(self._timeout):
-                return False
-            socket.disconnectFromServer()
-            return True
-        return False
+        socket = QtNetwork.QLocalSocket(self)
+        socket.connectToServer(self._key, QtCore.QIODevice.WriteOnly)
+        socket.waitForConnected(self._timeout)
+        socket.write(bytes(message, 'UTF-8'))
+        socket.waitForBytesWritten(self._timeout)
+        socket.disconnectFromServer()
 
 
 # Adding signals to QMainWindow

kcc/KCC_gui.py

@@ -17,7 +17,7 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-__version__ = '4.2'
+__version__ = '4.3.1'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'
@@ -36,12 +36,10 @@ 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, Process
-from uuid import uuid4
+from psutil import Popen, Process
 from copy import copy
 from .shared import md5Checksum
 from . import comic2ebook
-from . import dualmetafix
 from . import KCC_rc_web
 if sys.platform.startswith('darwin'):
     from . import KCC_ui_osx as KCC_ui
@@ -113,15 +111,15 @@ class WebServerHandler(BaseHTTPRequestHandler):
                 self.send_header('Content-type', 'text/html')
                 self.end_headers()
                 self.wfile.write(bytes('<!DOCTYPE html>\n'
-                                 '<html lang="en">\n'
-                                 '<head><meta charset="utf-8">\n'
-                                 '<link href="' + GUI.webContent.favicon + '" rel="icon" type="image/x-icon" />\n'
-                                 '<title>Kindle Comic Converter</title>\n'
-                                 '</head>\n'
-                                 '<body>\n'
-                                 '<div style="text-align: center; font-size:25px">\n'
-                                 '<p style="font-size:50px">- <img style="vertical-align: middle" '
-                                 'alt="KCC Logo" src="' + GUI.webContent.logo + '" /> -</p>\n', 'UTF-8'))
+                                       '<html lang="en">\n'
+                                       '<head><meta charset="utf-8">\n'
+                                       '<link href="' + GUI.webContent.favicon + '" rel="icon" type="image/x-icon" />\n'
+                                       '<title>Kindle Comic Converter</title>\n'
+                                       '</head>\n'
+                                       '<body>\n'
+                                       '<div style="text-align: center; font-size:25px">\n'
+                                       '<p style="font-size:50px">- <img style="vertical-align: middle" '
+                                       'alt="KCC Logo" src="' + GUI.webContent.logo + '" /> -</p>\n', 'UTF-8'))
                 if len(GUI.completedWork) > 0 and not GUI.conversionAlive:
                     for key in sorted(GUI.completedWork.keys()):
                         self.wfile.write(bytes('<p><a href="' + key + '">' + key.split('.')[0] + '</a></p>\n', 'UTF-8'))
@@ -129,8 +127,8 @@ class WebServerHandler(BaseHTTPRequestHandler):
                     self.wfile.write(bytes('<p style="font-weight: bold">No downloads are available.<br/>'
                                      'Convert some files and refresh this page.</p>\n', 'UTF-8'))
                 self.wfile.write(bytes('</div>\n'
-                                 '</body>\n'
-                                 '</html>\n', 'UTF-8'))
+                                       '</body>\n'
+                                       '</html>\n', 'UTF-8'))
             elif sendReply:
                 outputFile = GUI.completedWork[unquote(self.path[1:])]
                 fp = open(outputFile, 'rb')
@@ -265,84 +263,14 @@ class ProgressThread(QtCore.QThread):
         self.running = False
 
 
-class WorkerSignals(QtCore.QObject):
-    result = QtCore.pyqtSignal(list)
-
-
-class KindleGenThread(QtCore.QRunnable):
-    def __init__(self, batch):
-        super(KindleGenThread, self).__init__()
-        self.signals = WorkerSignals()
-        self.work = batch
-
-    def run(self):
-        kindlegenErrorCode = 0
-        kindlegenError = ''
-        try:
-            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
-                    if "Error(" in line:
-                        kindlegenErrorCode = 1
-                        kindlegenError = line
-                    # ERROR: EPUB too big
-                    if ":E23026:" in line:
-                        kindlegenErrorCode = 23026
-                    if kindlegenErrorCode > 0:
-                        break
-            else:
-                # ERROR: EPUB too big
-                kindlegenErrorCode = 23026
-            self.signals.result.emit([kindlegenErrorCode, kindlegenError, self.work])
-        except Exception as err:
-            # ERROR: KCC unknown generic error
-            kindlegenErrorCode = 1
-            kindlegenError = format(err)
-            self.signals.result.emit([kindlegenErrorCode, kindlegenError, self.work])
-
-
-class DualMetaFixThread(QtCore.QRunnable):
-    def __init__(self, batch):
-        super(DualMetaFixThread, self).__init__()
-        self.signals = WorkerSignals()
-        self.work = batch
-
-    def run(self):
-        item = self.work
-        os.remove(item)
-        mobiPath = item.replace('.epub', '.mobi')
-        move(mobiPath, mobiPath + '_toclean')
-        try:
-            # 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)])
-
-
 class WorkerThread(QtCore.QThread):
-    #noinspection PyArgumentList
+    # noinspection PyArgumentList
     def __init__(self):
         QtCore.QThread.__init__(self)
-        self.pool = QtCore.QThreadPool()
         self.conversionAlive = False
         self.errors = False
         self.kindlegenErrorCode = [0]
         self.workerOutput = []
-        # Let's make sure that we don't fill the memory
-        availableMemory = virtual_memory().total/1000000000
-        if availableMemory <= 2:
-            self.threadNumber = 1
-        elif 2 < availableMemory <= 4:
-            self.threadNumber = 2
-        else:
-            self.threadNumber = 4
-        # Let's make sure that we don't use too many threads
-        if self.threadNumber > QtCore.QThread.idealThreadCount():
-            self.threadNumber = QtCore.QThread.idealThreadCount()
         self.progressBarTick = MW.progressBarTick
         self.addMessage = MW.addMessage
 
@@ -361,9 +289,11 @@ class WorkerThread(QtCore.QThread):
         MW.addTrayMessage.emit('Conversion interrupted.', 'Critical')
         MW.modeConvert.emit(1)
 
-    def addResult(self, output):
-        MW.progressBarTick.emit('tick')
-        self.workerOutput.append(output)
+    def sanitizeTrace(self, traceback):
+        return ''.join(format_tb(traceback))\
+            .replace('C:\\Users\\AcidWeb\\Documents\\Projekty\\KCC\\', '')\
+            .replace('C:\\Python34\\', '')\
+            .replace('C:\\Python34_64\\', '')
 
     def run(self):
         MW.modeConvert.emit(0)
@@ -385,10 +315,9 @@ class WorkerThread(QtCore.QThread):
             options.quality = 1
         elif GUI.QualityBox.checkState() == 2:
             options.quality = 2
-        if str(GUI.FormatBox.currentText()) == 'CBZ':
-            options.cbzoutput = True
+        options.format = str(GUI.FormatBox.currentText())
         if GUI.currentMode == 1:
-            if profile in ['KFHD', 'KFHD8', 'KFHDX', 'KFHDX8']:
+            if 'KFH' in profile:
                 options.upscale = True
 
         # Advanced mode settings
@@ -410,10 +339,7 @@ class WorkerThread(QtCore.QThread):
             if GUI.WebtoonBox.isChecked():
                 options.webtoon = True
             if float(GUI.GammaValue) > 0.09:
-                # noinspection PyTypeChecker
                 options.gamma = float(GUI.GammaValue)
-            if str(GUI.FormatBox.currentText()) == 'MOBI':
-                options.batchsplit = True
 
         # Other/custom settings.
         if GUI.currentMode > 2:
@@ -462,7 +388,7 @@ class WorkerThread(QtCore.QThread):
                 self.errors = True
                 _, _, traceback = sys.exc_info()
                 MW.showDialog.emit("Error during conversion %s:\n\n%s\n\nTraceback:\n%s"
-                                   % (jobargv[-1], str(err), "".join(format_tb(traceback))), 'error')
+                                   % (jobargv[-1], str(err), self.sanitizeTrace(traceback)), 'error')
                 MW.addMessage.emit('Failed to create EPUB!', 'error', False)
                 MW.addTrayMessage.emit('Failed to create EPUB!', 'Critical')
             if not self.conversionAlive:
@@ -483,14 +409,10 @@ class WorkerThread(QtCore.QThread):
                     MW.progressBarTick.emit('tick')
                     MW.addMessage.emit('Creating MOBI files', 'info', False)
                     GUI.progress.content = 'Creating MOBI files'
-                    self.workerOutput = []
-                    # Number of KindleGen threads depends on the size of RAM
-                    self.pool.setMaxThreadCount(self.threadNumber)
+                    work = []
                     for item in outputPath:
-                        worker = KindleGenThread(item)
-                        worker.signals.result.connect(self.addResult)
-                        self.pool.start(worker)
-                    self.pool.waitForDone()
+                        work.append([item])
+                    self.workerOutput = comic2ebook.makeMOBI(work, self)
                     self.kindlegenErrorCode = [0]
                     for errors in self.workerOutput:
                         if errors[0] != 0:
@@ -510,13 +432,9 @@ class WorkerThread(QtCore.QThread):
                         MW.addMessage.emit('Processing MOBI files', 'info', False)
                         GUI.progress.content = 'Processing MOBI files'
                         self.workerOutput = []
-                        # DualMetaFix is very fast and there is not reason to use multithreading.
-                        self.pool.setMaxThreadCount(1)
                         for item in outputPath:
-                            worker = DualMetaFixThread(item)
-                            worker.signals.result.connect(self.addResult)
-                            self.pool.start(worker)
-                        self.pool.waitForDone()
+                            self.workerOutput.append(comic2ebook.makeMOBIFix(item))
+                            MW.progressBarTick.emit('tick')
                         for success in self.workerOutput:
                             if not success[0]:
                                 self.errors = True
@@ -1014,7 +932,6 @@ class KCCGUI(KCC_ui.Ui_KCC):
                                            'GammaSlider': float(self.GammaValue)*100})
         self.settings.sync()
         self.tray.hide()
-        APP.shutdown()
 
     def handleMessage(self, message):
         MW.raise_()
@@ -1099,7 +1016,9 @@ class KCCGUI(KCC_ui.Ui_KCC):
             self.listFontSize = 11
             self.statusBarFontSize = 10
             self.statusBarStyle = 'QLabel{padding-top:2px;padding-bottom:3px;}'
-            self.ProgressBar.setStyleSheet('QProgressBar{padding-top:5px;text-align:center;}')
+            self.ProgressBar.setStyleSheet('QProgressBar{font-size:13px;text-align:center;'
+                                           'border:2px solid grey;border-radius:5px;}'
+                                           'QProgressBar::chunk{background-color:steelblue;width:20px;}')
         elif sys.platform.startswith('linux'):
             self.listFontSize = 8
             self.statusBarFontSize = 8
@@ -1117,22 +1036,20 @@ class KCCGUI(KCC_ui.Ui_KCC):
             self.p.ionice(1)
 
         self.profiles = {
+            "Kindle Voyage": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
+                              'DefaultUpscale': False, 'Label': 'KV'},
             "Kindle Paperwhite": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                                  'DefaultUpscale': False, 'Label': 'KHD'},
+                                  'DefaultUpscale': False, 'Label': 'KPW'},
             "Kindle": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
                        'DefaultUpscale': False, 'Label': 'K345'},
-            "Kindle DX/DXG": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 0,
+            "Kindle DX/DXG": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 2,
                               'DefaultUpscale': False, 'Label': 'KDX'},
-            "Kindle Fire": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                            'DefaultUpscale': False, 'Label': 'KF'},
-            "K. Fire HD 7\"": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                               'DefaultUpscale': True, 'Label': 'KFHD'},
-            "K. Fire HD 8.9\"": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                                 'DefaultUpscale': True, 'Label': 'KFHD8'},
-            "K. Fire HDX 7\"": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                                'DefaultUpscale': True, 'Label': 'KFHDX'},
-            "K. Fire HDX 8.9\"": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                                  'DefaultUpscale': True, 'Label': 'KFHDX8'},
+            "K. Fire HD": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
+                           'DefaultUpscale': True, 'Label': 'KFHD'},
+            "K. Fire HDX": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
+                            'DefaultUpscale': True, 'Label': 'KFHDX'},
+            "K. Fire HDX 8.9": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
+                                'DefaultUpscale': True, 'Label': 'KFHDX8'},
             "Kobo Mini/Touch": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
                                 'DefaultUpscale': False, 'Label': 'KoMT'},
             "Kobo Glow": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
@@ -1141,6 +1058,8 @@ class KCCGUI(KCC_ui.Ui_KCC):
                           'DefaultUpscale': False, 'Label': 'KoA'},
             "Kobo Aura HD": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
                              'DefaultUpscale': False, 'Label': 'KoAHD'},
+            "Kobo Aura H2O": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
+                              'DefaultUpscale': False, 'Label': 'KoAH2O'},
             "Other": {'Quality': False, 'ForceExpert': True, 'DefaultFormat': 1,
                       'DefaultUpscale': False, 'Label': 'OTHER'},
             "Kindle for Android": {'Quality': False, 'ForceExpert': True, 'DefaultFormat': 0,
@@ -1151,26 +1070,26 @@ class KCCGUI(KCC_ui.Ui_KCC):
                          'DefaultUpscale': False, 'Label': 'K2'}
         }
         profilesGUI = [
+            "Kindle Voyage",
             "Kindle Paperwhite",
             "Kindle",
-            "Kindle DX/DXG",
             "Separator",
-            "Kindle Fire",
-            "K. Fire HD 7\"",
-            "K. Fire HD 8.9\"",
-            "K. Fire HDX 7\"",
-            "K. Fire HDX 8.9\"",
+            "K. Fire HD",
+            "K. Fire HDX",
+            "K. Fire HDX 8.9",
             "Separator",
             "Kobo Mini/Touch",
             "Kobo Glow",
             "Kobo Aura",
             "Kobo Aura HD",
+            "Kobo Aura H2O",
             "Separator",
             "Other",
             "Separator",
             "Kindle for Android",
             "Kindle 1",
             "Kindle 2",
+            "Kindle DX/DXG",
         ]
 
         statusBarLabel = QtWidgets.QLabel('<b><a href="http://kcc.iosphe.re/">HOMEPAGE</a> - <a href="https://github.'

kcc/__init__.py

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

kcc/comic2ebook.py

@@ -18,16 +18,18 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-__version__ = '4.2'
+__version__ = '4.3.1'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'
 
 import os
 import sys
+from copy import copy
+from glob import glob
 from json import loads
 from urllib.request import Request, urlopen
-from re import split, sub, compile
+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
@@ -38,6 +40,8 @@ from xml.dom.minidom import parse
 from uuid import uuid4
 from slugify import slugify as slugifyExt
 from PIL import Image
+from subprocess import STDOUT, PIPE
+from psutil import Popen, virtual_memory
 try:
     from PyQt5 import QtCore
 except ImportError:
@@ -47,17 +51,27 @@ from . import comic2panel
 from . import image
 from . import cbxarchive
 from . import pdfjpgextract
+from . import dualmetafix
 
 
 def main(argv=None):
     global options
     parser = makeParser()
-    options, args = parser.parse_args(argv)
-    checkOptions()
-    if len(args) != 1:
+    optionstemplate, args = parser.parse_args(argv)
+    if len(args) == 0:
         parser.print_help()
         return
-    outputPath = makeBook(args[0])
+    sources = set([source for arg in args for source in glob(arg)])
+    outputPath = []
+    if len(sources) == 0:
+        print('No matching files found.')
+        return
+    for source in sources:
+        options = copy(optionstemplate)
+        checkOptions()
+        if len(sources) > 1:
+            print('\nWorking on ' + source)
+        outputPath = makeBook(source)
     return outputPath
 
 
@@ -214,10 +228,6 @@ def buildNCX(dstdir, title, chapters, chapterNames):
 def buildOPF(dstdir, title, filelist, cover=None):
     opffile = os.path.join(dstdir, 'OEBPS', 'content.opf')
     profilelabel, deviceres, palette, gamma, panelviewsize = options.profileData
-    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:
@@ -244,7 +254,8 @@ def buildOPF(dstdir, title, filelist, cover=None):
                   "<meta name=\"fixed-layout\" content=\"true\"/>\n"
                   "<meta name=\"rendition:orientation\" content=\"portrait\"/>\n",
                   "<meta name=\"orientation-lock\" content=\"portrait\"/>\n",
-                  "<meta name=\"original-resolution\" content=\"", imgres, "\"/>\n",
+                  "<meta name=\"original-resolution\" content=\"",
+                  str(deviceres[0]) + "x" + str(deviceres[1]), "\"/>\n",
                   "<meta name=\"primary-writing-mode\" content=\"", writingmode, "\"/>\n",
                   "<meta name=\"ke-border-color\" content=\"#ffffff\"/>\n",
                   "<meta name=\"ke-border-width\" content=\"0\"/>\n",
@@ -409,7 +420,7 @@ def buildEPUB(path, chapterNames, tomeNumber):
         chapter = False
         for afile in filenames:
             filename = getImageFileName(afile)
-            if not '-kcc-hq' in filename[0]:
+            if '-kcc-hq' not in filename[0]:
                 filelist.append(buildHTML(dirpath, afile, os.path.join(dirpath, afile)))
                 if not chapter:
                     chapterlist.append((dirpath.replace('Images', 'Text'), filelist[-1][1]))
@@ -428,7 +439,7 @@ def buildEPUB(path, chapterNames, tomeNumber):
 
 def imgOptimization(img, opt, hqImage=None):
     if not img.fill:
-        img.getImageFill(opt.webtoon)
+        img.getImageFill()
     if not opt.webtoon:
         img.cropWhiteSpace()
     if opt.cutpagenumbers and not opt.webtoon:
@@ -667,11 +678,12 @@ def getComicInfo(path, originalPath):
             options.authors.sort()
         else:
             options.authors = ['KCC']
-        if len(xml.getElementsByTagName('ScanInformation')) != 0:
-            coverId = xml.getElementsByTagName('ScanInformation')[0].firstChild.nodeValue
-            coverId = compile('(MCD\\()(\\d+)(\\))').search(coverId)
-            if coverId:
-                options.remoteCovers = getCoversFromMCB(coverId.group(2))
+        # Disabled due to closure of MCD
+        # if len(xml.getElementsByTagName('ScanInformation')) != 0:
+        #    coverId = xml.getElementsByTagName('ScanInformation')[0].firstChild.nodeValue
+        #    coverId = compile('(MCD\\()(\\d+)(\\))').search(coverId)
+        #    if coverId:
+        #        options.remoteCovers = getCoversFromMCB(coverId.group(2))
         os.remove(xmlPath)
 
 
@@ -749,7 +761,7 @@ def sanitizePermissions(filetree):
             os.chmod(os.path.join(root, name), S_IWRITE | S_IREAD | S_IEXEC)
 
 
-#noinspection PyUnboundLocalVariable
+# noinspection PyUnboundLocalVariable
 def splitDirectory(path):
     # Detect directory stucture
     for root, dirs, files in walkLevel(os.path.join(path, 'OEBPS', 'Images'), 0):
@@ -874,7 +886,7 @@ def detectCorruption(tmpPath, orgPath):
         for name in files:
             if getImageFileName(name) is not None:
                 path = os.path.join(root, name)
-                pathOrg = os.path.join(orgPath, name)
+                pathOrg = orgPath + path.split('OEBPS' + os.path.sep + 'Images')[1]
                 if os.path.getsize(path) == 0:
                     rmtree(os.path.join(tmpPath, '..', '..'), True)
                     raise RuntimeError('Image file %s is corrupted.' % pathOrg)
@@ -948,7 +960,7 @@ def makeZIP(zipFilename, baseDir, isEPUB=False):
 
 
 def makeParser():
-    """Create and return an option parser set up with kcc's options."""
+    """Create and return an option parser set up with KCC options."""
     psr = OptionParser(usage="Usage: kcc-c2e [options] comic_file|comic_folder", add_help_option=False)
 
     mainOptions = OptionGroup(psr, "MAIN")
@@ -957,9 +969,9 @@ def makeParser():
     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]")
+    mainOptions.add_option("-p", "--profile", action="store", dest="profile", default="KV",
+                           help="Device profile (Available options: K1, K2, K345, KDX, KPW, KV, KFHD, KFHDX, KFHDX8,"
+                                " KFA, KoMT, KoG, KoA, KoAHD, KoAH2O) [Default=KV]")
     mainOptions.add_option("-q", "--quality", type="int", dest="quality", default="0",
                            help="Quality of Panel View. 0 - Normal 1 - High 2 - Ultra [Default=0]")
     mainOptions.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
@@ -971,8 +983,8 @@ def makeParser():
                              help="Output generated file to specified directory or file")
     outputOptions.add_option("-t", "--title", action="store", dest="title", default="defaulttitle",
                              help="Comic title [Default=filename or directory name]")
-    outputOptions.add_option("--cbz-output", action="store_true", dest="cbzoutput", default=False,
-                             help="Outputs a CBZ archive and does not generate EPUB")
+    outputOptions.add_option("-f", "--format", action="store", dest="format", default="Auto",
+                             help="Output format (Available options: Auto, MOBI, EPUB, CBZ) [Default=Auto]")
     outputOptions.add_option("--batchsplit", action="store_true", dest="batchsplit", default=False,
                              help="Split output into multiple files"),
 
@@ -1019,13 +1031,22 @@ def checkOptions():
     global options
     options.panelview = True
     options.bordersColor = None
+    if options.format == 'Auto':
+        if options.profile in ['K1', 'K2', 'K345', 'KPW', 'KV', 'KFHD', 'KFHDX', 'KFHDX8', 'KFA']:
+            options.format = 'MOBI'
+        elif options.profile in ['Other']:
+            options.format = 'EPUB'
+        elif options.profile in ['KDX', 'KoMT', 'KoG', 'KoA', 'KoAHD', 'KoAH2O']:
+            options.format = 'CBZ'
     if options.white_borders:
-        options.bordersColor = "white"
+        options.bordersColor = 'white'
     if options.black_borders:
-        options.bordersColor = "black"
+        options.bordersColor = 'black'
+    # Splitting MOBI is not optional
+    if options.format == 'MOBI':
+        options.batchsplit = True
     # Disabling grayscale conversion for Kindle Fire family.
-    if options.profile == 'KF' or options.profile == 'KFHD' or options.profile == 'KFHD8' or options.profile == 'KFHDX'\
-       or options.profile == 'KFHDX8' or options.forcecolor:
+    if 'KFH' in options.profile or options.forcecolor:
         options.forcecolor = True
     else:
         options.forcecolor = False
@@ -1052,10 +1073,10 @@ def checkOptions():
         print("ERROR: Kindle for Android profile require --customwidth and --customheight options!")
         sys.exit(1)
     # CBZ files on Kindle DX/DXG support higher resolution
-    if options.profile == 'KDX' and options.cbzoutput:
+    if options.profile == 'KDX' and options.format == 'CBZ':
         options.customheight = 1200
     # Ultra mode don't work with CBZ format
-    if options.quality == 2 and options.cbzoutput:
+    if options.quality == 2 and options.format == 'CBZ':
         options.quality = 1
     # Override profile data
     if options.customwidth != 0 or options.customheight != 0:
@@ -1072,12 +1093,35 @@ def checkOptions():
     options.profileData = image.ProfileData.Profiles[options.profile]
 
 
+def checkTools(source):
+    source = source.upper()
+    if source.endswith('.CBR') or source.endswith('.RAR'):
+        rarExitCode = Popen('unrar', stdout=PIPE, stderr=STDOUT, shell=True)
+        rarExitCode = rarExitCode.wait()
+        if rarExitCode != 0 and rarExitCode != 7:
+            print('\nUnRAR is missing!')
+            exit(1)
+    elif source.endswith('.CB7') or source.endswith('.7Z'):
+        sevenzaExitCode = Popen('7za', stdout=PIPE, stderr=STDOUT, shell=True)
+        sevenzaExitCode = sevenzaExitCode.wait()
+        if sevenzaExitCode != 0 and sevenzaExitCode != 7:
+            print('\n7za is missing!')
+            exit(1)
+    if options.format == 'MOBI':
+        kindleGenExitCode = Popen('kindlegen -locale en', stdout=PIPE, stderr=STDOUT, shell=True)
+        if kindleGenExitCode.wait() != 0:
+            print('\nKindleGen is missing!')
+            exit(1)
+
+
 def makeBook(source, qtGUI=None):
-    """Generates EPUB/CBZ comic ebook from a bunch of images."""
+    """Generates MOBI/EPUB/CBZ comic ebook from a bunch of images."""
     global GUI
     GUI = qtGUI
     if GUI:
         GUI.progressBarTick.emit('1')
+    else:
+        checkTools(source)
     path = getWorkFolder(source)
     print("\nChecking images...")
     getComicInfo(os.path.join(path, "OEBPS", "Images"), source)
@@ -1095,7 +1139,7 @@ def makeBook(source, qtGUI=None):
     if GUI:
         GUI.progressBarTick.emit('1')
     chapterNames = sanitizeTree(os.path.join(path, 'OEBPS', 'Images'))
-    if 'Ko' in options.profile and options.cbzoutput:
+    if 'Ko' in options.profile and options.format == 'CBZ':
         sanitizeTreeKobo(os.path.join(path, 'OEBPS', 'Images'))
     if options.batchsplit:
         tomes = splitDirectory(path)
@@ -1104,7 +1148,7 @@ def makeBook(source, qtGUI=None):
     filepath = []
     tomeNumber = 0
     if GUI:
-        if options.cbzoutput:
+        if options.format == 'CBZ':
             GUI.progressBarTick.emit('Compressing CBZ files')
         else:
             GUI.progressBarTick.emit('Compressing EPUB files')
@@ -1112,11 +1156,13 @@ def makeBook(source, qtGUI=None):
         GUI.progressBarTick.emit('tick')
     options.baseTitle = options.title
     for tome in tomes:
-        if len(tomes) > 1:
+        if len(tomes) > 9:
+            tomeNumber += 1
+            options.title = options.baseTitle + ' [' + str(tomeNumber).zfill(2) + '/' + str(len(tomes)).zfill(2) + ']'
+        elif 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
+        if options.format == 'CBZ':
             print("\nCreating CBZ file...")
             if len(tomes) > 1:
                 filepath.append(getOutputFilename(source, options.output, '.cbz', ' ' + str(tomeNumber)))
@@ -1124,9 +1170,8 @@ def makeBook(source, qtGUI=None):
                 filepath.append(getOutputFilename(source, options.output, '.cbz', ''))
             makeZIP(tome + '_comic', os.path.join(tome, "OEBPS", "Images"))
         else:
-            print("\nCreating EPUB structure...")
+            print("\nCreating EPUB file...")
             buildEPUB(tome, chapterNames, tomeNumber)
-            # actually zip the ePub
             if len(tomes) > 1:
                 filepath.append(getOutputFilename(source, options.output, '.epub', ' ' + str(tomeNumber)))
             else:
@@ -1136,4 +1181,92 @@ def makeBook(source, qtGUI=None):
         rmtree(tome, True)
         if GUI:
             GUI.progressBarTick.emit('tick')
-    return filepath
+    if not GUI and options.format == 'MOBI':
+        print("\nCreating MOBI file...")
+        work = []
+        for i in filepath:
+            work.append([i])
+        output = makeMOBI(work, GUI)
+        for errors in output:
+            if errors[0] != 0:
+                print('KINDLEGEN ERROR!')
+                print(errors)
+                return filepath
+        for i in filepath:
+            output = makeMOBIFix(i)
+            if not output[0]:
+                print('DUALMETAFIX ERROR!')
+                return filepath
+            else:
+                os.remove(i.replace('.epub', '.mobi') + '_toclean')
+    return filepath
+
+
+def makeMOBIFix(item):
+    os.remove(item)
+    mobiPath = item.replace('.epub', '.mobi')
+    move(mobiPath, mobiPath + '_toclean')
+    try:
+        dualmetafix.DualMobiMetaFix(mobiPath + '_toclean', mobiPath, bytes(str(uuid4()), 'UTF-8'))
+        return [True]
+    except Exception as err:
+        return [False, format(err)]
+
+
+def makeMOBIWorkerTick(output):
+    makeMOBIWorkerOutput.append(output)
+    if output[0] != 0:
+        makeMOBIWorkerPool.terminate()
+    if GUI:
+        GUI.progressBarTick.emit('tick')
+        if not GUI.conversionAlive:
+            makeMOBIWorkerPool.terminate()
+
+
+def makeMOBIWorker(item):
+    item = item[0]
+    kindlegenErrorCode = 0
+    kindlegenError = ''
+    try:
+        if os.path.getsize(item) < 629145600:
+            output = Popen('kindlegen -dont_append_source -locale en "' + item + '"',
+                           stdout=PIPE, stderr=STDOUT, shell=True)
+            for line in output.stdout:
+                line = line.decode('utf-8')
+                # ERROR: Generic error
+                if "Error(" in line:
+                    kindlegenErrorCode = 1
+                    kindlegenError = line
+                # ERROR: EPUB too big
+                if ":E23026:" in line:
+                    kindlegenErrorCode = 23026
+                if kindlegenErrorCode > 0:
+                    break
+        else:
+            # ERROR: EPUB too big
+            kindlegenErrorCode = 23026
+        return [kindlegenErrorCode, kindlegenError, item]
+    except Exception as err:
+        # ERROR: KCC unknown generic error
+        kindlegenErrorCode = 1
+        kindlegenError = format(err)
+        return [kindlegenErrorCode, kindlegenError, item]
+
+
+def makeMOBI(work, qtGUI=None):
+    global GUI, makeMOBIWorkerPool, makeMOBIWorkerOutput
+    GUI = qtGUI
+    makeMOBIWorkerOutput = []
+    availableMemory = virtual_memory().total/1000000000
+    if availableMemory <= 2:
+        threadNumber = 1
+    elif 2 < availableMemory <= 4:
+        threadNumber = 2
+    else:
+        threadNumber = 4
+    makeMOBIWorkerPool = Pool(threadNumber)
+    for i in work:
+        makeMOBIWorkerPool.apply_async(func=makeMOBIWorker, args=(i, ), callback=makeMOBIWorkerTick)
+    makeMOBIWorkerPool.close()
+    makeMOBIWorkerPool.join()
+    return makeMOBIWorkerOutput

kcc/comic2panel.py

@@ -18,7 +18,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-__version__ = '4.2'
+__version__ = '4.3.1'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'
@@ -118,7 +118,6 @@ def splitImageTick(output):
             splitWorkerPool.terminate()
 
 
-#noinspection PyUnboundLocalVariable
 def splitImage(work):
     try:
         path = work[0]
@@ -165,6 +164,7 @@ def splitImage(work):
                     for panel in panelsCleaned:
                         panels.append(panel)
             if opt.debug:
+                # noinspection PyUnboundLocalVariable
                 debugImage.save(os.path.join(path, fileExpanded[0] + '-debug.png'), 'PNG')
 
             # Create virtual pages

kcc/image.py

@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = '4.2'
+__version__ = '4.3.1'
 __license__ = 'ISC'
 __copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'
@@ -24,6 +24,7 @@ __docformat__ = 'restructuredtext en'
 import os
 from io import BytesIO
 from urllib.request import Request, urlopen
+from urllib.parse import quote
 from functools import reduce
 from PIL import Image, ImageOps, ImageStat, ImageChops
 from .shared import md5Checksum
@@ -84,18 +85,18 @@ class ProfileData:
         'K1': ("Kindle 1", (600, 670), Palette4, 1.8, (900, 1005)),
         'K2': ("Kindle 2", (600, 670), Palette15, 1.8, (900, 1005)),
         'K345': ("Kindle", (600, 800), Palette16, 1.8, (900, 1200)),
-        'KHD': ("Kindle Paperwhite", (758, 1024), Palette16, 1.8, (1137, 1536)),
         'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.8, (1236, 1500)),
-        'KF': ("Kindle Fire", (600, 1024), PalleteNull, 1.0, (900, 1536)),
-        'KFHD': ("K. Fire HD 7\"", (800, 1280), PalleteNull, 1.0, (1200, 1920)),
-        'KFHD8': ("K. Fire HD 8.9\"", (1200, 1920), PalleteNull, 1.0, (1800, 2880)),
-        'KFHDX': ("K. Fire HDX 7\"", (1200, 1920), PalleteNull, 1.0, (1800, 2880)),
-        'KFHDX8': ("K. Fire HDX 8.9\"", (1600, 2560), PalleteNull, 1.0, (2400, 3840)),
+        'KPW': ("Kindle Paperwhite", (758, 1024), Palette16, 1.8, (1137, 1536)),
+        'KV': ("Kindle Voyage", (1072, 1448), Palette16, 1.8, (1608, 2172)),
+        'KFHD': ("K. Fire HD", (800, 1280), PalleteNull, 1.0, (1200, 1920)),
+        'KFHDX': ("K. Fire HDX", (1200, 1920), PalleteNull, 1.0, (1800, 2880)),
+        'KFHDX8': ("K. Fire HDX 8.9", (1600, 2560), PalleteNull, 1.0, (2400, 3840)),
+        'KFA': ("Kindle for Android", (0, 0), PalleteNull, 1.0, (0, 0)),
         'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.8, (900, 1200)),
         'KoG': ("Kobo Glow", (768, 1024), Palette16, 1.8, (1152, 1536)),
         'KoA': ("Kobo Aura", (758, 1024), Palette16, 1.8, (1137, 1536)),
         'KoAHD': ("Kobo Aura HD", (1080, 1440), Palette16, 1.8, (1620, 2160)),
-        'KFA': ("Kindle for Android", (0, 0), PalleteNull, 1.0, (0, 0)),
+        'KoAH2O': ("Kobo Aura H2O", (1080, 1430), Palette16, 1.8, (1620, 2145)),
         'OTHER': ("Other", (0, 0), Palette16, 1.8, (0, 0)),
     }
 
@@ -403,50 +404,44 @@ class ComicPage:
 
     def getImageHistogram(self, image):
         histogram = image.histogram()
-        RBGW = []
-        pixelCount = 0
-        for i in range(256):
-            pixelCount += histogram[i] + histogram[256 + i] + histogram[512 + i]
-            RBGW.append(histogram[i] + histogram[256 + i] + histogram[512 + i])
-        white = 0
-        black = 0
-        for i in range(251, 256):
-            white += RBGW[i]
-        for i in range(5):
-            black += RBGW[i]
-        if black > pixelCount*0.8 and white == 0:
-            return 1
-        elif white > pixelCount*0.8 and black == 0:
+        if histogram[0] == 0:
             return -1
+        elif histogram[255] == 0:
+            return 1
         else:
-            return False
+            return 0
 
-    def getImageFill(self, webtoon):
-        fill = 0
-        if not webtoon and not self.rotated:
-            # Search for horizontal solid lines
-            startY = 0
-            while startY < self.image.size[1]:
-                if startY + 5 > self.image.size[1]:
-                    startY = self.image.size[1] - 5
-                checkSolid = self.getImageHistogram(self.image.crop((0, startY, self.image.size[0], startY+5)))
-                if checkSolid:
-                    fill += checkSolid
-                startY += 5
+    def getImageFill(self):
+        bw = self.image.convert('L').point(lambda x: 0 if x < 128 else 255, '1')
+        imageBoxA = bw.getbbox()
+        imageBoxB = ImageChops.invert(bw).getbbox()
+        if imageBoxA is None or imageBoxB is None:
+            surfaceB, surfaceW = 0, 0
         else:
-            # Search for vertical solid lines
-            startX = 0
-            while startX < self.image.size[0]:
-                if startX + 5 > self.image.size[0]:
-                    startX = self.image.size[0] - 5
-                checkSolid = self.getImageHistogram(self.image.crop((startX, 0, startX+5, self.image.size[1])))
-                if checkSolid:
-                    fill += checkSolid
-                startX += 5
-        if fill > 0:
+            surfaceB = (imageBoxA[2] - imageBoxA[0]) * (imageBoxA[3] - imageBoxA[1])
+            surfaceW = (imageBoxB[2] - imageBoxB[0]) * (imageBoxB[3] - imageBoxB[1])
+        if surfaceW < surfaceB:
+            self.fill = 'white'
+        elif surfaceW > surfaceB:
             self.fill = 'black'
         else:
-            self.fill = 'white'
+            fill = 0
+            startY = 0
+            while startY < bw.size[1]:
+                if startY + 5 > bw.size[1]:
+                    startY = bw.size[1] - 5
+                fill += self.getImageHistogram(bw.crop((0, startY, bw.size[0], startY+5)))
+                startY += 5
+            startX = 0
+            while startX < bw.size[0]:
+                if startX + 5 > bw.size[0]:
+                    startX = bw.size[0] - 5
+                fill += self.getImageHistogram(bw.crop((startX, 0, startX+5, bw.size[1])))
+                startX += 5
+            if fill > 0:
+                self.fill = 'black'
+            else:
+                self.fill = 'white'
 
     def isImageColor(self):
         v = ImageStat.Stat(self.image).var
@@ -485,7 +480,7 @@ class Cover:
             self.tomeNumber = tomeNumber
         if self.tomeNumber in self.options.remoteCovers:
             try:
-                source = urlopen(Request(self.options.remoteCovers[self.tomeNumber],
+                source = urlopen(Request(quote(self.options.remoteCovers[self.tomeNumber]).replace('%3A', ':', 1),
                                          headers={'User-Agent': 'KindleComicConverter/' + __version__})).read()
                 self.image = Image.open(BytesIO(source))
                 self.processExternal()

kcc/rarfile.py

@@ -178,6 +178,23 @@ EXTRACT_ARGS = ('x', '-y', '-idq')
 #: args for testrar()
 TEST_ARGS = ('t', '-idq')
 
+#
+# Allow use of tool that is not compatible with unrar.
+#
+# By default use 'bsdtar' which is 'tar' program that
+# sits on top of libarchive.
+#
+# Problems with libarchive RAR backend:
+# - Does not support solid archives.
+# - Does not support password-protected archives.
+#
+
+ALT_TOOL = 'bsdtar'
+ALT_OPEN_ARGS = ('-x', '--to-stdout', '-f')
+ALT_EXTRACT_ARGS = ('-x', '-f')
+ALT_TEST_ARGS = ('-t', '-f')
+ALT_CHECK_ARGS = ('--help',)
+
 #: whether to speed up decompression by using tmp archive
 USE_EXTRACT_HACK = 1
 
@@ -336,6 +353,8 @@ class RarUnknownError(RarExecError):
     """Unknown exit code"""
 class RarSignalExit(RarExecError):
     """Unrar exited with signal"""
+class RarCannotExec(RarExecError):
+    """Executable not found."""
 
 
 def is_rarfile(xfile):
@@ -693,10 +712,7 @@ class RarFile(object):
         """Let 'unrar' test the archive.
         """
         cmd = [UNRAR_TOOL] + list(TEST_ARGS)
-        if self._password is not None:
-            cmd.append('-p' + self._password)
-        else:
-            cmd.append('-p-')
+        add_password_arg(cmd, self._password)
         cmd.append(self.rarfile)
         p = custom_popen(cmd)
         output = p.communicate()[0]
@@ -1172,8 +1188,7 @@ class RarFile(object):
         if is_filelike(rarfile):
             raise ValueError("Cannot use unrar directly on memory buffer")
         cmd = [UNRAR_TOOL] + list(OPEN_ARGS)
-        if psw is not None:
-            cmd.append("-p" + psw)
+        add_password_arg(cmd, psw)
         cmd.append(rarfile)
 
         # not giving filename avoids encoding related problems
@@ -1205,10 +1220,7 @@ class RarFile(object):
 
         # pasoword
         psw = psw or self._password
-        if psw is not None:
-            cmd.append('-p' + psw)
-        else:
-            cmd.append('-p-')
+        add_password_arg(cmd, psw)
 
         # rar file
         cmd.append(self.rarfile)
@@ -1830,10 +1842,7 @@ def rar_decompress(vers, meth, data, declen=0, flags=0, crc=0, psw=None, salt=No
         tmpf.close()
 
         cmd = [UNRAR_TOOL] + list(OPEN_ARGS)
-        if psw is not None and (flags & RAR_FILE_PASSWORD):
-            cmd.append("-p" + psw)
-        else:
-            cmd.append("-p-")
+        add_password_arg(cmd, psw, (flags & RAR_FILE_PASSWORD))
         cmd.append(tmpname)
 
         p = custom_popen(cmd)
@@ -1902,10 +1911,27 @@ def custom_popen(cmd):
     except OSError:
         ex = sys.exc_info()[1]
         if ex.errno == errno.ENOENT:
-            raise RarExecError("Unrar not installed? (rarfile.UNRAR_TOOL=%r)" % UNRAR_TOOL)
+            raise RarCannotExec("Unrar not installed? (rarfile.UNRAR_TOOL=%r)" % UNRAR_TOOL)
         raise
     return p
 
+def custom_check(cmd, ignore_retcode=False):
+    """Run command, collect output, raise error if needed."""
+    p = custom_popen(cmd)
+    out, err = p.communicate()
+    if p.returncode and not ignore_retcode:
+        raise RarExecError("Check-run failed")
+    return out
+
+def add_password_arg(cmd, psw, required=False):
+    """Append password switch to commandline."""
+    if UNRAR_TOOL == ALT_TOOL:
+        return
+    if psw is not None:
+        cmd.append('-p' + psw)
+    else:
+        cmd.append('-p-')
+
 def check_returncode(p, out):
     """Raise exception according to unrar exit code"""
 
@@ -1920,6 +1946,8 @@ def check_returncode(p, out):
         RarWarning, RarFatalError, RarCRCError, RarLockedArchiveError,
         RarWriteError, RarOpenError, RarUserError, RarMemoryError,
         RarCreateError, RarNoFilesError] # codes from rar.txt
+    if UNRAR_TOOL == ALT_TOOL:
+        errmap = [None]
     if code > 0 and code < len(errmap):
         exc = errmap[code]
     elif code == 255:
@@ -1936,3 +1964,24 @@ def check_returncode(p, out):
         msg = "%s [%d]" % (exc.__doc__, p.returncode)
 
     raise exc(msg)
+
+#
+# Check if unrar works
+#
+
+try:
+    # does UNRAR_TOOL work?
+    custom_check([UNRAR_TOOL], True)
+except RarCannotExec:
+    try:
+        # does ALT_TOOL work?
+        custom_check([ALT_TOOL] + list(ALT_CHECK_ARGS), True)
+        # replace config
+        UNRAR_TOOL = ALT_TOOL
+        OPEN_ARGS = ALT_OPEN_ARGS
+        EXTRACT_ARGS = ALT_EXTRACT_ARGS
+        TEST_ARGS = ALT_TEST_ARGS
+    except RarCannotExec:
+        # no usable tool, only uncompressed archives work
+        pass
+

setup.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
 """
-cx_Freeze/py2app build script for KCC.
-
-Usage (Mac OS X):
-    python setup.py py2app
+py2exe/py2app build script for KCC.
 
 Usage (Windows):
     python setup.py py2exe
+
+Usage (Mac OS X):
+    python setup.py py2app
 """
 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.2"
+VERSION = "4.3.1"
 MAIN = "kcc.py"
 
 if platform == "darwin":
@@ -47,7 +47,7 @@ if platform == "darwin":
                     ],
                     LSMinimumSystemVersion='10.8.0',
                     LSEnvironment=dict(
-                        PATH='/usr/local/bin:/usr/bin:/bin'
+                        PATH='./../Resources:/usr/local/bin:/usr/bin:/bin'
                     ),
                     NSHumanReadableCopyright='ISC License (ISCL)'
                 )
@@ -63,43 +63,22 @@ elif platform == "win32":
         suffix = '_64'
     else:
         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 +
+    additional_files = [('platforms', ['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={'py2exe': {"bundle_files": 2,
+        options={'py2exe': {"bundle_files": 1,
                             "dll_excludes": ["tcl85.dll", "tk85.dll"],
                             "dist_dir": "dist" + suffix,
                             "compressed": True,
                             "includes": ["sip"],
                             "excludes": ["tkinter"],
                             "optimize": 2}},
-        windows=[{"script": "kcc.py",
+        windows=[{"script": MAIN,
                   "dest_base": "KCC",
                   "version": VERSION,
                   "copyright": "Ciro Mattia Gonano, Pawel Jastrzebski © 2014",
@@ -114,7 +93,7 @@ else:
     print('Please use setup.sh to build Linux package.')
     exit()
 
-#noinspection PyUnboundLocalVariable
+# noinspection PyUnboundLocalVariable
 setup(
     name=NAME,
     version=VERSION,

setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Linux Python package build script
 
-VERSION="4.2"
+VERSION="4.3.1"
 
 cp kcc.py __main__.py
 zip kcc.zip __main__.py kcc/*.py