bump to 10.3.0

* add a novel mode where it only resizes images

* add GUI

* cleanup

* fix typo

* fully cooked

* remove print

* clean up

* cook

* cook

* handle LA case

* cleanup

.github/workflows/codeql-analysis.yml

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

.github/workflows/docker-publish.yml

@@ -21,20 +21,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Set Release Date
         id: release_date
@@ -43,7 +43,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: ghcr.io/${{ github.repository_owner }}/kcc
           # Always creates the "latest" tag
@@ -54,7 +54,7 @@ jobs:
             type=raw,value=${{ steps.release_date.outputs.release_date }}
 
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           context: .

.github/workflows/package-linux.yml

@@ -25,7 +25,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
@@ -59,12 +59,12 @@ jobs:
       env:
         UPDATE_INFO: gh-releases-zsync|ciromattia|kcc|latest|*x86_64.AppImage.zsync
     - name: upload artifact
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       with:
         name: AppImage
         path: './*.AppImage*'
     - name: Release
-      uses: softprops/action-gh-release@v2
+      uses: softprops/action-gh-release@v3
       if: startsWith(github.ref, 'refs/tags/')
       with:
         prerelease: true

.github/workflows/package-macos.yml

@@ -30,7 +30,7 @@ jobs:
     env:
       MACOSX_DEPLOYMENT_TARGET: '14.0'
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -80,12 +80,12 @@ jobs:
         run: |
           python setup.py build_binary
       - name: upload build
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: mac-os-build-${{ runner.arch }}
           path: dist/*.dmg
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         if: startsWith(github.ref, 'refs/tags/')
         with:
           prerelease: true

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

@@ -31,7 +31,7 @@ jobs:
       PYTHON_VERSION: 3.11.9
       MACOSX_DEPLOYMENT_TARGET: '10.14'
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - 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,12 +51,12 @@ jobs:
         run: |
           python3 setup.py build_binary
       - name: upload build
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: osx-build-${{ runner.arch }}
           path: dist/*.dmg
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         if: startsWith(github.ref, 'refs/tags/')
         with:
           prerelease: true

.github/workflows/package-windows.yml

@@ -35,7 +35,7 @@ jobs:
             command: build_c2p
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - 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@v6
+        uses: actions/upload-artifact@v7
         with:
           name: windows-build-${{ matrix.entry }}
           path: dist/*.exe
       - id: optional_step_id
-        uses: signpath/github-action-submit-signing-request@v2.0
+        uses: signpath/github-action-submit-signing-request@v2.2
         if: ${{ github.repository == 'ciromattia/kcc' }}
         with:
          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
@@ -69,7 +69,7 @@ jobs:
          wait-for-completion: true
          output-artifact-directory: 'dist/'
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         if: startsWith(github.ref, 'refs/tags/')
         with:
           prerelease: true

.github/workflows/package-windows7.yml

@@ -27,7 +27,7 @@ jobs:
     env:
       WINDOWS_7: 1
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -46,12 +46,12 @@ jobs:
           python setup.py build_binary
       - name: upload-unsigned-artifact
         id: upload-unsigned-artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: windows7-build
           path: dist/*.exe
       - id: optional_step_id
-        uses: signpath/github-action-submit-signing-request@v2.0
+        uses: signpath/github-action-submit-signing-request@v2.2
         if: ${{ github.repository == 'ciromattia/kcc' }}
         with:
          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
@@ -62,7 +62,7 @@ jobs:
          wait-for-completion: true
          output-artifact-directory: 'dist/'
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         if: startsWith(github.ref, 'refs/tags/')
         with:
           prerelease: true

.gitignore

@@ -2,7 +2,6 @@
 Pipfile
 Pipfile.lock
 setup.bat
-kindlecomicconverter/sentry.py
 other/windows/kindlegen.exe
 dist/
 build/

README.md

@@ -199,6 +199,8 @@ sudo apt-get install python3 p7zip-full python3-pil python3-psutil python3-slugi
         'KCS': ("Kindle Colorsoft", (1272, 1696), Palette16, 1.0),
         'KS1860': ("Kindle 1860", (1860, 1920), Palette16, 1.0),
         'KS1920': ("Kindle 1920", (1920, 1920), Palette16, 1.0),
+        'KS1240': ("Kindle 1240", (1240, 1860), Palette16, 1.0),
+        'KS1324': ("Kindle 1324", (1324, 1986), Palette16, 1.0),
         'KS': ("Kindle Scribe 1/2", (1860, 2480), Palette16, 1.0),
         'KS3': ("Kindle Scribe 3", (1986, 2648), Palette16, 1.0),
         'KSCS': ("Kindle Scribe Colorsoft", (1986, 2648), Palette16, 1.0),
@@ -237,15 +239,19 @@ MAIN:
                         Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KPW5, KV, KO, K11, KS, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O, KoAO, KoN, KoC, KoCC, KoL, KoLC, KoF, KoS, KoE)
                         [Default=KV]
   -m, --manga-style     Manga style (right-to-left reading and splitting)
+  --lightnovel          Only resize images and preserve original file structure.
+  --ebok                Force EBOK tag instead of PDOC for MOBI
+  --invertdirection     Invert page turn direction
   -q, --hq              Try to increase the quality of magnification
   -2, --two-panel       Display two not four panels in Panel View mode
+  --vertical4panel       Show side panels first in virtual panel view
   -w, --webtoon         Webtoon processing mode
   --ts TARGETSIZE, --targetsize TARGETSIZE
                         the maximal size of output file in MB. [Default=100MB for webtoon and 400MB for others]
 
 PROCESSING:
   -n, --noprocessing    Do not modify image and ignore any profile or processing option
-  --pdfextract          Use legacy PDF image extraction method from KCC 8 and earlier.
+  --legacyextract       Use legacy PDF/EPUB image extraction method from earlier KCC versions.
   --pdfwidth            Render vector PDFs based on device width instead of height.
   -u, --upscale         Resize images smaller than device's resolution
   -s, --stretch         Stretch images to device's resolution
@@ -267,7 +273,7 @@ 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
+  --smartcovercrop      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 for black and white images
@@ -289,12 +295,14 @@ OUTPUT SETTINGS:
   --metadatatitle       Write title using ComicInfo.xml or other embedded metadata. 0: Don't use Title from metadata 1: Combine Title with default schema 2: Use Title only [Default=0]
   -a AUTHOR, --author AUTHOR
                         Author name [Default=KCC]
+  --language            EPUB language [Default=en-US]
   -f FORMAT, --format FORMAT
                         Output format (Available options: Auto, MOBI, EPUB, CBZ, PDF, KFX, MOBI+EPUB) [Default=Auto]
   --nokepub             If format is EPUB, output file with '.epub' extension rather than '.kepub.epub'
   -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]
   --spreadshift         Shift first page to opposite side in landscape for two page spread alignment
+  --onepagelandscape    Show a single centered page in landscape
   --norotate            Do not rotate double page spreads in spread splitter option.
   --rotateright         Rotate double page spreads in opposite direction.
   --rotatefirst         Put rotated spread first in spread splitter option.
@@ -362,6 +370,7 @@ One time setup and running for the first time:
 ```
 python -m venv venv
 venv\Scripts\activate.bat
+pip install --upgrade pip
 pip install -r requirements.txt
 python kcc.py
 ```
@@ -387,6 +396,7 @@ One time setup and running for the first time:
 ```
 python3 -m venv venv
 source venv/bin/activate
+pip install --upgrade pip
 pip install -r requirements.txt
 python kcc.py
 ```
@@ -440,7 +450,6 @@ Older links (dead):
 ## PRIVACY
 **KCC** is initiating internet connections in two cases:
 * During startup - Version check and announcement check.
-* When error occurs - Automatic reporting on Windows and macOS.
 
 ## KNOWN ISSUES
 Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).

gui/MetaEditor.ui

@@ -62,6 +62,19 @@
       <item row="1" column="1">
        <widget class="QLineEdit" name="volumeLine"/>
       </item>
+      <item row="1" column="2">
+       <widget class="QCheckBox" name="bulkVolumeCheck">
+        <property name="visible">
+         <bool>false</bool>
+        </property>
+        <property name="toolTip">
+         <string>&lt;b&gt;Bulk Volume Editing&lt;/b&gt;&lt;br&gt;Check this box to assign volume numbers to multiple files.&lt;br&gt;&lt;br&gt;&lt;b&gt;Input formats:&lt;/b&gt;&lt;br&gt;&lt;code&gt;5&lt;/code&gt; → sequence starting from 5 (5, 6, 7...)&lt;br&gt;&lt;code&gt;1-10&lt;/code&gt; → range from 1 to 10&lt;br&gt;&lt;code&gt;1, 3, 5&lt;/code&gt; → specific values&lt;br&gt;&lt;br&gt;&lt;i&gt;Note: Files are sorted alphabetically before assignment.&lt;/i&gt;</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
       <item row="3" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
@@ -195,6 +208,7 @@
  <tabstops>
   <tabstop>seriesLine</tabstop>
   <tabstop>volumeLine</tabstop>
+  <tabstop>bulkVolumeCheck</tabstop>
   <tabstop>titleLine</tabstop>
   <tabstop>numberLine</tabstop>
   <tabstop>writerLine</tabstop>

kindlecomicconverter/KCC_gui.py

@@ -22,7 +22,7 @@ import itertools
 from pathlib import Path
 from PySide6.QtCore import (QSize, QUrl, Qt, Signal, QIODeviceBase, QEvent, QThread, QSettings)
 from PySide6.QtGui import (QColor, QIcon, QPixmap, QDesktopServices)
-from PySide6.QtWidgets import (QApplication, QLabel, QListWidgetItem, QMainWindow, QSystemTrayIcon, QFileDialog, QMessageBox, QDialog, QTreeView, QAbstractItemView)
+from PySide6.QtWidgets import (QApplication, QLabel, QListWidgetItem, QMainWindow, QSystemTrayIcon, QFileDialog, QMessageBox, QDialog, QAbstractItemView, QListView, QTreeView)
 from PySide6.QtNetwork import (QLocalSocket, QLocalServer)
 
 import os
@@ -38,7 +38,6 @@ from xml.sax.saxutils import escape
 from psutil import Process
 from copy import copy
 from packaging.version import Version
-from raven import Client
 from tempfile import gettempdir
 
 from .shared import HTMLStripper, sanitizeTrace, walkLevel, subprocess_run
@@ -274,6 +273,12 @@ class WorkerThread(QThread):
         options.format = gui_current_format
         if GUI.mangaBox.isChecked():
             options.righttoleft = True
+        if GUI.lightnovelBox.isChecked():
+            options.lightnovel = True
+        if GUI.ebokBox.isChecked():
+            options.ebok = True
+        if GUI.invertDirectionBox.isChecked():
+            options.invertdirection = True
         if GUI.rotateBox.checkState() == Qt.CheckState.PartiallyChecked:
             options.splitter = 2
         elif GUI.rotateBox.checkState() == Qt.CheckState.Checked:
@@ -282,6 +287,8 @@ class WorkerThread(QThread):
             options.autoscale = True
         elif GUI.qualityBox.checkState() == Qt.CheckState.Checked:
             options.hq = True
+        if GUI.vertical4PanelBox.isChecked():
+            options.vertical4panel = True
         if GUI.webtoonBox.isChecked():
             options.webtoon = True
         if GUI.upscaleBox.checkState() == Qt.CheckState.PartiallyChecked:
@@ -327,12 +334,12 @@ class WorkerThread(QThread):
             options.maximizestrips = True
         if GUI.disableProcessingBox.isChecked():
             options.noprocessing = True
-        if GUI.pdfExtractBox.isChecked():
+        if GUI.legacyExtractBox.isChecked():
-            options.pdfextract = True
+            options.legacyextract = True
         if GUI.pdfWidthBox.isChecked():
             options.pdfwidth = True
-        if GUI.noSmartCoverCropBox.isChecked():
+        if GUI.smartCoverCropBox.isChecked():
-            options.nosmartcovercrop = True
+            options.smartcovercrop = True
         if GUI.coverFillBox.isChecked():
             options.coverfill = True
         if GUI.metadataTitleBox.checkState() == Qt.CheckState.PartiallyChecked:
@@ -345,6 +352,8 @@ class WorkerThread(QThread):
             options.tempdir = True
         if GUI.spreadShiftBox.isChecked():
             options.spreadshift = True
+        if GUI.onePageLandscapeBox.isChecked():
+            options.onepagelandscape = True
         if GUI.fileFusionBox.isChecked():
             options.filefusion = True
         else:
@@ -378,6 +387,8 @@ class WorkerThread(QThread):
             options.title = str(GUI.titleEdit.text())
         if GUI.authorEdit.text():
             options.author = str(GUI.authorEdit.text())
+        if GUI.languageEdit.text():
+            options.language = str(GUI.languageEdit.text())
         if GUI.chunkSizeCheckBox.isChecked():
             options.targetsize = int(GUI.chunkSizeBox.value())
 
@@ -392,7 +403,10 @@ class WorkerThread(QThread):
             for job in currentJobs:
                 bookDir.append(job)
             try:
+                fusion_source_parent = str(Path(bookDir[0]).parent)
                 comic2ebook.options = comic2ebook.checkOptions(copy(options))
+                if options.output is None:
+                    options.output = fusion_source_parent
                 currentJobs.clear()
                 currentJobs.append(comic2ebook.makeFusion(bookDir))
                 MW.addMessage.emit('Created fusion at ' + currentJobs[0], 'info', False)
@@ -445,8 +459,6 @@ class WorkerThread(QThread):
                 _, _, traceback = sys.exc_info()
                 MW.showDialog.emit("Error during conversion %s:\n\n%s\n\nTraceback:\n%s"
                                    % (jobargv[-1], str(err), sanitizeTrace(traceback)), 'error')
-                if ' is corrupted.' not in str(err):
-                    GUI.sentry.captureException()
                 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)
@@ -466,7 +478,7 @@ class WorkerThread(QThread):
                     MW.addMessage.emit('Creating PDF files... <b>Done!</b>', 'info', True)
                 else:
                     MW.addMessage.emit('Creating EPUB files... <b>Done!</b>', 'info', True)
-                if 'MOBI' in gui_current_format:
+                if 'MOBI' in gui_current_format and not options.lightnovel:
                     MW.progressBarTick.emit(f'{job_progress_number}Creating MOBI files')
                     MW.progressBarTick.emit(str(len(outputPath) * 2 + 1))
                     MW.progressBarTick.emit('tick')
@@ -507,7 +519,6 @@ class WorkerThread(QThread):
                             for item in outputPath:
                                 GUI.progress.content = ''
                                 mobiPath = item.replace('.epub', '.mobi')
-                                os.remove(mobiPath + '_toclean')
                                 if GUI.targetDirectory and GUI.targetDirectory != os.path.dirname(mobiPath):
                                     try:
                                         move(mobiPath, GUI.targetDirectory)
@@ -528,8 +539,6 @@ class WorkerThread(QThread):
                                 mobiPath = item.replace('.epub', '.mobi')
                                 if os.path.exists(mobiPath):
                                     os.remove(mobiPath)
-                                if os.path.exists(mobiPath + '_toclean'):
-                                    os.remove(mobiPath + '_toclean')
                             MW.addMessage.emit('Failed to process MOBI file!', 'error', False)
                             MW.addTrayMessage.emit('Failed to process MOBI file!', 'Critical')
                     else:
@@ -558,12 +567,6 @@ class WorkerThread(QThread):
                                 move(item, GUI.targetDirectory)
                             except Exception:
                                 pass
-        if options.filefusion:
-            for path in currentJobs:
-                if os.path.isfile(path):
-                    os.remove(path)
-                elif os.path.isdir(path):
-                    rmtree(path, True)
         GUI.progress.content = ''
         GUI.progress.stop()
         MW.hideProgressBar.emit()
@@ -627,7 +630,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             GUI.jobList.clear()
         if self.tar or self.sevenzip:
             fnames = QFileDialog.getOpenFileNames(MW, 'Select file', self.lastPath,
-                                                            'Comic (*.cbz *.cbr *.cb7 *.zip *.rar *.7z *.pdf);;All (*.*)')
+                                                            'Comic (*.cbz *.cbr *.cb7 *.zip *.rar *.7z *.epub *.pdf);;All (*.*)')
         else:
             fnames = QFileDialog.getOpenFileNames(MW, 'Select file', self.lastPath,
                                                             'Comic (*.pdf);;All (*.*)')
@@ -658,30 +661,47 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
 
 
     def selectFileMetaEditor(self, sname):
+        files = []
         if not sname:
             if QApplication.keyboardModifiers() == Qt.ShiftModifier:
-                dname = QFileDialog.getExistingDirectory(MW, 'Select directory', self.lastPath)
+                # Multi-directory selection for bulk editing ComicInfo.xml
-                if dname != '':
+                dialog = QFileDialog(MW, 'Select volume directories', self.lastPath)
-                    sname = os.path.join(dname, 'ComicInfo.xml')
+                dialog.setFileMode(QFileDialog.FileMode.Directory)
-                    self.lastPath = os.path.dirname(sname)
+                dialog.setOption(QFileDialog.Option.ShowDirsOnly, True)
+                dialog.setOption(QFileDialog.Option.DontUseNativeDialog, True)
+                
+                # Enable multi-selection in the dialog (may not work with native dialog on all platforms)
+                file_view = dialog.findChild(QListView, 'listView')
+                if file_view:
+                    file_view.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection)
+                file_tree = dialog.findChild(QTreeView)
+                if file_tree:
+                    file_tree.setSelectionMode(QAbstractItemView.SelectionMode.ExtendedSelection)
+                
+                if dialog.exec():
+                    selected_dirs = dialog.selectedFiles()
+                    if selected_dirs:
+                        files = [os.path.join(d, 'ComicInfo.xml') for d in selected_dirs]
+                        self.lastPath = os.path.dirname(selected_dirs[0])
             else:
                 if self.sevenzip:
-                    fname = QFileDialog.getOpenFileName(MW, 'Select file', self.lastPath,
+                    fnames = QFileDialog.getOpenFileNames(MW, 'Select file(s)', self.lastPath,
-                                                                  'Comic (*.cbz *.cbr *.cb7)')
+                                                          'Comic (*.cbz *.cbr *.cb7)')
+                    files = fnames[0]
+                    if files:
+                        self.lastPath = os.path.abspath(os.path.join(files[0], os.pardir))
                 else:
-                    fname = ['']
                     self.showDialog("Editor is disabled due to a lack of 7z.", 'error')
                     self.addMessage('<a href="https://github.com/ciromattia/kcc#7-zip">Install 7z (link)</a>'
                     ' to enable metadata editing.', 'warning')
-                if fname[0] != '':
+        else:
-                    sname = fname[0]
+            files = [sname]
-                    self.lastPath = os.path.abspath(os.path.join(sname, os.pardir))
+        
-        if sname:
+        if files:
             try:
-                self.editor.loadData(sname)
+                self.editor.loadData(files)
             except Exception as err:
                 _, _, traceback = sys.exc_info()
-                GUI.sentry.captureException()
                 self.showDialog("Failed to parse metadata!\n\n%s\n\nTraceback:\n%s"
                                 % (str(err), sanitizeTrace(traceback)), 'error')
             else:
@@ -948,6 +968,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             GUI.chunkSizeCheckBox.setChecked(False)
         elif GUI.formats[str(GUI.formatBox.currentText())]['format'] == 'KFX':
             GUI.mozJpegBox.setCheckState(Qt.CheckState.PartiallyChecked)
+            GUI.upscaleBox.setChecked(True)
         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():
@@ -1066,8 +1087,13 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         self.settings.setValue('startNumber', self.startNumber + 1)
         self.settings.setValue('windowSize', str(MW.size().width()) + 'x' + str(MW.size().height()))
         self.settings.setValue('options', {'mangaBox': GUI.mangaBox.checkState(),
+                                           'lightnovelBox': GUI.lightnovelBox.checkState(),
+                                           'ebokBox': GUI.ebokBox.checkState(),
+                                           'invertDirectionBox': GUI.invertDirectionBox.checkState(),
+                                           'languageEdit': GUI.languageEdit.text(),
                                            'rotateBox': GUI.rotateBox.checkState(),
                                            'qualityBox': GUI.qualityBox.checkState(),
+                                           'vertical4PanelBox': GUI.vertical4PanelBox.checkState(),
                                            'gammaBox': GUI.gammaBox.checkState(),
                                            'autoLevelBox': GUI.autoLevelBox.checkState(),
                                            'autocontrastBox': GUI.autocontrastBox.checkState(),
@@ -1082,9 +1108,9 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                                            'colorBox': GUI.colorBox.checkState(),
                                            'eraseRainbowBox': GUI.eraseRainbowBox.checkState(),
                                            'disableProcessingBox': GUI.disableProcessingBox.checkState(),
-                                           'pdfExtractBox': GUI.pdfExtractBox.checkState(),
+                                           'legacyExtractBox': GUI.legacyExtractBox.checkState(),
                                            'pdfWidthBox': GUI.pdfWidthBox.checkState(),
-                                           'noSmartCoverCropBox': GUI.noSmartCoverCropBox.checkState(),
+                                           'smartCoverCropBox': GUI.smartCoverCropBox.checkState(),
                                            'coverFillBox': GUI.coverFillBox.checkState(),
                                            'metadataTitleBox': GUI.metadataTitleBox.checkState(),
                                            'mozJpegBox': GUI.mozJpegBox.checkState(),
@@ -1099,6 +1125,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                                            'deleteBox': GUI.deleteBox.checkState(),
                                            'tempDirBox': GUI.tempDirBox.checkState(),
                                            'spreadShiftBox': GUI.spreadShiftBox.checkState(),
+                                           'onePageLandscapeBox': GUI.onePageLandscapeBox.checkState(),
                                            'fileFusionBox': GUI.fileFusionBox.checkState(),
                                            'defaultOutputFolderBox': GUI.defaultOutputFolderBox.checkState(),
                                            'noRotateBox': GUI.noRotateBox.checkState(),
@@ -1122,7 +1149,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                 GUI.jobList.clear()
             formats = ['.pdf']
             if self.tar or self.sevenzip:
-                formats.extend(['.cb7', '.7z', '.cbz', '.zip', '.cbr', '.rar'])
+                formats.extend(['.cb7', '.7z', '.cbz', '.zip', '.cbr', '.rar', '.epub'])
             if os.path.isdir(message):
                 GUI.jobList.addItem(message)
                 GUI.jobList.scrollToBottom()
@@ -1174,6 +1201,11 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             self.kindleGen = False
             if startup:
                 self.display_kindlegen_missing()
+        except OSError as e:
+            self.kindleGen = False
+            if startup:
+                error = f"kindlegen: {e.strerror}\n\n Re-install Rosetta/Kindle Previewer/other Intel app?\n\nPlease email Amazon to make Kindle Previewer Apple silicon native at amazon.com/kindle-help"
+                self.showDialog(error, 'error')
 
     def __init__(self, kccapp, kccwindow):
         global APP, MW, GUI
@@ -1183,7 +1215,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         self.setupUi(MW)
         self.editor = KCCGUI_MetaEditor()
         self.icons = Icons()
-        self.settings = QSettings('ciromattia', 'kcc9')
+        self.settings = QSettings('ciromattia', 'kcc10')
         self.settingsVersion = self.settings.value('settingsVersion', '', type=str)
         self.lastPath = self.settings.value('lastPath', '', type=str)
         self.defaultOutputFolder = str(self.settings.value('defaultOutputFolder', '', type=str))
@@ -1209,7 +1241,6 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         self.croppingPowerValue = 1.0
         self.currentMode = 1
         self.targetDirectory = ''
-        self.sentry = Client(release=__version__)
         if sys.platform.startswith('win'):
             # noinspection PyUnresolvedReferences
             from psutil import BELOW_NORMAL_PRIORITY_CLASS
@@ -1261,6 +1292,9 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             "Kindle 1240x1860": {
                 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KS1240',
             },
+            "Kindle 1324x1986": {
+                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KS1324',
+            },
             "Kindle Scribe 1/2": {
                 'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KS',
             },
@@ -1368,6 +1402,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             "Separator",
             "Other",
             "Separator",
+            "Kindle 1324x1986",
             "Kindle 1920x1920",
             "Kindle 1860x1920",
             "Kindle 1240x1860",
@@ -1494,6 +1529,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                 GUI.widthBox.setValue(int(self.options[option]))
             elif str(option) == "heightBox":
                 GUI.heightBox.setValue(int(self.options[option]))
+            elif str(option) == "languageEdit":
+                GUI.languageEdit.setText(str(self.options[option]))
             elif str(option) == "gammaSlider":
                 if GUI.gammaSlider.isEnabled():
                     GUI.gammaSlider.setValue(int(self.options[option]))
@@ -1532,62 +1569,299 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
 
 
 class KCCGUI_MetaEditor(KCC_ui_editor.Ui_editorDialog):
-    def loadData(self, file):
+    def _buildBulkFieldToolTip(self, fieldLabel, valuesByFile):
-        self.parser = metadata.MetadataParser(file)
+        note = '<p><em>Note: Changing this field will overwrite all values in all selected files.</em></p>'
-        if self.parser.format in ['RAR', 'RAR5']:
+
-            self.editorWidget.setEnabled(False)
+        if len(valuesByFile) <= 20:
-            self.okButton.setEnabled(False)
+            rows = ''.join(
-            self.statusLabel.setText('CBR metadata are read-only.')
+                '<tr>'
+                f'<td style="padding:2px 6px; white-space:nowrap;">{escape(os.path.basename(f))}</td>'
+                f'<td style="padding:2px 6px;">{escape(v)}</td>'
+                '</tr>'
+                for f, v in valuesByFile
+            )
+
+            table = (
+                '<table border="1" cellspacing="0" cellpadding="0">'
+                '<tr>'
+                '<th style="padding:2px 6px; text-align:left;">File</th>'
+                '<th style="padding:2px 6px; text-align:left;">Value</th>'
+                '</tr>'
+                f'{rows}'
+                '</table>'
+            )
         else:
+            counts = {}
+            for _, v in valuesByFile:
+                counts[v] = counts.get(v, 0) + 1
+
+            rows = ''.join(
+                '<tr>'
+                f'<td style="padding:2px 6px;">{escape(v)}</td>'
+                f'<td style="padding:2px 6px; text-align:right;">{c}</td>'
+                '</tr>'
+                for v, c in sorted(counts.items(), key=lambda t: (-t[1], t[0]))
+            )
+
+            table = (
+                '<table border="1" cellspacing="0" cellpadding="0">'
+                '<tr>'
+                '<th style="padding:2px 6px; text-align:left;">Value</th>'
+                '<th style="padding:2px 6px; text-align:right;">Count</th>'
+                '</tr>'
+                f'{rows}'
+                '</table>'
+            )
+
+        tooltipHTML = f'\
+            <b>{escape(fieldLabel)}</b>\
+            {note}\
+            {table}\
+        '
+
+        return tooltipHTML
+
+    def loadData(self, files):
+        self.files = files if isinstance(files, list) else [files]
+        self.bulkMode = len(self.files) > 1
+        
+        # Sort files by name for consistent volume assignment
+        self.files.sort()
+        
+        # Unified CBR check for all files (both single and bulk mode)
+        for file in self.files:
+            parser = metadata.MetadataParser(file)
+            if parser.format in ['RAR', 'RAR5']:
+                self.editorWidget.setEnabled(False)
+                self.okButton.setEnabled(False)
+                self.statusLabel.setText('CBR files in selection are read-only.')
+                return
+        
+        if self.bulkMode:
+            firstFile = self.files[0]
+            self.parser = metadata.MetadataParser(firstFile)
+            self.editorWidget.setEnabled(True)
+            self.okButton.setEnabled(True)
+            self.statusLabel.setText(f'Editing {len(self.files)} files.')
+
+            # Show bulk volume checkbox
+            self.bulkVolumeCheck.setVisible(True)
+            self.bulkVolumeCheck.setChecked(False)
+
+            for field in (self.volumeLine, self.numberLine, self.titleLine):
+                field.setEnabled(False)
+                field.setText('')
+                field.setPlaceholderText('(multiple files)')
+                field.setToolTip('')
+
+            # Load metadata for all files and show common values, or “(multiple values)” + tooltip.
+            parsed = []
+            for file in self.files:
+                parsed.append((file, metadata.MetadataParser(file)))
+
+            field_specs = [
+                (self.seriesLine, 'Series', lambda p: (p.data.get('Series', '') or '')),
+                (self.writerLine, 'Writer', lambda p: ', '.join(p.data.get('Writers', []) or [])),
+                (self.pencillerLine, 'Penciller', lambda p: ', '.join(p.data.get('Pencillers', []) or [])),
+                (self.inkerLine, 'Inker', lambda p: ', '.join(p.data.get('Inkers', []) or [])),
+                (self.coloristLine, 'Colorist', lambda p: ', '.join(p.data.get('Colorists', []) or [])),
+            ]
+
+            for line, label, extractor in field_specs:
+                line.setEnabled(True)
+                valuesByFile = [(f, extractor(p)) for f, p in parsed]
+                uniqueValues = {v for _, v in valuesByFile}
+
+                if len(uniqueValues) == 1:
+                    common_value = valuesByFile[0][1] if valuesByFile else ''
+                    line.setPlaceholderText('')
+                    line.setToolTip('')
+                    line.setText(common_value)
+                else:
+                    line.setText('')
+                    line.setPlaceholderText('(multiple values)')
+                    line.setToolTip(self._buildBulkFieldToolTip(label, valuesByFile))
+        else:
+            file = self.files[0]
+            self.parser = metadata.MetadataParser(file)
+            
+            # Hide bulk volume checkbox in single file mode
+            self.bulkVolumeCheck.setVisible(False)
+            
+            for field in (self.volumeLine, self.numberLine, self.titleLine, self.seriesLine,
+                          self.writerLine, self.pencillerLine, self.inkerLine, self.coloristLine):
+                field.setEnabled(True)
+                field.setPlaceholderText('')
+            
             self.editorWidget.setEnabled(True)
             self.okButton.setEnabled(True)
             self.statusLabel.setText('Separate authors with a comma.')
-        for field in (self.seriesLine, self.volumeLine, self.numberLine, self.titleLine):
+            
-            field.setText(self.parser.data[field.objectName().capitalize()[:-4]])
+            for field in (self.seriesLine, self.volumeLine, self.numberLine, self.titleLine):
-        for field in (self.writerLine, self.pencillerLine, self.inkerLine, self.coloristLine):
+                field.setText(self.parser.data[field.objectName().capitalize()[:-4]])
-            field.setText(', '.join(self.parser.data[field.objectName().capitalize()[:-4] + 's']))
+            for field in (self.writerLine, self.pencillerLine, self.inkerLine, self.coloristLine):
-        for field in (self.seriesLine, self.titleLine):
+                field.setText(', '.join(self.parser.data[field.objectName().capitalize()[:-4] + 's']))
-            if field.text() == '':
+            for field in (self.seriesLine, self.titleLine):
-                path = Path(file)
+                if field.text() == '':
-                if file.endswith('.xml'):
+                    path = Path(file)
-                    field.setText(path.parent.name)
+                    if file.endswith('.xml'):
-                else:
+                        field.setText(path.parent.name)
-                    field.setText(path.stem)
+                    else:
+                        field.setText(path.stem)
 
     def saveData(self):
-        for field in (self.volumeLine, self.numberLine):
+        if self.bulkMode:
-            if field.text().isnumeric() or self.cleanData(field.text()) == '':
+            bulkData = {}
-                self.parser.data[field.objectName().capitalize()[:-4]] = self.cleanData(field.text())
+            if self.cleanData(self.seriesLine.text()):
-            else:
+                bulkData['Series'] = self.cleanData(self.seriesLine.text())
-                self.statusLabel.setText(field.objectName().capitalize()[:-4] + ' field must be a number.')
+            
-                break
-        else:
-            for field in (self.seriesLine, self.titleLine):
-                self.parser.data[field.objectName().capitalize()[:-4]] = self.cleanData(field.text())
             for field in (self.writerLine, self.pencillerLine, self.inkerLine, self.coloristLine):
+                fieldName = field.objectName().capitalize()[:-4] + 's'
                 values = self.cleanData(field.text()).split(',')
-                tmpData = []
+                tmpData = [self.cleanData(v) for v in values if self.cleanData(v)]
-                for value in values:
+                if tmpData:
-                    if self.cleanData(value) != '':
+                    bulkData[fieldName] = tmpData
-                        tmpData.append(self.cleanData(value))
+            # Handle bulk volume editing
-                self.parser.data[field.objectName().capitalize()[:-4] + 's'] = tmpData
+            volumes = None
-            try:
+            if self.bulkVolumeCheck.isChecked():
-                self.parser.saveXML()
+                volumeText = self.volumeLine.text()
-            except Exception as err:
+                volumes, error = self.parseVolumeInput(volumeText, len(self.files))
-                _, _, traceback = sys.exc_info()
+                if error:
-                GUI.sentry.captureException()
+                    self.statusLabel.setText(error)
-                GUI.showDialog("Failed to save metadata!\n\n%s\n\nTraceback:\n%s"
+                    return
-                               % (str(err), sanitizeTrace(traceback)), 'error')
+
-            self.ui.close()
+            if not bulkData and volumes is None:
+                self.statusLabel.setText('No changes to apply.')
+                return
+
+            errors = []
+            total = len(self.files)
+            self.okButton.setEnabled(False)
+            self.cancelButton.setEnabled(False)
+
+            for i, file in enumerate(self.files, 1):
+                self.statusLabel.setText(f'Processing {i}/{total}: {os.path.basename(file)}')
+                QApplication.processEvents()
+
+                try:
+                    parser = metadata.MetadataParser(file)
+                    if parser.format in ['RAR', 'RAR5']:
+                        errors.append(f'{os.path.basename(file)}: CBR is read-only')
+                        continue
+                    for key, value in bulkData.items():
+                        parser.data[key] = value
+                    # Set volume if bulk volume editing is enabled
+                    if volumes is not None:
+                        parser.data['Volume'] = str(volumes[i - 1])
+                    parser.saveXML()
+                except Exception as err:
+                    errors.append(f'{os.path.basename(file)}: {str(err)}')
+
+            self.okButton.setEnabled(True)
+            self.cancelButton.setEnabled(True)
+
+            if errors:
+                GUI.showDialog("Some files failed to save:\n\n" + "\n".join(errors[:10]) +
+                              (f"\n...and {len(errors) - 10} more" if len(errors) > 10 else ""), 'error')
+                self.statusLabel.setText('Errors occurred.')
+            else:
+                self.statusLabel.setText(f'Successfully updated {total} files.')
+                self.ui.close()
+        else:
+            for field in (self.volumeLine, self.numberLine):
+                if field.text().isnumeric() or self.cleanData(field.text()) == '':
+                    self.parser.data[field.objectName().capitalize()[:-4]] = self.cleanData(field.text())
+                else:
+                    self.statusLabel.setText(field.objectName().capitalize()[:-4] + ' field must be a number.')
+                    break
+            else:
+                for field in (self.seriesLine, self.titleLine):
+                    self.parser.data[field.objectName().capitalize()[:-4]] = self.cleanData(field.text())
+                for field in (self.writerLine, self.pencillerLine, self.inkerLine, self.coloristLine):
+                    values = self.cleanData(field.text()).split(',')
+                    tmpData = []
+                    for value in values:
+                        if self.cleanData(value) != '':
+                            tmpData.append(self.cleanData(value))
+                    self.parser.data[field.objectName().capitalize()[:-4] + 's'] = tmpData
+                try:
+                    self.parser.saveXML()
+                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):
         return escape(s.strip())
 
+    def parseVolumeInput(self, text, fileCount):
+        text = text.strip()
+        if not text:
+            return None, None
+        
+        volumes = []
+        
+        # Check if it's a range (e.g., "5-10")
+        if '-' in text and ',' not in text:
+            parts = text.split('-')
+            if len(parts) != 2 or not parts[0].strip() or not parts[1].strip():
+                return None, 'Invalid range format (use start-end)'
+            try:
+                start = int(parts[0].strip())
+                end = int(parts[1].strip())
+                if start < 0 or end < 0:
+                    return None, 'Volume numbers must be positive'
+                if start > end:
+                    return None, 'Invalid range: start > end'
+                volumes = list(range(start, end + 1))
+            except ValueError:
+                return None, 'Invalid range format'
+        # Check if it's a comma-separated list (e.g., "1,3,5")
+        elif ',' in text:
+            try:
+                volumes = [int(v.strip()) for v in text.split(',') if v.strip()]
+                if any(v < 0 for v in volumes):
+                    return None, 'Volume numbers must be positive'
+            except ValueError:
+                return None, 'Invalid list format'
+        # Single number - generate sequence starting from that number
+        else:
+            try:
+                start = int(text)
+                if start < 0:
+                    return None, 'Volume number must be positive'
+                volumes = list(range(start, start + fileCount))
+            except ValueError:
+                return None, 'Invalid number'
+        
+        # Validate count
+        if not volumes:
+            return None, 'No valid volume numbers parsed'
+        if len(volumes) != fileCount:
+            return None, f'Volume count ({len(volumes)}) != file count ({fileCount})'
+        
+        return volumes, None
+    
+    def toggleBulkVolume(self, checked):
+        self.volumeLine.setEnabled(checked)
+        if checked:
+            self.volumeLine.setText('')
+            self.volumeLine.setPlaceholderText('e.g., 5 or 1-10 or 1,3,5')
+        else:
+            self.volumeLine.setText('')
+            self.volumeLine.setPlaceholderText('(multiple files)')
+
     def __init__(self):
         self.ui = QDialog()
         self.parser = None
+        self.files = []
+        self.bulkMode = False
         self.setupUi(self.ui)
         self.ui.setWindowFlags(self.ui.windowFlags() & ~Qt.WindowType.WindowContextHelpButtonHint)
+        
+        self.bulkVolumeCheck.stateChanged.connect(self.toggleBulkVolume)
+        
         self.okButton.clicked.connect(self.saveData)
         self.cancelButton.clicked.connect(self.ui.close)
         if sys.platform.startswith('linux'):

kindlecomicconverter/KCC_ui_editor.py

@@ -15,9 +15,9 @@ from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
     QFont, QFontDatabase, QGradient, QIcon,
     QImage, QKeySequence, QLinearGradient, QPainter,
     QPalette, QPixmap, QRadialGradient, QTransform)
-from PySide6.QtWidgets import (QApplication, QDialog, QGridLayout, QHBoxLayout,
+from PySide6.QtWidgets import (QApplication, QCheckBox, QDialog, QGridLayout,
-    QLabel, QLineEdit, QPushButton, QSizePolicy,
+    QHBoxLayout, QLabel, QLineEdit, QPushButton,
-    QVBoxLayout, QWidget)
+    QSizePolicy, QVBoxLayout, QWidget)
 from . import KCC_rc
 
 class Ui_editorDialog(object):
@@ -57,6 +57,12 @@ class Ui_editorDialog(object):
 
         self.gridLayout.addWidget(self.volumeLine, 1, 1, 1, 1)
 
+        self.bulkVolumeCheck = QCheckBox(self.editorWidget)
+        self.bulkVolumeCheck.setObjectName(u"bulkVolumeCheck")
+        self.bulkVolumeCheck.setVisible(False)
+
+        self.gridLayout.addWidget(self.bulkVolumeCheck, 1, 2, 1, 1)
+
         self.label_3 = QLabel(self.editorWidget)
         self.label_3.setObjectName(u"label_3")
 
@@ -157,7 +163,8 @@ class Ui_editorDialog(object):
         self.verticalLayout.addWidget(self.optionWidget)
 
         QWidget.setTabOrder(self.seriesLine, self.volumeLine)
-        QWidget.setTabOrder(self.volumeLine, self.titleLine)
+        QWidget.setTabOrder(self.volumeLine, self.bulkVolumeCheck)
+        QWidget.setTabOrder(self.bulkVolumeCheck, self.titleLine)
         QWidget.setTabOrder(self.titleLine, self.numberLine)
         QWidget.setTabOrder(self.numberLine, self.writerLine)
         QWidget.setTabOrder(self.writerLine, self.pencillerLine)
@@ -175,6 +182,10 @@ class Ui_editorDialog(object):
         editorDialog.setWindowTitle(QCoreApplication.translate("editorDialog", u"Metadata editor", None))
         self.label_1.setText(QCoreApplication.translate("editorDialog", u"Series:", None))
         self.label_2.setText(QCoreApplication.translate("editorDialog", u"Volume:", None))
+#if QT_CONFIG(tooltip)
+        self.bulkVolumeCheck.setToolTip(QCoreApplication.translate("editorDialog", u"<b>Bulk Volume Editing</b><br>Check this box to assign volume numbers to multiple files.<br><br><b>Input formats:</b><br><code>5</code> \u2192 sequence starting from 5 (5, 6, 7...)<br><code>1-10</code> \u2192 range from 1 to 10<br><code>1, 3, 5</code> \u2192 specific values<br><br><i>Note: Files are sorted alphabetically before assignment.</i>", None))
+#endif // QT_CONFIG(tooltip)
+        self.bulkVolumeCheck.setText("")
         self.label_3.setText(QCoreApplication.translate("editorDialog", u"Number:", None))
         self.label_4.setText(QCoreApplication.translate("editorDialog", u"Writer:", None))
         self.label_5.setText(QCoreApplication.translate("editorDialog", u"Penciller:", None))

kindlecomicconverter/__init__.py

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

kindlecomicconverter/comic2ebook.py

@@ -22,7 +22,9 @@ from collections import Counter
 import os
 import pathlib
 import re
+import shutil
 import sys
+import xml.etree.ElementTree as ET
 from argparse import ArgumentParser
 from time import perf_counter, strftime, gmtime
 from copy import copy
@@ -30,14 +32,14 @@ from glob import glob, escape
 from re import sub
 from stat import S_IWRITE, S_IREAD, S_IEXEC
 from typing import List
-from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
+from zipfile import ZipFile, ZIP_STORED
-from tempfile import mkdtemp, gettempdir, TemporaryFile
+from tempfile import mkdtemp, gettempdir
-from shutil import move, copytree, rmtree, copyfile
+from shutil import move, copytree, rmtree
 from multiprocessing import Pool, cpu_count
 from uuid import uuid4
 from natsort import os_sort_keygen, os_sorted
 from slugify import slugify as slugify_ext
-from PIL import Image, ImageFile
+from PIL import Image, ImageFile, ImageOps
 from pathlib import Path
 from subprocess import STDOUT, PIPE, CalledProcessError
 from psutil import virtual_memory, disk_usage
@@ -74,22 +76,19 @@ def main(argv=None):
         print('No matching files found.')
         return 1
     if options.filefusion:
+        fusion_source_parent = str(Path(sources[0]).parent)
         fusion_path = makeFusion(list(sources))
         sources.clear()
         sources.append(fusion_path)
     for source in sources:
         source = source.rstrip('\\').rstrip('/')
         options = copy(args)
+        if options.filefusion and options.output is None:
+            options.output = fusion_source_parent
         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
 
 
@@ -144,7 +143,7 @@ def buildHTML(path, imgfile, imgfilepath, imgfile2=None):
         f.write('<div style="display:none;">.</div>\n')
     f.write(f'<img width="{imgsize[0]}" height="{imgsize[1]}" src="{"../" * backref}Images/{postfix}{imgfile}"/>\n')
     if imgfile2:
-        f.write(f'<img style="bottom: 0" width="{imgsize2[0]}" height="{imgsize2[1]}" src="{"../" * backref}Images/{postfix}{imgfile2}"/>\n')
+        f.write(f'<img style="top: 1920px" width="{imgsize2[0]}" height="{imgsize2[1]}" src="{"../" * backref}Images/{postfix}{imgfile2}"/>\n')
     f.write("</div>\n")
     if options.iskindle and options.panelview:
         if options.autoscale:
@@ -227,7 +226,7 @@ def buildNCX(dstdir, title, chapters, chapternames):
     ncxfile = os.path.join(dstdir, 'OEBPS', 'toc.ncx')
     f = open(ncxfile, "w", encoding='UTF-8')
     f.writelines(["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
-                  "<ncx version=\"2005-1\" xml:lang=\"en-US\" xmlns=\"http://www.daisy.org/z3986/2005/ncx/\">\n",
+                  f"<ncx version=\"2005-1\" xml:lang=\"{options.language}\" xmlns=\"http://www.daisy.org/z3986/2005/ncx/\">\n",
                   "<head>\n",
                   "<meta name=\"dtb:uid\" content=\"urn:uuid:", options.uuid, "\"/>\n",
                   "<meta name=\"dtb:depth\" content=\"1\"/>\n",
@@ -293,10 +292,22 @@ def buildNAV(dstdir, title, chapters, chapternames):
 def buildOPF(dstdir, title, filelist, originalpath, cover=None):
     opffile = os.path.join(dstdir, 'OEBPS', 'content.opf')
     deviceres = options.profileData[1]
-    if options.righttoleft:
+
-        writingmode = "horizontal-rl"
+    if options.vertical4panel:
+        writingmode = "vertical"
     else:
-        writingmode = "horizontal-lr"
+        writingmode = "horizontal"
+    if options.invertdirection:
+        if options.righttoleft:
+            writingmode += "-lr"
+        else:
+            writingmode += "-rl"
+    else:
+        if options.righttoleft:
+            writingmode += "-rl"
+        else:
+            writingmode += "-lr"
+
     f = open(opffile, "w", encoding='UTF-8')
     f.writelines(["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
                   "<package version=\"3.0\" unique-identifier=\"BookID\" ",
@@ -304,7 +315,7 @@ def buildOPF(dstdir, title, filelist, originalpath, cover=None):
                   "<metadata xmlns:opf=\"http://www.idpf.org/2007/opf\" ",
                   "xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n",
                   "<dc:title>", hescape(title), "</dc:title>\n",
-                  "<dc:language>en-US</dc:language>\n",
+                  f"<dc:language>{options.language}</dc:language>\n",
                   "<dc:identifier id=\"BookID\">urn:uuid:", options.uuid, "</dc:identifier>\n",
                   "<dc:contributor id=\"contributor\">KindleComicConverter-" + __version__ + "</dc:contributor>\n"])
     if len(options.summary) > 0:
@@ -395,13 +406,22 @@ def buildOPF(dstdir, title, filelist, originalpath, cover=None):
         else:
             return ""
 
-    if options.righttoleft:
+    if options.invertdirection:
-        f.write("</manifest>\n<spine page-progression-direction=\"rtl\" toc=\"ncx\">\n")
+        if options.righttoleft:
-        pageside = "right"
+            f.write("</manifest>\n<spine page-progression-direction=\"ltr\" toc=\"ncx\">\n")
+            pageside = "left"
+        else:
+            f.write("</manifest>\n<spine page-progression-direction=\"rtl\" toc=\"ncx\">\n")
+            pageside = "right"
     else:
-        f.write("</manifest>\n<spine page-progression-direction=\"ltr\" toc=\"ncx\">\n")
+        if options.righttoleft:
-        pageside = "left"
+            f.write("</manifest>\n<spine page-progression-direction=\"rtl\" toc=\"ncx\">\n")
-    if originalpath.lower().endswith('.pdf'):
+            pageside = "right"
+        else:
+            f.write("</manifest>\n<spine page-progression-direction=\"ltr\" toc=\"ncx\">\n")
+            pageside = "left"
+
+    if originalpath.lower().endswith('.pdf') or originalpath.lower().endswith('.epub'):
         if pageside == "right":
             pageside = "left"
         else:
@@ -466,6 +486,8 @@ def buildOPF(dstdir, title, filelist, originalpath, cover=None):
                 pageside = "right"
 
     for entry, prop in zip(reflist, page_spread_property_list):
+        if options.onepagelandscape:
+            prop = 'center'
         f.write(f'<itemref idref="page_{entry}" {pageSpreadProperty(prop)}/>\n')
 
     f.write("</spine>\n</package>\n")
@@ -892,12 +914,17 @@ def getWorkFolder(afile, workdir=None):
         fullPath = os.path.join(workdir, 'OEBPS', 'Images')
     else:
         fullPath = workdir
-    check_path = gettempdir()
+
     if options.tempdir:
         check_path = os.path.dirname(afile)
+    else:
+        check_path = gettempdir()
+
+    DISK_WARNING = "Not enough disk space to perform conversion. Try Temp Directory option."
+
     if os.path.isdir(afile):
         if disk_usage(check_path)[2] < getDirectorySize(afile) * 2.5:
-            raise UserWarning("Not enough disk space to perform conversion.")
+            raise UserWarning(DISK_WARNING)
         try:
             copytree(afile, fullPath)
             sanitizePermissions(fullPath)
@@ -907,13 +934,13 @@ def getWorkFolder(afile, workdir=None):
             raise UserWarning("Failed to prepare a workspace.")
     elif os.path.isfile(afile):
         if disk_usage(check_path)[2]< os.path.getsize(afile) * 2.5:
-            raise UserWarning("Not enough disk space to perform conversion.")
+            raise UserWarning(DISK_WARNING)
         if afile.lower().endswith('.pdf'):
             if not os.path.exists(fullPath):
                 os.makedirs(fullPath)
             path = workdir
             sanitizePermissions(path)
-            if options.pdfextract:
+            if options.legacyextract:
                 pdf = pdfjpgextract.PdfJpgExtract(afile, fullPath)
                 njpg = pdf.extract()
                 if njpg == 0:
@@ -938,6 +965,8 @@ def getWorkFolder(afile, workdir=None):
             try:
                 cbx = comicarchive.ComicArchive(afile)
                 path = cbx.extract(fullPath)
+                if options.lightnovel:
+                    return workdir
                 sanitizePermissions(path)
 
                 tdir = os.listdir(fullPath)
@@ -952,11 +981,69 @@ def getWorkFolder(afile, workdir=None):
                     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]))
+
+                if options.legacyextract:
+                    return workdir
+
+                if afile.lower().endswith('.epub'):
+                    container = ET.parse(os.path.join(path, 'META-INF', 'container.xml'))
+                    opf_path = container.find(r'.//{*}rootfile').attrib['full-path']
+                    opf_path = os.path.join(path, opf_path)
+                    opf = ET.parse(opf_path)
+                    spine = []
+                    for spine_item in opf.findall(r'.//{*}itemref'):
+                        spine.append(spine_item.attrib.get('idref'))
+                    manifest_dict = {}
+                    for manifest_item in opf.findall(".//*[@media-type='application/xhtml+xml']"):
+                        manifest_dict[manifest_item.attrib.get('id')] = manifest_item.attrib.get('href')
+                    ordered_image_paths = []
+                    for i, spine_item in enumerate(spine):
+                        try:
+                            page_path = os.path.join(os.path.dirname(opf_path), manifest_dict[spine_item])
+                            page = ET.parse(page_path)
+                        except Exception:
+                            continue
+                        imgs = page.findall(r'.//{*}img') + page.findall(r'.//{*}image')
+
+                        largest_size = 0
+                        img_path = None
+                        for img in imgs:
+                            for key in img.attrib:
+                                if 'src' in key or 'href' in key:
+                                    temp_img_path = img.attrib[key]
+                                    if temp_img_path.startswith('..'):
+                                        temp_img_path = os.path.join(os.path.dirname(opf_path), os.path.dirname(manifest_dict[spine_item]), temp_img_path)
+                                    else:
+                                        temp_img_path = os.path.join(os.path.dirname(opf_path), os.path.dirname(manifest_dict[spine_item]), temp_img_path)
+                                    try:
+                                        temp_size = os.path.getsize(temp_img_path)
+                                        if temp_size > largest_size:
+                                            largest_size = temp_size
+                                            img_path = temp_img_path
+                                    except OSError:
+                                        pass
+                        # TODO empty image
+                        if img_path:
+                            ordered_image_paths.append(img_path)
+                    # fallback if naive spine extraction fails
+                    if not ordered_image_paths:
+                        return workdir
+
+                    if options.tempdir:
+                        workdir2 = mkdtemp('', 'KCC-', os.path.dirname(afile))
+                    else:
+                        workdir2 = mkdtemp('', 'KCC-')
+                    for i, img_path in enumerate(ordered_image_paths):
+                        _, ext = os.path.splitext(img_path)
+                        fullpath2 = os.path.join(workdir2, 'OEBPS', 'Images')
+                        os.makedirs(fullpath2, exist_ok=True)
+                        shutil.copyfile(img_path, os.path.join(fullpath2, f"{i}{ext}"))
+                    rmtree(workdir, True)
+                    return workdir2
+                
                 return workdir
- 
+            finally:
-            except OSError as e:
+                pass
-                rmtree(workdir, True)
-                raise UserWarning(e)
     else:
         raise UserWarning("Failed to open source file/directory.")
 
@@ -1321,7 +1408,6 @@ def slugify(value, is_natural_sorted):
 
 def makeZIP(zipfilename, basedir, job_progress='', isepub=False):
     start = perf_counter()
-    zipfilename = os.path.abspath(zipfilename) + '.zip'
     if SEVENZIP in available_archive_tools():
         if isepub:
             mimetypeFile = open(os.path.join(basedir, '!mimetype'), 'w')
@@ -1364,10 +1450,18 @@ def makeParser():
                                    " [Default=KV]")
     main_options.add_argument("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
                               help="Manga style (right-to-left reading and splitting)")
+    main_options.add_argument("--lightnovel", action="store_true", dest="lightnovel", default=False,
+                              help="Only resize images and preserve original file structure.")
+    main_options.add_argument("--ebok", action="store_true", dest="ebok", default=False,
+                              help="Force EBOK tag instead of PDOC for MOBI")
+    main_options.add_argument("--invertdirection", action="store_true", dest="invertdirection", default=False,
+                              help="Invert page turn direction")
     main_options.add_argument("-q", "--hq", action="store_true", dest="hq", default=False,
                               help="Try to increase the quality of magnification")
     main_options.add_argument("-2", "--two-panel", action="store_true", dest="autoscale", default=False,
                               help="Display two not four panels in Panel View mode")
+    main_options.add_argument("--vertical4panel", action="store_true", dest="vertical4panel", default=False,
+                              help="Display side panels first in virtual panel view")
     main_options.add_argument("-w", "--webtoon", action="store_true", dest="webtoon", default=False,
                               help="Webtoon processing mode"),
     main_options.add_argument("--ts", "--targetsize", type=int, dest="targetsize", default=None,
@@ -1383,6 +1477,8 @@ def makeParser():
                                      "2: Use Title only")
     output_options.add_argument("-a", "--author", action="store", dest="author", default="defaultauthor",
                                 help="Author name [Default=KCC]")
+    output_options.add_argument("--language", action="store", dest="language", default="en-US",
+                                help="EPUB language [Default=en-US]")
     output_options.add_argument("-f", "--format", action="store", dest="format", default="Auto",
                                 help="Output format (Available options: Auto, MOBI, EPUB, CBZ, KFX, MOBI+EPUB, PDF) "
                                      "[Default=Auto]")
@@ -1393,6 +1489,8 @@ def makeParser():
                                      "2: Consider every subdirectory as separate volume [Default=0]")
     output_options.add_argument("--spreadshift", action="store_true", dest="spreadshift", default=False,
                                 help="Shift first page to opposite side in landscape for spread alignment")
+    output_options.add_argument("--onepagelandscape", action="store_true", dest="onepagelandscape", default=False,
+                                help="Show a single centered page in landscape")
     output_options.add_argument("--norotate", action="store_true", dest="norotate", default=False,
                                 help="Do not rotate double page spreads in spread splitter option.")
     output_options.add_argument("--rotateright", action="store_true", dest="rotateright", default=False,
@@ -1402,12 +1500,12 @@ def makeParser():
 
     processing_options.add_argument("-n", "--noprocessing", action="store_true", dest="noprocessing", default=False,
                                     help="Do not modify image and ignore any profile or processing option")
-    processing_options.add_argument("--pdfextract", action="store_true", dest="pdfextract", default=False,
+    processing_options.add_argument("--legacyextract", action="store_true", dest="legacyextract", default=False,
-                                    help="Use the legacy PDF image extraction method from KCC 8 and earlier")
+                                    help="Use the legacy PDF/EPUB image extraction method from older KCC versions")
     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,
+    processing_options.add_argument("--smartcovercrop", action="store_true", dest="smartcovercrop", default=False,
-                                    help="Disable attempt to crop main cover from wide image")
+                                    help="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,
@@ -1488,6 +1586,9 @@ def checkOptions(options):
     else:
         options.isKobo = True
 
+    if options.lightnovel:
+        options.noKepub = True
+
     if not options.iskindle and ('MOBI' in options.format or 'EPUB-200MB' in options.format or 'KFX' in options.format):
         raise UserWarning('MOBI/Send to Kindle not supported for non-Kindle profiles')
 
@@ -1607,35 +1708,37 @@ def checkTools(source):
         except (FileNotFoundError, CalledProcessError):
             print('ERROR: KindleGen is missing!')
             sys.exit(1)
+        except OSError as e:
+            print(f"kindlegen: {e.strerror}")
+            print('Re-install Rosetta/Kindle Previewer/other Intel app?')
+            print('Please email Amazon to make Kindle Previewer Apple silicon native at amazon.com/kindle-help')
+            sys.exit(1)
 
 
-def checkPre(source):
+def checkPre(source='KCC-'):
     # Make sure that all temporary files are gone
     for root, dirs, _ in walkLevel(gettempdir(), 0):
         for tempdir in dirs:
-            if tempdir.startswith('KCC-'):
+            if tempdir.startswith(source):
                 rmtree(os.path.join(root, tempdir), True)
-    # Make sure that target directory is writable
-    if os.path.isdir(source):
-        src = os.path.abspath(os.path.join(source, '..'))
-    else:
-        src = os.path.dirname(source)
-    try:
-        with TemporaryFile(prefix='KCC-', dir=src):
-            pass
-    except Exception:
-        raise UserWarning("Target directory is not writable.")
-
 
 def makeFusion(sources: List[str]):
     if len(sources) < 2:
         raise UserWarning('Fusion requires at least 2 sources. Did you forget to uncheck fusion?')
     start = perf_counter()
     first_path = Path(sources[0])
-    if first_path.is_file():
+
-        fusion_path = first_path.parent.joinpath(first_path.stem + ' [fused]')
+    if options.tempdir:
+        fusion_parent = first_path.parent
     else:
-        fusion_path = first_path.parent.joinpath(first_path.name + ' [fused]')
+        # LLL is after KCC
+        checkPre('LLL-')
+        fusion_parent = Path(mkdtemp('', 'LLL-'))
+
+    if first_path.is_file():
+        fusion_path = fusion_parent.joinpath(first_path.stem + ' [fused]')
+    else:
+        fusion_path = fusion_parent.joinpath(first_path.name + ' [fused]')
     print("Running Fusion")
 
     # Check if prefix is needed when user-specified ordering differs from OS natural sorting
@@ -1644,7 +1747,6 @@ def makeFusion(sources: List[str]):
 
     for index, source in enumerate(sources, start=1):
         print(f"Processing {source}...")
-        checkPre(source)
         print("Checking images...")
         source_path = Path(source)
         # Add the fusion_0001_ prefix to maintain user-specified order if needed
@@ -1656,7 +1758,9 @@ def makeFusion(sources: List[str]):
         else:
             targetpath = fusion_path.joinpath(f'{prefix}{source_path.name}')
 
-        getWorkFolder(source, str(targetpath))
+        path = getWorkFolder(source, str(targetpath))
+        if path != str(targetpath):
+            move(os.path.join(path, 'OEBPS', 'Images'), targetpath)
         sanitizeTree(targetpath, prefix='fusion')
         # TODO: remove flattenTree when subchapters are supported
         flattenTree(targetpath)   
@@ -1676,10 +1780,41 @@ def makeBook(source, qtgui=None, job_progress=''):
         GUI.progressBarTick.emit('1')
     else:
         checkTools(source)
-    checkPre(source)
+    checkPre()
+    if not options.filefusion:
+        checkPre('LLL-')
     print(f"{job_progress}Preparing source images...")
     path = getWorkFolder(source)
     print(f"{job_progress}Checking images...")
+
+    if options.lightnovel:
+        for root, _, files in os.walk(os.path.join(path, 'OEBPS', 'Images')):
+            for file in files:
+                _, ext = os.path.splitext(file)
+                if ext.lower() in ('.jpg', '.jpeg', '.png', '.webp', '.gif'):
+                    with Image.open(os.path.join(root, file)) as img:
+                        # TODO: detect BW images saved as RGB
+                        if not options.forcecolor:
+                            if img.mode == 'RGB':
+                                img = img.convert('L')
+                            elif img.mode == 'RGBA':
+                                img = img.convert('LA')
+                        x, y = image.ProfileData.Profiles[options.profile][1]
+                        if options.iskindle:
+                            x = min(x, 1920)
+                            y = min(y, 1920)
+                        if img.size[0] > x or img.size[1] > y:
+                            img = ImageOps.contain(img, (x, y))
+                            img.save(os.path.join(root, file), quality=options.jpegquality)
+        _, ext = os.path.splitext(source)
+        if ext != '.epub':
+            ext = '.cbz'
+        output_file = getOutputFilename(source, options.output, ext, '')
+        makeZIP(output_file, os.path.join(path, 'OEBPS', 'Images'), job_progress)
+        rmtree(path, True)
+        
+        return [output_file]
+
     getMetadata(os.path.join(path, "OEBPS", "Images"), source)
     removeNonImages(os.path.join(path, "OEBPS", "Images"))
     detectSuboptimalProcessing(os.path.join(path, "OEBPS", "Images"), source)
@@ -1706,27 +1841,27 @@ def makeBook(source, qtgui=None, job_progress=''):
                     size = get_contain_resolution(imagef, (x, y))
                     normalized_resolutions.append(size)
 
-            counter = Counter(normalized_resolutions)
+        counter = Counter(normalized_resolutions)
 
-            aspect_ratios = []
+        aspect_ratios = []
-            filtered_resolutions = []
+        filtered_resolutions = []
-            for w, h in normalized_resolutions:
+        for w, h in normalized_resolutions:
-                aspect_ratio = h / w
+            aspect_ratio = h / w
-                # page-like aspect ratios, could be improved
+            # page-like aspect ratios, could be improved
-                if aspect_ratio > 1.3 and aspect_ratio < 1.7:
+            if aspect_ratio > 1.3 and aspect_ratio < 1.7:
-                    aspect_ratios.append(aspect_ratio)
+                aspect_ratios.append(aspect_ratio)
-                    filtered_resolutions.append((w, h))
+                filtered_resolutions.append((w, h))
 
-            most_common_res, most_common_count = counter.most_common(1)[0]
+        most_common_res, most_common_count = counter.most_common(1)[0]
-            options.kfx_resolution = most_common_res
+        options.kfx_resolution = most_common_res
-            if most_common_count / counter.total() > .6:
+        if most_common_count / sum(counter.values()) > .6:
-                pass
+            pass
-            #elif max(aspect_ratios) - min(aspect_ratios) < .2:
+        #elif max(aspect_ratios) - min(aspect_ratios) < .2:
-            else:
+        else:
-                # get the widest resolution
+            # get the widest resolution
-                options.kfx_resolution = max(filtered_resolutions)
+            options.kfx_resolution = max(filtered_resolutions)
-            # else:
+        # else:
-            #     raise UserWarning('Aspect ratio of pages too different for KFX conversion')
+        #     raise UserWarning('Aspect ratio of pages too different for KFX conversion')
 
     if options.noprocessing:
         print(f"{job_progress}Do not process image, ignore any profile or processing option")
@@ -1770,7 +1905,7 @@ def makeBook(source, qtgui=None, job_progress=''):
                 filepath.append(getOutputFilename(source, options.output, '.cbz', ''))
             if cover and 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)
+            makeZIP(filepath[-1], 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
@@ -1789,19 +1924,11 @@ def makeBook(source, qtgui=None, job_progress=''):
             else:
                 buildEPUB(tome, chapterNames, tomeNumber, False, cover, source, job_progress)
                 filepath.append(getOutputFilename(source, options.output, '.epub', ''))
-            makeZIP(tome + '_comic', tome, job_progress, True)
+            makeZIP(filepath[-1], 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])
-            try:
-                os.remove(tome + '_comic.zip')
-            except FileNotFoundError:
-                # newly temporary created file is not found. It might have been already deleted
-                pass
         rmtree(tome, True)
         if GUI:
             GUI.progressBarTick.emit('tick')
-    if not GUI and options.format == 'MOBI':
+    if not GUI and options.format == 'MOBI' and not options.lightnovel:
         print(f"{job_progress}Creating MOBI files...")
         work = []
         for i in filepath:
@@ -1820,8 +1947,6 @@ def makeBook(source, qtgui=None, job_progress=''):
             if not output[0]:
                 print(f'{job_progress}Error: Failed to tweak KindleGen output!')
                 return filepath
-            else:
-                os.remove(i.replace('.epub', '.mobi') + '_toclean')
             if cover and k.path and k.coverSupport:
                 options.covers[filepath.index(i)][0].saveToKindle(k, options.covers[filepath.index(i)][1])
     if options.delete:
@@ -1832,22 +1957,23 @@ def makeBook(source, qtgui=None, job_progress=''):
 
     end = perf_counter()
     print(f"{job_progress}makeBook: {end - start} seconds")
-    # Clean up temporary workspace
+
-    try:
+    if options.filefusion:
-        rmtree(path, True)
+        rmtree(source, True)
-    except Exception:
+        checkPre('LLL-')
-        pass
+
     return filepath
 
 
 def makeMOBIFix(item, uuid):
     is_pdoc = options.profile in image.ProfileData.ProfilesKindlePDOC.keys()
+    if options.ebok:
+        is_pdoc = False
     if not options.keep_epub:
         os.remove(item)
     mobiPath = item.replace('.epub', '.mobi')
-    move(mobiPath, mobiPath + '_toclean')
     try:
-        dualmetafix.DualMobiMetaFix(mobiPath + '_toclean', mobiPath, bytes(uuid, 'UTF-8'), is_pdoc)
+        dualmetafix.DualMobiMetaFix(mobiPath, bytes(uuid, 'UTF-8'), is_pdoc)
         return [True]
     except Exception as err:
         return [False, format(err)]
@@ -1869,8 +1995,11 @@ def makeMOBIWorker(item):
     kindlegenError = ''
     try:
         if os.path.getsize(item) < 629145600:
+            start = perf_counter()
             output = subprocess_run(['kindlegen', '-dont_append_source', '-locale', 'en', item],
                            stdout=PIPE, stderr=STDOUT, encoding='UTF-8', errors='ignore', check=True)
+            end = perf_counter()
+            print(f"kindlegen: {end - start} sec")
         else:
             # ERROR: EPUB too big
             kindlegenErrorCode = 23026

kindlecomicconverter/dualmetafix.py

@@ -136,12 +136,11 @@ def del_exth(rec0, exth_num):
 
 
 class DualMobiMetaFix:
-    def __init__(self, infile, outfile, asin, is_pdoc):
+    def __init__(self, outfile, asin, is_pdoc):
         cdetype = b'EBOK'
         if is_pdoc:
             cdetype = b'PDOC'
 
-        shutil.copyfile(infile, outfile)
         f = open(outfile, "r+b")
         self.datain = mmap.mmap(f.fileno(), 0)
         self.datain_rec0 = readsection(self.datain, 0)

kindlecomicconverter/image.py

@@ -106,6 +106,7 @@ class ProfileData:
         'KS1860': ("Kindle 1860", (1860, 1920), Palette16, 1.0),
         'KS1920': ("Kindle 1920", (1920, 1920), Palette16, 1.0),
         'KS1240': ("Kindle 1240", (1240, 1860), Palette16, 1.0),
+        'KS1324': ("Kindle 1324", (1324, 1986), Palette16, 1.0),
         'KS': ("Kindle Scribe 1/2", (1860, 2480), Palette16, 1.0),
         'KCS': ("Kindle Colorsoft", (1272, 1696), Palette16, 1.0),
         'KS3': ("Kindle Scribe 3", (1986, 2648), Palette16, 1.0),
@@ -164,7 +165,10 @@ class ComicPageParser:
         with Image.open(srcImgPath) as im:
             self.image = im.copy()
 
-        self.fill = self.fillCheck()
+        self.page_background_color = self.fillCheck()
+        self.fill = self.page_background_color
+        if self.opt.bordersColor:
+            self.fill = self.opt.bordersColor
         # backwards compatibility for Pillow >9.1.0
         if not hasattr(Image, 'Resampling'):
             Image.Resampling = Image
@@ -194,9 +198,9 @@ class ComicPageParser:
             new_image = Image.new("RGB", (int(width / 2), int(height*2)))
             new_image.paste(pageone, (0, 0))
             new_image.paste(pagetwo, (0, height))
-            self.payload.append(['N', self.source, new_image, self.fill])
+            self.payload.append(['N', self.source, new_image, self.page_background_color, self.fill])
         elif self.opt.webtoon:
-            self.payload.append(['N', self.source, self.image, self.fill])
+            self.payload.append(['N', self.source, self.image, self.page_background_color, self.fill])
         # rotate only TODO dead code?
         elif (width > height) != (dstwidth > dstheight) and width <= dstheight and height <= dstwidth and self.opt.splitter == 1:
             spread = self.image
@@ -205,11 +209,12 @@ class ComicPageParser:
                     spread = spread.rotate(90, Image.Resampling.BICUBIC, True)
                 else:
                     spread = spread.rotate(-90, Image.Resampling.BICUBIC, True)
-            self.payload.append(['R', self.source, spread, self.fill])
+            self.payload.append(['R', self.source, spread, self.page_background_color, self.fill])
         # elif wide enough to split
         elif (width > height) != (dstwidth > dstheight) and width / height > 1.16:
             # if (split) or (split and rotate)
-            if self.opt.splitter != 1 and width / height < 1.75:
+            BISECT_THRESHOLD = 1.8
+            if self.opt.splitter != 1 and width / height < BISECT_THRESHOLD:
                 if width > height:
                     leftbox = (0, 0, int(width / 2), height)
                     rightbox = (int(width / 2), 0, width, height)
@@ -222,23 +227,23 @@ class ComicPageParser:
                 else:
                     pageone = self.image.crop(leftbox)
                     pagetwo = self.image.crop(rightbox)
-                self.payload.append(['S1', self.source, pageone, self.fill])
+                self.payload.append(['S1', self.source, pageone, self.page_background_color, self.fill])
-                self.payload.append(['S2', self.source, pagetwo, self.fill])
+                self.payload.append(['S2', self.source, pagetwo, self.page_background_color, self.fill])
 
             # if (rotate) or (split and rotate)
-            if self.opt.splitter > 0 or (self.opt.splitter == 0 and width / height >= 1.75):
+            if self.opt.splitter > 0 or (self.opt.splitter == 0 and width / height >= BISECT_THRESHOLD):
                 spread = self.image
                 if not self.opt.norotate:
                     if not self.opt.rotateright:
                         spread = spread.rotate(90, Image.Resampling.BICUBIC, True)
                     else:
                         spread = spread.rotate(-90, Image.Resampling.BICUBIC, True)
-                self.payload.append(['R', self.source, spread, self.fill])
+                self.payload.append(['R', self.source, spread, self.page_background_color, self.fill])
         else:
-            self.payload.append(['N', self.source, self.image, self.fill])
+            self.payload.append(['N', self.source, self.image, self.page_background_color, self.fill])
 
     def fillCheck(self):
-        if self.opt.bordersColor:
+        if False:
             return self.opt.bordersColor
         else:
             bw = self.image.convert('L').point(lambda x: 0 if x < 128 else 255, '1')
@@ -277,7 +282,7 @@ class ComicPageParser:
 
 
 class ComicPage:
-    def __init__(self, options, mode, path, image, fill):
+    def __init__(self, options, mode, path, image, page_background_color, fill):
         self.opt = options
         _, self.size, self.palette, self.gamma = self.opt.profileData
         if self.opt.hq:
@@ -287,6 +292,7 @@ class ComicPage:
         self.image = image.convert("RGB")
         self.color = self.colorCheck()
         self.colorOutput = self.color and self.opt.forcecolor
+        self.page_background_color = page_background_color
         self.fill = fill
         self.rotated = False
         self.orgPath = os.path.join(path[0], path[1])
@@ -560,7 +566,7 @@ class ComicPage:
             self.image = self.image.crop(box)
 
     def cropPageNumber(self, power, minimum):
-        bbox = get_bbox_crop_margin_page_number(self.image, power, self.fill)
+        bbox = get_bbox_crop_margin_page_number(self.image, power, self.page_background_color)
         
         if bbox:
             w, h = self.image.size
@@ -570,7 +576,7 @@ class ComicPage:
             self.maybeCrop(bbox, minimum)
 
     def cropMargin(self, power, minimum):
-        bbox = get_bbox_crop_margin(self.image, power, self.fill)
+        bbox = get_bbox_crop_margin(self.image, power, self.page_background_color)
         
         if bbox:
             w, h = self.image.size
@@ -580,7 +586,7 @@ class ComicPage:
             self.maybeCrop(bbox, minimum)
 
     def cropInterPanelEmptySections(self, direction):
-        self.image = crop_empty_inter_panel(self.image, direction, background_color=self.fill)
+        self.image = crop_empty_inter_panel(self.image, direction, background_color=self.page_background_color)
 
 class Cover:
     def __init__(self, source, opt):
@@ -598,7 +604,7 @@ class Cover:
         self.image = ImageOps.autocontrast(self.image, preserve_tone=True)
         if not self.options.forcecolor:
             self.image = self.image.convert('L')
-        if not self.options.nosmartcovercrop:
+        if self.options.smartcovercrop:
             self.crop_main_cover()
 
         size = list(self.options.profileData[1])

kindlecomicconverter/shared.py

@@ -122,10 +122,6 @@ def dependencyCheck(level):
                 missing.append('PySide 6.0.0')
         except ImportError:
             missing.append('PySide 6.0.0+')
-        try:
-            import raven
-        except ImportError:
-            missing.append('raven 6.0.0+')
     if level > 1:
         try:
             from psutil import __version__ as psutilVersion

requirements-docker.txt

@@ -1,11 +1,11 @@
 Pillow>=11.3.0
-psutil>=5.9.5
+psutil>=7.2.2
-requests>=2.31.0
+requests>=2.34.2
-python-slugify>=1.2.1
+python-slugify>=8.0.4
-packaging>=23.2
+packaging>=26.2
 mozjpeg-lossless-optimization>=1.2.0
 natsort>=8.4.0
-distro>=1.8.0
+distro>=1.9.0
 # Below requirements are compiled in Dockefile
 # numpy==2.3.4
 # PyMuPDF==1.26.6

requirements-osx-legacy.txt

@@ -1,12 +1,11 @@
 PySide6==6.4.3
 Pillow>=11.3.0
-psutil>=5.9.5
+psutil>=7.2.2
-requests>=2.31.0
+requests>=2.34.2
-python-slugify>=1.2.1
+python-slugify>=8.0.4
-raven>=6.0.0
+packaging>=26.2
-packaging>=23.2
 mozjpeg-lossless-optimization>=1.2.0
 natsort>=8.4.0
-distro>=1.8.0
+distro>=1.9.0
 numpy<2
-PyMuPDF>=1.26.1
+PyMuPDF==1.25.5

requirements-win7.txt

@@ -1,12 +1,11 @@
 PySide6==6.1.3
 Pillow>=9
-psutil>=5.9.5
+psutil>=7.2.2
-requests>=2.31.0
+requests>=2.32.4
-python-slugify>=1.2.1
+python-slugify>=8.0.4
-raven>=6.0.0
+packaging>=26.2
-packaging>=23.2
 mozjpeg-lossless-optimization>=1.2.0
 natsort>=8.4.0
-distro>=1.8.0
+distro>=1.9.0
-numpy==1.23.0
+numpy==1.23.5
 PyMuPDF>=1.16

requirements.txt

@@ -1,12 +1,11 @@
 PySide6<6.10
 Pillow>=11.3.0
-psutil>=5.9.5
+psutil>=7.2.2
-requests>=2.31.0
+requests>=2.34.2
-python-slugify>=1.2.1,<9.0.0
+python-slugify>=8.0.4,<9.0.0
-raven>=6.0.0
+packaging>=26.2
-packaging>=23.2
 mozjpeg-lossless-optimization>=1.2.0
 natsort>=8.4.0
-distro>=1.8.0
+distro>=1.9.0
 numpy>=1.22.4
 PyMuPDF>=1.18.0

setup.py

@@ -153,11 +153,11 @@ setuptools.setup(
         'psutil>=5.9.5',
         'requests>=2.31.0',
         'python-slugify>=1.2.1,<9.0.0',
-        'raven>=6.0.0',
         'mozjpeg-lossless-optimization>=1.2.0',
         'natsort>=8.4.0',
         'distro>=1.8.0',
         'numpy>=1.22.4',
+        'packaging>=23.2',
         'PyMuPDF>=1.16.1',
     ],
     classifiers=[],