Merge pull request #216 from ciromattia/dev

5.2.1

README.md

@@ -90,7 +90,10 @@ Options:
     -f FORMAT, --format=FORMAT
                         Output format (Available options: Auto, MOBI, EPUB,
                         CBZ) [Default=Auto]
-    -b, --batchsplit    Split output into multiple files
+    -b BATCHSPLIT, --batchsplit=BATCHSPLIT
+                        Split output into multiple files. 0: Don't split 1:
+                        Automatic mode 2: Consider every subdirectory as
+                        separate volume [Default=0]
 
   PROCESSING:
     -u, --upscale       Resize images smaller than device's resolution
@@ -160,6 +163,11 @@ The app relies and includes the following scripts:
 * [Kobo Aura ONE](http://kcc.iosphe.re/Samples/Ubunchu-KoAO.kepub.epub)
 
 ## CHANGELOG
+####5.2.1:
+* Improved directory parsing
+* Tweaked margin detection algorithm
+* Improved error reporting
+
 ####5.2:
 * Added new Panel View options
 * Implemented new margin detection algorithm

gui/KCC.ui

@@ -228,12 +228,12 @@
         </widget>
        </item>
        <item row="2" column="1">
-        <widget class="QCheckBox" name="noDitheringBox">
+        <widget class="QCheckBox" name="outputSplit">
          <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Create PNG files instead JPEG.&lt;br/&gt;Quality increase is not noticeable on most of devices.&lt;br/&gt;Output files &lt;span style=&quot; font-weight:600;&quot;&gt;might&lt;/span&gt; be smaller.&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;MOBI conversion will be much slower.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Automatic mode&lt;br/&gt;&lt;/span&gt;Output will be splitted automatically.&lt;/p&gt;&lt;p style='white-space:pre'&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Volume mode&lt;br/&gt;&lt;/span&gt;Every subdirectory will be considered as separate volume.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="text">
-          <string>PNG output</string>
+          <string>Output split</string>
          </property>
         </widget>
        </item>
@@ -510,7 +510,7 @@
   <tabstop>upscaleBox</tabstop>
   <tabstop>gammaBox</tabstop>
   <tabstop>borderBox</tabstop>
-  <tabstop>noDitheringBox</tabstop>
+  <tabstop>outputSplit</tabstop>
   <tabstop>colorBox</tabstop>
   <tabstop>editorButton</tabstop>
   <tabstop>wikiButton</tabstop>

kcc.iss

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

kcc/KCC_gui.py

@@ -21,17 +21,15 @@
 import sys
 from urllib.parse import unquote
 from urllib.request import urlopen, urlretrieve, Request
-from time import sleep, time
-from datetime import datetime
+from time import sleep
 from shutil import move
 from subprocess import STDOUT, PIPE
 from PyQt5 import QtGui, QtCore, QtWidgets, QtNetwork
-from xml.dom.minidom import parse, Document
+from xml.dom.minidom import parse
 from psutil import Popen, Process
 from copy import copy
 from distutils.version import StrictVersion
 from xml.sax.saxutils import escape
-from platform import platform
 from raven import Client
 from .shared import md5Checksum, HTMLStripper, sanitizeTrace, saferRemove
 from . import __version__
@@ -270,8 +268,8 @@ def run(self):
             options.white_borders = True
         elif GUI.borderBox.checkState() == 2:
             options.black_borders = True
-        if GUI.noDitheringBox.isChecked():
-            options.forcepng = True
+        if GUI.outputSplit.isChecked():
+            options.batchsplit = 2
         if GUI.colorBox.isChecked():
             options.forcecolor = True
         if GUI.currentMode > 2:
@@ -319,10 +317,15 @@ def run(self):
                 GUI.progress.content = ''
                 self.errors = True
                 _, _, traceback = sys.exc_info()
+                if len(err.args) == 1:
+                    MW.showDialog.emit("Error during conversion %s:\n\n%s\n\nTraceback:\n%s"
+                                       % (jobargv[-1], str(err), sanitizeTrace(traceback)), 'error')
+                else:
+                    MW.showDialog.emit("Error during conversion %s:\n\n%s\n\nTraceback:\n%s"
+                                       % (jobargv[-1], str(err.args[0]), err.args[1]), 'error')
+                    GUI.sentry.extra_context({'realTraceback': err.args[1]})
                 if ' is corrupted.' not in str(err):
                     GUI.sentry.captureException()
-                MW.showDialog.emit("Error during conversion %s:\n\n%s\n\nTraceback:\n%s"
-                                   % (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)
@@ -528,7 +531,7 @@ def selectFileMetaEditor(self):
     def clearJobs(self):
         GUI.jobList.clear()
 
-    # noinspection PyCallByClass,PyTypeChecker,PyArgumentList
+    # noinspection PyCallByClass,PyTypeChecker
     def openWiki(self):
         QtGui.QDesktopServices.openUrl(QtCore.QUrl('https://github.com/ciromattia/kcc/wiki'))
 
@@ -646,6 +649,11 @@ def changeFormat(self, outputFormat=None):
         else:
             GUI.formatBox.setCurrentIndex(profile['DefaultFormat'])
         GUI.qualityBox.setEnabled(profile['PVOptions'])
+        if str(GUI.formatBox.currentText()) == 'MOBI/AZW3':
+            GUI.outputSplit.setEnabled(True)
+        else:
+            GUI.outputSplit.setEnabled(False)
+            GUI.outputSplit.setChecked(False)
 
     def stripTags(self, html):
         s = HTMLStripper()
@@ -700,7 +708,6 @@ def convertStart(self):
             self.conversionAlive = False
             self.worker.sync()
         else:
-            # noinspection PyArgumentList
             if QtWidgets.QApplication.keyboardModifiers() == QtCore.Qt.ShiftModifier:
                 dname = QtWidgets.QFileDialog.getExistingDirectory(MW, 'Select output directory', self.lastPath)
                 if dname != '':
@@ -762,7 +769,7 @@ def saveSettings(self, event):
                                            'upscaleBox': GUI.upscaleBox.checkState(),
                                            'borderBox': GUI.borderBox.checkState(),
                                            'webtoonBox': GUI.webtoonBox.checkState(),
-                                           'noDitheringBox': GUI.noDitheringBox.checkState(),
+                                           'outputSplit': GUI.outputSplit.checkState(),
                                            'colorBox': GUI.colorBox.checkState(),
                                            'widthBox': GUI.widthBox.value(),
                                            'heightBox': GUI.heightBox.value(),
@@ -848,7 +855,6 @@ def detectKindleGen(self, startup=False):
                 else:
                     self.addMessage('Download it and place executable in /usr/local/bin directory.', 'error')
 
-    # noinspection PyArgumentList
     def __init__(self, KCCAplication, KCCWindow):
         global APP, MW, GUI
         APP = KCCAplication

kcc/KCC_ui.py

@@ -97,9 +97,9 @@ def setupUi(self, mainWindow):
         self.borderBox.setTristate(True)
         self.borderBox.setObjectName("borderBox")
         self.gridLayout_2.addWidget(self.borderBox, 2, 0, 1, 1)
-        self.noDitheringBox = QtWidgets.QCheckBox(self.optionWidget)
-        self.noDitheringBox.setObjectName("noDitheringBox")
-        self.gridLayout_2.addWidget(self.noDitheringBox, 2, 1, 1, 1)
+        self.outputSplit = QtWidgets.QCheckBox(self.optionWidget)
+        self.outputSplit.setObjectName("outputSplit")
+        self.gridLayout_2.addWidget(self.outputSplit, 2, 1, 1, 1)
         self.colorBox = QtWidgets.QCheckBox(self.optionWidget)
         self.colorBox.setObjectName("colorBox")
         self.gridLayout_2.addWidget(self.colorBox, 2, 2, 1, 1)
@@ -219,8 +219,8 @@ def setupUi(self, mainWindow):
         mainWindow.setTabOrder(self.webtoonBox, self.upscaleBox)
         mainWindow.setTabOrder(self.upscaleBox, self.gammaBox)
         mainWindow.setTabOrder(self.gammaBox, self.borderBox)
-        mainWindow.setTabOrder(self.borderBox, self.noDitheringBox)
-        mainWindow.setTabOrder(self.noDitheringBox, self.colorBox)
+        mainWindow.setTabOrder(self.borderBox, self.outputSplit)
+        mainWindow.setTabOrder(self.outputSplit, self.colorBox)
         mainWindow.setTabOrder(self.colorBox, self.editorButton)
         mainWindow.setTabOrder(self.editorButton, self.wikiButton)
         mainWindow.setTabOrder(self.wikiButton, self.jobList)
@@ -251,8 +251,8 @@ def retranslateUi(self, mainWindow):
         self.gammaBox.setText(_translate("mainWindow", "Custom gamma"))
         self.borderBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>Color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>"))
         self.borderBox.setText(_translate("mainWindow", "W/B margins"))
-        self.noDitheringBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>"))
-        self.noDitheringBox.setText(_translate("mainWindow", "PNG output"))
+        self.outputSplit.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Automatic mode<br/></span>Output will be splitted automatically.</p><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Checked - Volume mode<br/></span>Every subdirectory will be considered as separate volume.</p></body></html>"))
+        self.outputSplit.setText(_translate("mainWindow", "Output split"))
         self.colorBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Disable conversion to grayscale.</p></body></html>"))
         self.colorBox.setText(_translate("mainWindow", "Color mode"))
         self.gammaLabel.setText(_translate("mainWindow", "Gamma: Auto"))

kcc/__init__.py

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