bump to 9.7.1

* add youtube, discord, humble buttons

* restore margins of top buttons

* fix button height on windows

* don't bold messages

.github/workflows/package-windows7.yml

@@ -50,6 +50,17 @@ jobs:
         with:
           name: windows7-build
           path: dist/*.exe
+      - id: optional_step_id
+        uses: signpath/github-action-submit-signing-request@v2.0
+        if: ${{ github.repository == 'ciromattia/kcc' }}
+        with:
+         api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+         organization-id: '1dc1bad6-4a8c-4f85-af30-5c5d3d392ea6'
+         project-slug: 'kcc'
+         signing-policy-slug: 'release-signing'
+         github-artifact-id: '${{ steps.upload-unsigned-artifact.outputs.artifact-id }}'
+         wait-for-completion: true
+         output-artifact-directory: 'dist/'
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')

README.md

@@ -270,14 +270,19 @@ PROCESSING:
                         Crop empty sections. 0: Disabled 1: Horizontally 2: Both [Default=0]
   --blackborders        Disable autodetection and force black borders
   --whiteborders        Disable autodetection and force white borders
+  --nosmartcovercrop    Disable attempt to crop main cover from wide image
   --coverfill           Center-crop only the cover to fill target device screen
   --forcecolor          Don't convert images to grayscale
-  --forcepng            Create PNG files instead JPEG
+  --forcepng            Create PNG files instead JPEG for black and white images
+  --webp                Replace JPG with lossy WEBP and PNG with lossless WEBP
+  --force-png-rgb       Force color images to be saved as PNG
+  --pnglegacy           Use a more compatible 8 bit PNG instead of 4 bit.
   --noquantize          Don't quantize PNG images to 16 colors
   --mozjpeg             Create JPEG files using mozJpeg
   --jpeg-quality        The JPEG quality, on a scale from 0 (worst) to 95 (best). Default 85 for most devices.
   --maximizestrips      Turn 1x4 strips to 2x2 strips
   -d, --delete          Delete source file(s) or a directory. It's not recoverable.
+  --tempdir             Create temporary files directory on source file drive.
 
 OUTPUT SETTINGS:
   -o OUTPUT, --output OUTPUT

kindlecomicconverter/KCC_gui.py

@@ -195,7 +195,7 @@ class VersionThread(QThread):
                         icon = 'bindle'
                     if category == 'kofi':
                         icon = 'kofi'
-                    message = f"<b>{payload.get('name')}</b>"
+                    message = f"{payload.get('name')}"
                     if payload.get('link'):
                         message = '<a href="{}"><b>{}</b></a>'.format(payload.get('link'), payload.get('name'))
                     if payload.get('showDeadline'):
@@ -331,6 +331,8 @@ class WorkerThread(QThread):
             options.pdfextract = True
         if GUI.pdfWidthBox.isChecked():
             options.pdfwidth = True
+        if GUI.noSmartCoverCropBox.isChecked():
+            options.nosmartcovercrop = True
         if GUI.coverFillBox.isChecked():
             options.coverfill = True
         if GUI.metadataTitleBox.checkState() == Qt.CheckState.PartiallyChecked:
@@ -339,6 +341,8 @@ class WorkerThread(QThread):
             options.metadatatitle = 2
         if GUI.deleteBox.isChecked():
             options.delete = True
+        if GUI.tempDirBox.isChecked():
+            options.tempdir = True
         if GUI.spreadShiftBox.isChecked():
             options.spreadshift = True
         if GUI.fileFusionBox.isChecked():
@@ -351,10 +355,16 @@ class WorkerThread(QThread):
             options.rotateright = True
         if GUI.rotateFirstBox.isChecked():
             options.rotatefirst = True
+        if GUI.forcePngRgbBox.isChecked():
+            options.force_png_rgb = True
         if GUI.mozJpegBox.checkState() == Qt.CheckState.PartiallyChecked:
             options.forcepng = True
         elif GUI.mozJpegBox.checkState() == Qt.CheckState.Checked:
             options.mozjpeg = True
+        if GUI.webpBox.isChecked():
+            options.webp = True
+        if GUI.pngLegacyBox.isChecked():
+            options.pnglegacy = True
         if GUI.noQuantizeBox.isChecked():
             options.noquantize = True
         if GUI.jpegQualityBox.isChecked():
@@ -688,6 +698,18 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         # noinspection PyCallByClass
         QDesktopServices.openUrl(QUrl('https://ko-fi.com/eink_dude'))
 
+    def openHumble(self):
+        # noinspection PyCallByClass
+        QDesktopServices.openUrl(QUrl('https://humblebundleinc.sjv.io/3JaR3A'))
+
+    def openYouTube(self):
+        # noinspection PyCallByClass
+        QDesktopServices.openUrl(QUrl('https://www.youtube.com/@eink-dude'))
+    
+    def openDiscord(self):
+        # noinspection PyCallByClass
+        QDesktopServices.openUrl(QUrl('https://discord.gg/um5JRKwmGT'))
+
     def modeChange(self, mode):
         if mode == 1:
             self.currentMode = 1
@@ -822,6 +844,14 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                     if bad_format in current_format:
                         self.addMessage('Scribe PNG MOBI/EPUB has a lot of problems like blank pages/sections. Use JPG instead.', 'warning')
                         break
+            GUI.pngLegacyBox.setEnabled(True)
+            GUI.noQuantizeBox.setEnabled(True)
+            GUI.forcePngRgbBox.setEnabled(True)
+        else:
+            GUI.pngLegacyBox.setEnabled(False)
+            GUI.noQuantizeBox.setEnabled(False)
+            GUI.forcePngRgbBox.setEnabled(False)           
+
 
     def togglechunkSizeCheckBox(self, value):
         GUI.chunkSizeWidget.setVisible(value)
@@ -892,6 +922,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         elif profile['Label'] == 'KDX':
             GUI.mozJpegBox.setCheckState(Qt.CheckState.PartiallyChecked)
             GUI.borderBox.setCheckState(Qt.CheckState.PartiallyChecked)
+            GUI.pngLegacyBox.setChecked(True)
         if not profile['PVOptions']:
             GUI.qualityBox.setChecked(False)
         if str(GUI.deviceBox.currentText()) == 'Other':
@@ -1048,15 +1079,20 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                                            'disableProcessingBox': GUI.disableProcessingBox.checkState(),
                                            'pdfExtractBox': GUI.pdfExtractBox.checkState(),
                                            'pdfWidthBox': GUI.pdfWidthBox.checkState(),
+                                           'noSmartCoverCropBox': GUI.noSmartCoverCropBox.checkState(),
                                            'coverFillBox': GUI.coverFillBox.checkState(),
                                            'metadataTitleBox': GUI.metadataTitleBox.checkState(),
                                            'mozJpegBox': GUI.mozJpegBox.checkState(),
+                                           'forcePngRgbBox': GUI.forcePngRgbBox.checkState(),
+                                           'webpBox': GUI.webpBox.checkState(),
+                                           'pngLegacyBox': GUI.pngLegacyBox.checkState(),
                                            'noQuantizeBox': GUI.noQuantizeBox.checkState(),
                                            'jpegQualityBox': GUI.jpegQualityBox.checkState(),
                                            'jpegQuality': GUI.jpegQualitySpinBox.value(),
                                            'widthBox': GUI.widthBox.value(),
                                            'heightBox': GUI.heightBox.value(),
                                            'deleteBox': GUI.deleteBox.checkState(),
+                                           'tempDirBox': GUI.tempDirBox.checkState(),
                                            'spreadShiftBox': GUI.spreadShiftBox.checkState(),
                                            'fileFusionBox': GUI.fileFusionBox.checkState(),
                                            'defaultOutputFolderBox': GUI.defaultOutputFolderBox.checkState(),
@@ -1184,7 +1220,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                             'convertButton', 'formatBox']:
                 getattr(GUI, element).setMinimumSize(QSize(0, 0))
             GUI.gridLayout.setContentsMargins(-1, -1, -1, -1)
-            for element in ['gridLayout_2', 'gridLayout_3', 'gridLayout_4', 'horizontalLayout', 'horizontalLayout_2']:
+            for element in ['gridLayout_2', 'gridLayout_3', 'gridLayout_4', 'gridLayout_6', 'horizontalLayout_2']:
                 getattr(GUI, element).setContentsMargins(-1, 0, -1, 0)
             if self.windowSize == '0x0':
                 MW.resize(500, 500)
@@ -1392,6 +1428,9 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         GUI.editorButton.clicked.connect(self.selectFileMetaEditor)
         GUI.wikiButton.clicked.connect(self.openWiki)
         GUI.kofiButton.clicked.connect(self.openKofi)
+        GUI.humbleButton.clicked.connect(self.openHumble)
+        GUI.youtubeButton.clicked.connect(self.openYouTube)
+        GUI.discordButton.clicked.connect(self.openDiscord)
         GUI.convertButton.clicked.connect(self.convertStart)
         GUI.gammaSlider.valueChanged.connect(self.changeGamma)
         GUI.gammaBox.stateChanged.connect(self.togglegammaBox)

kindlecomicconverter/__init__.py

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

kindlecomicconverter/comic2ebook.py

@@ -310,6 +310,15 @@ def buildOPF(dstdir, title, filelist, originalpath, cover=None):
         f.writelines(["<dc:description>", hescape(options.summary), "</dc:description>\n"])
     for author in options.authors:
         f.writelines(["<dc:creator>", hescape(author), "</dc:creator>\n"])
+    if not options.iskindle and options.series:
+        f.writelines(['<meta property="belongs-to-collection" id="c02">', hescape(options.series), "</meta>\n"])
+        f.writelines(['<meta refines="#c02" property="collection-type">', "series", "</meta>\n"])
+        if options.volume and options.number:
+            f.writelines(['<meta refines="#c02" property="group-position">', hescape(f"{options.volume}.{options.number}"), "</meta>\n"])
+        elif options.volume:
+            f.writelines(['<meta refines="#c02" property="group-position">', hescape(options.volume), "</meta>\n"])
+        elif options.number:
+            f.writelines(['<meta refines="#c02" property="group-position">', hescape(options.number), "</meta>\n"])
     f.write("<meta property=\"dcterms:modified\">" + strftime("%Y-%m-%dT%H:%M:%SZ", gmtime()) + "</meta>\n")
     if cover:
         f.write("<meta name=\"cover\" content=\"cover\"/>\n")
@@ -353,6 +362,8 @@ def buildOPF(dstdir, title, filelist, originalpath, cover=None):
             mt = 'image/png'
         elif '.gif' == filename[1]:
             mt = 'image/gif'
+        elif '.webp' == filename[1]:
+            mt = 'image/webp'
         else:
             mt = 'image/jpeg'
         f.write("<item id=\"img_" + str(uniqueid) + "\" href=\"" + folder + "/" + path[1] + "\" media-type=\"" +
@@ -545,7 +556,7 @@ def buildEPUB(path, chapternames, tomenumber, ischunked, cover: image.Cover, ori
     f.close()
     build_html_start = perf_counter()
     if cover:
-        cover.save_to_epub(os.path.join(path, 'OEBPS', 'Images', 'cover.jpg'), tomenumber, len_tomes)
+        cover.save_to_folder(os.path.join(path, 'OEBPS', 'Images', 'cover.jpg'), tomenumber, len_tomes)
     dot_clean(path)
     options.covers.append((cover, options.uuid))
     for dirpath, dirnames, filenames in os.walk(os.path.join(path, 'OEBPS', 'Images')):
@@ -689,7 +700,6 @@ def imgFileProcessing(work):
         workImg = image.ComicPageParser((dirpath, afile), opt)
         for i in workImg.payload:
             img = image.ComicPage(opt, *i)
-            is_color = (opt.forcecolor and img.color)
             if opt.cropping == 2 and not opt.webtoon:
                 img.cropPageNumber(opt.croppingp, opt.croppingm)
             if opt.cropping == 1 and not opt.webtoon:
@@ -699,22 +709,24 @@ def imgFileProcessing(work):
 
             img.gammaCorrectImage()
 
+            if not img.colorOutput:
+                img.convertToGrayscale()
+
             img.autocontrastImage()
             img.resizeImage()
-            img.optimizeForDisplay(opt.eraserainbow, is_color)
+            img.optimizeForDisplay(opt.eraserainbow, img.colorOutput)
 
-            if is_color:
+            if img.colorOutput:
                 pass
             elif opt.forcepng:
-                img.convertToGrayscale()
                 if not opt.noquantize:
                     img.quantizeImage()
                 if opt.format == 'PDF':
                     img.convertToGrayscale()
                 elif opt.profile == 'KDX' and opt.format == 'CBZ':
                     img.convertToGrayscale()
-            else:
-                img.convertToGrayscale()
+                elif opt.pnglegacy:
+                    img.convertToGrayscale()
             output.append(img.saveToDir())
         return output
     except Exception:
@@ -862,7 +874,8 @@ def mupdf_pdf_process_pages_parallel(filename, output_dir, target_width, target_
 def getWorkFolder(afile, workdir=None):
     if not workdir:
         workdir = mkdtemp('', 'KCC-')
-        # workdir = mkdtemp('', 'KCC-', os.path.dirname(afile))
+        if options.tempdir:
+            workdir = mkdtemp('', 'KCC-', os.path.dirname(afile))
         fullPath = os.path.join(workdir, 'OEBPS', 'Images')
     else:
         fullPath = workdir
@@ -892,9 +905,11 @@ def getWorkFolder(afile, workdir=None):
                 return workdir
             target_width, target_height = options.profileData[1]
             if options.cropping == 1:
-                target_height = target_height + target_height*0.20 #Account for possible margin at the top and bottom
+                target_height *= 1.2 #Account for possible margin at the top and bottom
+                target_width *= 1.2
             elif options.cropping == 2:
-                target_height = target_height + target_height*0.25 #Account for possible margin at the top and bottom with page number
+                target_height *= 1.25 #Account for possible margin at the top and bottom with page number
+                target_width *= 1.25
             try:
                 mupdf_pdf_process_pages_parallel(afile, fullPath, target_width, target_height)
             except Exception as e:
@@ -987,6 +1002,9 @@ def getMetadata(path, originalpath):
     options.comicinfo_chapters = []
     options.summary = ''
     titleSuffix = ''
+    options.volume = ''
+    options.number = ''
+    options.series = ''
     if options.title == 'defaulttitle':
         defaultTitle = True
         if os.path.isdir(originalpath):
@@ -1015,8 +1033,10 @@ def getMetadata(path, originalpath):
                 options.title = xml.data['Series']
             if xml.data['Volume']:
                 titleSuffix += ' Vol. ' + xml.data['Volume'].zfill(2)
+                options.volume = xml.data['Volume']
             if xml.data['Number']:
                 titleSuffix += ' #' + xml.data['Number'].zfill(3)
+                options.number = xml.data['Number']
             if options.metadatatitle == 1 and xml.data['Title']:
                 titleSuffix += ': ' + xml.data['Title']
             options.title += titleSuffix
@@ -1034,6 +1054,8 @@ def getMetadata(path, originalpath):
             options.comicinfo_chapters = xml.data['Bookmarks']
         if xml.data['Summary']:
             options.summary = xml.data['Summary']
+        if xml.data['Series']:
+            options.series = xml.data['Series']
         os.remove(xmlPath)
 
     if originalpath.lower().endswith('.pdf'):
@@ -1294,12 +1316,12 @@ def makeZIP(zipfilename, basedir, job_progress='', isepub=False):
             mimetypeFile = open(os.path.join(basedir, '!mimetype'), 'w')
             mimetypeFile.write('application/epub+zip')
             mimetypeFile.close()
-        subprocess_run([SEVENZIP, 'a', '-tzip', zipfilename, "*"], capture_output=True, check=True, cwd=basedir)
+        subprocess_run([SEVENZIP, 'a', '-mx0', '-tzip', zipfilename, "*"], capture_output=True, check=True, cwd=basedir)
         # crazy hack to ensure mimetype is first when using 7zip
         if isepub:
             subprocess_run([SEVENZIP, 'rn', zipfilename, '!mimetype', 'mimetype'], capture_output=True, check=True, cwd=basedir)
     else:
-        zipOutput = ZipFile(zipfilename, 'w', ZIP_DEFLATED)
+        zipOutput = ZipFile(zipfilename, 'w', ZIP_STORED)
         if isepub:
             zipOutput.writestr('mimetype', 'application/epub+zip', ZIP_STORED)
         for dirpath, _, filenames in os.walk(basedir):
@@ -1373,6 +1395,8 @@ def makeParser():
                                     help="Use the legacy PDF image extraction method from KCC 8 and earlier")
     processing_options.add_argument("--pdfwidth", action="store_true", dest="pdfwidth", default=False,
                                     help="Render vector PDFs to device width instead of height.")
+    processing_options.add_argument("--nosmartcovercrop", action="store_true", dest="nosmartcovercrop", default=False,
+                                    help="Disable attempt to crop main cover from wide image")
     processing_options.add_argument("--coverfill", action="store_true", dest="coverfill", default=False,
                                     help="Crop cover to fill screen")
     processing_options.add_argument("-u", "--upscale", action="store_true", dest="upscale", default=False,
@@ -1410,7 +1434,13 @@ def makeParser():
     output_options.add_argument("--eraserainbow", action="store_true", dest="eraserainbow", default=False,
                                 help="Erase rainbow effect on color eink screen by attenuating interfering frequencies")
     processing_options.add_argument("--forcepng", action="store_true", dest="forcepng", default=False,
-                                    help="Create PNG files instead JPEG")
+                                    help="Create PNG files instead JPEG for black and white images")
+    processing_options.add_argument("--force-png-rgb", action="store_true", dest="force_png_rgb", default=False,
+                                    help="Force color images to be saved as PNG")
+    processing_options.add_argument("--webp", action="store_true", dest="webp", default=False,
+                                    help="Replace JPG with lossy WEBP and PNG with lossless WEBP")
+    processing_options.add_argument("--pnglegacy", action="store_true", dest="pnglegacy", default=False,
+                                    help="Use a more compatible 8 bit png instead of 4 bit")
     processing_options.add_argument("--noquantize", action="store_true", dest="noquantize", default=False,
                                     help="Don't quantize to 16 color PNG")
     processing_options.add_argument("--mozjpeg", action="store_true", dest="mozjpeg", default=False,
@@ -1421,6 +1451,8 @@ def makeParser():
                                     help="Turn 1x4 strips to 2x2 strips")
     processing_options.add_argument("-d", "--delete", action="store_true", dest="delete", default=False,
                                     help="Delete source file(s) or a directory. It's not recoverable.")
+    processing_options.add_argument("--tempdir", action="store_true", dest="tempdir", default=False,
+                                    help="Create temporary files directory on source file drive.")
 
     custom_profile_options.add_argument("--customwidth", type=int, dest="customwidth", default=0,
                                         help="Replace screen width provided by device profile")
@@ -1528,6 +1560,8 @@ def checkOptions(options):
     options.kindle_azw3 = options.iskindle and ('MOBI' in options.format or 'EPUB' in options.format)
     options.kindle_scribe_azw3 = options.profile.startswith('KS') and options.kindle_azw3
 
+    options.webp_output = options.format != 'PDF' and not options.kindle_azw3 and options.webp
+
     # CBZ files on Kindle DX/DXG support higher resolution
     if options.profile == 'KDX' and options.format == 'CBZ':
         options.profileData = list(image.ProfileData.Profiles[options.profile])
@@ -1681,12 +1715,16 @@ def makeBook(source, qtgui=None, job_progress=''):
                 filepath.append(getOutputFilename(source, options.output, '.cbz', ' ' + str(tomeNumber)))
             else:
                 filepath.append(getOutputFilename(source, options.output, '.cbz', ''))
+            if cover.smartcover:
+                cover.save_to_folder(os.path.join(tome, 'OEBPS', 'Images', 'cover.jpg'), tomeNumber, len(tomes))
             makeZIP(tome + '_comic', os.path.join(tome, "OEBPS", "Images"), job_progress)
         elif options.format == 'PDF':
             print(f"{job_progress}Creating PDF file with PyMuPDF...")
             # determine output filename based on source and tome count
             suffix = (' ' + str(tomeNumber)) if len(tomes) > 1 else ''
             output_file = getOutputFilename(source, options.output, '.pdf', suffix)
+            if cover.smartcover:
+                cover.save_to_folder(os.path.join(tome, 'OEBPS', 'Images', 'cover.jpg'), tomeNumber, len(tomes))
             # use optimized buildPDF logic with streaming and compression
             output_pdf = buildPDF(tome, options.title, job_progress, None, output_file)
             filepath.append(output_pdf)

kindlecomicconverter/image.py

@@ -203,7 +203,7 @@ class ComicPageParser:
                     spread = spread.rotate(-90, Image.Resampling.BICUBIC, True)
             self.payload.append(['R', self.source, spread, self.fill])
         elif (width > height) != (dstwidth > dstheight) and not self.opt.webtoon:
-            if self.opt.splitter != 1:
+            if self.opt.splitter != 1 and width / height < 2:
                 if width > height:
                     leftbox = (0, 0, int(width / 2), height)
                     rightbox = (int(width / 2), 0, width, height)
@@ -218,7 +218,7 @@ class ComicPageParser:
                     pagetwo = self.image.crop(rightbox)
                 self.payload.append(['S1', self.source, pageone, self.fill])
                 self.payload.append(['S2', self.source, pagetwo, self.fill])
-            if self.opt.splitter > 0:
+            if self.opt.splitter > 0 or (self.opt.splitter == 0 and width / height >= 2):
                 spread = self.image
                 if not self.opt.norotate:
                     if not self.opt.rotateright:
@@ -277,6 +277,8 @@ class ComicPage:
         self.original_color_mode = image.mode
         # TODO: color check earlier
         self.image = image.convert("RGB")
+        self.color = self.colorCheck()
+        self.colorOutput = self.color and self.opt.forcecolor
         self.fill = fill
         self.rotated = False
         self.orgPath = os.path.join(path[0], path[1])
@@ -295,8 +297,7 @@ class ComicPage:
         if not hasattr(Image, 'Resampling'):
             Image.Resampling = Image
 
-    @cached_property
-    def color(self):
+    def colorCheck(self):
         if self.original_color_mode in ("L", "1"):
             return False
         if self.opt.webtoon:
@@ -405,17 +406,23 @@ class ComicPage:
             raise RuntimeError('Cannot save image. ' + str(err))
 
     def save_with_codec(self, image, targetPath):
-        if self.opt.forcepng:
+        if self.opt.forcepng and (not self.colorOutput or self.opt.force_png_rgb):
             image.info.pop('transparency', None)
-            if self.opt.iskindle and ('MOBI' in self.opt.format or 'EPUB' in self.opt.format):
+            if self.opt.webp_output:
+                targetPath += '.webp'
+                image.save(targetPath, 'WEBP', lossless=True, quality=self.opt.jpegquality)
+            elif self.opt.kindle_azw3:
                 targetPath += '.gif'
                 image.save(targetPath, 'GIF', optimize=1, interlace=False)
             else:
                 targetPath += '.png'
                 image.save(targetPath, 'PNG', optimize=1)
         else:
-            targetPath += '.jpg'
-            if self.opt.mozjpeg:
+            if self.opt.webp_output:
+                targetPath += '.webp'
+                image.save(targetPath, 'WEBP', quality=self.opt.jpegquality)
+            elif self.opt.mozjpeg:
+                targetPath += '.jpg'
                 with io.BytesIO() as output:
                     image.save(output, format="JPEG", optimize=1, quality=self.opt.jpegquality)
                     input_jpeg_bytes = output.getvalue()
@@ -423,6 +430,7 @@ class ComicPage:
                     with open(targetPath, "wb") as output_jpeg_file:
                         output_jpeg_file.write(output_jpeg_bytes)
             else:
+                targetPath += '.jpg'
                 image.save(targetPath, 'JPEG', optimize=1, quality=self.opt.jpegquality)
         return targetPath
 
@@ -517,7 +525,7 @@ class ComicPage:
                 self.image = ImageOps.contain(self.image, self.size, method=method)
 
     def resize_method(self):
-        if self.image.size[0] < self.size[0] and self.image.size[1] < self.size[1]:
+        if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]:
             return Image.Resampling.BICUBIC
         else:
             return Image.Resampling.LANCZOS
@@ -561,6 +569,7 @@ class Cover:
         self.options = opt
         self.source = source
         self.image = Image.open(source)
+        self.smartcover = False
         # backwards compatibility for Pillow >9.1.0
         if not hasattr(Image, 'Resampling'):
             Image.Resampling = Image
@@ -571,7 +580,8 @@ class Cover:
         self.image = ImageOps.autocontrast(self.image, preserve_tone=True)
         if not self.options.forcecolor:
             self.image = self.image.convert('L')
-        self.crop_main_cover()
+        if not self.options.nosmartcovercrop:
+            self.crop_main_cover()
 
         size = list(self.options.profileData[1])
         if self.options.kindle_scribe_azw3:
@@ -586,17 +596,19 @@ class Cover:
     def crop_main_cover(self):
         w, h = self.image.size
         if w / h > 2:
+            self.smartcover = True
             if self.options.righttoleft:
                 self.image = self.image.crop((w/6, 0, w/2 - w * 0.02, h))
             else:
                 self.image = self.image.crop((w/2 + w * 0.02, 0, 5/6 * w, h))
         elif w / h > 1.34:
+            self.smartcover = True
             if self.options.righttoleft:
                 self.image = self.image.crop((0, 0, w/2 - w * 0.03, h))
             else:
                 self.image = self.image.crop((w/2 + w * 0.03, 0, w, h))
 
-    def save_to_epub(self, target, tomeid, len_tomes=0):
+    def save_to_folder(self, target, tomeid, len_tomes=0):
         try:
             if tomeid == 0:
                 self.image.save(target, "JPEG", optimize=1, quality=self.options.jpegquality)