Bump version to 9.3.6

* Update requirements-osx-legacy.txt

* upgrade macos-13 to macos-15-intel

* upgrade macos-13 to macos-15-intel

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/docker-publish.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3

.github/workflows/package-linux.yml

@@ -25,7 +25,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
@@ -59,7 +59,7 @@ jobs:
       env:
         UPDATE_INFO: gh-releases-zsync|ciromattia|kcc|latest|*x86_64.AppImage.zsync
     - name: upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: AppImage
         path: './*.AppImage*'

.github/workflows/package-macos.yml

@@ -25,10 +25,10 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ macos-13, macos-14 ]
+        os: [ macos-15-intel, macos-14 ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -78,7 +78,7 @@ jobs:
         run: |
           python setup.py build_binary
       - name: upload build
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: mac-os-build-${{ runner.arch }}
           path: dist/*.dmg

.github/workflows/package-osx-legacy.yml

@@ -23,7 +23,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ macos-13 ]
+        os: [ macos-15-intel ]
     runs-on: ${{ matrix.os }}
     env:
       # We need the official Python, because the GA ones only support newer macOS versions
@@ -31,7 +31,7 @@ jobs:
       PYTHON_VERSION: 3.11.9
       MACOSX_DEPLOYMENT_TARGET: '10.14'
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Get Python
         run: curl https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg -o "python.pkg"
       - name: Install Python
@@ -51,7 +51,7 @@ jobs:
         run: |
           python3 setup.py build_binary
       - name: upload build
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: osx-build-${{ runner.arch }}
           path: dist/*.dmg

.github/workflows/package-windows.yml

@@ -35,7 +35,7 @@ jobs:
             command: build_c2p
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -53,12 +53,12 @@ jobs:
           python setup.py ${{ matrix.command }}
       - name: upload-unsigned-artifact
         id: upload-unsigned-artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: windows-build-${{ matrix.entry }}
           path: dist/*.exe
       - id: optional_step_id
-        uses: signpath/github-action-submit-signing-request@v1.3
+        uses: signpath/github-action-submit-signing-request@v2.0
         if: ${{ github.repository == 'ciromattia/kcc' }}
         with:
          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'

.github/workflows/package-windows7.yml

@@ -27,7 +27,7 @@ jobs:
     env:
       WINDOWS_7: 1
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -46,7 +46,7 @@ jobs:
           python setup.py build_binary
       - name: upload-unsigned-artifact
         id: upload-unsigned-artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: windows7-build
           path: dist/*.exe

README.md

@@ -104,7 +104,7 @@ For flatpak, Docker, and AppImage versions, refer to the wiki: https://github.co
 
 ## FAQ
 - Should I use Calibre?
-  - No. Calibre doesn't properly support fixed layout EPUB/MOBI, so modifying KCC output (even just metadata!) in Calibre will break the formatting.
+  - No. Calibre doesn't properly support fixed layout EPUB/MOBI, so modifying KCC output (even just metadata!) in Calibre can break the formatting.
     Viewing KCC output in Calibre will also not work properly.
     On 7th gen and later Kindles running firmware 5.15.1+, you can get cover thumbnails simply by USB dropping into documents folder.
     On 6th gen and older, you can get cover thumbnails by keeping Kindle plugged in during conversion.
@@ -318,6 +318,7 @@ Depending on your system [Python](https://www.python.org) may be called either `
 If you want to edit the code, a good code editor is [VS Code](https://code.visualstudio.com).
 
 If you want to edit the `.ui` files, use `pyside6-designer` which is included in the `pip install pyside6`.
+If new objects have been added, verify that correct tab order has been applied by using [Tab Order Editing Mode](https://doc.qt.io/qt-6/designer-tab-order.html).
 Then use the `gen_ui_files` scripts to autogenerate the python UI.
 
 An example PR adding a new checkbox is here: https://github.com/ciromattia/kcc/pull/785

gui/KCC.ui

@@ -65,7 +65,7 @@
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Enable right-to-left reading.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="text">
-          <string>Right-to-left mode</string>
+          <string>Right-to-left (manga)</string>
          </property>
         </widget>
        </item>
@@ -898,36 +898,47 @@
   </widget>
  </widget>
  <tabstops>
-  <tabstop>convertButton</tabstop>
+  <tabstop>jobList</tabstop>
+  <tabstop>fileButton</tabstop>
   <tabstop>clearButton</tabstop>
+  <tabstop>defaultOutputFolderButton</tabstop>
+  <tabstop>defaultOutputFolderBox</tabstop>
   <tabstop>deviceBox</tabstop>
+  <tabstop>widthBox</tabstop>
+  <tabstop>heightBox</tabstop>
   <tabstop>formatBox</tabstop>
+  <tabstop>convertButton</tabstop>
   <tabstop>mangaBox</tabstop>
   <tabstop>rotateBox</tabstop>
   <tabstop>qualityBox</tabstop>
   <tabstop>webtoonBox</tabstop>
   <tabstop>upscaleBox</tabstop>
   <tabstop>gammaBox</tabstop>
+  <tabstop>gammaSlider</tabstop>
   <tabstop>borderBox</tabstop>
   <tabstop>outputSplit</tabstop>
   <tabstop>colorBox</tabstop>
   <tabstop>mozJpegBox</tabstop>
   <tabstop>maximizeStrips</tabstop>
   <tabstop>croppingBox</tabstop>
+  <tabstop>croppingPowerSlider</tabstop>
+  <tabstop>preserveMarginBox</tabstop>
   <tabstop>spreadShiftBox</tabstop>
   <tabstop>deleteBox</tabstop>
   <tabstop>disableProcessingBox</tabstop>
-  <tabstop>chunkSizeBox</tabstop>
+  <tabstop>fileFusionBox</tabstop>
   <tabstop>noRotateBox</tabstop>
   <tabstop>interPanelCropBox</tabstop>
+  <tabstop>metadataTitleBox</tabstop>
+  <tabstop>chunkSizeCheckBox</tabstop>
+  <tabstop>chunkSizeBox</tabstop>
   <tabstop>eraseRainbowBox</tabstop>
-  <tabstop>heightBox</tabstop>
+  <tabstop>rotateFirstBox</tabstop>
-  <tabstop>croppingPowerSlider</tabstop>
+  <tabstop>autoLevelBox</tabstop>
+  <tabstop>autocontrastBox</tabstop>
   <tabstop>editorButton</tabstop>
+  <tabstop>kofiButton</tabstop>
   <tabstop>wikiButton</tabstop>
-  <tabstop>jobList</tabstop>
-  <tabstop>gammaSlider</tabstop>
-  <tabstop>widthBox</tabstop>
  </tabstops>
  <resources>
   <include location="KCC.qrc"/>

gui/MetaEditor.ui

@@ -192,6 +192,18 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>seriesLine</tabstop>
+  <tabstop>volumeLine</tabstop>
+  <tabstop>titleLine</tabstop>
+  <tabstop>numberLine</tabstop>
+  <tabstop>writerLine</tabstop>
+  <tabstop>pencillerLine</tabstop>
+  <tabstop>inkerLine</tabstop>
+  <tabstop>coloristLine</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
  <resources>
   <include location="KCC.qrc"/>
  </resources>

kindlecomicconverter/KCC_gui.py

@@ -382,13 +382,14 @@ class WorkerThread(QThread):
             error_message = 'Process Failed. Custom title can\'t be set when processing more than 1 source.\nDid you forget to check fusion?'
             print(error_message)
             MW.addMessage.emit(error_message, 'error', True)
-        for job in currentJobs:
+        for i, job in enumerate(currentJobs, start=1):
+            job_progress_number = f'[{i}/{len(currentJobs)}] '
             sleep(0.5)
             if not self.conversionAlive:
                 self.clean()
                 return
             self.errors = False
-            MW.addMessage.emit('<b>Source:</b> ' + job, 'info', False)
+            MW.addMessage.emit(f'<b>{job_progress_number}Source:</b> ' + job, 'info', False)
             if gui_current_format == 'CBZ':
                 MW.addMessage.emit('Creating CBZ files', 'info', False)
                 GUI.progress.content = 'Creating CBZ files'
@@ -402,7 +403,7 @@ class WorkerThread(QThread):
             jobargv.append(job)
             try:
                 comic2ebook.options = comic2ebook.checkOptions(copy(options))
-                outputPath = comic2ebook.makeBook(job, self)
+                outputPath = comic2ebook.makeBook(job, self, job_progress_number)
                 MW.hideProgressBar.emit()
             except UserWarning as warn:
                 if not self.conversionAlive:
@@ -444,7 +445,7 @@ class WorkerThread(QThread):
                 else:
                     MW.addMessage.emit('Creating EPUB files... <b>Done!</b>', 'info', True)
                 if 'MOBI' in gui_current_format:
-                    MW.progressBarTick.emit('Creating MOBI files')
+                    MW.progressBarTick.emit(f'{job_progress_number}Creating MOBI files')
                     MW.progressBarTick.emit(str(len(outputPath) * 2 + 1))
                     MW.progressBarTick.emit('tick')
                     MW.addMessage.emit('Creating MOBI files', 'info', False)
@@ -1027,7 +1028,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         MW.activateWindow()
         if type(message) is bytes:
             message = message.decode('UTF-8')
-        if not self.conversionAlive and message != 'ARISE':
+        if not self.conversionAlive and message != 'ARISE' and not GUI.jobList.findItems(message, Qt.MatchFlag.MatchExactly):
             if self.needClean:
                 self.needClean = False
                 GUI.jobList.clear()
@@ -1058,6 +1059,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                 if message[-1] == '/':
                     message = message[:-1]
             self.handleMessage(message)
+        GUI.jobList.sortItems()
 
     def forceShutdown(self):
         self.saveSettings(None)

kindlecomicconverter/KCC_ui.py

@@ -469,35 +469,46 @@ class Ui_mainWindow(object):
         self.statusBar.setObjectName(u"statusBar")
         self.statusBar.setSizeGripEnabled(False)
         mainWindow.setStatusBar(self.statusBar)
-        QWidget.setTabOrder(self.convertButton, self.clearButton)
+        QWidget.setTabOrder(self.jobList, self.fileButton)
-        QWidget.setTabOrder(self.clearButton, self.deviceBox)
+        QWidget.setTabOrder(self.fileButton, self.clearButton)
-        QWidget.setTabOrder(self.deviceBox, self.formatBox)
+        QWidget.setTabOrder(self.clearButton, self.defaultOutputFolderButton)
-        QWidget.setTabOrder(self.formatBox, self.mangaBox)
+        QWidget.setTabOrder(self.defaultOutputFolderButton, self.defaultOutputFolderBox)
+        QWidget.setTabOrder(self.defaultOutputFolderBox, self.deviceBox)
+        QWidget.setTabOrder(self.deviceBox, self.widthBox)
+        QWidget.setTabOrder(self.widthBox, self.heightBox)
+        QWidget.setTabOrder(self.heightBox, self.formatBox)
+        QWidget.setTabOrder(self.formatBox, self.convertButton)
+        QWidget.setTabOrder(self.convertButton, self.mangaBox)
         QWidget.setTabOrder(self.mangaBox, self.rotateBox)
         QWidget.setTabOrder(self.rotateBox, self.qualityBox)
         QWidget.setTabOrder(self.qualityBox, self.webtoonBox)
         QWidget.setTabOrder(self.webtoonBox, self.upscaleBox)
         QWidget.setTabOrder(self.upscaleBox, self.gammaBox)
-        QWidget.setTabOrder(self.gammaBox, self.borderBox)
+        QWidget.setTabOrder(self.gammaBox, self.gammaSlider)
+        QWidget.setTabOrder(self.gammaSlider, self.borderBox)
         QWidget.setTabOrder(self.borderBox, self.outputSplit)
         QWidget.setTabOrder(self.outputSplit, self.colorBox)
         QWidget.setTabOrder(self.colorBox, self.mozJpegBox)
         QWidget.setTabOrder(self.mozJpegBox, self.maximizeStrips)
         QWidget.setTabOrder(self.maximizeStrips, self.croppingBox)
-        QWidget.setTabOrder(self.croppingBox, self.spreadShiftBox)
+        QWidget.setTabOrder(self.croppingBox, self.croppingPowerSlider)
+        QWidget.setTabOrder(self.croppingPowerSlider, self.preserveMarginBox)
+        QWidget.setTabOrder(self.preserveMarginBox, self.spreadShiftBox)
         QWidget.setTabOrder(self.spreadShiftBox, self.deleteBox)
         QWidget.setTabOrder(self.deleteBox, self.disableProcessingBox)
-        QWidget.setTabOrder(self.disableProcessingBox, self.chunkSizeBox)
+        QWidget.setTabOrder(self.disableProcessingBox, self.fileFusionBox)
-        QWidget.setTabOrder(self.chunkSizeBox, self.noRotateBox)
+        QWidget.setTabOrder(self.fileFusionBox, self.noRotateBox)
         QWidget.setTabOrder(self.noRotateBox, self.interPanelCropBox)
-        QWidget.setTabOrder(self.interPanelCropBox, self.eraseRainbowBox)
+        QWidget.setTabOrder(self.interPanelCropBox, self.metadataTitleBox)
-        QWidget.setTabOrder(self.eraseRainbowBox, self.heightBox)
+        QWidget.setTabOrder(self.metadataTitleBox, self.chunkSizeCheckBox)
-        QWidget.setTabOrder(self.heightBox, self.croppingPowerSlider)
+        QWidget.setTabOrder(self.chunkSizeCheckBox, self.chunkSizeBox)
-        QWidget.setTabOrder(self.croppingPowerSlider, self.editorButton)
+        QWidget.setTabOrder(self.chunkSizeBox, self.eraseRainbowBox)
-        QWidget.setTabOrder(self.editorButton, self.wikiButton)
+        QWidget.setTabOrder(self.eraseRainbowBox, self.rotateFirstBox)
-        QWidget.setTabOrder(self.wikiButton, self.jobList)
+        QWidget.setTabOrder(self.rotateFirstBox, self.autoLevelBox)
-        QWidget.setTabOrder(self.jobList, self.gammaSlider)
+        QWidget.setTabOrder(self.autoLevelBox, self.autocontrastBox)
-        QWidget.setTabOrder(self.gammaSlider, self.widthBox)
+        QWidget.setTabOrder(self.autocontrastBox, self.editorButton)
+        QWidget.setTabOrder(self.editorButton, self.kofiButton)
+        QWidget.setTabOrder(self.kofiButton, self.wikiButton)
 
         self.retranslateUi(mainWindow)
 
@@ -513,7 +524,7 @@ class Ui_mainWindow(object):
 #if QT_CONFIG(tooltip)
         self.mangaBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Enable right-to-left reading.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-        self.mangaBox.setText(QCoreApplication.translate("mainWindow", u"Right-to-left mode", None))
+        self.mangaBox.setText(QCoreApplication.translate("mainWindow", u"Right-to-left (manga)", None))
 #if QT_CONFIG(tooltip)
         self.webtoonBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Enable special parsing mode for Korean Webtoons.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)

kindlecomicconverter/KCC_ui_editor.py

@@ -156,6 +156,15 @@ class Ui_editorDialog(object):
 
         self.verticalLayout.addWidget(self.optionWidget)
 
+        QWidget.setTabOrder(self.seriesLine, self.volumeLine)
+        QWidget.setTabOrder(self.volumeLine, self.titleLine)
+        QWidget.setTabOrder(self.titleLine, self.numberLine)
+        QWidget.setTabOrder(self.numberLine, self.writerLine)
+        QWidget.setTabOrder(self.writerLine, self.pencillerLine)
+        QWidget.setTabOrder(self.pencillerLine, self.inkerLine)
+        QWidget.setTabOrder(self.inkerLine, self.coloristLine)
+        QWidget.setTabOrder(self.coloristLine, self.okButton)
+        QWidget.setTabOrder(self.okButton, self.cancelButton)
 
         self.retranslateUi(editorDialog)
 

kindlecomicconverter/__init__.py

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

kindlecomicconverter/comic2ebook.py

@@ -43,7 +43,7 @@ from psutil import virtual_memory, disk_usage
 from html import escape as hescape
 import pymupdf
 
-from .shared import getImageFileName, walkSort, walkLevel, sanitizeTrace, subprocess_run, dot_clean
+from .shared import IMAGE_TYPES, getImageFileName, walkSort, walkLevel, sanitizeTrace, subprocess_run, dot_clean
 from .comicarchive import SEVENZIP, available_archive_tools
 from . import comic2panel
 from . import image
@@ -456,7 +456,7 @@ def buildOPF(dstdir, title, filelist, originalpath, cover=None):
                   "</container>"])
     f.close()
 
-def buildEPUB(path, chapternames, tomenumber, ischunked, cover: image.Cover, originalpath, len_tomes=0):
+def buildEPUB(path, chapternames, tomenumber, ischunked, cover: image.Cover, originalpath, job_progress='', len_tomes=0):
     filelist = []
     chapterlist = []
     os.mkdir(os.path.join(path, 'OEBPS', 'Text'))
@@ -564,7 +564,7 @@ def buildEPUB(path, chapternames, tomenumber, ischunked, cover: image.Cover, ori
             else:
                 filelist.append(buildHTML(dirpath, afile, os.path.join(dirpath, afile)))
     build_html_end = perf_counter()
-    print(f"buildHTML: {build_html_end - build_html_start} seconds")
+    print(f"{job_progress}buildHTML: {build_html_end - build_html_start} seconds")
     # Overwrite chapternames if ComicInfo.xml has bookmarks
     if ischunked:
        options.comicinfo_chapters = []
@@ -600,7 +600,7 @@ def buildEPUB(path, chapternames, tomenumber, ischunked, cover: image.Cover, ori
     buildOPF(path, options.title, filelist, originalpath, cover)
 
 
-def buildPDF(path, title, cover=None, output_file=None):
+def buildPDF(path, title, job_progress='', cover=None, output_file=None):
     """
     Build a PDF file from processed comic images.
     Images are combined into a single PDF optimized for e-readers.
@@ -625,11 +625,11 @@ def buildPDF(path, title, cover=None, output_file=None):
         # Save with optimizations for smaller file size
         doc.save(output_file, deflate=True, garbage=4, clean=True)
     end = perf_counter()
-    print(f"MuPDF output: {end-start} sec")
+    print(f"{job_progress}MuPDF output: {end-start} sec")
     return output_file
 
 
-def imgDirectoryProcessing(path):
+def imgDirectoryProcessing(path, job_progress=''):
     global workerPool, workerOutput
     workerPool = Pool(maxtasksperchild=100)
     workerOutput = []
@@ -649,7 +649,7 @@ def imgDirectoryProcessing(path):
         workerPool.close()
         workerPool.join()
         img_processing_end = perf_counter()
-        print(f"imgFileProcessing: {img_processing_end - img_processing_start} seconds")
+        print(f"{job_progress}imgFileProcessing: {img_processing_end - img_processing_start} seconds")
 
         # macOS 15 likes to add ._ files after multiprocessing
         dot_clean(path)
@@ -870,6 +870,9 @@ def getWorkFolder(afile):
             raise UserWarning("Not enough disk space to perform conversion.")
         if afile.lower().endswith('.pdf'):
             workdir = mkdtemp('', 'KCC-', os.path.dirname(afile))
+            fullPath = os.path.join(workdir, 'OEBPS', 'Images')
+            if not os.path.exists(fullPath):
+                os.makedirs(fullPath)
             path = workdir
             sanitizePermissions(path)
             target_height = options.profileData[1][1]
@@ -878,39 +881,44 @@ def getWorkFolder(afile):
             elif options.cropping == 2:
                 target_height = target_height + target_height*0.25 #Account for possible margin at the top and bottom with page number
             try:
-                mupdf_pdf_process_pages_parallel(afile, workdir, target_height)
+                mupdf_pdf_process_pages_parallel(afile, fullPath, target_height)
             except Exception as e:
                 rmtree(path, True)
                 raise UserWarning(f"Failed to extract images from PDF file. {e}")
+            return workdir
         else:
             workdir = mkdtemp('', 'KCC-', os.path.dirname(afile))
+            fullPath = os.path.join(workdir, 'OEBPS', 'Images')
+            if not os.path.exists(fullPath):
+                os.makedirs(fullPath)
             try:
                 cbx = comicarchive.ComicArchive(afile)
-                path = cbx.extract(workdir)
+                path = cbx.extract(fullPath)
                 sanitizePermissions(path)
 
-                tdir = os.listdir(workdir)
+                tdir = os.listdir(fullPath)
                 if len(tdir) == 2 and 'ComicInfo.xml' in tdir:
                     tdir.remove('ComicInfo.xml')
-                    if os.path.isdir(os.path.join(workdir, tdir[0])):
+                    if os.path.isdir(os.path.join(fullPath, tdir[0])):
                         os.replace(
-                            os.path.join(workdir, 'ComicInfo.xml'),
+                            os.path.join(fullPath, 'ComicInfo.xml'),
-                            os.path.join(workdir, tdir[0], 'ComicInfo.xml')
+                            os.path.join(fullPath, tdir[0], 'ComicInfo.xml')
                         )
-                if len(tdir) == 1 and os.path.isdir(os.path.join(workdir, tdir[0])):
+                if len(tdir) == 1 and os.path.isdir(os.path.join(fullPath, tdir[0])):
-                    path = os.path.join(workdir, tdir[0])
+                    for file in os.listdir(os.path.join(fullPath, tdir[0])):
+                        move(os.path.join(fullPath, tdir[0], file), fullPath)
+                    os.rmdir(os.path.join(fullPath, tdir[0]))
+                return workdir
  
             except OSError as e:
                 rmtree(workdir, True)
                 raise UserWarning(e)
     else:
         raise UserWarning("Failed to open source file/directory.")
-    newpath = mkdtemp('', 'KCC-', os.path.dirname(afile))
-    os.renames(path, os.path.join(newpath, 'OEBPS', 'Images'))
-    return newpath
 
 
 def getOutputFilename(srcpath, wantedname, ext, tomenumber):
+    source_path = Path(srcpath)
     if srcpath[-1] == os.path.sep:
         srcpath = srcpath[:-1]
     if 'Ko' in options.profile and options.format == 'EPUB':
@@ -920,20 +928,29 @@ def getOutputFilename(srcpath, wantedname, ext, tomenumber):
         else:
             ext = '.kepub.epub'
     if wantedname is not None:
+        wanted_root, wanted_ext = os.path.splitext(wantedname)
         if wantedname.endswith(ext):
             filename = os.path.abspath(wantedname)
-        elif os.path.isdir(srcpath):
+        elif wanted_ext == '.mobi' and ext == '.epub':
-            filename = os.path.join(os.path.abspath(options.output), os.path.basename(srcpath) + ext)
+            filename = os.path.abspath(wanted_root + ext)
+        # output directory
         else:
-            filename = os.path.join(os.path.abspath(options.output),
+            abs_path = os.path.abspath(options.output)
-                                    os.path.basename(os.path.splitext(srcpath)[0]) + ext)
+            if not os.path.exists(abs_path):
+                os.mkdir(abs_path)
+            if source_path.is_file():
+                filename = os.path.join(os.path.abspath(options.output), source_path.stem + tomenumber + ext)
+            else:
+                filename = os.path.join(os.path.abspath(options.output), source_path.name + tomenumber + ext)
     elif os.path.isdir(srcpath):
         filename = srcpath + tomenumber + ext
     else:
         if 'Ko' in options.profile and options.format == 'EPUB':
-            src = pathlib.Path(srcpath)
+            if source_path.is_file():
-            name = re.sub(r'\W+', '_', src.stem) + tomenumber + ext
+                name = re.sub(r'\W+', '_', source_path.stem) + tomenumber + ext
-            filename = src.with_name(name)
+            else:
+                name = re.sub(r'\W+', '_', source_path.name) + tomenumber + ext
+            filename = source_path.with_name(name)
         else:
             filename = os.path.splitext(srcpath)[0] + tomenumber + ext
     if os.path.isfile(filename):
@@ -1039,7 +1056,7 @@ def removeNonImages(filetree):
     for root, dirs, files in os.walk(filetree):
         for name in files:
             _, ext = getImageFileName(name)
-            if ext not in ('.png', '.jpg', '.jpeg', '.gif', '.webp', '.jp2', '.avif'):
+            if ext not in IMAGE_TYPES:
                 if os.path.exists(os.path.join(root, name)):
                     os.remove(os.path.join(root, name))
     # remove empty nested folders
@@ -1249,7 +1266,7 @@ def slugify(value, is_natural_sorted):
         value = sub(r'0*([0-9]{4,})', r'\1', sub(r'([0-9]+)', r'0000\1', value, count=2))
     return value
 
-def makeZIP(zipfilename, basedir, isepub=False):
+def makeZIP(zipfilename, basedir, job_progress='', isepub=False):
     start = perf_counter()
     zipfilename = os.path.abspath(zipfilename) + '.zip'
     if SEVENZIP in available_archive_tools():
@@ -1270,7 +1287,7 @@ def makeZIP(zipfilename, basedir, isepub=False):
                     zipOutput.write(path, aPath)
         zipOutput.close()
     end = perf_counter()
-    print(f"makeZIP time: {end - start} seconds")
+    print(f"{job_progress}makeZIP time: {end - start} seconds")
     return zipfilename
 
 def makeParser():
@@ -1534,7 +1551,7 @@ def makeFusion(sources: List[str]):
     return str(fusion_path)
 
 
-def makeBook(source, qtgui=None):
+def makeBook(source, qtgui=None, job_progress=''):
     start = perf_counter()
     global GUI
     GUI = qtgui
@@ -1542,11 +1559,12 @@ def makeBook(source, qtgui=None):
         GUI.progressBarTick.emit('1')
     else:
         checkTools(source)
+    options.kindle_azw3 = options.iskindle and ('MOBI' in options.format or 'EPUB' in options.format)
     options.kindle_scribe_azw3 = options.profile == 'KS' and ('MOBI' in options.format or 'EPUB' in options.format)
     checkPre(source)
-    print("Preparing source images...")
+    print(f"{job_progress}Preparing source images...")
     path = getWorkFolder(source)
-    print("Checking images...")
+    print(f"{job_progress}Checking images...")
     getMetadata(os.path.join(path, "OEBPS", "Images"), source)
     removeNonImages(os.path.join(path, "OEBPS", "Images"))
     detectSuboptimalProcessing(os.path.join(path, "OEBPS", "Images"), source)
@@ -1557,14 +1575,14 @@ def makeBook(source, qtgui=None):
 
     if options.webtoon:
         x, y = image.ProfileData.Profiles[options.profile][1]
-        comic2panel.main(['-y ' + str(y), '-x' + str(x), '-i', '-m', path], qtgui)
+        comic2panel.main(['-y ' + str(y), '-x' + str(x), '-i', '-m', path], job_progress, qtgui)
     if options.noprocessing:
-        print("Do not process image, ignore any profile or processing option")
+        print(f"{job_progress}Do not process image, ignore any profile or processing option")
     else:
-        print("Processing images...")
+        print(f"{job_progress}Processing images...")
         if GUI:
-            GUI.progressBarTick.emit('Processing images')
+            GUI.progressBarTick.emit(f'{job_progress}Processing images')
-        imgDirectoryProcessing(os.path.join(path, "OEBPS", "Images"))
+        imgDirectoryProcessing(os.path.join(path, "OEBPS", "Images"), job_progress)
     if GUI:
         GUI.progressBarTick.emit('1')
     if options.batchsplit > 0 or options.targetsize:
@@ -1575,11 +1593,11 @@ def makeBook(source, qtgui=None):
     tomeNumber = 0
     if GUI:
         if options.format == 'CBZ':
-            GUI.progressBarTick.emit('Compressing CBZ files')
+            GUI.progressBarTick.emit(f'{job_progress}Compressing CBZ files')
         elif options.format == 'PDF':
-            GUI.progressBarTick.emit('Creating PDF files')
+            GUI.progressBarTick.emit(f'{job_progress}Creating PDF files')
         else:
-            GUI.progressBarTick.emit('Compressing EPUB files')
+            GUI.progressBarTick.emit(f'{job_progress}Compressing EPUB files')
         GUI.progressBarTick.emit(str(len(tomes) + 1))
         GUI.progressBarTick.emit('tick')
     options.baseTitle = options.title
@@ -1593,29 +1611,29 @@ def makeBook(source, qtgui=None):
             tomeNumber += 1
             options.title = options.baseTitle + ' [' + str(tomeNumber) + '/' + str(len(tomes)) + ']'
         if options.format == 'CBZ':
-            print("Creating CBZ file...")
+            print(f"{job_progress}Creating CBZ file...")
             if len(tomes) > 1:
                 filepath.append(getOutputFilename(source, options.output, '.cbz', ' ' + str(tomeNumber)))
             else:
                 filepath.append(getOutputFilename(source, options.output, '.cbz', ''))
-            makeZIP(tome + '_comic', os.path.join(tome, "OEBPS", "Images"))
+            makeZIP(tome + '_comic', os.path.join(tome, "OEBPS", "Images"), job_progress)
         elif options.format == 'PDF':
-            print("Creating PDF file with PyMuPDF...")
+            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)
             # use optimized buildPDF logic with streaming and compression
-            output_pdf = buildPDF(tome, options.title, None, output_file)
+            output_pdf = buildPDF(tome, options.title, job_progress, None, output_file)
             filepath.append(output_pdf)
         else:
-            print("Creating EPUB file...")
+            print(f"{job_progress}Creating EPUB file...")
             if len(tomes) > 1:
-                buildEPUB(tome, chapterNames, tomeNumber, True, cover, source, len(tomes))
+                buildEPUB(tome, chapterNames, tomeNumber, True, cover, source, job_progress, len(tomes))
                 filepath.append(getOutputFilename(source, options.output, '.epub', ' ' + str(tomeNumber)))
             else:
-                buildEPUB(tome, chapterNames, tomeNumber, False, cover, source)
+                buildEPUB(tome, chapterNames, tomeNumber, False, cover, source, job_progress)
                 filepath.append(getOutputFilename(source, options.output, '.epub', ''))
-            makeZIP(tome + '_comic', tome, True)
+            makeZIP(tome + '_comic', tome, job_progress, True)
         # Copy files to final destination (PDF files are already saved directly)
         if options.format != 'PDF':
             copyfile(tome + '_comic.zip', filepath[-1])
@@ -1628,23 +1646,23 @@ def makeBook(source, qtgui=None):
         if GUI:
             GUI.progressBarTick.emit('tick')
     if not GUI and options.format == 'MOBI':
-        print("Creating MOBI files...")
+        print(f"{job_progress}Creating MOBI files...")
         work = []
         for i in filepath:
             work.append([i])
         output = makeMOBI(work, GUI)
         for errors in output:
             if errors[0] != 0:
-                print('Error: KindleGen failed to create MOBI!')
+                print(f"{job_progress}Error: KindleGen failed to create MOBI!")
                 print(errors)
                 return filepath
         k = kindle.Kindle(options.profile)
         if k.path and k.coverSupport:
-            print("Kindle detected. Uploading covers...")
+            print(f"{job_progress}Kindle detected. Uploading covers...")
         for i in filepath:
             output = makeMOBIFix(i, options.covers[filepath.index(i)][1])
             if not output[0]:
-                print('Error: Failed to tweak KindleGen output!')
+                print(f'{job_progress}Error: Failed to tweak KindleGen output!')
                 return filepath
             else:
                 os.remove(i.replace('.epub', '.mobi') + '_toclean')
@@ -1657,7 +1675,7 @@ def makeBook(source, qtgui=None):
             rmtree(source, True)
 
     end = perf_counter()
-    print(f"makeBook: {end - start} seconds")
+    print(f"{job_progress}makeBook: {end - start} seconds")
     # Clean up temporary workspace
     try:
         rmtree(path, True)

kindlecomicconverter/comic2panel.py

@@ -221,7 +221,7 @@ def splitImage(work):
         return str(sys.exc_info()[1]), sanitizeTrace(sys.exc_info()[2])
 
 
-def main(argv=None, qtgui=None):
+def main(argv=None, job_progress='', qtgui=None):
     global args, GUI, splitWorkerPool, splitWorkerOutput, mergeWorkerPool, mergeWorkerOutput
     parser = ArgumentParser(prog="kcc-c2p", usage="kcc-c2p [options] [input]", add_help=False)
 
@@ -262,7 +262,7 @@ def main(argv=None, qtgui=None):
                 splitWorkerOutput = []
                 splitWorkerPool = Pool(maxtasksperchild=10)
                 if args.merge:
-                    print("Merging images...")
+                    print(f"{job_progress}Merging images...")
                     directoryNumer = 1
                     mergeWork = []
                     mergeWorkerOutput = []
@@ -274,7 +274,7 @@ def main(argv=None, qtgui=None):
                             directoryNumer += 1
                             mergeWork.append([os.path.join(root, directory)])
                     if GUI:
-                        GUI.progressBarTick.emit('Combining images')
+                        GUI.progressBarTick.emit(f'{job_progress}Combining images')
                         GUI.progressBarTick.emit(str(directoryNumer))
                     for i in mergeWork:
                         mergeWorkerPool.apply_async(func=mergeDirectory, args=(i, ), callback=mergeDirectoryTick)
@@ -287,7 +287,7 @@ def main(argv=None, qtgui=None):
                         rmtree(targetDir, True)
                         raise RuntimeError("One of workers crashed. Cause: " + mergeWorkerOutput[0][0],
                                            mergeWorkerOutput[0][1])
-                print("Splitting images...")
+                print(f"{job_progress}Splitting images...")
                 dot_clean(targetDir)
                 for root, _, files in os.walk(targetDir, False):
                     for name in files:
@@ -297,7 +297,7 @@ def main(argv=None, qtgui=None):
                         else:
                             os.remove(os.path.join(root, name))
                 if GUI:
-                    GUI.progressBarTick.emit('Splitting images')
+                    GUI.progressBarTick.emit(f'{job_progress}Splitting images')
                     GUI.progressBarTick.emit(str(pagenumber))
                     GUI.progressBarTick.emit('tick')
                 if len(work) > 0:

kindlecomicconverter/comicarchive.py

@@ -20,12 +20,13 @@
 
 from functools import cached_property, lru_cache
 import os
+from pathlib import Path
 import platform
 import distro
 from subprocess import STDOUT, PIPE, CalledProcessError
 from xml.dom.minidom import parseString
 from xml.parsers.expat import ExpatError
-from .shared import subprocess_run
+from .shared import IMAGE_TYPES, subprocess_run
 
 EXTRACTION_ERROR = 'Failed to extract archive. Try extracting file outside of KCC.'
 SEVENZIP = '7zz' if platform.system() == 'Darwin' else '7z'
@@ -65,6 +66,9 @@ class ComicArchive:
     def extract(self, targetdir):
         if not os.path.isdir(targetdir):
             raise OSError('Target directory doesn\'t exist.')
+        
+        if Path(self.basename).suffix.lower() in IMAGE_TYPES:
+            raise UserWarning('Put images into folder and drag and drop folder into KCC window.')
 
         missing = []
 

kindlecomicconverter/image.py

@@ -86,6 +86,9 @@ class ProfileData:
     ]
 
     ProfilesKindleEBOK = {
+    }
+
+    ProfilesKindlePDOC = {
         'K1': ("Kindle 1", (600, 670), Palette4, 1.0),
         'K2': ("Kindle 2", (600, 670), Palette15, 1.0),
         'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.0),
@@ -93,9 +96,6 @@ class ProfileData:
         'K57': ("Kindle 5/7", (600, 800), Palette16, 1.0),
         'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.0),
         'KV': ("Kindle Voyage", (1072, 1448), Palette16, 1.0),
-    }
-
-    ProfilesKindlePDOC = {
         'KPW34': ("Kindle Paperwhite 3/4/Oasis", (1072, 1448), Palette16, 1.0),
         'K810': ("Kindle 8/10", (600, 800), Palette16, 1.0),
         'KO': ("Kindle Oasis 2/3/Paperwhite 12", (1264, 1680), Palette16, 1.0),
@@ -263,7 +263,6 @@ class ComicPage:
         _, self.size, self.palette, self.gamma = self.opt.profileData
         if self.opt.hq:
             self.size = (int(self.size[0] * 1.5), int(self.size[1] * 1.5))
-        self.kindle_scribe_azw3 = (options.profile == 'KS') and (options.format in ('MOBI', 'EPUB'))
         self.original_color_mode = image.mode
         # TODO: color check earlier
         self.image = image.convert("RGB")
@@ -481,6 +480,14 @@ class ComicPage:
             self.image = erase_rainbow_artifacts(self.image, is_color)
 
     def resizeImage(self):
+        if self.opt.norotate and self.targetPathOrder in ('-kcc-a', '-kcc-d') and not self.opt.kindle_scribe_azw3:
+            # TODO: Kindle Scribe case
+            if self.opt.kindle_azw3 and any(dim > 1920 for dim in self.image.size):
+                self.image = ImageOps.contain(self.image, (1920, 1920), Image.Resampling.LANCZOS)
+            elif self.image.size[0] > self.size[0] * 2 or self.image.size[1] > self.size[1]:
+                self.image = ImageOps.contain(self.image, (self.size[0] * 2, self.size[1], Image.Resampling.LANCZOS))
+            return
+        
         ratio_device = float(self.size[1]) / float(self.size[0])
         ratio_image = float(self.image.size[1]) / float(self.image.size[0])
         method = self.resize_method()

kindlecomicconverter/shared.py

@@ -27,6 +27,9 @@ import sys
 from traceback import format_tb
 
 
+IMAGE_TYPES = ('.png', '.jpg', '.jpeg', '.gif', '.webp', '.jp2', '.avif')
+
+
 class HTMLStripper(HTMLParser):
     def __init__(self):
         HTMLParser.__init__(self)

requirements-osx-legacy.txt

@@ -1,4 +1,4 @@
-PySide6==6.5.2
+PySide6==6.4.3
 Pillow>=11.3.0
 psutil>=5.9.5
 requests>=2.31.0

requirements.txt

@@ -2,7 +2,7 @@ PySide6<6.10
 Pillow>=11.3.0
 psutil>=5.9.5
 requests>=2.31.0
-python-slugify>=1.2.1
+python-slugify>=1.2.1,<9.0.0
 raven>=6.0.0
 packaging>=23.2
 mozjpeg-lossless-optimization>=1.2.0

setup.py

@@ -148,16 +148,15 @@ setuptools.setup(
     },
     packages=['kindlecomicconverter'],
     install_requires=[
-        'pyside6>=6.0.0',
+        'PySide6>=6.0.0',
         'Pillow>=9.3.0',
-        'PyMuPDF>=1.18.0',
         'psutil>=5.9.5',
+        'requests>=2.31.0',
         'python-slugify>=1.2.1,<9.0.0',
         'raven>=6.0.0',
-        'requests>=2.31.0',
+        'mozjpeg-lossless-optimization>=1.2.0',
-        'mozjpeg-lossless-optimization>=1.1.2',
         'natsort>=8.4.0',
-        'distro',
+        'distro>=1.8.0',
         'numpy>=1.22.4',
         'PyMuPDF>=1.16.1',
     ],