bump 9.2.2

* Make webtoon tall error more informative

* fix mistake

.gitignore

@@ -8,6 +8,7 @@ dist/
 build/
 KindleComicConverter*.egg-info/
 .idea/
+.vscode/
 win7
 osx10.11
 /venv/

README.md

@@ -274,6 +274,7 @@ OUTPUT SETTINGS:
   --spreadshift         Shift first page to opposite side in landscape for two page spread alignment
   --norotate            Do not rotate double page spreads in spread splitter option.
   --rotatefirst         Put rotated spread first in spread splitter option.
+  --filefusion          Combines all input files into a single file.
   --eraserainbow       Erase rainbow effect on color eink screen by attenuating interfering frequencies
 
 CUSTOM PROFILE:

gui/KCC.ui

@@ -416,7 +416,7 @@
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of the target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="maximum">
-          <number>3200</number>
+          <number>6000</number>
          </property>
         </widget>
        </item>
@@ -442,7 +442,7 @@
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of the target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="maximum">
-          <number>5120</number>
+          <number>8000</number>
          </property>
         </widget>
        </item>

kindlecomicconverter/KCC_gui.py

@@ -876,6 +876,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             GUI.chunkSizeCheckBox.setChecked(False)
         elif not GUI.webtoonBox.isChecked():
             GUI.chunkSizeCheckBox.setEnabled(True)
+        if GUI.formats[str(GUI.formatBox.currentText())]['format'] in ('CBZ', 'PDF') and not GUI.webtoonBox.isChecked():
+            self.addMessage("Partially check W/B Margins if you don't want KCC to extend the image margins.", 'info')   
 
     def stripTags(self, html):
         s = HTMLStripper()

kindlecomicconverter/KCC_ui.py

@@ -221,7 +221,7 @@ class Ui_mainWindow(object):
 
         self.widthBox = QSpinBox(self.customWidget)
         self.widthBox.setObjectName(u"widthBox")
-        self.widthBox.setMaximum(3200)
+        self.widthBox.setMaximum(6000)
 
         self.gridLayout_3.addWidget(self.widthBox, 0, 1, 1, 1)
 
@@ -234,7 +234,7 @@ class Ui_mainWindow(object):
 
         self.heightBox = QSpinBox(self.customWidget)
         self.heightBox.setObjectName(u"heightBox")
-        self.heightBox.setMaximum(5120)
+        self.heightBox.setMaximum(8000)
 
         self.gridLayout_3.addWidget(self.heightBox, 0, 3, 1, 1)
 

kindlecomicconverter/__init__.py

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

kindlecomicconverter/comic2ebook.py

@@ -71,12 +71,23 @@ def main(argv=None):
     if len(sources) == 0:
         print('No matching files found.')
         return 1
+    if options.filefusion:
+        fusion_path = makeFusion(list(sources))
+        sources.clear()
+        sources.add(fusion_path)
     for source in sources:
         source = source.rstrip('\\').rstrip('/')
         options = copy(args)
         options = checkOptions(options)
         print('Working on ' + source + '...')
         makeBook(source)
+
+    if options.filefusion:
+        for path in sources:
+            if os.path.isfile(path):
+                os.remove(path)
+            elif os.path.isdir(path):
+                rmtree(path, True)
     return 0
 
 
@@ -1330,6 +1341,8 @@ def makeParser():
                                 help="Disable autocontrast.")
     output_options.add_argument("--colorautocontrast", action="store_true", dest="colorautocontrast", default=False,
                                 help="Autocontrast color pages too. Skipped for pages without near blacks or whites.")
+    output_options.add_argument("--filefusion", action="store_true", dest="filefusion", default=False,
+                                help="Combines all input files into a single file.")
     processing_options.add_argument("-c", "--cropping", type=int, dest="cropping", default="2",
                                     help="Set cropping mode. 0: Disabled 1: Margins 2: Margins + page numbers [Default=2]")
     processing_options.add_argument("--cp", "--croppingpower", type=float, dest="croppingp", default="1.0",

kindlecomicconverter/comic2panel.py

@@ -62,8 +62,8 @@ def mergeDirectory(work):
                 imagesValid.append(i[0])
             # Silently drop directories that contain too many images
             # 131072 = GIMP_MAX_IMAGE_SIZE / 4
-            if targetHeight > 131072 * 2:
+            if targetHeight > 131072 * 3:
-                raise RuntimeError(f'Image too tall at {targetHeight} pixels.')
+                raise RuntimeError(f'Image too tall at {targetHeight} pixels. {targetWidth} pixels wide. Try using separate chapter folders or file fusion.')
             result = Image.new('RGB', (targetWidth, targetHeight))
             y = 0
             for i in imagesValid:

kindlecomicconverter/image.py

@@ -548,7 +548,7 @@ class Cover:
 
     def process(self):
         self.image = self.image.convert('RGB')
-        self.image = ImageOps.autocontrast(self.image)
+        self.image = ImageOps.autocontrast(self.image, preserve_tone=True)
         if not self.options.forcecolor:
             self.image = self.image.convert('L')
         self.crop_main_cover()