Merge pull request #153 from ciromattia/dev

4.6.4

README.md

@@ -32,10 +32,10 @@ You can find the latest released binary at the following links:
 ## DEPENDENCIES
 Following software is required to run Linux version of **KCC** and/or bare sources:
 - Python 3.3+
-- [PyQt](http://www.riverbankcomputing.co.uk/software/pyqt/download5) 5.2.0+
+- [PyQt](http://www.riverbankcomputing.co.uk/software/pyqt/download5) 5.4.0+
 - [Pillow](http://pypi.python.org/pypi/Pillow/) 2.8.2+
 - [psutil](https://pypi.python.org/pypi/psutil) 3.0.0+
-- [python-slugify](http://pypi.python.org/pypi/python-slugify) 1.1.2+
+- [python-slugify](http://pypi.python.org/pypi/python-slugify) 1.1.3+
 - [scandir](https://pypi.python.org/pypi/scandir) 1.1.0+
 
 On Debian based distributions these two commands should install all needed dependencies:
@@ -156,6 +156,26 @@ The app relies and includes the following scripts:
 * [Kobo Aura H2O](http://kcc.iosphe.re/Samples/Ubunchu-KoAH2O.kepub.epub)
 
 ## CHANGELOG
+####4.6.4:
+* Fixed multiple Windows specific problems
+* Improved error handling
+* Improved color detection algorithm
+* New, slimmer OS X release
+
+####4.6.3:
+* Implemented remote bug reporting
+* Minor bug fixes and GUI tweaks
+
+####4.6.2:
+* Fixed critical MOBI header bug
+* Fixed metadata encoding error
+
+####4.6.1:
+* Fixed KEPUB TOC generator
+* Added warning about too small input files
+* ComicRack Summary metadata field is now parsed
+* Small tweaks of KEPUB output
+
 ####4.6:
 * KEPUB is now default output for all Kobo profiles
 * EPUB output now produce fully valid EPUB 3.0.1
@@ -413,6 +433,14 @@ The app relies and includes the following scripts:
 ####1.0
 * Initial version
 
+## PRIVACY
+**KCC** is initiating internet connections in three cases:
+* During startup - Version check
+* When MCD metadata are used - Cover download
+* When error occurs - Automatic reporting
+
+Error report include **KCC** version, OS version and content of error message. 
+
 ## KNOWN ISSUES
 Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).
 

gui/KCC-OSX.ui

@@ -462,6 +462,12 @@
     <property name="selectionMode">
      <enum>QAbstractItemView::NoSelection</enum>
     </property>
+    <property name="verticalScrollMode">
+     <enum>QAbstractItemView::ScrollPerPixel</enum>
+    </property>
+    <property name="horizontalScrollMode">
+     <enum>QAbstractItemView::ScrollPerPixel</enum>
+    </property>
    </widget>
    <widget class="QPushButton" name="BasicModeButton">
     <property name="geometry">

gui/KCC.ui

@@ -397,6 +397,12 @@
     <property name="selectionMode">
      <enum>QAbstractItemView::NoSelection</enum>
     </property>
+    <property name="verticalScrollMode">
+     <enum>QAbstractItemView::ScrollPerPixel</enum>
+    </property>
+    <property name="horizontalScrollMode">
+     <enum>QAbstractItemView::ScrollPerPixel</enum>
+    </property>
    </widget>
    <widget class="QPushButton" name="BasicModeButton">
     <property name="geometry">

gui/MetaEditor-OSX.ui

@@ -126,6 +126,9 @@
      </rect>
     </property>
     <layout class="QFormLayout" name="formLayout">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::ExpandingFieldsGrow</enum>
+     </property>
      <item row="1" column="0">
       <widget class="QLabel" name="label">
        <property name="text">

kcc.iss

@@ -1,5 +1,5 @@
 #define MyAppName "Kindle Comic Converter"
-#define MyAppVersion "4.6"
+#define MyAppVersion "4.6.4"
 #define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski"
 #define MyAppURL "http://kcc.iosphe.re/"
 #define MyAppExeName "KCC.exe"

kcc/KCC_MetaEditor_ui_osx.py

@@ -76,6 +76,7 @@ class Ui_MetaEditorDialog(object):
         self.formLayoutWidget.setObjectName("formLayoutWidget")
         self.formLayout = QtWidgets.QFormLayout(self.formLayoutWidget)
         self.formLayout.setContentsMargins(0, 0, 0, 0)
+        self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow)
         self.formLayout.setObjectName("formLayout")
         self.label = QtWidgets.QLabel(self.formLayoutWidget)
         self.label.setObjectName("label")

kcc/KCC_gui.py

@@ -20,21 +20,22 @@
 import os
 import sys
 from urllib.parse import unquote
-from urllib.request import urlopen, urlretrieve
+from urllib.request import urlopen, urlretrieve, Request
 from socket import gethostbyname_ex, gethostname
-from traceback import format_tb
-from time import sleep
+from time import sleep, time
+from datetime import datetime
 from shutil import move
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from socketserver import ThreadingMixIn
 from subprocess import STDOUT, PIPE
 from PyQt5 import QtGui, QtCore, QtWidgets, QtNetwork
-from xml.dom.minidom import parse
+from xml.dom.minidom import parse, Document
 from psutil import Popen, Process
 from copy import copy
 from distutils.version import StrictVersion
 from xml.sax.saxutils import escape
-from .shared import md5Checksum, HTMLStripper
+from platform import platform
+from .shared import md5Checksum, HTMLStripper, sanitizeTrace
 from . import __version__
 from . import comic2ebook
 from . import KCC_rc_web
@@ -65,7 +66,6 @@ class QApplicationMessaging(QtWidgets.QApplication):
         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:
@@ -138,7 +138,7 @@ class Icons:
 
 
 class WebServerHandler(BaseHTTPRequestHandler):
-    # noinspection PyAttributeOutsideInit, PyArgumentList
+    # noinspection PyAttributeOutsideInit
     def do_GET(self):
         if self.path == '/':
             self.path = '/index.html'
@@ -245,22 +245,22 @@ class VersionThread(QtCore.QThread):
 
     def run(self):
         try:
-            XML = urlopen('http://kcc.iosphe.re/Version.php')
-            XML = parse(XML)
+            XML = parse(urlopen(Request('https://kcc.iosphe.re/Version/',
+                                        headers={'User-Agent': 'KindleComicConverter/' + __version__})))
         except Exception:
             return
-        latestVersion = XML.childNodes[0].getElementsByTagName('latest')[0].childNodes[0].toxml()
+        latestVersion = XML.childNodes[0].getElementsByTagName('LatestVersion')[0].childNodes[0].toxml()
         if StrictVersion(latestVersion) > StrictVersion(__version__):
             if sys.platform.startswith('win'):
                 self.newVersion = latestVersion
-                self.md5 = XML.childNodes[0].getElementsByTagName('WindowsMD5')[0].childNodes[0].toxml()
+                self.md5 = XML.childNodes[0].getElementsByTagName('MD5')[0].childNodes[0].toxml()
                 MW.showDialog.emit('<b>New version released!</b> <a href="https://github.com/ciromattia/kcc/releases/">'
                                    'See changelog.</a><br/><br/>Installed version: ' + __version__ +
                                    '<br/>Current version: ' + latestVersion +
                                    '<br/><br/>Would you like to start automatic update?', 'question')
                 self.getNewVersion()
             else:
-                MW.addMessage.emit('<a href="http://kcc.iosphe.re/">'
+                MW.addMessage.emit('<a href="https://kcc.iosphe.re/">'
                                    '<b>New version is available!</b></a> '
                                    '(<a href="https://github.com/ciromattia/kcc/releases/">'
                                    'Changelog</a>)', 'warning', False)
@@ -275,8 +275,8 @@ class VersionThread(QtCore.QThread):
             try:
                 MW.modeConvert.emit(-1)
                 MW.progressBarTick.emit('Downloading update')
-                path = urlretrieve('http://kcc.iosphe.re/Windows/KindleComicConverter_win_'
-                                   + self.newVersion + '.exe', reporthook=self.getNewVersionTick)
+                path = urlretrieve('https://kcc.iosphe.re/Windows/KindleComicConverter_win_' +
+                                   self.newVersion + '.exe', reporthook=self.getNewVersionTick)
                 if self.md5 != md5Checksum(path[0]):
                     raise Exception
                 move(path[0], path[0] + '.exe')
@@ -323,7 +323,6 @@ class ProgressThread(QtCore.QThread):
 
 
 class WorkerThread(QtCore.QThread):
-    # noinspection PyArgumentList
     def __init__(self):
         QtCore.QThread.__init__(self)
         self.conversionAlive = False
@@ -348,12 +347,6 @@ class WorkerThread(QtCore.QThread):
         MW.addTrayMessage.emit('Conversion interrupted.', 'Critical')
         MW.modeConvert.emit(1)
 
-    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)
 
@@ -437,16 +430,20 @@ class WorkerThread(QtCore.QThread):
                     GUI.progress.content = ''
                     self.errors = True
                     MW.addMessage.emit(str(warn), 'warning', False)
-                    MW.addMessage.emit('Failed to create output file!', 'error', False)
-                    MW.addTrayMessage.emit('Failed to create output file!', 'Critical')
+                    MW.addMessage.emit('Error during conversion! Please consult '
+                                       '<a href="https://github.com/ciromattia/kcc/wiki/Error-messages">wiki</a> '
+                                       'for more details.', 'error', False)
+                    MW.addTrayMessage.emit('Error during conversion!', 'Critical')
             except Exception as err:
                 GUI.progress.content = ''
                 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), self.sanitizeTrace(traceback)), 'error')
-                MW.addMessage.emit('Failed to create EPUB!', 'error', False)
-                MW.addTrayMessage.emit('Failed to create EPUB!', 'Critical')
+                                   % (jobargv[-1], str(err), sanitizeTrace(traceback)), 'error')
+                MW.addMessage.emit('Error during conversion! Please consult '
+                                   '<a href="https://github.com/ciromattia/kcc/wiki/Error-messages">wiki</a> '
+                                   'for more details.', 'error', False)
+                MW.addTrayMessage.emit('Error during conversion!', 'Critical')
             if not self.conversionAlive:
                 for item in outputPath:
                     if os.path.exists(item):
@@ -461,7 +458,7 @@ class WorkerThread(QtCore.QThread):
                     MW.addMessage.emit('Creating EPUB files... <b>Done!</b>', 'info', True)
                 if str(GUI.FormatBox.currentText()) == 'MOBI':
                     MW.progressBarTick.emit('Creating MOBI files')
-                    MW.progressBarTick.emit(str(len(outputPath)*2+1))
+                    MW.progressBarTick.emit(str(len(outputPath) * 2 + 1))
                     MW.progressBarTick.emit('tick')
                     MW.addMessage.emit('Creating MOBI files', 'info', False)
                     GUI.progress.content = 'Creating MOBI files'
@@ -500,7 +497,7 @@ class WorkerThread(QtCore.QThread):
                                 GUI.progress.content = ''
                                 mobiPath = item.replace('.epub', '.mobi')
                                 os.remove(mobiPath + '_toclean')
-                                if GUI.targetDirectory and GUI.targetDirectory != os.path.split(mobiPath)[0]:
+                                if GUI.targetDirectory and GUI.targetDirectory != os.path.dirname(mobiPath):
                                     try:
                                         move(mobiPath, GUI.targetDirectory)
                                         mobiPath = os.path.join(GUI.targetDirectory, os.path.basename(mobiPath))
@@ -520,7 +517,7 @@ class WorkerThread(QtCore.QThread):
                             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)
@@ -536,7 +533,7 @@ class WorkerThread(QtCore.QThread):
                                                False)
                 else:
                     for item in outputPath:
-                        if GUI.targetDirectory and GUI.targetDirectory != os.path.split(item)[0]:
+                        if GUI.targetDirectory and GUI.targetDirectory != os.path.dirname(item):
                             try:
                                 move(item, GUI.targetDirectory)
                                 item = os.path.join(GUI.targetDirectory, os.path.basename(item))
@@ -547,8 +544,9 @@ class WorkerThread(QtCore.QThread):
         GUI.progress.stop()
         MW.hideProgressBar.emit()
         GUI.needClean = True
-        MW.addMessage.emit('<b>All jobs completed.</b>', 'info', False)
-        MW.addTrayMessage.emit('All jobs completed.', 'Information')
+        if not self.errors:
+            MW.addMessage.emit('<b>All jobs completed.</b>', 'info', False)
+            MW.addTrayMessage.emit('All jobs completed.', 'Information')
         MW.modeConvert.emit(1)
 
 
@@ -557,7 +555,6 @@ class SystemTrayIcon(QtWidgets.QSystemTrayIcon):
         super().__init__()
         if self.isSystemTrayAvailable():
             QtWidgets.QSystemTrayIcon.__init__(self, GUI.icons.programIcon, MW)
-            # noinspection PyUnresolvedReferences
             self.activated.connect(self.catchClicks)
 
     def catchClicks(self):
@@ -633,8 +630,10 @@ class KCCGUI(KCC_ui.Ui_KCC):
             self.lastPath = os.path.abspath(os.path.join(fname, os.pardir))
             try:
                 self.editor.loadData(fname)
-            except:
-                self.showDialog('Failed to parse metadata!', 'error')
+            except Exception as err:
+                _, _, traceback = sys.exc_info()
+                self.showDialog("Failed to parse metadata!\n\n%s\n\nTraceback:\n%s"
+                                % (str(err), sanitizeTrace(traceback)), 'error')
             else:
                 self.editor.ui.exec_()
 
@@ -843,7 +842,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
 
     def changeGamma(self, value):
         value = float(value)
-        value = '%.2f' % (value/100)
+        value = '%.2f' % (value / 100)
         if float(value) <= 0.09:
             GUI.GammaLabel.setText('Gamma: Auto')
         else:
@@ -911,7 +910,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
         else:
             item = QtWidgets.QListWidgetItem('    ' + self.stripTags(message))
         if replace:
-            GUI.JobList.takeItem(GUI.JobList.count()-1)
+            GUI.JobList.takeItem(GUI.JobList.count() - 1)
         # Due to lack of HTML support in QListWidgetItem we overlay text field with QLabel
         # We still fill original text field with transparent content to trigger creation of horizontal scrollbar
         item.setForeground(QtGui.QColor('transparent'))
@@ -928,6 +927,31 @@ class KCCGUI(KCC_ui.Ui_KCC):
     def showDialog(self, message, kind):
         if kind == 'error':
             QtWidgets.QMessageBox.critical(MW, 'KCC - Error', message, QtWidgets.QMessageBox.Ok)
+            try:
+                doc = Document()
+                root = doc.createElement('KCCErrorReport')
+                doc.appendChild(root)
+                main = doc.createElement('Timestamp')
+                root.appendChild(main)
+                text = doc.createTextNode(datetime.fromtimestamp(time()).strftime('%Y-%m-%d %H:%M:%S'))
+                main.appendChild(text)
+                main = doc.createElement('OS')
+                root.appendChild(main)
+                text = doc.createTextNode(platform())
+                main.appendChild(text)
+                main = doc.createElement('Version')
+                root.appendChild(main)
+                text = doc.createTextNode(__version__)
+                main.appendChild(text)
+                main = doc.createElement('Error')
+                root.appendChild(main)
+                text = doc.createTextNode(message)
+                main.appendChild(text)
+                urlopen(Request(url='https://kcc.iosphe.re/ErrorHandle/', data=doc.toxml(encoding='utf-8'),
+                                headers={'Content-Type': 'application/xml',
+                                         'User-Agent': 'KindleComicConverter/' + __version__}))
+            except:
+                pass
         elif kind == 'question':
             GUI.versionCheck.setAnswer(QtWidgets.QMessageBox.question(MW, 'KCC - Question', message,
                                                                           QtWidgets.QMessageBox.Yes,
@@ -1026,7 +1050,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
                                            'ColorBox': GUI.ColorBox.checkState(),
                                            'customWidth': GUI.customWidth.text(),
                                            'customHeight': GUI.customHeight.text(),
-                                           'GammaSlider': float(self.GammaValue)*100})
+                                           'GammaSlider': float(self.GammaValue) * 100})
         self.settings.sync()
         self.tray.hide()
 
@@ -1205,7 +1229,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
             "Kindle DX/DXG",
         ]
 
-        statusBarLabel = QtWidgets.QLabel('<b><a href="http://kcc.iosphe.re/">HOMEPAGE</a> - <a href="https://github.'
+        statusBarLabel = QtWidgets.QLabel('<b><a href="https://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>')
@@ -1273,7 +1297,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
             if profile == "Other":
                 GUI.DeviceBox.addItem(self.icons.deviceOther, profile)
             elif profile == "Separator":
-                GUI.DeviceBox.insertSeparator(GUI.DeviceBox.count()+1)
+                GUI.DeviceBox.insertSeparator(GUI.DeviceBox.count() + 1)
             elif 'Ko' in profile:
                 GUI.DeviceBox.addItem(self.icons.deviceKobo, profile)
             else:
@@ -1307,6 +1331,12 @@ class KCCGUI(KCC_ui.Ui_KCC):
         self.versionCheck.start()
         self.contentServer.start()
         self.tray.show()
+
+        # Linux hack as PyQt 5.5 not hit mainstream distributions yet
+        if sys.platform.startswith('linux') and StrictVersion(QtCore.qVersion()) > StrictVersion('5.4.9'):
+            self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+            self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+
         MW.setWindowTitle("Kindle Comic Converter " + __version__)
         MW.show()
         MW.raise_()
@@ -1348,8 +1378,10 @@ class KCCGUI_MetaEditor(KCC_MetaEditor_ui.Ui_MetaEditorDialog):
                 self.parser.data[field.objectName()[:-4] + 's'] = tmpData
             try:
                 self.parser.saveXML()
-            except:
-                GUI.showDialog('Failed to save metadata!', 'error')
+            except Exception as err:
+                _, _, traceback = sys.exc_info()
+                GUI.showDialog("Failed to save metadata!\n\n%s\n\nTraceback:\n%s"
+                               % (str(err), sanitizeTrace(traceback)), 'error')
             self.ui.close()
 
     def cleanData(self, s):

kcc/KCC_ui.py

@@ -141,6 +141,8 @@ class Ui_KCC(object):
         self.JobList.setStyleSheet("QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}")
         self.JobList.setProperty("showDropIndicator", False)
         self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
+        self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+        self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
         self.JobList.setObjectName("JobList")
         self.BasicModeButton = QtWidgets.QPushButton(self.Form)
         self.BasicModeButton.setGeometry(QtCore.QRect(10, 10, 141, 32))

kcc/KCC_ui_osx.py

@@ -188,6 +188,8 @@ class Ui_KCC(object):
         self.JobList.setStyleSheet("QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}")
         self.JobList.setProperty("showDropIndicator", False)
         self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
+        self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+        self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
         self.JobList.setObjectName("JobList")
         self.BasicModeButton = QtWidgets.QPushButton(self.Form)
         self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 156, 41))

kcc/__init__.py

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

kcc/cbxarchive.py

@@ -70,8 +70,8 @@ class CBxArchive:
         if sys.platform.startswith('darwin'):
             copy(self.origFileName, os.path.join(os.path.dirname(self.origFileName), 'TMP_KCC_TMP'))
             self.origFileName = os.path.join(os.path.dirname(self.origFileName), 'TMP_KCC_TMP')
-        output = Popen('7za x "' + self.origFileName + '" -xr!__MACOSX -xr!.DS_Store -xr!thumbs.db -xr!Thumbs.db -o"'
-                       + targetdir + '"', stdout=PIPE, stderr=STDOUT, shell=True)
+        output = Popen('7za x "' + self.origFileName + '" -xr!__MACOSX -xr!.DS_Store -xr!thumbs.db -xr!Thumbs.db -o"' +
+                       targetdir + '"', stdout=PIPE, stderr=STDOUT, shell=True)
         extracted = False
         for line in output.stdout:
             if b"Everything is Ok" in line:

kcc/comic2ebook.py

@@ -28,7 +28,7 @@ from urllib.request import Request, urlopen
 from re import sub
 from stat import S_IWRITE, S_IREAD, S_IEXEC
 from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
-from tempfile import mkdtemp
+from tempfile import mkdtemp, gettempdir
 from shutil import move, copytree, rmtree
 from optparse import OptionParser, OptionGroup
 from multiprocessing import Pool
@@ -38,11 +38,12 @@ from PIL import Image
 from subprocess import STDOUT, PIPE
 from psutil import Popen, virtual_memory
 from scandir import walk
+from html import escape
 try:
     from PyQt5 import QtCore
 except ImportError:
     QtCore = None
-from .shared import md5Checksum, getImageFileName,  walkSort, walkLevel, saferReplace
+from .shared import md5Checksum, getImageFileName, walkSort, walkLevel, saferReplace
 from . import comic2panel
 from . import image
 from . import cbxarchive
@@ -65,6 +66,7 @@ def main(argv=None):
         print('No matching files found.')
         return
     for source in sources:
+        source = source.rstrip('\\').rstrip('/')
         options = copy(optionstemplate)
         checkOptions()
         if len(sources) > 1:
@@ -241,9 +243,9 @@ def buildNCX(dstdir, title, chapters, chapterNames):
             navID = filename[0].replace('/', '_').replace('\\', '_')
         elif os.path.basename(folder) != "Text":
             title = chapterNames[os.path.basename(folder)]
-        f.write("<navPoint id=\"" + navID + "\"><navLabel><text>"
-                + title + "</text></navLabel><content src=\"" + filename[0].replace("\\", "/")
-                + ".html\"/></navPoint>\n")
+        f.write("<navPoint id=\"" + navID + "\"><navLabel><text>" +
+                title + "</text></navLabel><content src=\"" + filename[0].replace("\\", "/") +
+                ".html\"/></navPoint>\n")
     f.write("</navMap>\n</ncx>")
     f.close()
 
@@ -260,7 +262,16 @@ def buildNAV(dstdir, title, chapters, chapterNames):
                   "</head>\n",
                   "<body>\n",
                   "<nav xmlns:epub=\"http://www.idpf.org/2007/ops\" epub:type=\"toc\" id=\"toc\">\n",
-                  "<ol></ol>\n",
+                  "<ol>\n"])
+    for chapter in chapters:
+        folder = chapter[0].replace(os.path.join(dstdir, 'OEBPS'), '').lstrip('/').lstrip('\\\\')
+        filename = getImageFileName(os.path.join(folder, chapter[1]))
+        if options.chapters:
+            title = chapterNames[chapter[1]]
+        elif os.path.basename(folder) != "Text":
+            title = chapterNames[os.path.basename(folder)]
+        f.write("<li><a href=\"" + filename[0].replace("\\", "/") + ".html\">" + title + "</a></li>\n")
+    f.writelines(["</ol>\n",
                   "</nav>\n",
                   "<nav epub:type=\"page-list\">\n",
                   "<ol>\n"
@@ -294,7 +305,8 @@ def buildOPF(dstdir, title, filelist, cover=None):
                   "<dc:title>", title, "</dc:title>\n",
                   "<dc:language>en-US</dc:language>\n",
                   "<dc:identifier id=\"BookID\">urn:uuid:", options.uuid, "</dc:identifier>\n",
-                  "<dc:contributor id=\"contributor\">KindleComicConverter-" + __version__ + "</dc:contributor>\n"])
+                  "<dc:contributor id=\"contributor\">KindleComicConverter-" + __version__ + "</dc:contributor>\n",
+                  "<dc:description>", options.summary, "</dc:description>\n"])
     for author in options.authors:
         f.writelines(["<dc:creator>", author, "</dc:creator>\n"])
     f.writelines(["<meta property=\"dcterms:modified\">" + strftime("%Y-%m-%dT%H:%M:%SZ", gmtime()) + "</meta>\n",
@@ -303,18 +315,15 @@ def buildOPF(dstdir, title, filelist, cover=None):
                   "<meta property=\"rendition:spread\">portrait</meta>\n",
                   "<meta property=\"rendition:layout\">pre-paginated</meta>\n"])
     if options.iskindle and options.profile != 'Custom':
-        f.writelines(["<meta property=\"RegionMagnification\">true</meta>\n",
-                      "<meta property=\"region-mag\">true</meta>\n",
-                      "<meta property=\"book-type\">comic</meta>\n",
-                      "<meta property=\"zero-gutter\">true</meta>\n",
-                      "<meta property=\"zero-margin\">true</meta>\n",
-                      "<meta property=\"fixed-layout\">true</meta>\n",
-                      "<meta property=\"orientation-lock\">portrait</meta>\n",
-                      "<meta property=\"original-resolution\">",
-                      str(deviceres[0]) + "x" + str(deviceres[1]) + "</meta>\n",
-                      "<meta property=\"primary-writing-mode\">" + writingmode + "</meta>\n",
-                      "<meta property=\"ke-border-color\">#ffffff</meta>\n",
-                      "<meta property=\"ke-border-width\">0</meta>\n"])
+        f.writelines(["<meta name=\"original-resolution\" content=\"",
+                      str(deviceres[0]) + "x" + str(deviceres[1]) + "\"/>\n",
+                      "<meta name=\"book-type\" content=\"comic\"/>\n",
+                      "<meta name=\"RegionMagnification\" content=\"true\"/>\n",
+                      "<meta name=\"primary-writing-mode\" content=\"" + writingmode + "\"/>\n",
+                      "<meta name=\"zero-gutter\" content=\"true\"/>\n",
+                      "<meta name=\"zero-margin\" content=\"true\"/>\n",
+                      "<meta name=\"ke-border-color\" content=\"#ffffff\"/>\n",
+                      "<meta name=\"ke-border-width\" content=\"0\"/>\n"])
     f.writelines(["</metadata>\n<manifest>\n<item id=\"ncx\" href=\"toc.ncx\" ",
                   "media-type=\"application/x-dtbncx+xml\"/>\n",
                   "<item id=\"nav\" href=\"nav.xhtml\" ",
@@ -333,15 +342,15 @@ def buildOPF(dstdir, title, filelist, cover=None):
         filename = getImageFileName(path[1])
         uniqueid = os.path.join(folder, filename[0]).replace('/', '_').replace('\\', '_')
         reflist.append(uniqueid)
-        f.write("<item id=\"page_" + str(uniqueid) + "\" href=\""
-                + folder.replace('Images', 'Text') + "/" + filename[0]
-                + ".html\" media-type=\"application/xhtml+xml\"/>\n")
+        f.write("<item id=\"page_" + str(uniqueid) + "\" href=\"" +
+                folder.replace('Images', 'Text') + "/" + filename[0] +
+                ".html\" media-type=\"application/xhtml+xml\"/>\n")
         if '.png' == filename[1]:
             mt = 'image/png'
         else:
             mt = 'image/jpeg'
-        f.write("<item id=\"img_" + str(uniqueid) + "\" href=\"" + folder + "/" + path[1] + "\" media-type=\""
-                + mt + "\"/>\n")
+        f.write("<item id=\"img_" + str(uniqueid) + "\" href=\"" + folder + "/" + path[1] + "\" media-type=\"" +
+                mt + "\"/>\n")
     f.write("<item id=\"css\" href=\"Text/style.css\" media-type=\"text/css\"/>\n")
     if options.righttoleft:
         f.write("</manifest>\n<spine page-progression-direction=\"rtl\" toc=\"ncx\">\n")
@@ -639,51 +648,45 @@ def imgFileProcessing(work):
 
 
 def getWorkFolder(afile):
-    if len(afile) > 240:
-        raise UserWarning("Path is too long.")
     if os.path.isdir(afile):
         workdir = mkdtemp('', 'KCC-')
         try:
             os.rmdir(workdir)
             fullPath = os.path.join(workdir, 'OEBPS', 'Images')
-            if len(fullPath) > 240:
-                raise UserWarning("Path is too long.")
             copytree(afile, fullPath)
             sanitizePermissions(fullPath)
             return workdir
-        except OSError:
+        except:
             rmtree(workdir, True)
-            raise
+            raise UserWarning("Failed to prepare a workspace.")
     elif afile.lower().endswith('.pdf'):
         pdf = pdfjpgextract.PdfJpgExtract(afile)
         path, njpg = pdf.extract()
         if njpg == 0:
             rmtree(path, True)
-            raise UserWarning("Failed to extract images.")
+            raise UserWarning("Failed to extract images from PDF file.")
     else:
         workdir = mkdtemp('', 'KCC-')
         cbx = cbxarchive.CBxArchive(afile)
         if cbx.isCbxFile():
             try:
                 path = cbx.extract(workdir)
-            except OSError:
+            except:
                 rmtree(workdir, True)
-                raise UserWarning("Failed to extract file.")
+                raise UserWarning("Failed to extract archive.")
         else:
             rmtree(workdir, True)
-            raise TypeError("Failed to detect archive format.")
-    if len(os.path.join(path, 'OEBPS', 'Images')) > 240:
-        raise UserWarning("Path is too long.")
-    move(path, path + "_temp")
-    move(path + "_temp", os.path.join(path, 'OEBPS', 'Images'))
-    return path
+            raise UserWarning("Failed to detect archive format.")
+    newpath = mkdtemp('', 'KCC-')
+    move(path, os.path.join(newpath, 'OEBPS', 'Images'))
+    return newpath
 
 
 def getOutputFilename(srcpath, wantedname, ext, tomeNumber):
     if srcpath[-1] == os.path.sep:
         srcpath = srcpath[:-1]
-    if not ext.startswith('.'):
-        ext = '.' + ext
+    if 'Ko' in options.profile and options.format == 'EPUB':
+        ext = '.kepub.epub'
     if wantedname is not None:
         if wantedname.endswith(ext):
             filename = os.path.abspath(wantedname)
@@ -695,7 +698,14 @@ def getOutputFilename(srcpath, wantedname, ext, tomeNumber):
     elif os.path.isdir(srcpath):
         filename = srcpath + tomeNumber + ext
     else:
-        filename = os.path.splitext(srcpath)[0] + tomeNumber + ext
+        if 'Ko' in options.profile and options.format == 'EPUB':
+            path = srcpath.split(os.path.sep)
+            path[-1] = ''.join(e for e in path[-1].split('.')[0] if e.isalnum()) + tomeNumber + ext
+            if not path[-1].split('.')[0]:
+                path[-1] = 'KCCPlaceholder' + tomeNumber + ext
+            filename = os.path.sep.join(path)
+        else:
+            filename = os.path.splitext(srcpath)[0] + tomeNumber + ext
     if os.path.isfile(filename):
         counter = 0
         basename = os.path.splitext(filename)[0]
@@ -710,6 +720,7 @@ def getComicInfo(path, originalPath):
     options.authors = ['KCC']
     options.remoteCovers = {}
     options.chapters = []
+    options.summary = ''
     titleSuffix = ''
     if options.title == 'defaulttitle':
         defaultTitle = True
@@ -728,7 +739,7 @@ def getComicInfo(path, originalPath):
         options.authors = []
         if defaultTitle:
             if xml.data['Series']:
-                options.title = xml.data['Series']
+                options.title = escape(xml.data['Series'])
             if xml.data['Volume']:
                 titleSuffix += ' V' + xml.data['Volume']
             if xml.data['Number']:
@@ -736,7 +747,7 @@ def getComicInfo(path, originalPath):
             options.title += titleSuffix
         for field in ['Writers', 'Pencillers', 'Inkers', 'Colorists']:
             for person in xml.data[field]:
-                options.authors.append(person)
+                options.authors.append(escape(person))
         if len(options.authors) > 0:
             options.authors = list(set(options.authors))
             options.authors.sort()
@@ -746,6 +757,8 @@ def getComicInfo(path, originalPath):
             options.remoteCovers = getCoversFromMCB(xml.data['MUid'])
         if xml.data['Bookmarks']:
             options.chapters = xml.data['Bookmarks']
+        if xml.data['Summary']:
+            options.summary = escape(xml.data['Summary'])
         os.remove(xmlPath)
 
 
@@ -948,6 +961,8 @@ def splitProcess(path, mode):
 
 
 def detectCorruption(tmpPath, orgPath):
+    imageNumber = 0
+    imageSmaller = 0
     for root, dirs, files in walk(tmpPath, False):
         for name in files:
             if getImageFileName(name) is not None:
@@ -961,14 +976,24 @@ def detectCorruption(tmpPath, orgPath):
                     img.verify()
                     img = Image.open(path)
                     img.load()
+                    imageNumber += 1
+                    if options.profileData[1][0] > img.size[0] and options.profileData[1][1] > img.size[1]:
+                        imageSmaller += 1
                 except Exception as err:
                     rmtree(os.path.join(tmpPath, '..', '..'), True)
-                    if 'decoder' in err and 'not available' in err:
+                    if 'decoder' in str(err) and 'not available' in str(err):
                         raise RuntimeError('Pillow was compiled without JPG and/or PNG decoder.')
                     else:
                         raise RuntimeError('Image file %s is corrupted.' % pathOrg)
             else:
                 os.remove(os.path.join(root, name))
+    if imageSmaller > imageNumber * 0.5 and not options.upscale and not options.stretch:
+        print("\nMore than half of images are smaller than target device resolution. "
+              "Consider enabling stretching or upscaling to improve readability.")
+        if GUI:
+            GUI.addMessage.emit('More than half of images are smaller than target device resolution.', 'warning', False)
+            GUI.addMessage.emit('Consider enabling stretching or upscaling to improve readability.', 'warning', False)
+            GUI.addMessage.emit('', '', False)
 
 
 def detectMargins(path):
@@ -1009,7 +1034,7 @@ def createNewTome():
 
 def slugify(value):
     value = slugifyExt(value)
-    value = sub(r'0*([0-9]{4,})', r'\1', sub(r'([0-9]+)', r'0000\1', value))
+    value = sub(r'0*([0-9]{4,})', r'\1', sub(r'([0-9]+)', r'0000\1', value, count=2))
     return value
 
 
@@ -1151,7 +1176,7 @@ def checkOptions():
         if options.customheight != 0:
             Y = options.customheight
         newProfile = ("Custom", (int(X), int(Y)), image.ProfileData.Palette16,
-                      image.ProfileData.Profiles[options.profile][3], (int(int(X)*1.5), int(int(Y)*1.5)))
+                      image.ProfileData.Profiles[options.profile][3], (int(int(X) * 1.5), int(int(Y) * 1.5)))
         image.ProfileData.Profiles["Custom"] = newProfile
         options.profile = "Custom"
     options.profileData = image.ProfileData.Profiles[options.profile]
@@ -1178,6 +1203,21 @@ def checkTools(source):
             exit(1)
 
 
+def checkPre(source):
+    # Make sure that all temporary files are gone
+    for root, dirs, _ in walkLevel(gettempdir(), 0):
+        for tempdir in dirs:
+            if tempdir.startswith('KCC-'):
+                rmtree(os.path.join(root, tempdir), True)
+    # Make sure that target directory is writable
+    if os.path.isdir(source):
+        writable = os.access(os.path.abspath(os.path.join(source, '..')), os.W_OK)
+    else:
+        writable = os.access(os.path.dirname(source), os.W_OK)
+    if not writable:
+        raise UserWarning("Target directory is not writable.")
+
+
 def makeBook(source, qtGUI=None):
     """Generates MOBI/EPUB/CBZ comic ebook from a bunch of images."""
     global GUI
@@ -1186,6 +1226,7 @@ def makeBook(source, qtGUI=None):
         GUI.progressBarTick.emit('1')
     else:
         checkTools(source)
+    checkPre(source)
     path = getWorkFolder(source)
     print("\nChecking images...")
     getComicInfo(os.path.join(path, "OEBPS", "Images"), source)
@@ -1239,11 +1280,6 @@ def makeBook(source, qtGUI=None):
                 filepath.append(getOutputFilename(source, options.output, '.epub', ''))
             makeZIP(tome + '_comic', tome, True)
         move(tome + '_comic.zip', filepath[-1])
-        if 'Ko' in options.profile:
-            filename = filepath[-1].split(os.path.sep)
-            filename[-1] = ''.join(e for e in filename[-1].split('.')[0] if e.isalnum()) + '.kepub.epub'
-            filename = os.path.sep.join(filename)
-            move(filepath[-1], filename)
         rmtree(tome, True)
         if GUI:
             GUI.progressBarTick.emit('tick')
@@ -1323,7 +1359,7 @@ def makeMOBI(work, qtGUI=None):
     global GUI, makeMOBIWorkerPool, makeMOBIWorkerOutput
     GUI = qtGUI
     makeMOBIWorkerOutput = []
-    availableMemory = virtual_memory().total/1000000000
+    availableMemory = virtual_memory().total / 1000000000
     if availableMemory <= 2:
         threadNumber = 1
     elif 2 < availableMemory <= 4:

kcc/comic2panel.py

@@ -85,19 +85,19 @@ def sanitizePanelSize(panel, opt):
     newPanels = []
     if panel[2] > 6 * opt.height:
         diff = int(panel[2] / 8)
-        newPanels.append([panel[0], panel[1] - diff*7, diff])
-        newPanels.append([panel[1] - diff*7, panel[1] - diff*6, diff])
-        newPanels.append([panel[1] - diff*6, panel[1] - diff*5, diff])
-        newPanels.append([panel[1] - diff*5, panel[1] - diff*4, diff])
-        newPanels.append([panel[1] - diff*4, panel[1] - diff*3, diff])
-        newPanels.append([panel[1] - diff*3, panel[1] - diff*2, diff])
-        newPanels.append([panel[1] - diff*2, panel[1] - diff, diff])
+        newPanels.append([panel[0], panel[1] - diff * 7, diff])
+        newPanels.append([panel[1] - diff * 7, panel[1] - diff * 6, diff])
+        newPanels.append([panel[1] - diff * 6, panel[1] - diff * 5, diff])
+        newPanels.append([panel[1] - diff * 5, panel[1] - diff * 4, diff])
+        newPanels.append([panel[1] - diff * 4, panel[1] - diff * 3, diff])
+        newPanels.append([panel[1] - diff * 3, panel[1] - diff * 2, diff])
+        newPanels.append([panel[1] - diff * 2, panel[1] - diff, diff])
         newPanels.append([panel[1] - diff, panel[1], diff])
     elif panel[2] > 3 * opt.height:
         diff = int(panel[2] / 4)
-        newPanels.append([panel[0], panel[1] - diff*3, diff])
-        newPanels.append([panel[1] - diff*3, panel[1] - diff*2, diff])
-        newPanels.append([panel[1] - diff*2, panel[1] - diff, diff])
+        newPanels.append([panel[0], panel[1] - diff * 3, diff])
+        newPanels.append([panel[1] - diff * 3, panel[1] - diff * 2, diff])
+        newPanels.append([panel[1] - diff * 2, panel[1] - diff, diff])
         newPanels.append([panel[1] - diff, panel[1], diff])
     elif panel[2] > 1.5 * opt.height:
         newPanels.append([panel[0], panel[1] - int(panel[2] / 2), int(panel[2] / 2)])

kcc/dualmetafix.py

@@ -36,15 +36,15 @@ title_offset = 84
 
 
 def getint(data, ofs, sz='L'):
-    i, = struct.unpack_from('>'+sz, data, ofs)
+    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:]
+        return data[:ofs] + struct.pack('>L', n) + data[ofs + 4:]
     else:
-        return data[:ofs]+struct.pack('>H', n)+data[ofs+2:]
+        return data[:ofs] + struct.pack('>H', n) + data[ofs + 2:]
 
 
 def getsecaddr(datain, secno):
@@ -52,11 +52,11 @@ def getsecaddr(datain, secno):
     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:
+    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)
+        secend = getint(datain, first_pdb_record + (secno + 1) * 8)
     return secstart, secend
 
 
@@ -71,28 +71,28 @@ def replacesection(datain, secno, secdata):
     seclen = secend - secstart
     if len(secdata) != seclen:
         raise DualMetaFixException('section length change in replacesection')
-    datain[secstart:secstart+seclen] = secdata
+    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':
+    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)
+    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)
+    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:
+    if sectail != b'\0' * newrecsize:
         raise DualMetaFixException('add_exth: trimmed non-null bytes at end of section')
     newrec0 = newrec0[0:rlen]
     return newrec0
@@ -106,30 +106,31 @@ def read_exth(rec0, exth_num):
         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)])
+            exth_values.append(rec0[ebase + 8:ebase + getint(rec0, ebase + 4)])
         enum -= 1
-        ebase = ebase+getint(rec0, ebase+4)
+        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
+    ebase_idx = ebase + 12
     enum_idx = 0
     while enum_idx < enum:
         exth_id = getint(rec0, ebase_idx)
-        exth_size = getint(rec0, ebase_idx+4)
+        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
+            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
+        ebase_idx = ebase_idx + exth_size
     return rec0
 
 

kcc/image.py

@@ -148,8 +148,8 @@ class ComicPage:
                 if self.noVPV:
                     flags.append('NoVerticalPanelView')
                 if self.border:
-                    flags.append('Margins-' + str(self.border[0]) + '-' + str(self.border[1]) + '-'
-                                 + str(self.border[2]) + '-' + str(self.border[3]))
+                    flags.append('Margins-' + str(self.border[0]) + '-' + str(self.border[1]) + '-' +
+                                 str(self.border[2]) + '-' + str(self.border[3]))
             if self.fill != 'white':
                 flags.append('BlackFill')
             if self.opt.quality == 2:
@@ -199,10 +199,10 @@ class ComicPage:
         else:
             multiplier = 1.5
         if border is not None:
-            self.border = [round(float(border[0])/float(self.image.size[0])*150, 3),
-                           round(float(border[1])/float(self.image.size[1])*150, 3),
-                           round(float(self.image.size[0]-border[2])/float(self.image.size[0])*150, 3),
-                           round(float(self.image.size[1]-border[3])/float(self.image.size[1])*150, 3)]
+            self.border = [round(float(border[0]) / float(self.image.size[0]) * 150, 3),
+                           round(float(border[1]) / float(self.image.size[1]) * 150, 3),
+                           round(float(self.image.size[0] - border[2]) / float(self.image.size[0]) * 150, 3),
+                           round(float(self.image.size[1] - border[3]) / float(self.image.size[1]) * 150, 3)]
             if int((border[2] - border[0]) * multiplier) < self.size[0] + 10:
                 self.noHPV = True
             if int((border[3] - border[1]) * multiplier) < self.size[1] + 10:
@@ -428,13 +428,13 @@ class ComicPage:
             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)))
+                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])))
+                fill += self.getImageHistogram(bw.crop((startX, 0, startX + 5, bw.size[1])))
                 startX += 5
             if fill > 0:
                 self.fill = 'black'
@@ -442,29 +442,25 @@ class ComicPage:
                 self.fill = 'white'
 
     def isImageColor(self):
-        v = ImageStat.Stat(self.image).var
-        isMonochromatic = reduce(lambda x, y: x and y < 0.005, v, True)
-        if isMonochromatic:
-            # Monochromatic
-            return False
-        else:
-            if len(v) == 3:
-                maxmin = abs(max(v) - min(v))
-                if maxmin > 1000:
-                    # Color
-                    return True
-                elif maxmin > 100:
-                    # Probably color
-                    return True
-                else:
-                    # Grayscale
-                    return False
-            elif len(v) == 1:
-                # Black and white
+        img = self.image.copy()
+        bands = img.getbands()
+        if bands == ('R', 'G', 'B') or bands == ('R', 'G', 'B', 'A'):
+            thumb = img.resize((40, 40))
+            SSE, bias = 0, [0, 0, 0]
+            bias = ImageStat.Stat(thumb).mean[:3]
+            bias = [b - sum(bias) / 3 for b in bias]
+            for pixel in thumb.getdata():
+                mu = sum(pixel) / 3
+                SSE += sum((pixel[i] - mu - bias[i]) * (pixel[i] - mu - bias[i]) for i in [0, 1, 2])
+            MSE = float(SSE) / (40 * 40)
+            if MSE <= 22:
                 return False
             else:
-                # Detection failed
-                return False
+                return True
+        elif len(bands) == 1:
+            return False
+        else:
+            return False
 
 
 class Cover:
@@ -513,4 +509,4 @@ class Cover:
         try:
             self.image.save(self.target, "JPEG", optimize=1, quality=80)
         except IOError:
-            raise RuntimeError('Failed to save cover')
+            raise RuntimeError('Failed to process downloaded cover.')

kcc/metadata.py

@@ -38,6 +38,7 @@ class MetadataParser:
                      'Pencillers': [],
                      'Inkers': [],
                      'Colorists': [],
+                     'Summary': '',
                      'MUid': '',
                      'Bookmarks': []}
         self.rawdata = None
@@ -90,6 +91,8 @@ class MetadataParser:
             self.data['Volume'] = self.rawdata.getElementsByTagName('Volume')[0].firstChild.nodeValue
         if len(self.rawdata.getElementsByTagName('Number')) != 0:
             self.data['Number'] = self.rawdata.getElementsByTagName('Number')[0].firstChild.nodeValue
+        if len(self.rawdata.getElementsByTagName('Summary')) != 0:
+            self.data['Summary'] = self.rawdata.getElementsByTagName('Summary')[0].firstChild.nodeValue
         for field in ['Writer', 'Penciller', 'Inker', 'Colorist']:
             if len(self.rawdata.getElementsByTagName(field)) != 0:
                 for person in self.rawdata.getElementsByTagName(field)[0].firstChild.nodeValue.split(', '):
@@ -113,7 +116,7 @@ class MetadataParser:
             for row in (['Series', self.data['Series']], ['Volume', self.data['Volume']],
                         ['Number', self.data['Number']], ['Writer', ', '.join(self.data['Writers'])],
                         ['Penciller', ', '.join(self.data['Pencillers'])], ['Inker', ', '.join(self.data['Inkers'])],
-                        ['Colorist', ', '.join(self.data['Colorists'])],
+                        ['Colorist', ', '.join(self.data['Colorists'])], ['Summary', self.data['Summary']],
                         ['ScanInformation', 'MCD(' + self.data['MUid'] + ')' if self.data['MUid'] else '']):
                 if self.rawdata.getElementsByTagName(row[0]):
                     node = self.rawdata.getElementsByTagName(row[0])[0]
@@ -135,7 +138,7 @@ class MetadataParser:
             for row in (['Series', self.data['Series']], ['Volume', self.data['Volume']],
                         ['Number', self.data['Number']], ['Writer', ', '.join(self.data['Writers'])],
                         ['Penciller', ', '.join(self.data['Pencillers'])], ['Inker', ', '.join(self.data['Inkers'])],
-                        ['Colorist', ', '.join(self.data['Colorists'])],
+                        ['Colorist', ', '.join(self.data['Colorists'])], ['Summary', self.data['Summary']],
                         ['ScanInformation', 'MCD(' + self.data['MUid'] + ')' if self.data['MUid'] else '']):
                 if row[1]:
                     main = doc.createElement(row[0])

kcc/rarfile.py

@@ -360,9 +360,8 @@ class RarCannotExec(RarExecError):
 
 def is_rarfile(xfile):
     '''Check quickly whether file is rar archive.'''
-    fd = XFile(xfile)
-    buf = fd.read(len(RAR_ID))
-    fd.close()
+    with open(xfile, 'rb') as fh:
+        buf = fh.read(len(RAR_ID))
     if buf == RAR_ID or buf == RAR5_ID:
         return True
     else:

kcc/shared.py

@@ -25,6 +25,7 @@ from shutil import rmtree, move
 from tempfile import mkdtemp
 from zipfile import ZipFile, ZIP_DEFLATED
 from re import split
+from traceback import format_tb
 try:
     from scandir import walk
 except ImportError:
@@ -45,6 +46,9 @@ class HTMLStripper(HTMLParser):
     def get_data(self):
         return ''.join(self.fed)
 
+    def error(self, message):
+        pass
+
 
 def getImageFileName(imgfile):
     name, ext = os.path.splitext(imgfile)
@@ -117,16 +121,22 @@ def removeFromZIP(zipfname, *filenames):
         rmtree(tempdir)
 
 
-# noinspection PyUnresolvedReferences
+def sanitizeTrace(traceback):
+    return ''.join(format_tb(traceback))\
+        .replace('C:\\Users\\pawel\\Documents\\Projekty\\KCC\\', '')\
+        .replace('C:\\Python34\\', '')\
+        .replace('C:\\Python34_64\\', '')
+
+
 def dependencyCheck(level):
     missing = []
     if level > 2:
         try:
             from PyQt5.QtCore import qVersion as qtVersion
-            if StrictVersion('5.2.0') > StrictVersion(qtVersion()):
-                missing.append('PyQt 5.2.0+')
+            if StrictVersion('5.4.0') > StrictVersion(qtVersion()):
+                missing.append('PyQt 5.4.0+')
         except ImportError:
-            missing.append('PyQt 5.2.0+')
+            missing.append('PyQt 5.4.0+')
     if level > 1:
         try:
             from psutil import __version__ as psutilVersion
@@ -136,10 +146,10 @@ def dependencyCheck(level):
             missing.append('psutil 3.0.0+')
         try:
             from slugify import __version__ as slugifyVersion
-            if StrictVersion('1.1.2') > StrictVersion(slugifyVersion):
-                missing.append('python-slugify 1.1.2+')
+            if StrictVersion('1.1.3') > StrictVersion(slugifyVersion):
+                missing.append('python-slugify 1.1.3+')
         except ImportError:
-            missing.append('python-slugify 1.1.2+')
+            missing.append('python-slugify 1.1.3+')
     try:
         from PIL import PILLOW_VERSION as pillowVersion
         if StrictVersion('2.8.2') > StrictVersion(pillowVersion):

setup.json

@@ -0,0 +1,10 @@
+{
+  "title": "Kindle Comic Converter",
+  "icon": "icons/comic2ebook.icns",
+  "background": "icons/WizardOSX.png",
+  "icon-size": 160,
+  "contents": [
+    { "x": 180, "y": 300, "type": "file", "path": "dist/Kindle Comic Converter.app" },
+    { "x": 520, "y": 300, "type": "link", "path": "/Applications" }
+  ]
+}

setup.py

@@ -22,10 +22,9 @@ VERSION = __version__
 MAIN = 'kcc.py'
 extra_options = {}
 
-# noinspection PyUnresolvedReferences
 if platform == 'darwin':
     from setuptools import setup
-    from os import chmod, makedirs
+    from os import chmod, makedirs, system
     from shutil import copyfile
     extra_options = dict(
         setup_requires=['py2app'],
@@ -34,10 +33,10 @@ if platform == 'darwin':
             py2app=dict(
                 argv_emulation=True,
                 iconfile='icons/comic2ebook.icns',
-                includes=['sip', 'PyQt5.QtPrintSupport'],
+                includes=['sip'],
                 resources=['LICENSE.txt', 'other/qt.conf', 'other/Additional-LICENSE.txt', 'other/unrar', 'other/7za'],
                 plist=dict(
-                    CFBundleName=NAME,
+                    CFBundleName='Kindle Comic Converter',
                     CFBundleShortVersionString=VERSION,
                     CFBundleGetInfoString=NAME + ' ' + VERSION +
                     ', written 2012-2015 by Ciro Mattia Gonano and Pawel Jastrzebski',
@@ -60,7 +59,6 @@ if platform == 'darwin':
         )
     )
 elif platform == 'win32':
-    # noinspection PyUnresolvedReferences
     import py2exe
     from platform import architecture
     from distutils.core import setup
@@ -95,7 +93,7 @@ elif platform == 'win32':
         zipfile=None,
         data_files=additional_files)
 else:
-    if argv[1] == 'make_pyz':
+    if len(argv) > 1 and argv[1] == 'make_pyz':
         from os import system
         script = '''
         cp kcc.py __main__.py
@@ -137,7 +135,7 @@ else:
             install_requires=[
                 'Pillow>=2.8.2',
                 'psutil>=3.0.0',
-                'python-slugify>=1.1.2',
+                'python-slugify>=1.1.3',
                 'scandir>=1.1.0',
             ],
             zip_safe=False,
@@ -156,7 +154,8 @@ setup(
 )
 
 if platform == 'darwin':
-    makedirs('dist/' + NAME + '.app/Contents/PlugIns/platforms', exist_ok=True)
-    copyfile('other/libqcocoa.dylib', 'dist/' + NAME + '.app/Contents/PlugIns/platforms/libqcocoa.dylib')
-    chmod('dist/' + NAME + '.app/Contents/Resources/unrar', 0o777)
-    chmod('dist/' + NAME + '.app/Contents/Resources/7za', 0o777)
+    makedirs('dist/Kindle Comic Converter.app/Contents/PlugIns/platforms', exist_ok=True)
+    copyfile('other/libqcocoa.dylib', 'dist/Kindle Comic Converter.app/Contents/PlugIns/platforms/libqcocoa.dylib')
+    chmod('dist/Kindle Comic Converter.app/Contents/Resources/unrar', 0o777)
+    chmod('dist/Kindle Comic Converter.app/Contents/Resources/7za', 0o777)
+    system('appdmg setup.json dist/KindleComicConverter_osx_' + VERSION + '.dmg')