Bump version to 9.3.4

* remove duplicated PyMuPDF entry and change packages order for easier comparison with requirements.txt

* update packages versions to be synced to each other (requirements.txt vs install_requires in setuptools.setup()

* add missing pyinstaller package which is required to build exe/app

* clarify minimums

* fix typo

* remove pyinstaller

Remove pyinstaller from the requirements.

---------

Co-authored-by: Alex Xu <alexkurosakimh3@gmail.com>

.dockerignore

@@ -1,13 +1,40 @@
 .git
 .github
+
 build
 dist
 KindleComicConverter.egg-info
+
 .dockerignore
 .gitignore
 .travis.yml
+
 Dockerfile
 venv
+.venv
+__pycache__/
+*/__pycache__/
+*.pyc
+
 *.md
-LICENSE.txt
+*.txt
+!requirements-docker.txt
 MANIFEST.in
+
+*.yml
+*.spec
+
+*.svg
+*.jpg
+*.json
+
+gen_ui_files.bat
+gen_ui_files.sh
+
+gui/
+icons/
+
+kindlecomicconverter/KCC_gui.py
+kindlecomicconverter/KCC_rc.py
+kindlecomicconverter/KCC_ui_editor.py
+kindlecomicconverter/KCC_ui.py

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: eink_dude
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,6 +69,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/docker-base-publish.yml

@@ -1,34 +0,0 @@
-name: Docker base
-
-on:
-  workflow_dispatch:
-  push:
-    tags: [ 'docker-base-*' ]
-    
-    # Don't trigger if it's just a documentation update
-    paths-ignore:
-      - '**.md'
-      - '**.MD'
-      - '**.yml'
-      - 'docs/**'
-      - 'LICENSE'
-      - '.gitattributes'
-      - '.gitignore'
-      - '.dockerignore'
-
-
-jobs:
-  build_and_push:
-    uses: sdr-enthusiasts/common-github-workflows/.github/workflows/build_and_push_image.yml@main
-    with:
-      docker_build_file: ./Dockerfile-base
-      platform_linux_arm32v7_enabled: true
-      platform_linux_arm64v8_enabled: true
-      platform_linux_amd64_enabled: true
-      push_enabled: true
-      build_nohealthcheck: false
-      ghcr_repo_owner: ${{ github.repository_owner }}
-      ghcr_repo: ${{ github.repository }}
-      build_latest: false
-    secrets:
-      ghcr_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker-publish.yml

@@ -1,10 +1,10 @@
-name: Docker
+name: Build and Publish Docker Image
 
 on:
   workflow_dispatch:
   push:
-    # Publish semver tags as releases.
+    tags: 
-    tags: [ 'v*.*.*' ]
+      - 'v*.*.*'
     
     # Don't trigger if it's just a documentation update
     paths-ignore:
@@ -15,19 +15,53 @@ on:
       - 'LICENSE'
       - '.gitattributes'
       - '.gitignore'
-      - '.dockerignore'
-
 
 jobs:
-  build_and_push:
+  build_and_publish_base_image:
-    uses: sdr-enthusiasts/common-github-workflows/.github/workflows/build_and_push_image.yml@main
+    runs-on: ubuntu-latest
-    with:
+    steps:
-      platform_linux_arm32v7_enabled: true
+      - name: Checkout
-      platform_linux_arm64v8_enabled: true
+        uses: actions/checkout@v6
-      platform_linux_amd64_enabled: true
+
-      push_enabled: true
+      - name: Login to GitHub Container Registry
-      build_nohealthcheck: false
+        uses: docker/login-action@v3
-      ghcr_repo_owner: ${{ github.repository_owner }}
+        with:
-      ghcr_repo: ${{ github.repository }}
+          registry: ghcr.io
-    secrets:
+          username: ${{ github.repository_owner }}
-      ghcr_token: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set Release Date
+        id: release_date
+        run: |
+          echo "release_date=$(date --rfc-3339=date)" >> $GITHUB_OUTPUT
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository_owner }}/kcc
+          # Always creates the "latest" tag
+          flavor: |
+            latest=true
+          tags: |
+            type=ref,event=tag
+            type=raw,value=${{ steps.release_date.outputs.release_date }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          context: .
+          push: true
+          tags: |
+            ${{ steps.meta.outputs.tags }}
+          cache-from: |
+            type=registry,ref=ghcr.io/ciromattia/kcc:cache
+            type=registry,ref=ghcr.io/${{ github.repository_owner }}/kcc:cache
+          cache-to: type=registry,ref=ghcr.io/${{ github.repository_owner }}/kcc:cache,mode=max

.github/workflows/package-linux.yml

@@ -25,9 +25,9 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.11
         cache: 'pip'
@@ -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

@@ -28,9 +28,9 @@ jobs:
         os: [ macos-13, macos-14 ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.11
           cache: 'pip'
@@ -69,7 +69,7 @@ jobs:
           # apply provisioning profile
           mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
           cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: 16
       - run: npm install -g appdmg
@@ -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
@@ -89,7 +89,6 @@ jobs:
           prerelease: true
           generate_release_notes: true
           files: |
-            LICENSE.txt
             dist/*.dmg
       - name: Clean up keychain and provisioning profile
 #        TODO signing

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

@@ -0,0 +1,66 @@
+name: build KCC for osx legacy
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "v*.*.*"
+
+    # Don't trigger if it's just a documentation update
+    paths-ignore:
+      - '**.md'
+      - '**.MD'
+      - '**.yml'
+      - '**.sh'
+      - 'docs/**'
+      - 'Dockerfile'
+      - 'LICENSE'
+      - '.gitattributes'
+      - '.gitignore'
+      - '.dockerignore'
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ macos-13 ]
+    runs-on: ${{ matrix.os }}
+    env:
+      # We need the official Python, because the GA ones only support newer macOS versions
+      # The deployment target is picked up by the Python build tools automatically
+      PYTHON_VERSION: 3.11.9
+      MACOSX_DEPLOYMENT_TARGET: '10.14'
+    steps:
+      - 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
+        run: |
+          sudo installer -pkg python.pkg -target /
+      - name: Install Python dependencies
+        run: |
+          python3 --version
+          pip3 install --upgrade pip setuptools wheel pyinstaller certifi
+          pip3 install --upgrade -r requirements-osx-legacy.txt
+          ./gen_ui_files.sh
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 16
+      - run: npm install -g appdmg
+      - name: build binary
+        run: |
+          python3 setup.py build_binary
+      - name: upload build
+        uses: actions/upload-artifact@v5
+        with:
+          name: osx-build-${{ runner.arch }}
+          path: dist/*.dmg
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          prerelease: true
+          generate_release_notes: true
+          files: |
+            LICENSE.txt
+            dist/*.dmg

.github/workflows/package-windows-with-docker.yml

@@ -1,62 +0,0 @@
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: build KCC for windows with docker
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - "v*.*.*"
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        entry: [ kcc-c2e, kcc-c2p ]
-        include:
-          - entry: kcc-c2e
-            capital: KCC_c2e
-          - entry: kcc-c2p
-            capital: KCC_c2p
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Package Application
-        uses: JackMcKew/pyinstaller-action-windows@main
-        with:
-          path: .
-          spec: ./${{ matrix.entry }}.spec
-      - name: rename binaries
-        run: |   
-          version_built=$(cat kindlecomicconverter/__init__.py | grep version | awk '{print $3}' | sed "s/[^.0-9b]//g")
-          mv dist/windows/${{ matrix.entry }}.exe dist/windows/${{ matrix.capital }}_${version_built}.exe 
-
-      - name: upload-unsigned-artifact
-        id: upload-unsigned-artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: windows-build-${{ matrix.entry }}
-          path: dist/windows/*.exe
-      
-      - id: optional_step_id
-        uses: signpath/github-action-submit-signing-request@v1.2
-        if: ${{ github.repository == 'ciromattia/kcc' }}
-        with:
-          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
-          organization-id: '1dc1bad6-4a8c-4f85-af30-5c5d3d392ea6'
-          project-slug: 'kcc'
-          signing-policy-slug: 'release-signing'
-          github-artifact-id: '${{ steps.upload-unsigned-artifact.outputs.artifact-id }}'
-          wait-for-completion: true
-          output-artifact-directory: 'dist/windows/'
-      
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          prerelease: true
-          generate_release_notes: true
-          files: |
-            LICENSE.txt
-            dist/windows/*.exe

.github/workflows/package-windows.yml

@@ -23,11 +23,21 @@ on:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        entry: [ kcc, kcc-c2e, kcc-c2p ]
+        include:
+          - entry: kcc
+            command: build_binary
+          - entry: kcc-c2e
+            command: build_c2e
+          - entry: kcc-c2p
+            command: build_c2p
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.11
           cache: 'pip'
@@ -40,15 +50,15 @@ jobs:
           pip install certifi pyinstaller --no-binary pyinstaller
       - name: build binary
         run: |
-          python setup.py build_binary
+          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
+          name: windows-build-${{ matrix.entry }}
           path: dist/*.exe
       - id: optional_step_id
-        uses: signpath/github-action-submit-signing-request@v1.2
+        uses: signpath/github-action-submit-signing-request@v2.0
         if: ${{ github.repository == 'ciromattia/kcc' }}
         with:
          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
@@ -65,5 +75,4 @@ jobs:
           prerelease: true
           generate_release_notes: true
           files: |
-            LICENSE.txt
             dist/*.exe

.github/workflows/package-windows7.yml

@@ -0,0 +1,60 @@
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: build KCC for windows 7
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "v*.*.*"
+
+    # Don't trigger if it's just a documentation update
+    paths-ignore:
+      - '**.md'
+      - '**.MD'
+      - '**.yml'
+      - '**.sh'
+      - 'docs/**'
+      - 'Dockerfile'
+      - 'LICENSE'
+      - '.gitattributes'
+      - '.gitignore'
+      - '.dockerignore'
+
+jobs:
+  build:
+    runs-on: windows-2022
+    env:
+      WINDOWS_7: 1
+    steps:
+      - uses: actions/checkout@v6
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.8
+          cache: 'pip'
+      - name: Install dependencies
+        env:
+          PYINSTALLER_COMPILE_BOOTLOADER: 1
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install -r requirements-win7.txt
+          pip install certifi pyinstaller --no-binary pyinstaller
+          .\gen_ui_files.bat
+      - name: build binary
+        run: |
+          python setup.py build_binary
+      - name: upload-unsigned-artifact
+        id: upload-unsigned-artifact
+        uses: actions/upload-artifact@v5
+        with:
+          name: windows7-build
+          path: dist/*.exe
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          prerelease: true
+          generate_release_notes: true
+          files: |
+            dist/*.exe

.gitignore

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

Dockerfile

@@ -1,19 +1,77 @@
-# Select final stage based on TARGETARCH ARG
+# STAGE 1: BUILDER
-FROM ghcr.io/ciromattia/kcc:docker-base-20241116
+# Contains all build tools and dev dependencies, will be discarded
-LABEL com.kcc.name="Kindle Comic Converter"
+FROM python:3.13-slim-bullseye AS builder
-LABEL com.kcc.author="Ciro Mattia Gonano, Paweł Jastrzębski and Darodi"
-LABEL org.opencontainers.image.description='Kindle Comic Converter'
-LABEL org.opencontainers.image.documentation='https://github.com/ciromattia/kcc'
-LABEL org.opencontainers.image.source='https://github.com/ciromattia/kcc'
-LABEL org.opencontainers.image.authors='darodi'
-LABEL org.opencontainers.image.url='https://github.com/ciromattia/kcc'
-LABEL org.opencontainers.image.documentation='https://github.com/ciromattia/kcc'
-LABEL org.opencontainers.image.vendor='ciromattia'
-LABEL org.opencontainers.image.licenses='ISC'
-LABEL org.opencontainers.image.title="Kindle Comic Converter"
 
-COPY . /opt/kcc
+# Install system dependencies
-RUN cat /opt/kcc/kindlecomicconverter/__init__.py | grep version | awk '{print $3}' | sed "s/'//g" > /IMAGE_VERSION
+RUN set -x && \
+    BUILD_DEPS="build-essential cmake libffi-dev libfreetype6-dev libfontconfig1-dev libpng-dev libjpeg-dev libssl-dev libxft-dev make python3-dev python3-setuptools python3-wheel" && \
+    RUNTIME_DEPS="bash ca-certificates chrpath locales locales-all libfreetype6 libfontconfig1 p7zip-full python3 python3-pip libgl1" && \
+    DEBIAN_FRONTEND=noninteractive apt-get update -y && \
+    apt-get install -y --no-install-recommends ${BUILD_DEPS} ${RUNTIME_DEPS}
 
-ENTRYPOINT ["/opt/kcc/kcc-c2e.py"]
+RUN \
+    set -x && \
+    python -m venv /opt/venv && \
+    . /opt/venv/bin/activate && \
+    pip install --upgrade pip
+
+# Install numpy first, as it is unlikely to change and takes too long to compile
+RUN \
+    set -x && \
+    . /opt/venv/bin/activate && \
+    pip install --no-cache-dir numpy==2.3.4
+
+# Install PyMuPDF separately, as it is likely to change but still takes too long to compile
+RUN \
+    set -x && \
+    . /opt/venv/bin/activate && \
+    pip install --no-cache-dir PyMuPDF==1.26.6
+
+# Install Python dependencies using virtual environment
+COPY requirements-docker.txt .
+
+RUN \
+    set -x && \
+    . /opt/venv/bin/activate && \
+    pip install --no-cache-dir -r requirements-docker.txt
+
+# STAGE 2: FINAL
+# Clean, small and secure image with only runtime dependencies
+FROM python:3.13-slim-bullseye
+
+# Install runtime dependencies only
+RUN \
+    set -x && \
+    DEBIAN_FRONTEND=noninteractive apt-get update -y && \
+    apt-get install -y --no-install-recommends p7zip-full && \
+    rm -rf /var/lib/apt/lists/*
+
+# Copy artifacts from builder
+COPY --from=builder /opt/venv /opt/venv
+COPY . /opt/kcc/
+
+WORKDIR /opt/kcc
+ENV PATH="/opt/venv/bin:$PATH"
+
+# Setup executable and version file
+RUN \
+    chmod +x /opt/kcc/entrypoint.sh && \
+    ln -s /opt/kcc/kcc-c2e.py /usr/local/bin/c2e && \
+    ln -s /opt/kcc/kcc-c2p.py /usr/local/bin/c2p && \
+    ln -s /opt/kcc/entrypoint.sh /usr/local/bin/entrypoint && \
+    ln -s /opt/kcc/kindlegen/kindlegen /usr/local/bin/kindlegen && \
+    cat /opt/kcc/kindlecomicconverter/__init__.py | grep version | awk '{print $3}' | sed "s/'//g" > /IMAGE_VERSION
+
+LABEL com.kcc.name="Kindle Comic Converter" \
+    com.kcc.author="Ciro Mattia Gonano, Paweł Jastrzębski and Darodi" \
+    org.opencontainers.image.title="Kindle Comic Converter" \
+    org.opencontainers.image.description='Kindle Comic Converter' \
+    org.opencontainers.image.documentation='https://github.com/ciromattia/kcc' \
+    org.opencontainers.image.source='https://github.com/ciromattia/kcc' \
+    org.opencontainers.image.authors='Darodi and José Cerezo' \
+    org.opencontainers.image.url='https://github.com/ciromattia/kcc' \
+    org.opencontainers.image.vendor='ciromattia' \
+    org.opencontainers.image.licenses='ISC'
+
+ENTRYPOINT ["entrypoint"]
 CMD ["-h"]

Dockerfile-base

@@ -1,164 +0,0 @@
-FROM --platform=linux/amd64 python:3.13-slim-bullseye as compile-amd64
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
-RUN echo "I'm building for $TARGETOS/$TARGETARCH/$TARGETVARIANT"
-
-
-COPY requirements.txt /opt/kcc/
-ENV PATH="/opt/venv/bin:$PATH"
-RUN DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \
-    apt-get install -y libpng-dev libjpeg-dev p7zip-full unrar-free libgl1 && \
-    python -m pip install --upgrade pip && \
-    python -m venv /opt/venv && \
-    python -m pip install -r /opt/kcc/requirements.txt
-
-
-######################################################################################
-
-FROM --platform=linux/arm64 python:3.13-slim-bullseye as compile-arm64
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
-RUN echo "I'm building for $TARGETOS/$TARGETARCH/$TARGETVARIANT"
-
-ENV LC_ALL=C.UTF-8 \
-    LANG=C.UTF-8 \
-    LANGUAGE=en_US:en
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-COPY requirements.txt /opt/kcc/
-ENV PATH="/opt/venv/bin:$PATH"
-
-RUN set -x && \
-    TEMP_PACKAGES=() && \
-    KEPT_PACKAGES=() && \
-    # Packages only required during build
-    TEMP_PACKAGES+=(build-essential) && \
-    TEMP_PACKAGES+=(cmake) && \
-    TEMP_PACKAGES+=(libfreetype6-dev) && \
-    TEMP_PACKAGES+=(libfontconfig1-dev) && \
-    TEMP_PACKAGES+=(libpng-dev) && \
-    TEMP_PACKAGES+=(libjpeg-dev) && \
-    TEMP_PACKAGES+=(libssl-dev) && \
-    TEMP_PACKAGES+=(libxft-dev) && \
-    TEMP_PACKAGES+=(make) && \
-    TEMP_PACKAGES+=(python3-dev) && \
-    TEMP_PACKAGES+=(python3-setuptools) && \
-    TEMP_PACKAGES+=(python3-wheel) && \
-    # Packages kept in the image
-    KEPT_PACKAGES+=(bash) && \
-    KEPT_PACKAGES+=(ca-certificates) && \
-    KEPT_PACKAGES+=(chrpath) && \
-    KEPT_PACKAGES+=(locales) && \
-    KEPT_PACKAGES+=(locales-all) && \
-    KEPT_PACKAGES+=(libfreetype6) && \
-    KEPT_PACKAGES+=(libfontconfig1) && \
-    KEPT_PACKAGES+=(p7zip-full) && \
-    KEPT_PACKAGES+=(python3) && \
-    KEPT_PACKAGES+=(python3-pip) && \
-    KEPT_PACKAGES+=(unrar-free) && \
-    # Install packages
-    DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        ${KEPT_PACKAGES[@]} \
-        ${TEMP_PACKAGES[@]} \
-        && \
-    # Install required python modules
-    python -m pip install --upgrade pip && \
-    python -m venv /opt/venv && \
-    python -m pip install -r /opt/kcc/requirements.txt
-
-
-######################################################################################
-
-FROM --platform=linux/arm/v7 python:3.13-slim-bullseye as compile-armv7
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
-RUN echo "I'm building for $TARGETOS/$TARGETARCH/$TARGETVARIANT"
-
-ENV LC_ALL=C.UTF-8 \
-    LANG=C.UTF-8 \
-    LANGUAGE=en_US:en
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-COPY requirements.txt /opt/kcc/
-ENV PATH="/opt/venv/bin:$PATH"
-
-RUN set -x && \
-    TEMP_PACKAGES=() && \
-    KEPT_PACKAGES=() && \
-    # Packages only required during build
-    TEMP_PACKAGES+=(build-essential) && \
-    TEMP_PACKAGES+=(cmake) && \
-    TEMP_PACKAGES+=(libffi-dev) && \
-    TEMP_PACKAGES+=(libfreetype6-dev) && \
-    TEMP_PACKAGES+=(libfontconfig1-dev) && \
-    TEMP_PACKAGES+=(libpng-dev) && \
-    TEMP_PACKAGES+=(libjpeg-dev) && \
-    TEMP_PACKAGES+=(libssl-dev) && \
-    TEMP_PACKAGES+=(libxft-dev) && \
-    TEMP_PACKAGES+=(make) && \
-    TEMP_PACKAGES+=(python3-dev) && \
-    TEMP_PACKAGES+=(python3-setuptools) && \
-    TEMP_PACKAGES+=(python3-wheel) && \
-    # Packages kept in the image
-    KEPT_PACKAGES+=(bash) && \
-    KEPT_PACKAGES+=(ca-certificates) && \
-    KEPT_PACKAGES+=(chrpath) && \
-    KEPT_PACKAGES+=(locales) && \
-    KEPT_PACKAGES+=(locales-all) && \
-    KEPT_PACKAGES+=(libfreetype6) && \
-    KEPT_PACKAGES+=(libfontconfig1) && \
-    KEPT_PACKAGES+=(p7zip-full) && \
-    KEPT_PACKAGES+=(python3) && \
-    KEPT_PACKAGES+=(python3-pip) && \
-    KEPT_PACKAGES+=(unrar-free) && \
-    # Install packages
-    DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        ${KEPT_PACKAGES[@]} \
-        ${TEMP_PACKAGES[@]} \
-        && \
-    # Install required python modules
-    python -m pip install --upgrade pip && \
-    python -m venv /opt/venv && \
-    python -m pip install --upgrade pillow psutil requests python-slugify raven packaging mozjpeg-lossless-optimization natsort distro numpy
-
-
-######################################################################################
-FROM --platform=linux/amd64 python:3.13-slim-bullseye as build-amd64
-COPY --from=compile-amd64 /opt/venv /opt/venv
-
-FROM --platform=linux/arm64 python:3.13-slim-bullseye as build-arm64
-COPY --from=compile-arm64 /opt/venv /opt/venv
-
-FROM --platform=linux/arm/v7 python:3.13-slim-bullseye as build-armv7
-COPY --from=compile-armv7 /opt/venv /opt/venv
-######################################################################################
-
-# Select final stage based on TARGETARCH ARG
-FROM build-${TARGETARCH}${TARGETVARIANT}
-LABEL com.kcc.name="Kindle Comic Converter base image"
-LABEL com.kcc.author="Ciro Mattia Gonano, Paweł Jastrzębski and Darodi"
-LABEL org.opencontainers.image.description='Kindle Comic Converter base image'
-LABEL org.opencontainers.image.documentation='https://github.com/ciromattia/kcc'
-LABEL org.opencontainers.image.source='https://github.com/ciromattia/kcc'
-LABEL org.opencontainers.image.authors='darodi'
-LABEL org.opencontainers.image.url='https://github.com/ciromattia/kcc'
-LABEL org.opencontainers.image.documentation='https://github.com/ciromattia/kcc'
-LABEL org.opencontainers.image.vendor='ciromattia'
-LABEL org.opencontainers.image.licenses='ISC'
-LABEL org.opencontainers.image.title="Kindle Comic Converter"
-
-
-ENV PATH="/opt/venv/bin:$PATH"
-WORKDIR /app
-RUN DEBIAN_FRONTEND=noninteractive apt-get update -y && apt-get -yq upgrade && \
-    apt-get install -y p7zip-full unrar-free  && \
-    ln -s /app/kindlegen /bin/kindlegen && \
-    echo docker-base-20241116 > /IMAGE_VERSION
-

README.md

@@ -2,22 +2,50 @@
 
 # KCC
 
-
-
 [![GitHub release](https://img.shields.io/github/release/ciromattia/kcc.svg)](https://github.com/ciromattia/kcc/releases)
 [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/ciromattia/kcc/docker-publish.yml?label=docker%20build)](https://github.com/ciromattia/kcc/pkgs/container/kcc)
+[![Github All Releases](https://img.shields.io/github/downloads/ciromattia/kcc/total.svg)](https://github.com/ciromattia/kcc/releases)
+
+
+**Kindle Comic Converter** optimizes black & white comics and manga for E-ink ereaders 
+like Kindle, Kobo, ReMarkable, and more.
+Pages display in fullscreen without margins, 
+with proper fixed layout support.
+Supported input formats include JPG/PNG image files in folders, archives, or PDFs.
+Supported output formats include MOBI/AZW3, EPUB, KEPUB, CBZ, and PDF.
+
+**NEW**: PDF output is now supported for direct conversion to reMarkable devices! 
+When using a reMarkable profile (Rmk1, Rmk2, RmkPP), the format automatically defaults to PDF 
+for optimal compatibility with your device's native PDF reader.
+
+The absolute highest quality source files are print quality DRM-free PDFs from Kodansha/[Humble Bundle](https://humblebundleinc.sjv.io/xL6Zv1)/Fanatical,
+which can be directly converted by KCC.
 
-**Kindle Comic Converter** optimizes comics and manga for eink readers like Kindle, Kobo, ReMarkable, and more. 
-Pages display in fullscreen without margins, with proper fixed layout support. 
 Its main feature is various optional image processing steps to look good on eink screens, 
 which have different requirements than normal LCD screens.
-It also does filesize optimization by downscaling to your specific device's screen resolution,
+Combining that with downscaling to your specific device's screen resolution
-which can improve performance on underpowered ereaders. 
+can result in filesize reductions of hundreds of MB per volume with no visible quality loss on eink.
-Supported input formats include folders and archives of JPG/PNG files and more.
+This can also improve battery life, page turn speed, and general performance 
-Supported output formats include virtual panel view MOBI/AZW3, EPUB, KEPUB, and CBZ.
+on underpowered ereaders with small memory and storage capacities.
+
+KCC avoids many common formatting issues (some of which occur [even on the Kindle Store](https://github.com/ciromattia/kcc/wiki/Kindle-Store-bad-formatting)), such as:
+1) faded black levels causing unneccessarily low contrast, which is hard to see and can cause eyestrain.
+2) unneccessary margins at the bottom of the screen
+3) Not utilizing the full 1860x2480 resolution of the 10" Kindle Scribe
+4) incorrect page turn direction for manga that's read right to left
+5) unaligned two page spreads in landscape, where pages are shifted over by 1
+
+The GUI looks like this, built in Qt6, with my most commonly used settings:
 
 ![image](https://github.com/user-attachments/assets/36ad2131-6677-4559-bd6f-314a90c27218)
 
+Simply drag and drop your files/folders into the KCC window, 
+adjust your settings (hover over each option to see details in a tooltip), 
+and hit convert to create ereader optimized files.
+You can change the default output directory by holding `Shift` while clicking the convert button.
+Then just drag and drop the generated output files onto your device's documents folder via USB.
+If you are on macOS and use a 2022+ Kindle, you may need to use Amazon USB File Manager for Mac.
+
 YouTube tutorial (please subscribe): https://www.youtube.com/watch?v=IR2Fhcm9658
 
 ### A word of warning
@@ -44,6 +72,13 @@ If you find **KCC** valuable you can consider donating to the authors:
 
   [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/Q5Q41BW8HS)
 
+## Commissions
+
+This section is subject to change:
+
+Email (for commisions and inquiries): `kindle.comic.converter` gmail
+
+
 ## Sponsors
 
 - Free code signing on Windows provided by [SignPath.io](https://about.signpath.io/), certificate by [SignPath Foundation](https://signpath.org/)
@@ -57,26 +92,44 @@ Click on **Assets** of the latest release.
 You probably want either
 - `KCC_*.*.*.exe` (Windows)
 - `kcc_macos_arm_*.*.*.dmg` (recent Mac with Apple Silicon M1 chip or later)
-- `kcc_macos_i386_*.*.*.dmg` (older Mac with Intel chip)
+- `kcc_macos_i386_*.*.*.dmg` (older Mac with Intel chip macOS 12+)
+
+There are also legacy macOS 10.14+ and Windows 7 experimental versions available.
 
 The `c2e` and `c2p` versions are command line tools for power users.
 
-On Windows 11, you may need to run in compatibility mode for an older Windows version.
-
 On Mac, right click open to get past the security warning.
 
 For flatpak, Docker, and AppImage versions, refer to the wiki: https://github.com/ciromattia/kcc/wiki/Installation
 
 ## FAQ
-- [Windows 7 support](https://github.com/ciromattia/kcc/issues/678)
+- Should I use Calibre?
-- [Combine files/chapters](https://github.com/ciromattia/kcc/issues/612#issuecomment-2117985011)
+  - No. Calibre doesn't properly support fixed layout EPUB/MOBI, so modifying KCC output (even just metadata!) in Calibre can break the formatting.
-- [Flatpak mobi conversion stuck](https://github.com/ciromattia/kcc/wiki/Installation#linux)
+    Viewing KCC output in Calibre will also not work properly.
-- Image too dark?
+    On 7th gen and later Kindles running firmware 5.15.1+, you can get cover thumbnails simply by USB dropping into documents folder.
-  - The default gamma correction of 1.8 makes the image darker, and is useful for faded/gray artwork/text. Disable by setting gamma = 1.0
+    On 6th gen and older, you can get cover thumbnails by keeping Kindle plugged in during conversion.
-- [Better PDF support (Humble Bundle, Fanatical, etc)](https://github.com/ciromattia/kcc/issues/680)
+    If you are careful to not modify the file however, you can still use Calibre, but direct USB dropping is reccomended.
+- Blank pages?
+  - May happen when [using PNG with Kindle Scribe](https://github.com/ciromattia/kcc/issues/665) or [any format with a Kindle Colorsoft](https://github.com/ciromattia/kcc/issues/768). Solve by using JPG with Kindle Scribe or buying a Kobo Colour. Happens more often when turning pages really fast.
+    Going back a few pages and exiting and re-entering book should fix it temporarily.
+- What output format should I use?
+  - MOBI for Kindles. CBZ for Kindle DX. CBZ for Koreader. KEPUB for Kobo. PDF for ReMarkable.
+- All options have additional information in tooltips if you hover over the option.
+- To get the converted book onto your Kindle/Kobo, just drag and drop the mobi/kepub into the documents folder on your Kindle/Kobo via USB
+- Kindle panel view not working?
+  - Virtual panel view is enabled in Aa menu on your Kindle, not in KCC as of 7.4
+- Right to left mode not working?
+  - RTL mode only affects splitting order for CBZ output. Your cbz reader itself sets the page turn direction.
+- Colors inverted?
+  - Disable Kindle dark mode
 - Cannot connect Kindle Scribe or 2024+ Kindle to macOS
   - Use official MTP [Amazon USB File Transfer app](https://www.amazon.com/gp/help/customer/display.html/ref=hp_Connect_USB_MTP?nodeId=TCUBEdEkbIhK07ysFu)
     (no login required). Works much better than previously recommended Android File Transfer. Cannot run simutaneously with other transfer apps.
+- How to make AZW3 instead of MOBI?
+  - The `.mobi` file generated by KCC is a dual filetype, it's both MOBI and AZW3. The file extension is `.mobi` for compatibility reasons.
+- [Windows 7 support](https://github.com/ciromattia/kcc/issues/678)
+- Image too dark?
+  - The default gamma correction of 1.8 makes the image darker, and is useful for faded/gray artwork/text. Disable by setting gamma = 1.0
 - Huge margins / slow page turns?
   - You likely modified the file during transfer using a 3rd party app. Try simply dragging and dropping the final mobi/kepub file into the Kindle documents folder via USB.
 
@@ -128,10 +181,12 @@ sudo apt-get install python3 p7zip-full python3-pil python3-psutil python3-slugi
         'K11': ("Kindle 11", (1072, 1448), Palette16, 1.8),
         'K2': ("Kindle 2", (600, 670), Palette15, 1.8),
         'K34': ("Kindle Keyboard/Touch", (600, 800), Palette16, 1.8),
-        'K578': ("Kindle", (600, 800), Palette16, 1.8),
+        'K57': ("Kindle 5/7", (600, 800), Palette16, 1.8),
+        'K810': ("Kindle 8/10", (600, 800), Palette16, 1.8),
         'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.8),
         'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.8),
-        'KV': ("Kindle Paperwhite 3/4/Voyage/Oasis", (1072, 1448), Palette16, 1.8),
+        'KV': ("Kindle Voyage, (1072, 1448), Palette16, 1.8),
+        'KPW34': ("Kindle Paperwhite 3/4/Oasis", (1072, 1448), Palette16, 1.8),
         'KPW5': ("Kindle Paperwhite 5/Signature Edition", (1236, 1648), Palette16, 1.8),
         'KO': ("Kindle Oasis 2/3/Paperwhite 12/Colorsoft 12", (1264, 1680), Palette16, 1.8),
         'KS': ("Kindle Scribe", (1860, 2480), Palette16, 1.8),
@@ -176,13 +231,16 @@ MAIN:
                         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 profil or processing option
+  -n, --noprocessing    Do not modify image and ignore any profile or processing option
   -u, --upscale         Resize images smaller than device's resolution
   -s, --stretch         Stretch images to device's resolution
   -r SPLITTER, --splitter SPLITTER
                         Double page parsing mode. 0: Split 1: Rotate 2: Both [Default=0]
   -g GAMMA, --gamma GAMMA
                         Apply gamma correction to linearize the image [Default=Auto]
+  --autolevel           Set most common dark pixel value to be black point for leveling.
+  --noautocontrast      Disable autocontrast
+  --colorautocontrast   Force autocontrast for all pages. Skipped when near blacks and whites don't exist
   -c CROPPING, --cropping CROPPING
                         Set cropping mode. 0: Disabled 1: Margins 2: Margins + page numbers [Default=2]
   --cp CROPPINGP, --croppingpower CROPPINGP
@@ -205,16 +263,19 @@ OUTPUT SETTINGS:
                         Output generated file to specified directory or file
   -t TITLE, --title TITLE
                         Comic title [Default=filename or directory name]
+  --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]
   -f FORMAT, --format FORMAT
-                        Output format (Available options: Auto, MOBI, EPUB, CBZ, KFX, MOBI+EPUB) [Default=Auto]
+                        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
   --norotate            Do not rotate double page spreads in spread splitter option.
-  --reducerainbow       Reduce rainbow effect on color eink by slightly blurring images
+  --rotatefirst         Put rotated spread first in spread splitter option.
+  --filefusion          Combines all input files into a single file.
+  --eraserainbow       Erase rainbow effect on color eink screen by attenuating interfering frequencies
 
 CUSTOM PROFILE:
   --customwidth CUSTOMWIDTH
@@ -250,21 +311,27 @@ OTHER:
 
 This section is for developers who want to contribute to KCC or power users who want to run the latest code without waiting for an official release.
 
-Easiest to use [GitHub Desktop](https://desktop.github.com) to clone the KCC repo. From GitHub Desktop, click on `Repository` in the toolbar, then `Command Prompt` (Windows)/`Terminal` (Mac) to open a window in the KCC repo.
+Easiest to use [GitHub Desktop](https://desktop.github.com) to clone your fork of the KCC repo. From GitHub Desktop, click on `Repository` in the toolbar, then `Command Prompt` (Windows)/`Terminal` (Mac) to open a window in the KCC repo.
 
 Depending on your system [Python](https://www.python.org) may be called either `python` or `python3`. We use virtual environments (venv) to manage dependencies.
 
 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
 
+video of adding a new checkbox: https://youtu.be/g3I8DU74C7g
+
 Do not use `git merge` to merge master from upstream, 
 use the "Sync fork" button on your fork on GitHub in your branch 
 to avoid weird looking merges in pull requests.
 
+When making changes, be aware of how your change might affect file splitting/chunking
+or chapter alignment.
+
 ### Windows install from source
 
 One time setup and running for the first time:
@@ -290,6 +357,8 @@ python setup.py build_binary
 
 ### macOS install from source
 
+If the system installed Python gives you issues, please install the latest Python from either brew or the official website.
+
 One time setup and running for the first time:
 ```
 python3 -m venv venv
@@ -346,7 +415,7 @@ Older links (dead):
 
 ## PRIVACY
 **KCC** is initiating internet connections in two cases:
-* During startup - Version check.
+* During startup - Version check and announcement check.
 * When error occurs - Automatic reporting on Windows and macOS.
 
 ## KNOWN ISSUES
@@ -355,3 +424,6 @@ Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).
 ## COPYRIGHT
 Copyright (c) 2012-2025 Ciro Mattia Gonano, Paweł Jastrzębski, Darodi and Alex Xu.
 **KCC** is released under ISC LICENSE; see [LICENSE.txt](./LICENSE.txt) for further details.
+
+## Verification
+Impact-Site-Verification: ffe48fc7-4f0c-40fd-bd2e-59f4d7205180

entrypoint.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+MODE=${KCC_MODE:-c2e}
+
+case "$MODE" in
+  "c2e")
+    echo "Starting C2E..."
+    exec c2e "$@"
+    ;;
+
+  "c2p")
+    echo "Starting C2P..."
+    exec c2p "$@"
+    ;;
+
+  *)
+    echo "Error: Unknown mode '$MODE'" >&2
+    exit 1
+    ;;
+esac

environment.yml

@@ -4,7 +4,7 @@ channels:
   - defaults
 dependencies:
   - python=3.11
-  - Pillow>=5.2.0
+  - Pillow>=11.3.0
   - psutil>=5.9.5
   - python-slugify>=1.2.1
   - raven>=6.0.0

gui/KCC.qrc

@@ -28,4 +28,9 @@
     <file>../icons/document_new.png</file>
     <file>../icons/folder_new.png</file>
   </qresource>
+  <qresource prefix="Brand">
+    <file>../icons/kofi_symbol.png</file>
+    <file>../icons/Humble_H-Red.png</file>
+    <file>../icons/Bindle_Red.png</file>
+  </qresource>
 </RCC>

gui/MetaEditor.ui

@@ -62,56 +62,66 @@
       <item row="1" column="1">
        <widget class="QLineEdit" name="volumeLine"/>
       </item>
-      <item row="2" column="0">
+      <item row="3" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Number:</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
+      <item row="3" column="1">
        <widget class="QLineEdit" name="numberLine"/>
       </item>
-      <item row="3" column="0">
+      <item row="4" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Writer:</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
+      <item row="4" column="1">
        <widget class="QLineEdit" name="writerLine"/>
       </item>
-      <item row="4" column="0">
+      <item row="5" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
          <string>Penciller:</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1">
+      <item row="5" column="1">
        <widget class="QLineEdit" name="pencillerLine"/>
       </item>
-      <item row="5" column="0">
+      <item row="6" column="0">
        <widget class="QLabel" name="label_6">
         <property name="text">
          <string>Inker:</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="1">
+      <item row="6" column="1">
        <widget class="QLineEdit" name="inkerLine"/>
       </item>
-      <item row="6" column="0">
+      <item row="7" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Colorist:</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="1">
+      <item row="7" column="1">
        <widget class="QLineEdit" name="coloristLine"/>
       </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Title:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="titleLine"/>
+      </item>
      </layout>
     </widget>
    </item>
@@ -182,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>

kcc-c2e.spec

@@ -11,7 +11,7 @@ a = Analysis(['kcc-c2e.py'],
              hiddenimports=['_cffi_backend'],
              hookspath=[],
              runtime_hooks=[],
-             excludes=[],
+             excludes=['pkg_resources'],
              win_no_prefer_redirects=False,
              win_private_assemblies=False,
              cipher=block_cipher,

kcc-c2p.spec

@@ -11,7 +11,7 @@ a = Analysis(['kcc-c2p.py'],
              hiddenimports=['_cffi_backend'],
              hookspath=[],
              runtime_hooks=[],
-             excludes=[],
+             excludes=['pkg_resources'],
              win_no_prefer_redirects=False,
              win_private_assemblies=False,
              cipher=block_cipher,

kcc.spec

@@ -11,7 +11,7 @@ a = Analysis(['kcc.py'],
              hiddenimports=['_cffi_backend'],
              hookspath=[],
              runtime_hooks=[],
-             excludes=[],
+             excludes=['pkg_resources'],
              win_no_prefer_redirects=False,
              win_private_assemblies=False,
              cipher=block_cipher,

kindlecomicconverter/KCC_gui.py

@@ -16,9 +16,13 @@
 # OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
+
+from datetime import datetime, timezone
+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, QApplication, QSystemTrayIcon, QFileDialog, QMessageBox, QDialog)
+from PySide6.QtWidgets import (QApplication, QLabel, QListWidgetItem, QMainWindow, QSystemTrayIcon, QFileDialog, QMessageBox, QDialog)
 from PySide6.QtNetwork import (QLocalSocket, QLocalServer)
 
 import os
@@ -27,7 +31,7 @@ import sys
 from urllib.parse import unquote
 from time import sleep
 from shutil import move, rmtree
-from subprocess import STDOUT, PIPE
+from subprocess import STDOUT, PIPE, CalledProcessError
 
 import requests
 from xml.sax.saxutils import escape
@@ -37,10 +41,10 @@ from packaging.version import Version
 from raven import Client
 from tempfile import gettempdir
 
-from .shared import HTMLStripper, available_archive_tools, sanitizeTrace, walkLevel, subprocess_run
+from .shared import HTMLStripper, sanitizeTrace, walkLevel, subprocess_run
+from .comicarchive import SEVENZIP, available_archive_tools
 from . import __version__
 from . import comic2ebook
-from . import image
 from . import metadata
 from . import kindle
 from . import KCC_ui
@@ -121,7 +125,7 @@ class Icons:
         self.EPUBFormat = QIcon()
         self.EPUBFormat.addPixmap(QPixmap(":/Formats/icons/EPUB.png"), QIcon.Mode.Normal, QIcon.State.Off)
         self.KFXFormat = QIcon()
-        self.KFXFormat.addPixmap(QPixmap(":/Formats/icons/KFX.png"), QIcon.Normal, QIcon.Off)
+        self.KFXFormat.addPixmap(QPixmap(":/Formats/icons/KFX.png"), QIcon.Mode.Normal, QIcon.State.Off)
 
         self.info = QIcon()
         self.info.addPixmap(QPixmap(":/Status/icons/info.png"), QIcon.Mode.Normal, QIcon.State.Off)
@@ -133,6 +137,15 @@ class Icons:
         self.programIcon = QIcon()
         self.programIcon.addPixmap(QPixmap(":/Icon/icons/comic2ebook.png"), QIcon.Mode.Normal, QIcon.State.Off)
 
+        self.kofi = QIcon()
+        self.kofi.addPixmap(QPixmap(":/Brand/icons/kofi_symbol.png"), QIcon.Mode.Normal, QIcon.State.Off)
+        
+        self.humble = QIcon()
+        self.humble.addPixmap(QPixmap(":/Brand/icons/Humble_H-Red.png"), QIcon.Mode.Normal, QIcon.State.Off)
+
+        self.bindle = QIcon()
+        self.bindle.addPixmap(QPixmap(":/Brand/icons/Bindle_Red.png"), QIcon.Mode.Normal, QIcon.State.Off)
+
 
 class VersionThread(QThread):
     def __init__(self):
@@ -147,19 +160,52 @@ class VersionThread(QThread):
 
     def run(self):
         try:
-            json_parser = requests.get("https://api.github.com/repos/ciromattia/kcc/releases/latest").json()
+            # unauthenticated API requests limit is 60 req/hour
+            if getattr(sys, 'frozen', False):
+                json_parser = requests.get("https://api.github.com/repos/ciromattia/kcc/releases/latest").json()
 
-            html_url = json_parser["html_url"]
+                html_url = json_parser["html_url"]
-            latest_version = json_parser["tag_name"]
+                latest_version = json_parser["tag_name"]
-            latest_version = re.sub(r'^v', "", latest_version)
+                latest_version = re.sub(r'^v', "", latest_version)
 
-            if ("b" not in __version__ and Version(latest_version) > Version(__version__)) \
+                if ("b" not in __version__ and Version(latest_version) > Version(__version__)) \
-                    or ("b" in __version__
+                        or ("b" in __version__
-                        and Version(latest_version) >= Version(re.sub(r'b.*', '', __version__))):
+                            and Version(latest_version) >= Version(re.sub(r'b.*', '', __version__))):
-                MW.addMessage.emit('<a href="' + html_url + '"><b>The new version is available!</b></a>', 'warning',
+                    MW.addMessage.emit('<a href="' + html_url + '"><b>The new version is available!</b></a>', 'warning',
-                                   False)
+                                    False)
         except Exception:
-            return
+            pass
+        
+        try:
+            announcements = requests.get('https://api.github.com/repos/axu2/kcc-messages/contents/links.json',
+                                       headers={
+                                           'Accept': 'application/vnd.github.raw+json',
+                                           'X-GitHub-Api-Version': '2022-11-28'}).json()
+            for category, payloads in announcements.items():
+                for payload in payloads:
+                    expiration = datetime.fromisoformat(payload['expiration'])
+                    if expiration < datetime.now(timezone.utc):
+                        continue
+                    delta = expiration - datetime.now(timezone.utc)
+                    time_left = f"{delta.days} day(s) left"
+                    icon = 'info'
+                    if category == 'humbleMangaBundles':
+                        icon = 'humble'
+                    if category == 'humbleComicBundles':
+                        icon = 'bindle'
+                    if category == 'kofi':
+                        icon = 'kofi'
+                    message = f"<b>{payload.get('name')}</b>"
+                    if payload.get('link'):
+                        message = '<a href="{}"><b>{}</b></a>'.format(payload.get('link'), payload.get('name'))
+                    if payload.get('showDeadline'):
+                        message += f': {time_left}'
+                    if category == 'humbleBundles':
+                        message += ' [referral]'
+                    MW.addMessage.emit(message, icon , False)
+        except Exception as e:
+            print(e)
+
 
     def setAnswer(self, dialoganswer):
         self.answer = dialoganswer
@@ -244,11 +290,29 @@ class WorkerThread(QThread):
             options.upscale = True
         if GUI.gammaBox.isChecked() and float(GUI.gammaValue) > 0.09:
             options.gamma = float(GUI.gammaValue)
-        options.cropping = GUI.croppingBox.checkState().value
+        if GUI.autoLevelBox.isChecked():
+            options.autolevel = True
+        if GUI.autocontrastBox.checkState() == Qt.CheckState.PartiallyChecked:
+            options.noautocontrast = True
+        elif GUI.autocontrastBox.checkState() == Qt.CheckState.Checked:
+            options.colorautocontrast = True
+        if GUI.croppingBox.isChecked():
+            if GUI.croppingBox.checkState() == Qt.CheckState.PartiallyChecked:
+                options.cropping = 1
+            else:
+                options.cropping = 2
+        else:
+            options.cropping = 0
         if GUI.croppingBox.checkState() != Qt.CheckState.Unchecked:
             options.croppingp = float(GUI.croppingPowerValue)
             options.preservemargin = GUI.preserveMarginBox.value()
-        options.interpanelcrop = GUI.interPanelCropBox.checkState().value
+        if GUI.interPanelCropBox.isChecked():
+            if GUI.interPanelCropBox.checkState() == Qt.CheckState.PartiallyChecked:
+                options.interpanelcrop = 1
+            else:
+                options.interpanelcrop = 2
+        else:
+            options.interpanelcrop = 0
         if GUI.borderBox.checkState() == Qt.CheckState.PartiallyChecked:
             options.white_borders = True
         elif GUI.borderBox.checkState() == Qt.CheckState.Checked:
@@ -257,18 +321,28 @@ class WorkerThread(QThread):
             options.batchsplit = 2
         if GUI.colorBox.isChecked():
             options.forcecolor = True
-        if GUI.reduceRainbowBox.isChecked():
+        if GUI.eraseRainbowBox.isChecked():
-            options.reducerainbow = True
+            options.eraserainbow = True
         if GUI.maximizeStrips.isChecked():
             options.maximizestrips = True
         if GUI.disableProcessingBox.isChecked():
             options.noprocessing = True
+        if GUI.metadataTitleBox.checkState() == Qt.CheckState.PartiallyChecked:
+            options.metadatatitle = 1
+        elif GUI.metadataTitleBox.checkState() == Qt.CheckState.Checked:
+            options.metadatatitle = 2
         if GUI.deleteBox.isChecked():
             options.delete = True
         if GUI.spreadShiftBox.isChecked():
             options.spreadshift = True
+        if GUI.fileFusionBox.isChecked():
+            options.filefusion = True
+        else:
+            options.filefusion = False
         if GUI.noRotateBox.isChecked():
             options.norotate = True
+        if GUI.rotateFirstBox.isChecked():
+            options.rotatefirst = True
         if GUI.mozJpegBox.checkState() == Qt.CheckState.PartiallyChecked:
             options.forcepng = True
         elif GUI.mozJpegBox.checkState() == Qt.CheckState.Checked:
@@ -278,6 +352,8 @@ class WorkerThread(QThread):
             options.customheight = str(GUI.heightBox.value())
         if GUI.targetDirectory != '':
             options.output = GUI.targetDirectory
+        if GUI.titleEdit.text():
+            options.title = str(GUI.titleEdit.text())
         if GUI.authorEdit.text():
             options.author = str(GUI.authorEdit.text())
         if GUI.chunkSizeCheckBox.isChecked():
@@ -288,16 +364,38 @@ class WorkerThread(QThread):
             if GUI.jobList.item(i).icon().isNull():
                 currentJobs.append(str(GUI.jobList.item(i).text()))
         GUI.jobList.clear()
-        for job in currentJobs:
+        if options.filefusion:
+            bookDir = []
+            MW.addMessage.emit('Attempting file fusion', 'info', False)
+            for job in currentJobs:
+                bookDir.append(job)
+            try:
+                comic2ebook.options = comic2ebook.checkOptions(copy(options))
+                currentJobs.clear()
+                currentJobs.append(comic2ebook.makeFusion(bookDir))
+                MW.addMessage.emit('Created fusion at ' + currentJobs[0], 'info', False)
+            except Exception as e:
+                print('Fusion Failed. ' + str(e))
+                MW.addMessage.emit('Fusion Failed. ' + str(e), 'error', True)
+        elif len(currentJobs) > 1 and options.title != 'defaulttitle':
+            currentJobs.clear()
+            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 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'
+            elif gui_current_format == 'PDF':
+                MW.addMessage.emit('Creating PDF files', 'info', False)
+                GUI.progress.content = 'Creating PDF files'
             else:
                 MW.addMessage.emit('Creating EPUB files', 'info', False)
                 GUI.progress.content = 'Creating EPUB files'
@@ -305,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:
@@ -342,10 +440,12 @@ class WorkerThread(QThread):
                 GUI.progress.content = ''
                 if gui_current_format == 'CBZ':
                     MW.addMessage.emit('Creating CBZ files... <b>Done!</b>', 'info', True)
+                elif gui_current_format == 'PDF':
+                    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:
-                    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)
@@ -395,8 +495,10 @@ class WorkerThread(QThread):
                             k = kindle.Kindle(options.profile)
                             if k.path and k.coverSupport:
                                 for item in outputPath:
-                                    comic2ebook.options.covers[outputPath.index(item)][0].saveToKindle(
+                                    cover = comic2ebook.options.covers[outputPath.index(item)][0]
-                                        k, comic2ebook.options.covers[outputPath.index(item)][1])
+                                    if cover:
+                                        cover.saveToKindle(
+                                            k, comic2ebook.options.covers[outputPath.index(item)][1])
                                 MW.addMessage.emit('Kindle detected. Uploading covers... <b>Done!</b>', 'info', False)
                         else:
                             GUI.progress.content = ''
@@ -421,7 +523,7 @@ class WorkerThread(QThread):
                         if self.kindlegenErrorCode[0] == 1 and self.kindlegenErrorCode[1] != '':
                             MW.showDialog.emit("KindleGen error:\n\n" + self.kindlegenErrorCode[1], 'error')
                         if self.kindlegenErrorCode[0] == 23026:
-                            MW.addMessage.emit('Created EPUB file was too big.', 'error', False)
+                            MW.addMessage.emit('Created EPUB file was too big. Weird file structure?', 'error', False)
                             MW.addMessage.emit('EPUB file: ' + str(epubSize) + 'MB. Supported size: ~350MB.', 'error',
                                                False)
                         if self.kindlegenErrorCode[0] == 3221226505:
@@ -433,6 +535,12 @@ 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()
@@ -462,17 +570,33 @@ class SystemTrayIcon(QSystemTrayIcon):
 
 
 class KCCGUI(KCC_ui.Ui_mainWindow):
-    def selectDir(self):
+    def selectDefaultOutputFolder(self):
-        if self.needClean:
+        dname = QFileDialog.getExistingDirectory(MW, 'Select default output folder', self.defaultOutputFolder)
-            self.needClean = False
+        if self.is_directory_on_kindle(dname):
-            GUI.jobList.clear()
+            return
-        dname = QFileDialog.getExistingDirectory(MW, 'Select directory', self.lastPath)
         if dname != '':
             if sys.platform.startswith('win'):
                 dname = dname.replace('/', '\\')
-            self.lastPath = os.path.abspath(os.path.join(dname, os.pardir))
+            GUI.defaultOutputFolder = dname
-            GUI.jobList.addItem(dname)
+
-            GUI.jobList.scrollToBottom()
+    def is_directory_on_kindle(self, dname):
+        path = Path(dname)
+        for parent in itertools.chain([path], path.parents):
+            if parent.name == 'documents' and parent.parent.joinpath('system').joinpath('thumbnails').is_dir():
+                self.addMessage("Cannot select Kindle as output directory", 'error')
+                return True
+
+    def selectOutputFolder(self):
+        dname = QFileDialog.getExistingDirectory(MW, 'Select output directory', self.lastPath)
+        if self.is_directory_on_kindle(dname):
+            return
+        if dname != '':
+            if sys.platform.startswith('win'):
+                dname = dname.replace('/', '\\')
+            GUI.targetDirectory = dname
+        else:
+            GUI.targetDirectory = ''
+        return GUI.targetDirectory
 
     def selectFile(self):
         if self.needClean:
@@ -492,31 +616,26 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                 GUI.jobList.addItem(fname)
                 GUI.jobList.scrollToBottom()
 
-    def selectFileMetaEditor(self):
+    def selectFileMetaEditor(self, sname):
-        sname = ''
+        if not sname:
-        if QApplication.keyboardModifiers() == Qt.ShiftModifier:
+            if QApplication.keyboardModifiers() == Qt.ShiftModifier:
-            dname = QFileDialog.getExistingDirectory(MW, 'Select directory', self.lastPath)
+                dname = QFileDialog.getExistingDirectory(MW, 'Select directory', self.lastPath)
-            if dname != '':
+                if dname != '':
-                sname = os.path.join(dname, 'ComicInfo.xml')
+                    sname = os.path.join(dname, 'ComicInfo.xml')
-                if sys.platform.startswith('win'):
+                    self.lastPath = os.path.dirname(sname)
-                    sname = sname.replace('/', '\\')
-                self.lastPath = os.path.abspath(sname)
-        else:
-            if self.sevenzip:
-                fname = QFileDialog.getOpenFileName(MW, 'Select file', self.lastPath,
-                                                              'Comic (*.cbz *.cbr *.cb7)')
             else:
-                fname = ['']
+                if self.sevenzip:
-                self.showDialog("Editor is disabled due to a lack of 7z.", 'error')
+                    fname = QFileDialog.getOpenFileName(MW, 'Select file', self.lastPath,
-                self.addMessage('<a href="https://github.com/ciromattia/kcc#7-zip">Install 7z (link)</a>'
+                                                                  'Comic (*.cbz *.cbr *.cb7)')
-                ' to enable metadata editing.', 'warning')
-            if fname[0] != '':
-                if sys.platform.startswith('win'):
-                    sname = fname[0].replace('/', '\\')
                 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] != '':
                     sname = fname[0]
-                self.lastPath = os.path.abspath(os.path.join(sname, os.pardir))
+                    self.lastPath = os.path.abspath(os.path.join(sname, os.pardir))
-        if sname != '':
+        if sname:
             try:
                 self.editor.loadData(sname)
             except Exception as err:
@@ -534,6 +653,10 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         # noinspection PyCallByClass
         QDesktopServices.openUrl(QUrl('https://github.com/ciromattia/kcc/wiki'))
 
+    def openKofi(self):
+        # noinspection PyCallByClass
+        QDesktopServices.openUrl(QUrl('https://ko-fi.com/eink_dude'))
+
     def modeChange(self, mode):
         if mode == 1:
             self.currentMode = 1
@@ -556,7 +679,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         GUI.editorButton.setEnabled(status)
         GUI.wikiButton.setEnabled(status)
         GUI.deviceBox.setEnabled(status)
-        GUI.directoryButton.setEnabled(status)
+        GUI.defaultOutputFolderButton.setEnabled(status)
         GUI.clearButton.setEnabled(status)
         GUI.fileButton.setEnabled(status)
         GUI.formatBox.setEnabled(status)
@@ -603,40 +726,91 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
 
     def togglewebtoonBox(self, value):
         if value:
+            self.addMessage('You can choose a taller device profile to get taller cuts in webtoon mode.', 'info')
+            self.addMessage('Try reading webtoon panels side by side in landscape!', 'info')
             GUI.qualityBox.setEnabled(False)
             GUI.qualityBox.setChecked(False)
             GUI.mangaBox.setEnabled(False)
             GUI.mangaBox.setChecked(False)
             GUI.rotateBox.setEnabled(False)
             GUI.rotateBox.setChecked(False)
+            GUI.borderBox.setEnabled(False)
+            GUI.borderBox.setCheckState(Qt.CheckState.PartiallyChecked)
             GUI.upscaleBox.setEnabled(False)
-            GUI.upscaleBox.setChecked(True)
+            GUI.upscaleBox.setChecked(False)
-            GUI.chunkSizeCheckBox.setEnabled(False)
+            GUI.croppingBox.setEnabled(False)
-            GUI.chunkSizeCheckBox.setChecked(False)
+            GUI.croppingBox.setChecked(False)
+            GUI.interPanelCropBox.setEnabled(False)
+            GUI.interPanelCropBox.setChecked(False)
+            GUI.autoLevelBox.setEnabled(False)
+            GUI.autoLevelBox.setChecked(False)
+            GUI.autocontrastBox.setEnabled(False)
+            GUI.autocontrastBox.setChecked(False)
         else:
             profile = GUI.profiles[str(GUI.deviceBox.currentText())]
             if profile['PVOptions']:
                 GUI.qualityBox.setEnabled(True)
             GUI.mangaBox.setEnabled(True)
             GUI.rotateBox.setEnabled(True)
-            GUI.upscaleBox.setEnabled(True)
+            GUI.borderBox.setEnabled(True)
-            GUI.chunkSizeCheckBox.setEnabled(True)
+            profile = GUI.profiles[str(GUI.deviceBox.currentText())]
+            if profile['Label'] != 'KS':
+                GUI.upscaleBox.setEnabled(True)
+            GUI.croppingBox.setEnabled(True)
+            GUI.interPanelCropBox.setEnabled(True)
+            GUI.autoLevelBox.setEnabled(True)
+            GUI.autocontrastBox.setEnabled(True)
+            GUI.autocontrastBox.setChecked(True)
+
 
     def togglequalityBox(self, value):
         profile = GUI.profiles[str(GUI.deviceBox.currentText())]
         if value == 2:
-            if profile['Label'] == 'KV' or profile['Label'] in image.ProfileData.ProfilesKindlePDOC.keys():
+            if profile['Label'] not in ('K57', 'KPW', 'K810') :
                 self.addMessage('This option is intended for older Kindle models.', 'warning')
-                self.addMessage('On this device, quality improvement will be negligible.', 'warning')
+                self.addMessage('On this device, there will be conversion speed and quality issues.', 'warning')
+                self.addMessage('Use the Kindle Scribe profile if you want higher resolution when zooming.', 'warning')
             GUI.upscaleBox.setEnabled(False)
             GUI.upscaleBox.setChecked(True)
         else:
             GUI.upscaleBox.setEnabled(True)
             GUI.upscaleBox.setChecked(profile['DefaultUpscale'])
-    
+
+    def toggleImageFormatBox(self, value):
+        profile = GUI.profiles[str(GUI.deviceBox.currentText())]
+        if value == 1:
+            if profile['Label'] == 'KS':
+                current_format = GUI.formats[str(GUI.formatBox.currentText())]['format']
+                for bad_format in ('MOBI', 'EPUB'):
+                    if bad_format in current_format:
+                        self.addMessage('Scribe PNG MOBI/EPUB has a lot of problems like blank pages/sections. Use JPG instead.', 'warning')
+                        break
+
     def togglechunkSizeCheckBox(self, value):
         GUI.chunkSizeWidget.setVisible(value)
 
+    def toggletitleEdit(self, value):
+        if value:
+            self.metadataTitleBox.setChecked(False)
+
+    def togglefileFusionBox(self, value):
+        if value:
+            GUI.metadataTitleBox.setChecked(False)
+            GUI.metadataTitleBox.setEnabled(False)
+        else:
+            GUI.metadataTitleBox.setEnabled(True)
+
+    def togglemetadataTitleBox(self, value):
+        if value:
+            GUI.titleEdit.setText(None)
+
+    def editSourceMetadata(self, item):
+        if item.icon().isNull():
+            sname = item.text()
+            if os.path.isdir(sname):
+                sname = os.path.join(sname, "ComicInfo.xml")
+            self.selectFileMetaEditor(sname)
+
     def changeGamma(self, value):
         valueRaw = int(5 * round(float(value) / 5))
         value = '%.2f' % (float(valueRaw) / 100)
@@ -664,15 +838,20 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             self.modeChange(1)
         GUI.colorBox.setChecked(profile['ForceColor'])
         self.changeFormat()
-        GUI.gammaSlider.setValue(0)
-        self.changeGamma(0)
         if not GUI.webtoonBox.isChecked():
             GUI.qualityBox.setEnabled(profile['PVOptions'])
         GUI.upscaleBox.setChecked(profile['DefaultUpscale'])
         if profile['Label'] == 'KS':
             GUI.upscaleBox.setDisabled(True)
         else:
-            GUI.upscaleBox.setEnabled(True)
+            if not GUI.webtoonBox.isChecked():
+                GUI.upscaleBox.setEnabled(True)
+        if profile['Label'] == 'KCS':
+            current_format = GUI.formats[str(GUI.formatBox.currentText())]['format']
+            for bad_format in ('MOBI', 'EPUB'):
+                if bad_format in current_format:
+                    self.addMessage('Colorsoft MOBI/EPUB can have blank pages. Just go back a few pages, exit, and reenter book.', 'info')
+                    break
         if not profile['PVOptions']:
             GUI.qualityBox.setChecked(False)
         if str(GUI.deviceBox.currentText()) == 'Other':
@@ -698,6 +877,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             GUI.chunkSizeCheckBox.setChecked(False)
         elif not GUI.webtoonBox.isChecked():
             GUI.chunkSizeCheckBox.setEnabled(True)
+        if GUI.formats[str(GUI.formatBox.currentText())]['format'] in ('CBZ', 'PDF') and not GUI.webtoonBox.isChecked():
+            self.addMessage("Partially check W/B Margins if you don't want KCC to extend the image margins.", 'info')   
 
     def stripTags(self, html):
         s = HTMLStripper()
@@ -752,13 +933,10 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             self.worker.sync()
         else:
             if QApplication.keyboardModifiers() == Qt.KeyboardModifier.ShiftModifier:
-                dname = QFileDialog.getExistingDirectory(MW, 'Select output directory', self.lastPath)
+                if not self.selectOutputFolder():
-                if dname != '':
+                    return
-                    if sys.platform.startswith('win'):
+            elif GUI.defaultOutputFolderBox.isChecked():
-                        dname = dname.replace('/', '\\')
+                self.targetDirectory = self.defaultOutputFolder
-                    GUI.targetDirectory = dname
-                else:
-                    GUI.targetDirectory = ''
             else:
                 GUI.targetDirectory = ''
             self.progress.start()
@@ -769,6 +947,12 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                 self.addMessage('No files selected! Please choose files to convert.', 'error')
                 self.needClean = True
                 return
+            if GUI.defaultOutputFolderBox.checkState() == Qt.CheckState.PartiallyChecked:
+                parent = Path(self.jobList.item(0).text()).parent
+                target_path = parent.joinpath(f"{parent.name}")
+                if not target_path.exists():
+                    target_path.mkdir()
+                self.targetDirectory = str(target_path)
             if self.currentMode > 2 and (GUI.widthBox.value() == 0 or GUI.heightBox.value() == 0):
                 GUI.jobList.clear()
                 self.addMessage('Target resolution is not set!', 'error')
@@ -800,34 +984,41 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             event.ignore()
         self.settings.setValue('settingsVersion', __version__)
         self.settings.setValue('lastPath', self.lastPath)
+        self.settings.setValue('defaultOutputFolder', self.defaultOutputFolder)
         self.settings.setValue('lastDevice', GUI.deviceBox.currentIndex())
         self.settings.setValue('currentFormat', GUI.formatBox.currentIndex())
         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().value,
+        self.settings.setValue('options', {'mangaBox': GUI.mangaBox.checkState(),
-                                           'rotateBox': GUI.rotateBox.checkState().value,
+                                           'rotateBox': GUI.rotateBox.checkState(),
-                                           'qualityBox': GUI.qualityBox.checkState().value,
+                                           'qualityBox': GUI.qualityBox.checkState(),
-                                           'gammaBox': GUI.gammaBox.checkState().value,
+                                           'gammaBox': GUI.gammaBox.checkState(),
-                                           'croppingBox': GUI.croppingBox.checkState().value,
+                                           'autoLevelBox': GUI.autoLevelBox.checkState(),
+                                           'autocontrastBox': GUI.autocontrastBox.checkState(),
+                                           'croppingBox': GUI.croppingBox.checkState(),
                                            'croppingPowerSlider': float(self.croppingPowerValue) * 100,
                                            'preserveMarginBox': self.preserveMarginBox.value(),
-                                           'interPanelCropBox': GUI.interPanelCropBox.checkState().value,
+                                           'interPanelCropBox': GUI.interPanelCropBox.checkState(),
-                                           'upscaleBox': GUI.upscaleBox.checkState().value,
+                                           'upscaleBox': GUI.upscaleBox.checkState(),
-                                           'borderBox': GUI.borderBox.checkState().value,
+                                           'borderBox': GUI.borderBox.checkState(),
-                                           'webtoonBox': GUI.webtoonBox.checkState().value,
+                                           'webtoonBox': GUI.webtoonBox.checkState(),
-                                           'outputSplit': GUI.outputSplit.checkState().value,
+                                           'outputSplit': GUI.outputSplit.checkState(),
-                                           'colorBox': GUI.colorBox.checkState().value,
+                                           'colorBox': GUI.colorBox.checkState(),
-                                           'reduceRainbowBox': GUI.reduceRainbowBox.checkState().value,
+                                           'eraseRainbowBox': GUI.eraseRainbowBox.checkState(),
-                                           'disableProcessingBox': GUI.disableProcessingBox.checkState().value,
+                                           'disableProcessingBox': GUI.disableProcessingBox.checkState(),
-                                           'mozJpegBox': GUI.mozJpegBox.checkState().value,
+                                           'metadataTitleBox': GUI.metadataTitleBox.checkState(),
+                                           'mozJpegBox': GUI.mozJpegBox.checkState(),
                                            'widthBox': GUI.widthBox.value(),
                                            'heightBox': GUI.heightBox.value(),
-                                           'deleteBox': GUI.deleteBox.checkState().value,
+                                           'deleteBox': GUI.deleteBox.checkState(),
-                                           'spreadShiftBox': GUI.spreadShiftBox.checkState().value,
+                                           'spreadShiftBox': GUI.spreadShiftBox.checkState(),
-                                           'noRotateBox': GUI.noRotateBox.checkState().value,
+                                           'fileFusionBox': GUI.fileFusionBox.checkState(),
-                                           'maximizeStrips': GUI.maximizeStrips.checkState().value,
+                                           'defaultOutputFolderBox': GUI.defaultOutputFolderBox.checkState(),
+                                           'noRotateBox': GUI.noRotateBox.checkState(),
+                                           'rotateFirstBox': GUI.rotateFirstBox.checkState(),
+                                           'maximizeStrips': GUI.maximizeStrips.checkState(),
                                            'gammaSlider': float(self.gammaValue) * 100,
-                                           'chunkSizeCheckBox': GUI.chunkSizeCheckBox.checkState().value,
+                                           'chunkSizeCheckBox': GUI.chunkSizeCheckBox.checkState(),
                                            'chunkSizeBox': GUI.chunkSizeBox.value()})
         self.settings.sync()
         self.tray.hide()
@@ -837,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()
@@ -868,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)
@@ -889,7 +1081,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                         self.addMessage('Your <a href="https://www.amazon.com/b?node=23496309011">KindleGen</a>'
                                         ' is outdated! MOBI conversion might fail.', 'warning')
                     break
-        except FileNotFoundError:
+        except (FileNotFoundError, CalledProcessError):
             self.kindleGen = False
             if startup:
                 self.display_kindlegen_missing()
@@ -902,14 +1094,21 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         self.setupUi(MW)
         self.editor = KCCGUI_MetaEditor()
         self.icons = Icons()
-        self.settings = QSettings('ciromattia', 'kcc')
+        self.settings = QSettings('ciromattia', 'kcc9')
         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))
+        if not os.path.exists(self.defaultOutputFolder):
+            self.defaultOutputFolder = ''
         self.lastDevice = self.settings.value('lastDevice', 0, type=int)
         self.currentFormat = self.settings.value('currentFormat', 0, type=int)
         self.startNumber = self.settings.value('startNumber', 0, type=int)
         self.windowSize = self.settings.value('windowSize', '0x0', type=str)
-        self.options = self.settings.value('options', {'gammaSlider': 0, 'croppingBox': 2, 'croppingPowerSlider': 100})
+        default_options = {'gammaSlider': 0, 'croppingBox': 2, 'croppingPowerSlider': 100}
+        try:
+            self.options = self.settings.value('options', default_options)
+        except Exception:
+            self.options = default_options
         self.worker = WorkerThread()
         self.versionCheck = VersionThread()
         self.progress = ProgressThread()
@@ -933,7 +1132,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             if self.windowSize == '0x0':
                 MW.resize(500, 500)
         elif sys.platform.startswith('darwin'):
-            for element in ['editorButton', 'wikiButton', 'directoryButton', 'clearButton', 'fileButton', 'deviceBox',
+            for element in ['editorButton', 'wikiButton', 'defaultOutputFolderButton', 'clearButton', 'fileButton', 'deviceBox',
                             'convertButton', 'formatBox']:
                 getattr(GUI, element).setMinimumSize(QSize(0, 0))
             GUI.gridLayout.setContentsMargins(-1, -1, -1, -1)
@@ -946,6 +1145,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             "MOBI/AZW3": {'icon': 'MOBI', 'format': 'MOBI'},
             "EPUB": {'icon': 'EPUB', 'format': 'EPUB'},
             "CBZ": {'icon': 'CBZ', 'format': 'CBZ'},
+            "PDF": {'icon': 'EPUB', 'format': 'PDF'},
             "KFX (does not work)": {'icon': 'KFX', 'format': 'KFX'},
             "MOBI + EPUB": {'icon': 'MOBI', 'format': 'MOBI+EPUB'},
             "EPUB (200MB limit)": {'icon': 'EPUB', 'format': 'EPUB-200MB'},
@@ -954,33 +1154,35 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
 
 
         self.profiles = {
-            "Kindle Oasis 9/10": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0,
+            "Kindle Oasis 9/10": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
                                  'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KO'},
-            "Kindle Oasis 8": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0,
+            "Kindle 8/10": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                             'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KV'},
+                       'DefaultUpscale': False, 'ForceColor': False, 'Label': 'K810'},
-            "Kindle Voyage": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0,
+            "Kindle Oasis 8": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
+                             'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KPW34'},
+            "Kindle Voyage": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
                               'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KV'},
             "Kindle Scribe": {
-                'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KS',
+                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KS',
             },
             "Kindle 11": {
-                'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'K11',
+                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'K11',
             },
-            "Kindle PW 11": {
+            "Kindle Paperwhite 11": {
-                'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KPW5',
+                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KPW5',
             },
-            "Kindle PW 12": {
+            "Kindle Paperwhite 12": {
-                'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KO',
+                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KO',
             },
-            "Kindle CS 12": {
+            "Kindle Colorsoft": {
-                'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': True, 'Label': 'KO',
+                'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': True, 'ForceColor': True, 'Label': 'KCS',
             },
-            "Kindle PW 7/10": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0,
+            "Kindle Paperwhite 7/10": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                              'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KV'},
+                              'DefaultUpscale': True, 'ForceColor': False, 'Label': 'KPW34'},
-            "Kindle PW 5/6": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
+            "Kindle Paperwhite 5/6": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
                               'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KPW'},
-            "Kindle 4/5/7/8/10": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
+            "Kindle 4/5/7": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                       'DefaultUpscale': False, 'ForceColor': False, 'Label': 'K578'},
+                       'DefaultUpscale': False, 'ForceColor': False, 'Label': 'K57'},
             "Kindle DX": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 2,
                               'DefaultUpscale': False, 'ForceColor': False, 'Label': 'KDX'},
             "Kobo Mini/Touch": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1,
@@ -1025,20 +1227,22 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                           'Label': 'KoS'},
             "Kobo Elipsa": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, 'DefaultUpscale': True, 'ForceColor': False,
                             'Label': 'KoE'},
-            "reMarkable 1": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, 'DefaultUpscale': True, 'ForceColor': False,
+            "reMarkable 1": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 3, 'DefaultUpscale': True, 'ForceColor': False,
                              'Label': 'Rmk1'},
-            "reMarkable 2": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, 'DefaultUpscale': True, 'ForceColor': False,
+            "reMarkable 2": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 3, 'DefaultUpscale': True, 'ForceColor': False,
                              'Label': 'Rmk2'},
-            "reMarkable Paper Pro": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, 'DefaultUpscale': True, 'ForceColor': True,
+            "reMarkable Paper Pro": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 3, 'DefaultUpscale': True, 'ForceColor': True,
                              'Label': 'RmkPP'},
+            "reMarkable Paper Pro Move": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 3, 'DefaultUpscale': True, 'ForceColor': True,
+                             'Label': 'RmkPPMove'},
             "Other": {'PVOptions': False, 'ForceExpert': True, 'DefaultFormat': 1, 'DefaultUpscale': False, 'ForceColor': False,
                       'Label': 'OTHER'},
         }
         profilesGUI = [
-            "Kindle CS 12",
+            "Kindle Colorsoft",
-            "Kindle PW 12",
+            "Kindle Paperwhite 12",
             "Kindle Scribe",
-            "Kindle PW 11",
+            "Kindle Paperwhite 11",
             "Kindle 11",
             "Kindle Oasis 9/10",
             "Separator",
@@ -1053,14 +1257,16 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             "reMarkable 1",
             "reMarkable 2",
             "reMarkable Paper Pro",
+            "reMarkable Paper Pro Move",
             "Separator",
             "Other",
             "Separator",
+            "Kindle 8/10",
             "Kindle Oasis 8",
-            "Kindle PW 7/10",
+            "Kindle Paperwhite 7/10",
             "Kindle Voyage",
-            "Kindle PW 5/6",
+            "Kindle Paperwhite 5/6",
-            "Kindle 4/5/7/8/10",
+            "Kindle 4/5/7",
             "Kindle Touch",
             "Kindle Keyboard",
             "Kindle DX",
@@ -1079,34 +1285,43 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             "Kobo Mini/Touch",
         ]
 
-        statusBarLabel = QLabel('<b><a href="https://kcc.iosphe.re/">HOMEPAGE</a> - <a href="https://github.'
+        link_dict = {
-                                          'com/ciromattia/kcc/blob/master/README.md#issues--new-features--donations">DO'
+            'README': "https://github.com/ciromattia/kcc?tab=readme-ov-file#kcc",
-                                          'NATE</a> - <a href="http://www.mobileread.com/forums/showthread.php?t=207461'
+            'FAQ': "https://github.com/ciromattia/kcc/blob/master/README.md#faq",
-                                          '">FORUM</a></b>')
+            'YOUTUBE': "https://youtu.be/IR2Fhcm9658?si=Z-2zzLaUFjmaEbrj",
+            'COMMISSIONS': "https://github.com/ciromattia/kcc?tab=readme-ov-file#commissions",
+            'DONATE': "https://github.com/ciromattia/kcc/blob/master/README.md#issues--new-features--donations",
+            'FORUM': "http://www.mobileread.com/forums/showthread.php?t=207461",
+            'DISCORD': "https://discord.com/invite/qj7wpnUHav",
+        }
+
+        link_html_list = [f'<a href="{v}">{k}</a>' for k, v in link_dict.items()]
+        statusBarLabel = QLabel(f'<b>{" - ".join(link_html_list)}</b>')
         statusBarLabel.setAlignment(Qt.AlignmentFlag.AlignCenter)
         statusBarLabel.setOpenExternalLinks(True)
         GUI.statusBar.addPermanentWidget(statusBarLabel, 1)
 
-        self.addMessage('<b>Welcome!</b>', 'info')
+        self.addMessage('<b>Tip:</b> Hover mouse over options to see additional information in tooltips.', 'info')
-        self.addMessage('<b>Remember:</b> All options have additional information in tooltips.', 'info')
+        self.addMessage('<b>Tip:</b> You can drag and drop image folders or comic files/archives into this window to convert.', 'info')
         if self.startNumber < 5:
             self.addMessage('Since you are a new user of <b>KCC</b> please see few '
                             '<a href="https://github.com/ciromattia/kcc/wiki/Important-tips">important tips</a>.',
                             'info')
         
         self.tar = 'tar' in available_archive_tools()
-        self.sevenzip = '7z' in available_archive_tools()
+        self.sevenzip = SEVENZIP in available_archive_tools()
         if not any([self.tar, self.sevenzip]):
             self.addMessage('<a href="https://github.com/ciromattia/kcc#7-zip">Install 7z (link)</a>'
                             ' to enable CBZ/CBR/ZIP/etc processing.', 'warning')
         self.detectKindleGen(True)
 
         APP.messageFromOtherInstance.connect(self.handleMessage)
-        GUI.directoryButton.clicked.connect(self.selectDir)
+        GUI.defaultOutputFolderButton.clicked.connect(self.selectDefaultOutputFolder)
         GUI.clearButton.clicked.connect(self.clearJobs)
         GUI.fileButton.clicked.connect(self.selectFile)
         GUI.editorButton.clicked.connect(self.selectFileMetaEditor)
         GUI.wikiButton.clicked.connect(self.openWiki)
+        GUI.kofiButton.clicked.connect(self.openKofi)
         GUI.convertButton.clicked.connect(self.convertStart)
         GUI.gammaSlider.valueChanged.connect(self.changeGamma)
         GUI.gammaBox.stateChanged.connect(self.togglegammaBox)
@@ -1114,9 +1329,14 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
         GUI.croppingPowerSlider.valueChanged.connect(self.changeCroppingPower)
         GUI.webtoonBox.stateChanged.connect(self.togglewebtoonBox)
         GUI.qualityBox.stateChanged.connect(self.togglequalityBox)
+        GUI.mozJpegBox.stateChanged.connect(self.toggleImageFormatBox)
         GUI.chunkSizeCheckBox.stateChanged.connect(self.togglechunkSizeCheckBox)
         GUI.deviceBox.activated.connect(self.changeDevice)
         GUI.formatBox.activated.connect(self.changeFormat)
+        GUI.titleEdit.textChanged.connect(self.toggletitleEdit)
+        GUI.fileFusionBox.stateChanged.connect(self.togglefileFusionBox)
+        GUI.metadataTitleBox.stateChanged.connect(self.togglemetadataTitleBox)
+        GUI.jobList.itemDoubleClicked.connect(self.editSourceMetadata)
         MW.progressBarTick.connect(self.updateProgressbar)
         MW.modeConvert.connect(self.modeConvert)
         MW.addMessage.connect(self.addMessage)
@@ -1205,15 +1425,17 @@ class KCCGUI_MetaEditor(KCC_ui_editor.Ui_editorDialog):
             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):
+        for field in (self.seriesLine, self.volumeLine, self.numberLine, self.titleLine):
             field.setText(self.parser.data[field.objectName().capitalize()[:-4]])
         for field in (self.writerLine, self.pencillerLine, self.inkerLine, self.coloristLine):
             field.setText(', '.join(self.parser.data[field.objectName().capitalize()[:-4] + 's']))
-        if self.seriesLine.text() == '':
+        for field in (self.seriesLine, self.titleLine):
-            if file.endswith('.xml'):
+            if field.text() == '':
-                self.seriesLine.setText(file.split('\\')[-2])
+                path = Path(file)
-            else:
+                if file.endswith('.xml'):
-                self.seriesLine.setText(file.split('\\')[-1].split('/')[-1].split('.')[0])
+                    field.setText(path.parent.name)
+                else:
+                    field.setText(path.stem)
 
     def saveData(self):
         for field in (self.volumeLine, self.numberLine):
@@ -1223,7 +1445,8 @@ class KCCGUI_MetaEditor(KCC_ui_editor.Ui_editorDialog):
                 self.statusLabel.setText(field.objectName().capitalize()[:-4] + ' field must be a number.')
                 break
         else:
-            self.parser.data['Series'] = self.cleanData(self.seriesLine.text())
+            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 = []

kindlecomicconverter/KCC_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'KCC.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.8.2
+## Created by: Qt User Interface Compiler version 6.9.3
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -26,7 +26,7 @@ class Ui_mainWindow(object):
     def setupUi(self, mainWindow):
         if not mainWindow.objectName():
             mainWindow.setObjectName(u"mainWindow")
-        mainWindow.resize(519, 572)
+        mainWindow.resize(566, 573)
         icon = QIcon()
         icon.addFile(u":/Icon/icons/comic2ebook.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
         mainWindow.setWindowIcon(icon)
@@ -35,8 +35,167 @@ class Ui_mainWindow(object):
         self.gridLayout = QGridLayout(self.centralWidget)
         self.gridLayout.setObjectName(u"gridLayout")
         self.gridLayout.setContentsMargins(-1, -1, -1, 5)
+        self.optionWidget = QWidget(self.centralWidget)
+        self.optionWidget.setObjectName(u"optionWidget")
+        self.gridLayout_2 = QGridLayout(self.optionWidget)
+        self.gridLayout_2.setObjectName(u"gridLayout_2")
+        self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
+        self.titleEdit = QLineEdit(self.optionWidget)
+        self.titleEdit.setObjectName(u"titleEdit")
+        sizePolicy = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.titleEdit.sizePolicy().hasHeightForWidth())
+        self.titleEdit.setSizePolicy(sizePolicy)
+        self.titleEdit.setFocusPolicy(Qt.FocusPolicy.ClickFocus)
+        self.titleEdit.setClearButtonEnabled(False)
+
+        self.gridLayout_2.addWidget(self.titleEdit, 0, 0, 1, 1)
+
+        self.mangaBox = QCheckBox(self.optionWidget)
+        self.mangaBox.setObjectName(u"mangaBox")
+
+        self.gridLayout_2.addWidget(self.mangaBox, 1, 0, 1, 1)
+
+        self.webtoonBox = QCheckBox(self.optionWidget)
+        self.webtoonBox.setObjectName(u"webtoonBox")
+
+        self.gridLayout_2.addWidget(self.webtoonBox, 2, 0, 1, 1)
+
+        self.croppingBox = QCheckBox(self.optionWidget)
+        self.croppingBox.setObjectName(u"croppingBox")
+        self.croppingBox.setTristate(True)
+
+        self.gridLayout_2.addWidget(self.croppingBox, 4, 2, 1, 1)
+
+        self.maximizeStrips = QCheckBox(self.optionWidget)
+        self.maximizeStrips.setObjectName(u"maximizeStrips")
+
+        self.gridLayout_2.addWidget(self.maximizeStrips, 4, 1, 1, 1)
+
+        self.deleteBox = QCheckBox(self.optionWidget)
+        self.deleteBox.setObjectName(u"deleteBox")
+
+        self.gridLayout_2.addWidget(self.deleteBox, 5, 1, 1, 1)
+
+        self.rotateFirstBox = QCheckBox(self.optionWidget)
+        self.rotateFirstBox.setObjectName(u"rotateFirstBox")
+
+        self.gridLayout_2.addWidget(self.rotateFirstBox, 8, 1, 1, 1)
+
+        self.outputSplit = QCheckBox(self.optionWidget)
+        self.outputSplit.setObjectName(u"outputSplit")
+
+        self.gridLayout_2.addWidget(self.outputSplit, 3, 1, 1, 1)
+
+        self.borderBox = QCheckBox(self.optionWidget)
+        self.borderBox.setObjectName(u"borderBox")
+        self.borderBox.setTristate(True)
+
+        self.gridLayout_2.addWidget(self.borderBox, 3, 0, 1, 1)
+
+        self.gammaBox = QCheckBox(self.optionWidget)
+        self.gammaBox.setObjectName(u"gammaBox")
+
+        self.gridLayout_2.addWidget(self.gammaBox, 2, 2, 1, 1)
+
+        self.upscaleBox = QCheckBox(self.optionWidget)
+        self.upscaleBox.setObjectName(u"upscaleBox")
+        self.upscaleBox.setTristate(True)
+
+        self.gridLayout_2.addWidget(self.upscaleBox, 2, 1, 1, 1)
+
+        self.chunkSizeCheckBox = QCheckBox(self.optionWidget)
+        self.chunkSizeCheckBox.setObjectName(u"chunkSizeCheckBox")
+
+        self.gridLayout_2.addWidget(self.chunkSizeCheckBox, 7, 1, 1, 1)
+
+        self.colorBox = QCheckBox(self.optionWidget)
+        self.colorBox.setObjectName(u"colorBox")
+
+        self.gridLayout_2.addWidget(self.colorBox, 3, 2, 1, 1)
+
+        self.rotateBox = QCheckBox(self.optionWidget)
+        self.rotateBox.setObjectName(u"rotateBox")
+        self.rotateBox.setTristate(True)
+
+        self.gridLayout_2.addWidget(self.rotateBox, 1, 1, 1, 1)
+
+        self.spreadShiftBox = QCheckBox(self.optionWidget)
+        self.spreadShiftBox.setObjectName(u"spreadShiftBox")
+
+        self.gridLayout_2.addWidget(self.spreadShiftBox, 5, 0, 1, 1)
+
+        self.disableProcessingBox = QCheckBox(self.optionWidget)
+        self.disableProcessingBox.setObjectName(u"disableProcessingBox")
+
+        self.gridLayout_2.addWidget(self.disableProcessingBox, 5, 2, 1, 1)
+
+        self.eraseRainbowBox = QCheckBox(self.optionWidget)
+        self.eraseRainbowBox.setObjectName(u"eraseRainbowBox")
+
+        self.gridLayout_2.addWidget(self.eraseRainbowBox, 7, 2, 1, 1)
+
+        self.noRotateBox = QCheckBox(self.optionWidget)
+        self.noRotateBox.setObjectName(u"noRotateBox")
+
+        self.gridLayout_2.addWidget(self.noRotateBox, 6, 1, 1, 1)
+
+        self.fileFusionBox = QCheckBox(self.optionWidget)
+        self.fileFusionBox.setObjectName(u"fileFusionBox")
+
+        self.gridLayout_2.addWidget(self.fileFusionBox, 6, 0, 1, 1)
+
+        self.authorEdit = QLineEdit(self.optionWidget)
+        self.authorEdit.setObjectName(u"authorEdit")
+        sizePolicy.setHeightForWidth(self.authorEdit.sizePolicy().hasHeightForWidth())
+        self.authorEdit.setSizePolicy(sizePolicy)
+        self.authorEdit.setFocusPolicy(Qt.FocusPolicy.ClickFocus)
+        self.authorEdit.setClearButtonEnabled(False)
+
+        self.gridLayout_2.addWidget(self.authorEdit, 0, 1, 1, 1)
+
+        self.qualityBox = QCheckBox(self.optionWidget)
+        self.qualityBox.setObjectName(u"qualityBox")
+        self.qualityBox.setTristate(True)
+
+        self.gridLayout_2.addWidget(self.qualityBox, 1, 2, 1, 1)
+
+        self.interPanelCropBox = QCheckBox(self.optionWidget)
+        self.interPanelCropBox.setObjectName(u"interPanelCropBox")
+        self.interPanelCropBox.setTristate(True)
+
+        self.gridLayout_2.addWidget(self.interPanelCropBox, 6, 2, 1, 1)
+
+        self.metadataTitleBox = QCheckBox(self.optionWidget)
+        self.metadataTitleBox.setObjectName(u"metadataTitleBox")
+        self.metadataTitleBox.setTristate(True)
+
+        self.gridLayout_2.addWidget(self.metadataTitleBox, 7, 0, 1, 1)
+
+        self.mozJpegBox = QCheckBox(self.optionWidget)
+        self.mozJpegBox.setObjectName(u"mozJpegBox")
+        self.mozJpegBox.setTristate(True)
+
+        self.gridLayout_2.addWidget(self.mozJpegBox, 4, 0, 1, 1)
+
+        self.autoLevelBox = QCheckBox(self.optionWidget)
+        self.autoLevelBox.setObjectName(u"autoLevelBox")
+
+        self.gridLayout_2.addWidget(self.autoLevelBox, 8, 2, 1, 1)
+
+        self.autocontrastBox = QCheckBox(self.optionWidget)
+        self.autocontrastBox.setObjectName(u"autocontrastBox")
+        self.autocontrastBox.setTristate(True)
+
+        self.gridLayout_2.addWidget(self.autocontrastBox, 9, 2, 1, 1)
+
+
+        self.gridLayout.addWidget(self.optionWidget, 5, 0, 1, 2)
+
         self.jobList = QListWidget(self.centralWidget)
         self.jobList.setObjectName(u"jobList")
+        self.jobList.setMinimumSize(QSize(0, 150))
         self.jobList.setStyleSheet(u"")
         self.jobList.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
         self.jobList.setVerticalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel)
@@ -44,111 +203,6 @@ class Ui_mainWindow(object):
 
         self.gridLayout.addWidget(self.jobList, 2, 0, 1, 2)
 
-        self.toolWidget = QWidget(self.centralWidget)
-        self.toolWidget.setObjectName(u"toolWidget")
-        self.horizontalLayout = QHBoxLayout(self.toolWidget)
-        self.horizontalLayout.setObjectName(u"horizontalLayout")
-        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
-        self.editorButton = QPushButton(self.toolWidget)
-        self.editorButton.setObjectName(u"editorButton")
-        self.editorButton.setMinimumSize(QSize(0, 30))
-        icon1 = QIcon()
-        icon1.addFile(u":/Other/icons/editor.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.editorButton.setIcon(icon1)
-
-        self.horizontalLayout.addWidget(self.editorButton)
-
-        self.wikiButton = QPushButton(self.toolWidget)
-        self.wikiButton.setObjectName(u"wikiButton")
-        self.wikiButton.setMinimumSize(QSize(0, 30))
-        icon2 = QIcon()
-        icon2.addFile(u":/Other/icons/wiki.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.wikiButton.setIcon(icon2)
-
-        self.horizontalLayout.addWidget(self.wikiButton)
-
-
-        self.gridLayout.addWidget(self.toolWidget, 0, 0, 1, 2)
-
-        self.buttonWidget = QWidget(self.centralWidget)
-        self.buttonWidget.setObjectName(u"buttonWidget")
-        sizePolicy = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.buttonWidget.sizePolicy().hasHeightForWidth())
-        self.buttonWidget.setSizePolicy(sizePolicy)
-        self.gridLayout_4 = QGridLayout(self.buttonWidget)
-        self.gridLayout_4.setObjectName(u"gridLayout_4")
-        self.gridLayout_4.setContentsMargins(0, 0, 0, 0)
-        self.directoryButton = QPushButton(self.buttonWidget)
-        self.directoryButton.setObjectName(u"directoryButton")
-        self.directoryButton.setMinimumSize(QSize(0, 30))
-        icon3 = QIcon()
-        icon3.addFile(u":/Other/icons/folder_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.directoryButton.setIcon(icon3)
-
-        self.gridLayout_4.addWidget(self.directoryButton, 0, 0, 1, 1)
-
-        self.fileButton = QPushButton(self.buttonWidget)
-        self.fileButton.setObjectName(u"fileButton")
-        self.fileButton.setMinimumSize(QSize(0, 30))
-        icon4 = QIcon()
-        icon4.addFile(u":/Other/icons/document_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.fileButton.setIcon(icon4)
-
-        self.gridLayout_4.addWidget(self.fileButton, 0, 3, 1, 1)
-
-        self.deviceBox = QComboBox(self.buttonWidget)
-        self.deviceBox.setObjectName(u"deviceBox")
-        self.deviceBox.setMinimumSize(QSize(0, 28))
-
-        self.gridLayout_4.addWidget(self.deviceBox, 1, 0, 1, 1)
-
-        self.formatBox = QComboBox(self.buttonWidget)
-        self.formatBox.setObjectName(u"formatBox")
-        self.formatBox.setMinimumSize(QSize(0, 28))
-
-        self.gridLayout_4.addWidget(self.formatBox, 1, 3, 1, 1)
-
-        self.convertButton = QPushButton(self.buttonWidget)
-        self.convertButton.setObjectName(u"convertButton")
-        self.convertButton.setMinimumSize(QSize(0, 30))
-        font = QFont()
-        font.setBold(True)
-        self.convertButton.setFont(font)
-        icon5 = QIcon()
-        icon5.addFile(u":/Other/icons/convert.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.convertButton.setIcon(icon5)
-
-        self.gridLayout_4.addWidget(self.convertButton, 1, 2, 1, 1)
-
-        self.clearButton = QPushButton(self.buttonWidget)
-        self.clearButton.setObjectName(u"clearButton")
-        self.clearButton.setMinimumSize(QSize(0, 30))
-        icon6 = QIcon()
-        icon6.addFile(u":/Other/icons/clear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
-        self.clearButton.setIcon(icon6)
-
-        self.gridLayout_4.addWidget(self.clearButton, 0, 2, 1, 1)
-
-        self.directoryButton.raise_()
-        self.clearButton.raise_()
-        self.fileButton.raise_()
-        self.deviceBox.raise_()
-        self.convertButton.raise_()
-        self.formatBox.raise_()
-
-        self.gridLayout.addWidget(self.buttonWidget, 3, 0, 1, 2)
-
-        self.progressBar = QProgressBar(self.centralWidget)
-        self.progressBar.setObjectName(u"progressBar")
-        self.progressBar.setMinimumSize(QSize(0, 30))
-        self.progressBar.setFont(font)
-        self.progressBar.setVisible(False)
-        self.progressBar.setAlignment(Qt.AlignmentFlag.AlignJustify|Qt.AlignmentFlag.AlignVCenter)
-
-        self.gridLayout.addWidget(self.progressBar, 1, 0, 1, 2)
-
         self.customWidget = QWidget(self.centralWidget)
         self.customWidget.setObjectName(u"customWidget")
         self.customWidget.setVisible(False)
@@ -167,7 +221,7 @@ class Ui_mainWindow(object):
 
         self.widthBox = QSpinBox(self.customWidget)
         self.widthBox.setObjectName(u"widthBox")
-        self.widthBox.setMaximum(2160)
+        self.widthBox.setMaximum(6000)
 
         self.gridLayout_3.addWidget(self.widthBox, 0, 1, 1, 1)
 
@@ -180,13 +234,82 @@ class Ui_mainWindow(object):
 
         self.heightBox = QSpinBox(self.customWidget)
         self.heightBox.setObjectName(u"heightBox")
-        self.heightBox.setMaximum(3840)
+        self.heightBox.setMaximum(8000)
 
         self.gridLayout_3.addWidget(self.heightBox, 0, 3, 1, 1)
 
 
         self.gridLayout.addWidget(self.customWidget, 8, 0, 1, 2)
 
+        self.gammaWidget = QWidget(self.centralWidget)
+        self.gammaWidget.setObjectName(u"gammaWidget")
+        self.gammaWidget.setVisible(False)
+        self.horizontalLayout_2 = QHBoxLayout(self.gammaWidget)
+        self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
+        self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
+        self.gammaLabel = QLabel(self.gammaWidget)
+        self.gammaLabel.setObjectName(u"gammaLabel")
+
+        self.horizontalLayout_2.addWidget(self.gammaLabel)
+
+        self.gammaSlider = QSlider(self.gammaWidget)
+        self.gammaSlider.setObjectName(u"gammaSlider")
+        self.gammaSlider.setMaximum(250)
+        self.gammaSlider.setSingleStep(5)
+        self.gammaSlider.setOrientation(Qt.Orientation.Horizontal)
+
+        self.horizontalLayout_2.addWidget(self.gammaSlider)
+
+
+        self.gridLayout.addWidget(self.gammaWidget, 7, 0, 1, 2)
+
+        self.toolWidget = QWidget(self.centralWidget)
+        self.toolWidget.setObjectName(u"toolWidget")
+        self.horizontalLayout = QHBoxLayout(self.toolWidget)
+        self.horizontalLayout.setObjectName(u"horizontalLayout")
+        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
+        self.editorButton = QPushButton(self.toolWidget)
+        self.editorButton.setObjectName(u"editorButton")
+        self.editorButton.setMinimumSize(QSize(0, 30))
+        icon1 = QIcon()
+        icon1.addFile(u":/Other/icons/editor.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.editorButton.setIcon(icon1)
+
+        self.horizontalLayout.addWidget(self.editorButton)
+
+        self.kofiButton = QPushButton(self.toolWidget)
+        self.kofiButton.setObjectName(u"kofiButton")
+        self.kofiButton.setMinimumSize(QSize(0, 30))
+        icon2 = QIcon()
+        icon2.addFile(u":/Brand/icons/kofi_symbol.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.kofiButton.setIcon(icon2)
+        self.kofiButton.setIconSize(QSize(19, 16))
+
+        self.horizontalLayout.addWidget(self.kofiButton)
+
+        self.wikiButton = QPushButton(self.toolWidget)
+        self.wikiButton.setObjectName(u"wikiButton")
+        self.wikiButton.setMinimumSize(QSize(0, 30))
+        icon3 = QIcon()
+        icon3.addFile(u":/Other/icons/wiki.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.wikiButton.setIcon(icon3)
+
+        self.horizontalLayout.addWidget(self.wikiButton)
+
+
+        self.gridLayout.addWidget(self.toolWidget, 0, 0, 1, 2)
+
+        self.progressBar = QProgressBar(self.centralWidget)
+        self.progressBar.setObjectName(u"progressBar")
+        self.progressBar.setMinimumSize(QSize(0, 30))
+        font = QFont()
+        font.setBold(True)
+        self.progressBar.setFont(font)
+        self.progressBar.setVisible(False)
+        self.progressBar.setAlignment(Qt.AlignmentFlag.AlignJustify|Qt.AlignmentFlag.AlignVCenter)
+
+        self.gridLayout.addWidget(self.progressBar, 1, 0, 1, 2)
+
         self.croppingWidget = QWidget(self.centralWidget)
         self.croppingWidget.setObjectName(u"croppingWidget")
         self.croppingWidget.setVisible(False)
@@ -227,154 +350,87 @@ class Ui_mainWindow(object):
 
         self.gridLayout.addWidget(self.croppingWidget, 9, 0, 1, 2)
 
-        self.optionWidget = QWidget(self.centralWidget)
+        self.buttonWidget = QWidget(self.centralWidget)
-        self.optionWidget.setObjectName(u"optionWidget")
+        self.buttonWidget.setObjectName(u"buttonWidget")
-        self.gridLayout_2 = QGridLayout(self.optionWidget)
+        sizePolicy3 = QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Fixed)
-        self.gridLayout_2.setObjectName(u"gridLayout_2")
-        self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
-        self.croppingBox = QCheckBox(self.optionWidget)
-        self.croppingBox.setObjectName(u"croppingBox")
-        self.croppingBox.setTristate(True)
-
-        self.gridLayout_2.addWidget(self.croppingBox, 4, 2, 1, 1)
-
-        self.mangaBox = QCheckBox(self.optionWidget)
-        self.mangaBox.setObjectName(u"mangaBox")
-
-        self.gridLayout_2.addWidget(self.mangaBox, 1, 0, 1, 1)
-
-        self.webtoonBox = QCheckBox(self.optionWidget)
-        self.webtoonBox.setObjectName(u"webtoonBox")
-
-        self.gridLayout_2.addWidget(self.webtoonBox, 2, 0, 1, 1)
-
-        self.rotateBox = QCheckBox(self.optionWidget)
-        self.rotateBox.setObjectName(u"rotateBox")
-        self.rotateBox.setTristate(True)
-
-        self.gridLayout_2.addWidget(self.rotateBox, 1, 1, 1, 1)
-
-        self.borderBox = QCheckBox(self.optionWidget)
-        self.borderBox.setObjectName(u"borderBox")
-        self.borderBox.setTristate(True)
-
-        self.gridLayout_2.addWidget(self.borderBox, 3, 0, 1, 1)
-
-        self.gammaBox = QCheckBox(self.optionWidget)
-        self.gammaBox.setObjectName(u"gammaBox")
-
-        self.gridLayout_2.addWidget(self.gammaBox, 2, 2, 1, 1)
-
-        self.interPanelCropBox = QCheckBox(self.optionWidget)
-        self.interPanelCropBox.setObjectName(u"interPanelCropBox")
-        self.interPanelCropBox.setTristate(True)
-
-        self.gridLayout_2.addWidget(self.interPanelCropBox, 6, 2, 1, 1)
-
-        self.colorBox = QCheckBox(self.optionWidget)
-        self.colorBox.setObjectName(u"colorBox")
-
-        self.gridLayout_2.addWidget(self.colorBox, 3, 2, 1, 1)
-
-        self.qualityBox = QCheckBox(self.optionWidget)
-        self.qualityBox.setObjectName(u"qualityBox")
-        self.qualityBox.setTristate(True)
-
-        self.gridLayout_2.addWidget(self.qualityBox, 1, 2, 1, 1)
-
-        self.disableProcessingBox = QCheckBox(self.optionWidget)
-        self.disableProcessingBox.setObjectName(u"disableProcessingBox")
-
-        self.gridLayout_2.addWidget(self.disableProcessingBox, 5, 2, 1, 1)
-
-        self.maximizeStrips = QCheckBox(self.optionWidget)
-        self.maximizeStrips.setObjectName(u"maximizeStrips")
-
-        self.gridLayout_2.addWidget(self.maximizeStrips, 4, 1, 1, 1)
-
-        self.authorEdit = QLineEdit(self.optionWidget)
-        self.authorEdit.setObjectName(u"authorEdit")
-        sizePolicy3 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed)
         sizePolicy3.setHorizontalStretch(0)
         sizePolicy3.setVerticalStretch(0)
-        sizePolicy3.setHeightForWidth(self.authorEdit.sizePolicy().hasHeightForWidth())
+        sizePolicy3.setHeightForWidth(self.buttonWidget.sizePolicy().hasHeightForWidth())
-        self.authorEdit.setSizePolicy(sizePolicy3)
+        self.buttonWidget.setSizePolicy(sizePolicy3)
-        self.authorEdit.setFocusPolicy(Qt.FocusPolicy.ClickFocus)
+        self.gridLayout_4 = QGridLayout(self.buttonWidget)
-        self.authorEdit.setClearButtonEnabled(False)
+        self.gridLayout_4.setObjectName(u"gridLayout_4")
+        self.gridLayout_4.setContentsMargins(0, 0, 0, 0)
+        self.convertButton = QPushButton(self.buttonWidget)
+        self.convertButton.setObjectName(u"convertButton")
+        self.convertButton.setMinimumSize(QSize(0, 30))
+        self.convertButton.setFont(font)
+        icon4 = QIcon()
+        icon4.addFile(u":/Other/icons/convert.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.convertButton.setIcon(icon4)
 
-        self.gridLayout_2.addWidget(self.authorEdit, 0, 0, 1, 1)
+        self.gridLayout_4.addWidget(self.convertButton, 1, 3, 1, 1)
 
-        self.deleteBox = QCheckBox(self.optionWidget)
+        self.clearButton = QPushButton(self.buttonWidget)
-        self.deleteBox.setObjectName(u"deleteBox")
+        self.clearButton.setObjectName(u"clearButton")
+        self.clearButton.setMinimumSize(QSize(0, 30))
+        icon5 = QIcon()
+        icon5.addFile(u":/Other/icons/clear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.clearButton.setIcon(icon5)
 
-        self.gridLayout_2.addWidget(self.deleteBox, 5, 1, 1, 1)
+        self.gridLayout_4.addWidget(self.clearButton, 0, 3, 1, 1)
 
-        self.mozJpegBox = QCheckBox(self.optionWidget)
+        self.deviceBox = QComboBox(self.buttonWidget)
-        self.mozJpegBox.setObjectName(u"mozJpegBox")
+        self.deviceBox.setObjectName(u"deviceBox")
-        self.mozJpegBox.setTristate(True)
+        self.deviceBox.setMinimumSize(QSize(0, 28))
 
-        self.gridLayout_2.addWidget(self.mozJpegBox, 4, 0, 1, 1)
+        self.gridLayout_4.addWidget(self.deviceBox, 1, 1, 1, 1)
 
-        self.spreadShiftBox = QCheckBox(self.optionWidget)
+        self.fileButton = QPushButton(self.buttonWidget)
-        self.spreadShiftBox.setObjectName(u"spreadShiftBox")
+        self.fileButton.setObjectName(u"fileButton")
+        self.fileButton.setMinimumSize(QSize(0, 30))
+        icon6 = QIcon()
+        icon6.addFile(u":/Other/icons/document_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.fileButton.setIcon(icon6)
 
-        self.gridLayout_2.addWidget(self.spreadShiftBox, 5, 0, 1, 1)
+        self.gridLayout_4.addWidget(self.fileButton, 0, 1, 1, 1)
 
-        self.upscaleBox = QCheckBox(self.optionWidget)
+        self.defaultOutputFolderButton = QPushButton(self.buttonWidget)
-        self.upscaleBox.setObjectName(u"upscaleBox")
+        self.defaultOutputFolderButton.setObjectName(u"defaultOutputFolderButton")
-        self.upscaleBox.setTristate(True)
+        self.defaultOutputFolderButton.setMinimumSize(QSize(0, 30))
+        icon7 = QIcon()
+        icon7.addFile(u":/Other/icons/folder_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
+        self.defaultOutputFolderButton.setIcon(icon7)
 
-        self.gridLayout_2.addWidget(self.upscaleBox, 2, 1, 1, 1)
+        self.gridLayout_4.addWidget(self.defaultOutputFolderButton, 0, 5, 1, 1)
 
-        self.outputSplit = QCheckBox(self.optionWidget)
+        self.defaultOutputFolderBox = QCheckBox(self.buttonWidget)
-        self.outputSplit.setObjectName(u"outputSplit")
+        self.defaultOutputFolderBox.setObjectName(u"defaultOutputFolderBox")
+        sizePolicy2.setHeightForWidth(self.defaultOutputFolderBox.sizePolicy().hasHeightForWidth())
+        self.defaultOutputFolderBox.setSizePolicy(sizePolicy2)
+        self.defaultOutputFolderBox.setTristate(True)
 
-        self.gridLayout_2.addWidget(self.outputSplit, 3, 1, 1, 1)
+        self.gridLayout_4.addWidget(self.defaultOutputFolderBox, 0, 4, 1, 1)
 
-        self.noRotateBox = QCheckBox(self.optionWidget)
+        self.formatBox = QComboBox(self.buttonWidget)
-        self.noRotateBox.setObjectName(u"noRotateBox")
+        self.formatBox.setObjectName(u"formatBox")
+        self.formatBox.setMinimumSize(QSize(0, 28))
 
-        self.gridLayout_2.addWidget(self.noRotateBox, 6, 1, 1, 1)
+        self.gridLayout_4.addWidget(self.formatBox, 1, 4, 1, 2)
 
-        self.reduceRainbowBox = QCheckBox(self.optionWidget)
+        self.clearButton.raise_()
-        self.reduceRainbowBox.setObjectName(u"reduceRainbowBox")
+        self.deviceBox.raise_()
+        self.convertButton.raise_()
+        self.formatBox.raise_()
+        self.defaultOutputFolderButton.raise_()
+        self.fileButton.raise_()
+        self.defaultOutputFolderBox.raise_()
 
-        self.gridLayout_2.addWidget(self.reduceRainbowBox, 7, 2, 1, 1)
+        self.gridLayout.addWidget(self.buttonWidget, 3, 0, 1, 2)
-
-        self.chunkSizeCheckBox = QCheckBox(self.optionWidget)
-        self.chunkSizeCheckBox.setObjectName(u"chunkSizeCheckBox")
-
-        self.gridLayout_2.addWidget(self.chunkSizeCheckBox, 7, 1, 1, 1)
-
-
-        self.gridLayout.addWidget(self.optionWidget, 5, 0, 1, 2)
-
-        self.gammaWidget = QWidget(self.centralWidget)
-        self.gammaWidget.setObjectName(u"gammaWidget")
-        self.gammaWidget.setVisible(False)
-        self.horizontalLayout_2 = QHBoxLayout(self.gammaWidget)
-        self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
-        self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
-        self.gammaLabel = QLabel(self.gammaWidget)
-        self.gammaLabel.setObjectName(u"gammaLabel")
-
-        self.horizontalLayout_2.addWidget(self.gammaLabel)
-
-        self.gammaSlider = QSlider(self.gammaWidget)
-        self.gammaSlider.setObjectName(u"gammaSlider")
-        self.gammaSlider.setMaximum(250)
-        self.gammaSlider.setSingleStep(5)
-        self.gammaSlider.setOrientation(Qt.Orientation.Horizontal)
-
-        self.horizontalLayout_2.addWidget(self.gammaSlider)
-
-
-        self.gridLayout.addWidget(self.gammaWidget, 7, 0, 1, 2)
 
         self.chunkSizeWidget = QWidget(self.centralWidget)
         self.chunkSizeWidget.setObjectName(u"chunkSizeWidget")
-        sizePolicy3.setHeightForWidth(self.chunkSizeWidget.sizePolicy().hasHeightForWidth())
+        sizePolicy.setHeightForWidth(self.chunkSizeWidget.sizePolicy().hasHeightForWidth())
-        self.chunkSizeWidget.setSizePolicy(sizePolicy3)
+        self.chunkSizeWidget.setSizePolicy(sizePolicy)
         self.chunkSizeWidget.setVisible(False)
         self.horizontalLayout_4 = QHBoxLayout(self.chunkSizeWidget)
         self.horizontalLayout_4.setSpacing(0)
@@ -413,37 +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.directoryButton)
+        QWidget.setTabOrder(self.fileButton, self.clearButton)
-        QWidget.setTabOrder(self.directoryButton, self.fileButton)
+        QWidget.setTabOrder(self.clearButton, self.defaultOutputFolderButton)
-        QWidget.setTabOrder(self.fileButton, self.deviceBox)
+        QWidget.setTabOrder(self.defaultOutputFolderButton, self.defaultOutputFolderBox)
-        QWidget.setTabOrder(self.deviceBox, self.formatBox)
+        QWidget.setTabOrder(self.defaultOutputFolderBox, self.deviceBox)
-        QWidget.setTabOrder(self.formatBox, self.mangaBox)
+        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.reduceRainbowBox)
+        QWidget.setTabOrder(self.interPanelCropBox, self.metadataTitleBox)
-        QWidget.setTabOrder(self.reduceRainbowBox, 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)
 
@@ -453,29 +518,112 @@ class Ui_mainWindow(object):
     def retranslateUi(self, mainWindow):
         mainWindow.setWindowTitle(QCoreApplication.translate("mainWindow", u"Kindle Comic Converter", None))
 #if QT_CONFIG(tooltip)
-        self.editorButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Shift+Click to edit directory.</p></body></html>", None))
+        self.titleEdit.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Default Title</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-        self.editorButton.setText(QCoreApplication.translate("mainWindow", u"Metadata Editor", None))
+        self.titleEdit.setPlaceholderText(QCoreApplication.translate("mainWindow", u"Default Title", None))
-        self.wikiButton.setText(QCoreApplication.translate("mainWindow", u"Wiki", None))
 #if QT_CONFIG(tooltip)
-        self.directoryButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Add directory containing JPG, PNG or GIF files to queue.<br/><span style=\" font-weight:600;\">CBR, CBZ and CB7 files inside will not be processed!</span></p></body></html>", None))
+        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.directoryButton.setText(QCoreApplication.translate("mainWindow", u"Add image folder", None))
+        self.mangaBox.setText(QCoreApplication.translate("mainWindow", u"Right-to-left (manga)", None))
 #if QT_CONFIG(tooltip)
-        self.fileButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html>", None))
+        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)
-        self.fileButton.setText(QCoreApplication.translate("mainWindow", u"Add file(s)", None))
+        self.webtoonBox.setText(QCoreApplication.translate("mainWindow", u"Webtoon mode", None))
 #if QT_CONFIG(tooltip)
-        self.deviceBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Target device.</p></body></html>", None))
+        self.croppingBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Disabled</span></p><p>Disabled</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Margins<br/></span>Margins</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Margins + page numbers<br/></span>Margins +page numbers</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
+        self.croppingBox.setText(QCoreApplication.translate("mainWindow", u"Cropping mode", None))
 #if QT_CONFIG(tooltip)
-        self.formatBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Output format.</p></body></html>", None))
+        self.maximizeStrips.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - 1x4<br/></span>Keep format 1x4 panels strips.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - 2x2<br/></span>Turn 1x4 strips to 2x2 to maximize screen usage.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
+        self.maximizeStrips.setText(QCoreApplication.translate("mainWindow", u"1x4 to 2x2 strips", None))
 #if QT_CONFIG(tooltip)
-        self.convertButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Shift+Click to select the output directory.</p></body></html>", None))
+        self.deleteBox.setToolTip(QCoreApplication.translate("mainWindow", u"Delete input file(s) or directory. It's not recoverable!", None))
+#endif // QT_CONFIG(tooltip)
+        self.deleteBox.setText(QCoreApplication.translate("mainWindow", u"Delete input", None))
+#if QT_CONFIG(tooltip)
+        self.rotateFirstBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>When the spread splitter option is partially checked,</p><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Rotate Last<br/></span>Put the rotated 2 page spread after the split spreads.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Rotate First<br/></span>Put the rotated 2 page spread before the split spreads.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.rotateFirstBox.setText(QCoreApplication.translate("mainWindow", u"Rotate First", None))
+#if QT_CONFIG(tooltip)
+        self.outputSplit.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Automatic mode<br/></span>The output will be split automatically.</p><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Checked - Volume mode<br/></span>Every subdirectory will be considered as a separate volume.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.outputSplit.setText(QCoreApplication.translate("mainWindow", u"Output split", None))
+#if QT_CONFIG(tooltip)
+        self.borderBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>The color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be untouched.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.borderBox.setText(QCoreApplication.translate("mainWindow", u"W/B margins", None))
+#if QT_CONFIG(tooltip)
+        self.gammaBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Set a custom gamma correction.</p><p>1.0 is default (disabled).<br/>&lt; 1.0 makes the image brighter.<br/>&gt; 1.0 makes the image darker. </p><p>1.8 was the default in KCC 9.1.0 and earlier.</p><p>Use if you want to make midtones darker.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.gammaBox.setText(QCoreApplication.translate("mainWindow", u"Custom gamma", None))
+#if QT_CONFIG(tooltip)
+        self.upscaleBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.upscaleBox.setText(QCoreApplication.translate("mainWindow", u"Stretch/Upscale", None))
+#if QT_CONFIG(tooltip)
+        self.chunkSizeCheckBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:700; text-decoration: underline;\">Unchecked<br/></span>Maximal output file size is 100 MB for Webtoon, 400 MB for others before split occurs.</p><p><span style=\" font-weight:700; text-decoration: underline;\">Checked</span><br/>Output file size specified in &quot;Chunk size MB&quot; before split occurs.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.chunkSizeCheckBox.setText(QCoreApplication.translate("mainWindow", u"Chunk size", None))
+#if QT_CONFIG(tooltip)
+        self.colorBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Disable conversion to grayscale.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.colorBox.setText(QCoreApplication.translate("mainWindow", u"Color mode", None))
+#if QT_CONFIG(tooltip)
+        self.rotateBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Split<br/></span>Double page spreads will be cut into two separate pages.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Split and rotate<br/></span>Double page spreads will be displayed twice. First split and then rotated. </p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Rotate<br/></span>Double page spreads will be rotated.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.rotateBox.setText(QCoreApplication.translate("mainWindow", u"Spread splitter", None))
+#if QT_CONFIG(tooltip)
+        self.spreadShiftBox.setToolTip(QCoreApplication.translate("mainWindow", u"Shift first page to opposite side in landscape for two page spread alignment", None))
+#endif // QT_CONFIG(tooltip)
+        self.spreadShiftBox.setText(QCoreApplication.translate("mainWindow", u"Spread shift", None))
+#if QT_CONFIG(tooltip)
+        self.disableProcessingBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Do not process any image, ignore profile and processing options.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.disableProcessingBox.setText(QCoreApplication.translate("mainWindow", u"Disable processing", None))
+#if QT_CONFIG(tooltip)
+        self.eraseRainbowBox.setToolTip(QCoreApplication.translate("mainWindow", u"Erase rainbow effect on color eink screen by attenuating interfering frequencies", None))
+#endif // QT_CONFIG(tooltip)
+        self.eraseRainbowBox.setText(QCoreApplication.translate("mainWindow", u"Rainbow eraser", None))
+#if QT_CONFIG(tooltip)
+        self.noRotateBox.setToolTip(QCoreApplication.translate("mainWindow", u"Do not rotate double page spreads in spread splitter option.", None))
+#endif // QT_CONFIG(tooltip)
+        self.noRotateBox.setText(QCoreApplication.translate("mainWindow", u"No rotate", None))
+#if QT_CONFIG(tooltip)
+        self.fileFusionBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Combines all selected files into a single file. (Helpful for combining chapters into volumes.)</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.fileFusionBox.setText(QCoreApplication.translate("mainWindow", u"File Fusion", None))
+#if QT_CONFIG(tooltip)
+        self.authorEdit.setToolTip(QCoreApplication.translate("mainWindow", u"Default Author is KCC", None))
+#endif // QT_CONFIG(tooltip)
+        self.authorEdit.setPlaceholderText(QCoreApplication.translate("mainWindow", u"Default Author", None))
+#if QT_CONFIG(tooltip)
+        self.qualityBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - 4 panels<br/></span>Zoom each corner separately.</p><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - 2 panels<br/></span>Zoom only the top and bottom of the page.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - 4 high-quality panels<br/></span>Zoom each corner separately. Try to increase the quality of magnification. Check wiki for more details.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.qualityBox.setText(QCoreApplication.translate("mainWindow", u"Panel View 4/2/HQ", None))
+#if QT_CONFIG(tooltip)
+        self.interPanelCropBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Disabled<br/></span>Disabled</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Horizontal<br/></span>Crop empty horizontal lines.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Both<br/></span>Crop empty horizontal and vertical lines.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.interPanelCropBox.setText(QCoreApplication.translate("mainWindow", u"Inter-panel crop", None))
+#if QT_CONFIG(tooltip)
+        self.metadataTitleBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Don't use metadata Title<br/></span>Write default title.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Add metadata Title to the default schema<br/></span>Write default title with Title from ComicInfo.xml or other embedded metadata.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Use metadata Title only<br/></span>Write Title from ComicInfo.xml or other embedded metadata.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.metadataTitleBox.setText(QCoreApplication.translate("mainWindow", u"Metadata Title", None))
+#if QT_CONFIG(tooltip)
+        self.mozJpegBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - JPEG<br/></span>Use JPEG files</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - force PNG<br/></span>Create PNG files instead JPEG</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - mozJpeg<br/></span>10-20% smaller JPEG file, with the same image quality, but processing time multiplied by 2</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.mozJpegBox.setText(QCoreApplication.translate("mainWindow", u"JPEG/PNG/mozJpeg", None))
+#if QT_CONFIG(tooltip)
+        self.autoLevelBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>By default, KCC maps the darkest pixel value to pure black (the black point.)</p><p>Extreme black point sets the black point to be the most common dark pixel value.</p><p>Useful when text is black but artwork is gray.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.autoLevelBox.setText(QCoreApplication.translate("mainWindow", u"Extreme Black Point", None))
+#if QT_CONFIG(tooltip)
+        self.autocontrastBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - BW only<br/></span>Only autocontrast bw pages. Ignored for pages where near blacks or whites don't exist.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Disabled<br/></span>Disable autocontrast</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - BW and Color<br/></span>BW and color images will be autocontrasted. Ignored for pages where near blacks or whites don't exist.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.autocontrastBox.setText(QCoreApplication.translate("mainWindow", u"Autocontrast", None))
+#if QT_CONFIG(tooltip)
+        self.jobList.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Double click on source to open it in metadata editor.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-        self.convertButton.setText(QCoreApplication.translate("mainWindow", u"Convert", None))
-        self.clearButton.setText(QCoreApplication.translate("mainWindow", u"Clear list", None))
 #if QT_CONFIG(tooltip)
         self.hLabel.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
@@ -490,92 +638,41 @@ class Ui_mainWindow(object):
 #if QT_CONFIG(tooltip)
         self.heightBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Resolution of the target device.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
+        self.gammaLabel.setText(QCoreApplication.translate("mainWindow", u"Gamma: Auto", None))
+#if QT_CONFIG(tooltip)
+        self.editorButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Shift+Click to edit directory.</p></body></html>", None))
+#endif // QT_CONFIG(tooltip)
+        self.editorButton.setText(QCoreApplication.translate("mainWindow", u"Metadata Editor", None))
+        self.kofiButton.setText(QCoreApplication.translate("mainWindow", u"Support me on Ko-fi", None))
+        self.wikiButton.setText(QCoreApplication.translate("mainWindow", u"Wiki", None))
 #if QT_CONFIG(tooltip)
         self.preserveMarginLabel.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>After calculating the cropping boundaries, &quot;back up&quot; a specified percentage amount.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
         self.preserveMarginLabel.setText(QCoreApplication.translate("mainWindow", u"Preserve Margin %", None))
         self.croppingPowerLabel.setText(QCoreApplication.translate("mainWindow", u"Cropping power:", None))
 #if QT_CONFIG(tooltip)
-        self.croppingBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Disabled</span></p><p>Disabled</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Margins<br/></span>Margins</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Margins + page numbers<br/></span>Margins +page numbers</p></body></html>", None))
+        self.convertButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Shift+Click to select the output directory for this list.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-        self.croppingBox.setText(QCoreApplication.translate("mainWindow", u"Cropping mode", None))
+        self.convertButton.setText(QCoreApplication.translate("mainWindow", u"Convert", None))
+        self.clearButton.setText(QCoreApplication.translate("mainWindow", u"Clear list", None))
 #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))
+        self.deviceBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Target device.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-        self.mangaBox.setText(QCoreApplication.translate("mainWindow", u"Manga mode", 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))
+        self.fileButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-        self.webtoonBox.setText(QCoreApplication.translate("mainWindow", u"Webtoon mode", None))
+        self.fileButton.setText(QCoreApplication.translate("mainWindow", u"Add file(s)", None))
 #if QT_CONFIG(tooltip)
-        self.rotateBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Split<br/></span>Double page spreads will be cut into two separate pages.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Rotate and split<br/></span>Double page spreads will be displayed twice. First rotated and then split. </p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Rotate<br/></span>Double page spreads will be rotated.</p></body></html>", None))
+        self.defaultOutputFolderButton.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Use this to select the default output directory.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-        self.rotateBox.setText(QCoreApplication.translate("mainWindow", u"Spread splitter", None))
+        self.defaultOutputFolderButton.setText("")
 #if QT_CONFIG(tooltip)
-        self.borderBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>The color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>", None))
+        self.defaultOutputFolderBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - next to source<br/></span>Place output files next to source files</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - folder next to source<br/></span>Place output files in a folder next to source files</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Custom<br/></span>Place output files in custom directory specified by right button</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-        self.borderBox.setText(QCoreApplication.translate("mainWindow", u"W/B margins", None))
+        self.defaultOutputFolderBox.setText(QCoreApplication.translate("mainWindow", u"Output Folder", None))
 #if QT_CONFIG(tooltip)
-        self.gammaBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Disable automatic gamma correction.</p></body></html>", None))
+        self.formatBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Output format.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-        self.gammaBox.setText(QCoreApplication.translate("mainWindow", u"Custom gamma", None))
-#if QT_CONFIG(tooltip)
-        self.interPanelCropBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Disabled<br/></span>Disabled</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Horizontal<br/></span>Crop empty horizontal lines.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Both<br/></span>Crop empty horizontal and vertical lines.</p></body></html>", None))
-#endif // QT_CONFIG(tooltip)
-        self.interPanelCropBox.setText(QCoreApplication.translate("mainWindow", u"Inter-panel crop", None))
-#if QT_CONFIG(tooltip)
-        self.colorBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Disable conversion to grayscale.</p></body></html>", None))
-#endif // QT_CONFIG(tooltip)
-        self.colorBox.setText(QCoreApplication.translate("mainWindow", u"Color mode", None))
-#if QT_CONFIG(tooltip)
-        self.qualityBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - 4 panels<br/></span>Zoom each corner separately.</p><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - 2 panels<br/></span>Zoom only the top and bottom of the page.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - 4 high-quality panels<br/></span>Zoom each corner separately. Try to increase the quality of magnification. Check wiki for more details.</p></body></html>", None))
-#endif // QT_CONFIG(tooltip)
-        self.qualityBox.setText(QCoreApplication.translate("mainWindow", u"Panel View 4/2/HQ", None))
-#if QT_CONFIG(tooltip)
-        self.disableProcessingBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Do not process any image, ignore profile and processing options.</p></body></html>", None))
-#endif // QT_CONFIG(tooltip)
-        self.disableProcessingBox.setText(QCoreApplication.translate("mainWindow", u"Disable processing", None))
-#if QT_CONFIG(tooltip)
-        self.maximizeStrips.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - 1x4<br/></span>Keep format 1x4 panels strips.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - 2x2<br/></span>Turn 1x4 strips to 2x2 to maximize screen usage.</p></body></html>", None))
-#endif // QT_CONFIG(tooltip)
-        self.maximizeStrips.setText(QCoreApplication.translate("mainWindow", u"1x4 to 2x2 strips", None))
-#if QT_CONFIG(tooltip)
-        self.authorEdit.setToolTip(QCoreApplication.translate("mainWindow", u"Default Author is KCC", None))
-#endif // QT_CONFIG(tooltip)
-        self.authorEdit.setPlaceholderText(QCoreApplication.translate("mainWindow", u"Default Author", None))
-#if QT_CONFIG(tooltip)
-        self.deleteBox.setToolTip(QCoreApplication.translate("mainWindow", u"Delete input file(s) or directory. It's not recoverable!", None))
-#endif // QT_CONFIG(tooltip)
-        self.deleteBox.setText(QCoreApplication.translate("mainWindow", u"Delete input", None))
-#if QT_CONFIG(tooltip)
-        self.mozJpegBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - JPEG<br/></span>Use JPEG files</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - force PNG<br/></span>Create PNG files instead JPEG</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - mozJpeg<br/></span>10-20% smaller JPEG file, with the same image quality, but processing time multiplied by 2</p></body></html>", None))
-#endif // QT_CONFIG(tooltip)
-        self.mozJpegBox.setText(QCoreApplication.translate("mainWindow", u"JPEG/PNG/mozJpeg", None))
-#if QT_CONFIG(tooltip)
-        self.spreadShiftBox.setToolTip(QCoreApplication.translate("mainWindow", u"Shift first page to opposite side in landscape for two page spread alignment", None))
-#endif // QT_CONFIG(tooltip)
-        self.spreadShiftBox.setText(QCoreApplication.translate("mainWindow", u"Spread shift", None))
-#if QT_CONFIG(tooltip)
-        self.upscaleBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>", None))
-#endif // QT_CONFIG(tooltip)
-        self.upscaleBox.setText(QCoreApplication.translate("mainWindow", u"Stretch/Upscale", None))
-#if QT_CONFIG(tooltip)
-        self.outputSplit.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Automatic mode<br/></span>The output will be split automatically.</p><p style='white-space:pre'><span style=\" font-weight:600; text-decoration: underline;\">Checked - Volume mode<br/></span>Every subdirectory will be considered as a separate volume.</p></body></html>", None))
-#endif // QT_CONFIG(tooltip)
-        self.outputSplit.setText(QCoreApplication.translate("mainWindow", u"Output split", None))
-#if QT_CONFIG(tooltip)
-        self.noRotateBox.setToolTip(QCoreApplication.translate("mainWindow", u"Do not rotate double page spreads in spread splitter option.", None))
-#endif // QT_CONFIG(tooltip)
-        self.noRotateBox.setText(QCoreApplication.translate("mainWindow", u"No rotate", None))
-#if QT_CONFIG(tooltip)
-        self.reduceRainbowBox.setToolTip(QCoreApplication.translate("mainWindow", u"Reduce rainbow effect on color eink by slightly blurring images", None))
-#endif // QT_CONFIG(tooltip)
-        self.reduceRainbowBox.setText(QCoreApplication.translate("mainWindow", u"Rainbow blur", None))
-#if QT_CONFIG(tooltip)
-        self.chunkSizeCheckBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p><span style=\" font-weight:700; text-decoration: underline;\">Unchecked<br/></span>Maximal output file size is 100 MB for Webtoon, 400 MB for others before split occurs.</p><p><span style=\" font-weight:700; text-decoration: underline;\">Checked</span><br/>Output file size specified in &quot;Chunk size MB&quot; before split occurs.</p></body></html>", None))
-#endif // QT_CONFIG(tooltip)
-        self.chunkSizeCheckBox.setText(QCoreApplication.translate("mainWindow", u"Chunk size", None))
-        self.gammaLabel.setText(QCoreApplication.translate("mainWindow", u"Gamma: Auto", None))
 #if QT_CONFIG(tooltip)
         self.chunkSizeWidget.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p>Warning: chunk size greater than default may cause<br/>performance/battery issues, especially on older devices.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)

kindlecomicconverter/KCC_ui_editor.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'MetaEditor.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.8.2
+## Created by: Qt User Interface Compiler version 6.9.3
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -60,52 +60,62 @@ class Ui_editorDialog(object):
         self.label_3 = QLabel(self.editorWidget)
         self.label_3.setObjectName(u"label_3")
 
-        self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1)
+        self.gridLayout.addWidget(self.label_3, 3, 0, 1, 1)
 
         self.numberLine = QLineEdit(self.editorWidget)
         self.numberLine.setObjectName(u"numberLine")
 
-        self.gridLayout.addWidget(self.numberLine, 2, 1, 1, 1)
+        self.gridLayout.addWidget(self.numberLine, 3, 1, 1, 1)
 
         self.label_4 = QLabel(self.editorWidget)
         self.label_4.setObjectName(u"label_4")
 
-        self.gridLayout.addWidget(self.label_4, 3, 0, 1, 1)
+        self.gridLayout.addWidget(self.label_4, 4, 0, 1, 1)
 
         self.writerLine = QLineEdit(self.editorWidget)
         self.writerLine.setObjectName(u"writerLine")
 
-        self.gridLayout.addWidget(self.writerLine, 3, 1, 1, 1)
+        self.gridLayout.addWidget(self.writerLine, 4, 1, 1, 1)
 
         self.label_5 = QLabel(self.editorWidget)
         self.label_5.setObjectName(u"label_5")
 
-        self.gridLayout.addWidget(self.label_5, 4, 0, 1, 1)
+        self.gridLayout.addWidget(self.label_5, 5, 0, 1, 1)
 
         self.pencillerLine = QLineEdit(self.editorWidget)
         self.pencillerLine.setObjectName(u"pencillerLine")
 
-        self.gridLayout.addWidget(self.pencillerLine, 4, 1, 1, 1)
+        self.gridLayout.addWidget(self.pencillerLine, 5, 1, 1, 1)
 
         self.label_6 = QLabel(self.editorWidget)
         self.label_6.setObjectName(u"label_6")
 
-        self.gridLayout.addWidget(self.label_6, 5, 0, 1, 1)
+        self.gridLayout.addWidget(self.label_6, 6, 0, 1, 1)
 
         self.inkerLine = QLineEdit(self.editorWidget)
         self.inkerLine.setObjectName(u"inkerLine")
 
-        self.gridLayout.addWidget(self.inkerLine, 5, 1, 1, 1)
+        self.gridLayout.addWidget(self.inkerLine, 6, 1, 1, 1)
 
         self.label_7 = QLabel(self.editorWidget)
         self.label_7.setObjectName(u"label_7")
 
-        self.gridLayout.addWidget(self.label_7, 6, 0, 1, 1)
+        self.gridLayout.addWidget(self.label_7, 7, 0, 1, 1)
 
         self.coloristLine = QLineEdit(self.editorWidget)
         self.coloristLine.setObjectName(u"coloristLine")
 
-        self.gridLayout.addWidget(self.coloristLine, 6, 1, 1, 1)
+        self.gridLayout.addWidget(self.coloristLine, 7, 1, 1, 1)
+
+        self.label_8 = QLabel(self.editorWidget)
+        self.label_8.setObjectName(u"label_8")
+
+        self.gridLayout.addWidget(self.label_8, 2, 0, 1, 1)
+
+        self.titleLine = QLineEdit(self.editorWidget)
+        self.titleLine.setObjectName(u"titleLine")
+
+        self.gridLayout.addWidget(self.titleLine, 2, 1, 1, 1)
 
 
         self.verticalLayout.addWidget(self.editorWidget)
@@ -146,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)
 
@@ -161,6 +180,7 @@ class Ui_editorDialog(object):
         self.label_5.setText(QCoreApplication.translate("editorDialog", u"Penciller:", None))
         self.label_6.setText(QCoreApplication.translate("editorDialog", u"Inker:", None))
         self.label_7.setText(QCoreApplication.translate("editorDialog", u"Colorist:", None))
+        self.label_8.setText(QCoreApplication.translate("editorDialog", u"Title:", None))
         self.statusLabel.setText("")
         self.okButton.setText(QCoreApplication.translate("editorDialog", u"Save", None))
         self.cancelButton.setText(QCoreApplication.translate("editorDialog", u"Cancel", None))

kindlecomicconverter/__init__.py

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

kindlecomicconverter/comic2panel.py

@@ -18,13 +18,17 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
+import math
 import os
 import sys
 from argparse import ArgumentParser
-from shutil import rmtree, copytree, move
+from shutil import rmtree
 from multiprocessing import Pool
-from PIL import Image, ImageChops, ImageOps, ImageDraw
+from PIL import Image, ImageChops, ImageOps, ImageDraw, ImageFilter, ImageFile
-from .shared import getImageFileName, walkLevel, walkSort, sanitizeTrace
+from PIL.Image import Dither
+from .shared import dot_clean, getImageFileName, walkLevel, walkSort, sanitizeTrace
+
+ImageFile.LOAD_TRUNCATED_IMAGES = True
 
 
 def mergeDirectoryTick(output):
@@ -44,6 +48,7 @@ def mergeDirectory(work):
         imagesValid = []
         sizes = []
         targetHeight = 0
+        dot_clean(directory)
         for root, _, files in walkLevel(directory, 0):
             for name in files:
                 if getImageFileName(name) is not None:
@@ -57,8 +62,8 @@ def mergeDirectory(work):
                 imagesValid.append(i[0])
             # Silently drop directories that contain too many images
             # 131072 = GIMP_MAX_IMAGE_SIZE / 4
-            if targetHeight > 131072:
+            if targetHeight > 131072 * 3:
-                return None
+                raise RuntimeError(f'Image too tall at {targetHeight} pixels. {targetWidth} pixels wide. Try using separate chapter folders or file fusion.')
             result = Image.new('RGB', (targetWidth, targetHeight))
             y = 0
             for i in imagesValid:
@@ -100,7 +105,11 @@ def splitImage(work):
         Image.warnings.simplefilter('error', Image.DecompressionBombWarning)
         Image.MAX_IMAGE_PIXELS = 1000000000
         imgOrg = Image.open(filePath).convert('RGB')
-        imgProcess = Image.open(filePath).convert('1')
+        # I experimented with custom vertical edge kernel [-1, 2, -1] but got poor results
+        imgEdges = Image.open(filePath).convert('L').filter(ImageFilter.FIND_EDGES)
+        # threshold of 8 is too high. 5 is too low.
+        imgProcess = imgEdges.point(lambda p: 255 if p > 6 else 0).convert('1', dither=Dither.NONE)
+
         widthImg, heightImg = imgOrg.size
         if heightImg > opt.height:
             if opt.debug:
@@ -111,47 +120,71 @@ def splitImage(work):
             yWork = 0
             panelDetected = False
             panels = []
+            # check git history for how these constant values changed
+            h_pad = int(widthImg / 20)
+            v_pad = int(widthImg / 80)
+            if v_pad % 2:
+                v_pad += 1
             while yWork < heightImg:
-                tmpImg = imgProcess.crop((4, yWork, widthImg-4, yWork + 4))
+                tmpImg = imgProcess.crop((h_pad, yWork, widthImg - h_pad, yWork + v_pad))
                 solid = detectSolid(tmpImg)
                 if not solid and not panelDetected:
                     panelDetected = True
-                    panelY1 = yWork - 2
+                    panelY1 = yWork
-                if heightImg - yWork <= 5:
+                if heightImg - yWork <= (v_pad // 2):
                     if not solid and panelDetected:
                         panelY2 = heightImg
                         panelDetected = False
                         panels.append((panelY1, panelY2, panelY2 - panelY1))
                 if solid and panelDetected:
                     panelDetected = False
-                    panelY2 = yWork + 6
+                    panelY2 = yWork
+                    # skip short panel at start
+                    if panelY1 < v_pad * 2 and panelY2 - panelY1 < v_pad * 2:
+                        continue
                     panels.append((panelY1, panelY2, panelY2 - panelY1))
-                yWork += 5
+                yWork += v_pad // 2
+
+            max_width = 1072
+            virtual_width = min((max_width, opt.width, widthImg))
+            if opt.width > max_width:
+                virtual_height = int(opt.height/max_width*virtual_width)
+            else:
+                virtual_height = int(opt.height/opt.width*virtual_width)
+            opt.height = virtual_height
 
             # Split too big panels
             panelsProcessed = []
             for panel in panels:
+                # 1.52 too high
                 if panel[2] <= opt.height * 1.5:
                     panelsProcessed.append(panel)
-                elif panel[2] < opt.height * 2:
+                elif panel[2] <= opt.height * 2:
                     diff = panel[2] - opt.height
                     panelsProcessed.append((panel[0], panel[1] - diff, opt.height))
                     panelsProcessed.append((panel[1] - opt.height, panel[1], opt.height))
                 else:
-                    parts = round(panel[2] / opt.height)
+                    # split super long panels with overlap
+                    parts = math.ceil(panel[2] / opt.height)
                     diff = panel[2] // parts
-                    for x in range(0, parts):
+                    panelsProcessed.append((panel[0], panel[0] + opt.height, opt.height))
-                        panelsProcessed.append((panel[0] + (x * diff), panel[1] - ((parts - x - 1) * diff), diff))
+                    for x in range(1, parts - 1):
+                        start = panel[0] + (x * diff)
+                        panelsProcessed.append((start, start + opt.height, opt.height))
+                    panelsProcessed.append((panel[1] - opt.height, panel[1], opt.height))
 
             if opt.debug:
                 for panel in panelsProcessed:
                     draw.rectangle(((0, panel[0]), (widthImg, panel[1])), (0, 255, 0, 128), (0, 0, 255, 255))
                 debugImage = Image.alpha_composite(imgOrg.convert(mode='RGBA'), drawImg)
+                # debugImage.show()
                 debugImage.save(os.path.join(path, os.path.splitext(name)[0] + '-debug.png'), 'PNG')
 
             # Create virtual pages
             pages = []
             currentPage = []
+            # TODO: 1.25 way too high, 1.1 too high, 1.05 slightly too high(?), optimized for 2 page landscape reading
+            # opt.height = max_height = virtual_height * 1.00
             pageLeft = opt.height
             panelNumber = 0
             for panel in panelsProcessed:
@@ -188,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)
 
@@ -200,6 +233,8 @@ def main(argv=None, qtgui=None):
                                    " with spaces.")
     main_options.add_argument("-y", "--height", type=int, dest="height", default=0,
                               help="Height of the target device screen")
+    main_options.add_argument("-x", "--width", type=int, dest="width", default=0,
+                              help="Width of the target device screen")
     main_options.add_argument("-i", "--in-place", action="store_true", dest="inPlace", default=False,
                               help="Overwrite source directory")
     main_options.add_argument("-m", "--merge", action="store_true", dest="merge", default=False,
@@ -221,13 +256,13 @@ def main(argv=None, qtgui=None):
             targetDir = sourceDir + "-Splitted"
             if os.path.isdir(sourceDir):
                 rmtree(targetDir, True)
-                copytree(sourceDir, targetDir)
+                os.renames(sourceDir, targetDir)
                 work = []
                 pagenumber = 1
                 splitWorkerOutput = []
                 splitWorkerPool = Pool(maxtasksperchild=10)
                 if args.merge:
-                    print("Merging images...")
+                    print(f"{job_progress}Merging images...")
                     directoryNumer = 1
                     mergeWork = []
                     mergeWorkerOutput = []
@@ -239,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)
@@ -252,7 +287,8 @@ 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:
                         if getImageFileName(name) is not None:
@@ -261,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:
@@ -269,6 +305,7 @@ def main(argv=None, qtgui=None):
                         splitWorkerPool.apply_async(func=splitImage, args=(i, ), callback=splitImageTick)
                     splitWorkerPool.close()
                     splitWorkerPool.join()
+                    dot_clean(targetDir)
                     if GUI and not GUI.conversionAlive:
                         rmtree(targetDir, True)
                         raise UserWarning("Conversion interrupted.")
@@ -277,11 +314,10 @@ def main(argv=None, qtgui=None):
                         raise RuntimeError("One of workers crashed. Cause: " + splitWorkerOutput[0][0],
                                            splitWorkerOutput[0][1])
                     if args.inPlace:
-                        rmtree(sourceDir)
+                        os.renames(targetDir, sourceDir)
-                        move(targetDir, sourceDir)
                 else:
                     rmtree(targetDir, True)
-                    raise UserWarning("Source directory is empty.")
+                    raise UserWarning("C2P: Source directory is empty.")
             else:
                 raise UserWarning("Provided input is not a directory.")
     else:

kindlecomicconverter/comicarchive.py

@@ -18,16 +18,18 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-from functools import cached_property
+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'
 
 
 class ComicArchive:
@@ -35,21 +37,22 @@ class ComicArchive:
         self.filepath = filepath
         if not os.path.isfile(self.filepath):
             raise OSError('File not found.')
+        self.dirname, self.basename = os.path.split(filepath)
 
     @cached_property
     def type(self):    
         extraction_commands = [
-            ['7z', 'l', '-y', '-p1', self.filepath],
+            [SEVENZIP, 'l', '-y', '-p1', self.basename],
         ]
 
         if distro.id() == 'fedora' or distro.like() == 'fedora':
             extraction_commands.append(
-                ['unrar', 'l', '-y', '-p1', self.filepath],
+                ['unrar', 'l', '-y', '-p1', self.basename],
             )
 
         for cmd in extraction_commands:
             try:
-                process = subprocess_run(cmd, capture_output=True, check=True)
+                process = subprocess_run(cmd, capture_output=True, check=True, cwd=self.dirname)
                 for line in process.stdout.splitlines():
                     if b'Type =' in line:
                         return line.rstrip().decode().split(' = ')[1].upper()
@@ -63,30 +66,33 @@ 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 = []
 
         extraction_commands = [
-            ['tar', '--exclude', '__MACOSX', '--exclude', '.DS_Store', '--exclude', 'thumbs.db', '--exclude', 'Thumbs.db', '-xf', self.filepath, '-C', targetdir],
+            ['tar', '--exclude', '__MACOSX', '--exclude', '.DS_Store', '--exclude', 'thumbs.db', '--exclude', 'Thumbs.db', '-xf', self.basename, '-C', targetdir],
-            ['7z', 'x', '-y', '-xr!__MACOSX', '-xr!.DS_Store', '-xr!thumbs.db', '-xr!Thumbs.db', '-o' + targetdir, self.filepath],
+            [SEVENZIP, 'x', '-y', '-xr!__MACOSX', '-xr!.DS_Store', '-xr!thumbs.db', '-xr!Thumbs.db', '-o' + targetdir, self.basename],
         ]
 
         if platform.system() == 'Darwin':
             extraction_commands.append(
-                ['unar', self.filepath, '-f', '-o', targetdir]
+                ['unar', self.basename, '-D', '-f', '-o', targetdir]
             )
 
         extraction_commands.reverse()
 
         if distro.id() == 'fedora' or distro.like() == 'fedora':
             extraction_commands.append(
-                ['unrar', 'x', '-y', '-x__MACOSX', '-x.DS_Store', '-xthumbs.db', '-xThumbs.db', self.filepath, targetdir]
+                ['unrar', 'x', '-y', '-x__MACOSX', '-x.DS_Store', '-xthumbs.db', '-xThumbs.db', self.basename, targetdir]
             )
         
         for cmd in extraction_commands:
             try:
-                subprocess_run(cmd, capture_output=True, check=True)
+                subprocess_run(cmd, capture_output=True, check=True, cwd=self.dirname)
-                return targetdir
+                return targetdir     
             except FileNotFoundError:
                 missing.append(cmd[0])
             except CalledProcessError:
@@ -100,17 +106,30 @@ class ComicArchive:
     def addFile(self, sourcefile):
         if self.type in ['RAR', 'RAR5']:
             raise NotImplementedError
-        process = subprocess_run(['7z', 'a', '-y', self.filepath, sourcefile],
+        process = subprocess_run([SEVENZIP, 'a', '-y', self.basename, sourcefile],
-                        stdout=PIPE, stderr=STDOUT)
+                        stdout=PIPE, stderr=STDOUT, cwd=self.dirname)
         if process.returncode != 0:
             raise OSError('Failed to add the file.')
 
     def extractMetadata(self):
-        process = subprocess_run(['7z', 'x', '-y', '-so', self.filepath, 'ComicInfo.xml'],
+        process = subprocess_run([SEVENZIP, 'x', '-y', '-so', self.basename, 'ComicInfo.xml'],
-                        stdout=PIPE, stderr=STDOUT)
+                        stdout=PIPE, stderr=STDOUT, cwd=self.dirname)
         if process.returncode != 0:
             raise OSError(EXTRACTION_ERROR)
         try:
             return parseString(process.stdout)
         except ExpatError:
             return None
+
+@lru_cache
+def available_archive_tools():
+    available = []
+
+    for tool in ['tar', SEVENZIP, 'unar', 'unrar']:
+        try:
+            subprocess_run([tool], stdout=PIPE, stderr=STDOUT)
+            available.append(tool)
+        except (FileNotFoundError, CalledProcessError):
+            pass
+    
+    return available

kindlecomicconverter/image.py

@@ -20,13 +20,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import io
 import os
+import numpy as np
 from pathlib import Path
+from functools import cached_property
 import mozjpeg_lossless_optimization
-from PIL import Image, ImageOps, ImageStat, ImageChops, ImageFilter
+from PIL import Image, ImageOps, ImageFile, ImageChops, ImageDraw
+
+from .rainbow_artifacts_eraser import erase_rainbow_artifacts
 from .page_number_crop_alg import get_bbox_crop_margin_page_number, get_bbox_crop_margin
 from .inter_panel_crop_alg import crop_empty_inter_panel
 
 AUTO_CROP_THRESHOLD = 0.015
+ImageFile.LOAD_TRUNCATED_IMAGES = True
 
 
 class ProfileData:
@@ -81,20 +86,23 @@ class ProfileData:
     ]
 
     ProfilesKindleEBOK = {
-        'K1': ("Kindle 1", (600, 670), Palette4, 1.8),
-        'K2': ("Kindle 2", (600, 670), Palette15, 1.8),
-        'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.8),
-        'K34': ("Kindle Keyboard/Touch", (600, 800), Palette16, 1.8),
-        'K578': ("Kindle", (600, 800), Palette16, 1.8),
-        'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.8),
-        'KV': ("Kindle Paperwhite 3/4/Voyage/Oasis", (1072, 1448), Palette16, 1.8),
     }
 
     ProfilesKindlePDOC = {
-        'KO': ("Kindle Oasis 2/3/Paperwhite 12/Colorsoft 12", (1264, 1680), Palette16, 1.8),
+        'K1': ("Kindle 1", (600, 670), Palette4, 1.0),
-        'K11': ("Kindle 11", (1072, 1448), Palette16, 1.8),
+        'K2': ("Kindle 2", (600, 670), Palette15, 1.0),
-        'KPW5': ("Kindle Paperwhite 5/Signature Edition", (1236, 1648), Palette16, 1.8),
+        'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.0),
-        'KS': ("Kindle Scribe", (1860, 2480), Palette16, 1.8),
+        'K34': ("Kindle Keyboard/Touch", (600, 800), Palette16, 1.0),
+        '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),
+        '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),
+        'K11': ("Kindle 11", (1072, 1448), Palette16, 1.0),
+        'KPW5': ("Kindle Paperwhite 5/Signature Edition", (1236, 1648), Palette16, 1.0),
+        'KS': ("Kindle Scribe", (1860, 2480), Palette16, 1.0),
+        'KCS': ("Kindle Colorsoft", (1264, 1680), Palette16, 1.0),
     }
 
     ProfilesKindle = {
@@ -103,34 +111,35 @@ class ProfileData:
     }
 
     ProfilesKobo = {
-        'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.8),
+        'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.0),
-        'KoG': ("Kobo Glo", (768, 1024), Palette16, 1.8),
+        'KoG': ("Kobo Glo", (768, 1024), Palette16, 1.0),
-        'KoGHD': ("Kobo Glo HD", (1072, 1448), Palette16, 1.8),
+        'KoGHD': ("Kobo Glo HD", (1072, 1448), Palette16, 1.0),
-        'KoA': ("Kobo Aura", (758, 1024), Palette16, 1.8),
+        'KoA': ("Kobo Aura", (758, 1024), Palette16, 1.0),
-        'KoAHD': ("Kobo Aura HD", (1080, 1440), Palette16, 1.8),
+        'KoAHD': ("Kobo Aura HD", (1080, 1440), Palette16, 1.0),
-        'KoAH2O': ("Kobo Aura H2O", (1080, 1430), Palette16, 1.8),
+        'KoAH2O': ("Kobo Aura H2O", (1080, 1430), Palette16, 1.0),
-        'KoAO': ("Kobo Aura ONE", (1404, 1872), Palette16, 1.8),
+        'KoAO': ("Kobo Aura ONE", (1404, 1872), Palette16, 1.0),
-        'KoN': ("Kobo Nia", (758, 1024), Palette16, 1.8),
+        'KoN': ("Kobo Nia", (758, 1024), Palette16, 1.0),
-        'KoC': ("Kobo Clara HD/Kobo Clara 2E", (1072, 1448), Palette16, 1.8),
+        'KoC': ("Kobo Clara HD/Kobo Clara 2E", (1072, 1448), Palette16, 1.0),
-        'KoCC': ("Kobo Clara Colour", (1072, 1448), Palette16, 1.8),
+        'KoCC': ("Kobo Clara Colour", (1072, 1448), Palette16, 1.0),
-        'KoL': ("Kobo Libra H2O/Kobo Libra 2", (1264, 1680), Palette16, 1.8),
+        'KoL': ("Kobo Libra H2O/Kobo Libra 2", (1264, 1680), Palette16, 1.0),
-        'KoLC': ("Kobo Libra Colour", (1264, 1680), Palette16, 1.8),
+        'KoLC': ("Kobo Libra Colour", (1264, 1680), Palette16, 1.0),
-        'KoF': ("Kobo Forma", (1440, 1920), Palette16, 1.8),
+        'KoF': ("Kobo Forma", (1440, 1920), Palette16, 1.0),
-        'KoS': ("Kobo Sage", (1440, 1920), Palette16, 1.8),
+        'KoS': ("Kobo Sage", (1440, 1920), Palette16, 1.0),
-        'KoE': ("Kobo Elipsa", (1404, 1872), Palette16, 1.8),
+        'KoE': ("Kobo Elipsa", (1404, 1872), Palette16, 1.0),
     }
 
     ProfilesRemarkable = {
-        'Rmk1': ("reMarkable 1", (1404, 1872), Palette16, 1.8),
+        'Rmk1': ("reMarkable 1", (1404, 1872), Palette16, 1.0),
-        'Rmk2': ("reMarkable 2", (1404, 1872), Palette16, 1.8),
+        'Rmk2': ("reMarkable 2", (1404, 1872), Palette16, 1.0),
-        'RmkPP': ("reMarkable Paper Pro", (1620, 2160), Palette16, 1.8),
+        'RmkPP': ("reMarkable Paper Pro", (1620, 2160), Palette16, 1.0),
+        'RmkPPMove': ("reMarkable Paper Pro Move", (954, 1696), Palette16, 1.0),
     }
 
     Profiles = {
         **ProfilesKindle,
         **ProfilesKobo,
         **ProfilesRemarkable,
-        'OTHER': ("Other", (0, 0), Palette16, 1.8),
+        'OTHER': ("Other", (0, 0), Palette16, 1.0),
     }
 
 
@@ -144,11 +153,10 @@ class ComicPageParser:
 
         # Detect corruption in source image, let caller catch any exceptions triggered.
         srcImgPath = os.path.join(source[0], source[1])
-        self.image = Image.open(srcImgPath)
+        Image.open(srcImgPath).verify()
-        self.image.verify()
+        with Image.open(srcImgPath) as im:
-        self.image = Image.open(srcImgPath).convert('RGB')
+            self.image = im.copy()
 
-        self.color = self.colorCheck()
         self.fill = self.fillCheck()
         # backwards compatibility for Pillow >9.1.0
         if not hasattr(Image, 'Resampling'):
@@ -179,13 +187,13 @@ 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.color, self.fill])
+            self.payload.append(['N', self.source, new_image, self.fill])
         elif (width > height) != (dstwidth > dstheight) and width <= dstheight and height <= dstwidth \
                 and not self.opt.webtoon and self.opt.splitter == 1:
             spread = self.image
             if not self.opt.norotate:
                 spread = spread.rotate(90, Image.Resampling.BICUBIC, True)
-            self.payload.append(['R', self.source, spread, self.color, self.fill])
+            self.payload.append(['R', self.source, spread, self.fill])
         elif (width > height) != (dstwidth > dstheight) and not self.opt.webtoon:
             if self.opt.splitter != 1:
                 if width > height:
@@ -200,38 +208,15 @@ class ComicPageParser:
                 else:
                     pageone = self.image.crop(leftbox)
                     pagetwo = self.image.crop(rightbox)
-                self.payload.append(['S1', self.source, pageone, self.color, self.fill])
+                self.payload.append(['S1', self.source, pageone, self.fill])
-                self.payload.append(['S2', self.source, pagetwo, self.color, self.fill])
+                self.payload.append(['S2', self.source, pagetwo, self.fill])
             if self.opt.splitter > 0:
                 spread = self.image
                 if not self.opt.norotate:
                     spread = spread.rotate(90, Image.Resampling.BICUBIC, True)
-                self.payload.append(['R', self.source, spread,
+                self.payload.append(['R', self.source, spread, self.fill])
-                                    self.color, self.fill])
         else:
-            self.payload.append(['N', self.source, self.image, self.color, self.fill])
+            self.payload.append(['N', self.source, self.image, self.fill])
-
-    def colorCheck(self):
-        if self.opt.webtoon:
-            return True
-        else:
-            img = self.image.copy()
-            bands = img.getbands()
-            if bands == ('R', 'G', 'B') or bands == ('R', 'G', 'B', 'A'):
-                thumb = img.resize((40, 40))
-                SSE, bias = 0, [0, 0, 0]
-                bias = ImageStat.Stat(thumb).mean[:3]
-                bias = [b - sum(bias) / 3 for b in bias]
-                for pixel in thumb.getdata():
-                    mu = sum(pixel) / 3
-                    SSE += sum((pixel[i] - mu - bias[i]) * (pixel[i] - mu - bias[i]) for i in [0, 1, 2])
-                MSE = float(SSE) / (40 * 40)
-                if MSE > 22:
-                    return True
-                else:
-                    return False
-            else:
-                return False
 
     def fillCheck(self):
         if self.opt.bordersColor:
@@ -273,95 +258,236 @@ class ComicPageParser:
 
 
 class ComicPage:
-    def __init__(self, options, mode, path, image, color, fill):
+    def __init__(self, options, mode, path, image, fill):
         self.opt = options
         _, 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
-        self.image = image
+        # TODO: color check earlier
-        self.color = color
+        self.image = image.convert("RGB")
         self.fill = fill
         self.rotated = False
         self.orgPath = os.path.join(path[0], path[1])
+        self.targetPathStart = os.path.join(path[0], os.path.splitext(path[1])[0])
         if 'N' in mode:
-            self.targetPath = os.path.join(path[0], os.path.splitext(path[1])[0]) + '-kcc'
+            self.targetPathOrder = '-kcc-x'
         elif 'R' in mode:
-            self.targetPath = os.path.join(path[0], os.path.splitext(path[1])[0]) + '-kcc-a'
+            self.targetPathOrder = '-kcc-a' if options.rotatefirst else '-kcc-d'
             if not options.norotate:
                 self.rotated = True
         elif 'S1' in mode:
-            self.targetPath = os.path.join(path[0], os.path.splitext(path[1])[0]) + '-kcc-b'
+            self.targetPathOrder = '-kcc-b'
         elif 'S2' in mode:
-            self.targetPath = os.path.join(path[0], os.path.splitext(path[1])[0]) + '-kcc-c'
+            self.targetPathOrder = '-kcc-c'
         # backwards compatibility for Pillow >9.1.0
         if not hasattr(Image, 'Resampling'):
             Image.Resampling = Image
 
+    @cached_property
+    def color(self):
+        if self.original_color_mode in ("L", "1"):
+            return False
+        if self.opt.webtoon:
+            return True
+        if self.calculate_color():
+            return True
+        return False
+    
+    # cut off pixels from both ends of the histogram to remove jpg compression artifacts
+    # for better accuracy, you could split the image in half and analyze each half separately
+    def histograms_cutoff(self, cb_hist, cr_hist, cutoff=(2, 2)):
+        if cutoff == (0, 0):
+            return cb_hist, cr_hist
+
+        for h in cb_hist, cr_hist:
+            # get number of pixels
+            n = sum(h)
+            # remove cutoff% pixels from the low end
+            cut = int(n * cutoff[0] // 100)
+            for lo in range(256):
+                if cut > h[lo]:
+                    cut = cut - h[lo]
+                    h[lo] = 0
+                else:
+                    h[lo] -= cut
+                    cut = 0
+                if cut <= 0:
+                    break
+            # remove cutoff% samples from the high end
+            cut = int(n * cutoff[1] // 100)
+            for hi in range(255, -1, -1):
+                if cut > h[hi]:
+                    cut = cut - h[hi]
+                    h[hi] = 0
+                else:
+                    h[hi] -= cut
+                    cut = 0
+                if cut <= 0:
+                    break
+        return cb_hist, cr_hist
+
+    def color_precision(self, cb_hist_original, cr_hist_original, cutoff, diff_threshold):
+        cb_hist, cr_hist = self.histograms_cutoff(cb_hist_original.copy(), cr_hist_original.copy(), cutoff)
+
+        cb_nonzero = [i for i, e in enumerate(cb_hist) if e]
+        cr_nonzero = [i for i, e in enumerate(cr_hist) if e]
+        cb_spread = cb_nonzero[-1] - cb_nonzero[0]
+        cr_spread = cr_nonzero[-1] - cr_nonzero[0]
+
+        # bias adjustment, don't go lower than 7
+        SPREAD_THRESHOLD = 7
+        if self.opt.forcecolor:
+            if any([
+                cb_nonzero[0] > 128,
+                cr_nonzero[0] > 128,
+                cb_nonzero[-1] < 128,
+                cr_nonzero[-1] < 128,
+            ]):
+                return True, True
+        elif cb_spread < SPREAD_THRESHOLD and cr_spread < SPREAD_THRESHOLD:
+            return True, False
+
+        DIFF_THRESHOLD = diff_threshold
+        if any([
+            cb_nonzero[0] <= 128 - DIFF_THRESHOLD, 
+            cr_nonzero[0] <= 128 - DIFF_THRESHOLD, 
+            cb_nonzero[-1] >= 128 + DIFF_THRESHOLD, 
+            cr_nonzero[-1] >= 128 + DIFF_THRESHOLD,
+        ]):
+            return True, True
+        
+        return False, None
+
+    def calculate_color(self):
+        img = self.image.convert("YCbCr")
+        _, cb, cr = img.split()
+        cb_hist_original = cb.histogram()
+        cr_hist_original = cr.histogram()
+
+        # you can increase 22 but don't increase 10. 4 maybe can go higher
+        for cutoff, diff_threshold in [((0, 0), 22), ((.2, .2), 10), ((3, 3), 4)]:
+            done, decision = self.color_precision(cb_hist_original, cr_hist_original, cutoff, diff_threshold)
+            if done:
+                return decision
+        return False
+        
     def saveToDir(self):
         try:
             flags = []
-            if not self.opt.forcecolor and not self.opt.forcepng:
-                self.image = self.image.convert('L')
             if self.rotated:
                 flags.append('Rotated')
             if self.fill != 'white':
                 flags.append('BlackBackground')
-            if self.opt.forcepng:
+            if self.opt.kindle_scribe_azw3 and self.image.size[1] > 1920:
-                self.image.info["transparency"] = None
+                w, h = self.image.size
-                self.targetPath += '.png'
+                targetPath = self.save_with_codec(self.image.crop((0, 0, w, 1920)), self.targetPathStart + self.targetPathOrder + '-above')
-                self.image.save(self.targetPath, 'PNG', optimize=1)
+                self.save_with_codec(self.image.crop((0, 1920, w, h)), self.targetPathStart + self.targetPathOrder + '-below')
+            elif self.opt.kindle_scribe_azw3:
+                targetPath = self.save_with_codec(self.image, self.targetPathStart + self.targetPathOrder + '-whole')
             else:
-                self.targetPath += '.jpg'
+                targetPath = self.save_with_codec(self.image, self.targetPathStart + self.targetPathOrder)
-                if self.opt.mozjpeg:
-                    with io.BytesIO() as output:
-                        self.image.save(output, format="JPEG", optimize=1, quality=85)
-                        input_jpeg_bytes = output.getvalue()
-                        output_jpeg_bytes = mozjpeg_lossless_optimization.optimize(input_jpeg_bytes)
-                        with open(self.targetPath, "wb") as output_jpeg_file:
-                            output_jpeg_file.write(output_jpeg_bytes)
-                else:
-                    self.image.save(self.targetPath, 'JPEG', optimize=1, quality=85)
             if os.path.isfile(self.orgPath):
                 os.remove(self.orgPath)
-            return [Path(self.targetPath).name, flags]
+            return [Path(targetPath).name, flags]
         except IOError as err:
             raise RuntimeError('Cannot save image. ' + str(err))
 
-    def autocontrastImage(self):
+    def save_with_codec(self, image, targetPath):
+        if self.opt.forcepng:
+            image.info.pop('transparency', None)
+            if self.opt.iskindle and ('MOBI' in self.opt.format or 'EPUB' in self.opt.format):
+                targetPath += '.gif'
+                image.save(targetPath, 'GIF', optimize=1, interlace=False)
+            else:
+                targetPath += '.png'
+                image.save(targetPath, 'PNG', optimize=1)
+        else:
+            targetPath += '.jpg'
+            if self.opt.mozjpeg:
+                with io.BytesIO() as output:
+                    image.save(output, format="JPEG", optimize=1, quality=85)
+                    input_jpeg_bytes = output.getvalue()
+                    output_jpeg_bytes = mozjpeg_lossless_optimization.optimize(input_jpeg_bytes)
+                    with open(targetPath, "wb") as output_jpeg_file:
+                        output_jpeg_file.write(output_jpeg_bytes)
+            else:
+                image.save(targetPath, 'JPEG', optimize=1, quality=85)
+        return targetPath
+
+    def gammaCorrectImage(self):
         gamma = self.opt.gamma
         if gamma < 0.1:
             gamma = self.gamma
             if self.gamma != 1.0 and self.color:
                 gamma = 1.0
         if gamma == 1.0:
-            self.image = ImageOps.autocontrast(self.image)
+            pass
         else:
-            self.image = ImageOps.autocontrast(Image.eval(self.image, lambda a: int(255 * (a / 255.) ** gamma)))
+            self.image = Image.eval(self.image, lambda a: int(255 * (a / 255.) ** gamma))
+
+    def autocontrastImage(self):
+        if self.opt.webtoon:
+            return
+        if self.opt.noautocontrast:
+            return
+        if self.color and not self.opt.colorautocontrast:
+            return
+
+        # if image is extremely low contrast, that was probably intentional
+        extrema = self.image.convert('L').getextrema()
+        if extrema[1] - extrema[0] < (255 - 32 * 3):
+            return
+
+        if self.opt.autolevel:
+            self.autolevelImage()
+
+        self.image = ImageOps.autocontrast(self.image, preserve_tone=True)
+
+    def autolevelImage(self):
+        img = self.image
+        if self.color:
+            img = self.image.convert("YCbCr")
+            y, cb, cr = img.split()
+            img = y
+        else:
+            img = img.convert('L')
+        h = img.histogram()
+        most_common_dark_pixel_count = max(h[:64])
+        black_point = h.index(most_common_dark_pixel_count)
+        bp = black_point
+        img = img.point(lambda p: p if p > bp else bp)
+        if self.color:
+            self.image = Image.merge(mode='YCbCr', bands=[img, cb, cr]).convert('RGB')
+        else:
+            self.image = img
+
+    def convertToGrayscale(self):
+        self.image = self.image.convert('L')
 
     def quantizeImage(self):
-        colors = len(self.palette) // 3
+        # remove all color pixels from image, since colorCheck() has some tolerance
-        if colors < 256:
+        # quantize with a small number of color pixels in a mostly b/w image can have unexpected results
-            self.palette += self.palette[:3] * (256 - colors)
+        self.image = self.image.convert("RGB")
+
         palImg = Image.new('P', (1, 1))
         palImg.putpalette(self.palette)
-        self.image = self.image.convert('L')
-        self.image = self.image.convert('RGB')
-        # Quantize is deprecated but new function call it internally anyway...
         self.image = self.image.quantize(palette=palImg)
 
-    def optimizeForDisplay(self, reducerainbow):
+    def optimizeForDisplay(self, eraserainbow, is_color):
-        # Reduce rainbow artifacts for grayscale images by breaking up dither patterns that cause Moire interference with color filter array
+        # Erase rainbow artifacts for grayscale and color images by removing spectral frequencies that cause Moire interference with color filter array
-        if reducerainbow and not self.color:
+        if eraserainbow and all(dim > 1 for dim in self.image.size):
-            unsharpFilter = ImageFilter.UnsharpMask(radius=1, percent=100)
+            self.image = erase_rainbow_artifacts(self.image, is_color)
-            self.image = self.image.filter(unsharpFilter)
-            self.image = self.image.filter(ImageFilter.BoxBlur(1.0))
-            self.image = self.image.filter(unsharpFilter)
 
     def resizeImage(self):
-        # kindle scribe conversion to mobi is limited in resolution by kindlegen, same with send to kindle and epub
+        if self.opt.norotate and self.targetPathOrder in ('-kcc-a', '-kcc-d') and not self.opt.kindle_scribe_azw3:
-        if self.kindle_scribe_azw3:
+            # TODO: Kindle Scribe case
-            self.size = (1440, 1920)
+            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()
@@ -372,11 +498,9 @@ class ComicPage:
         else: # if image bigger than device resolution or smaller with upscaling
             if abs(ratio_image - ratio_device) < AUTO_CROP_THRESHOLD:
                 self.image = ImageOps.fit(self.image, self.size, method=method)
-            elif (self.opt.format == 'CBZ' or self.opt.kfx) and not self.opt.white_borders:
+            elif (self.opt.format in ('CBZ', 'PDF') or self.opt.kfx) and not self.opt.white_borders:
                 self.image = ImageOps.pad(self.image, self.size, method=method, color=self.fill)
             else:
-                if self.kindle_scribe_azw3:
-                    self.size = (1860, 1920)
                 self.image = ImageOps.contain(self.image, self.size, method=method)
 
     def resize_method(self):
@@ -400,26 +524,29 @@ class ComicPage:
         bbox = get_bbox_crop_margin_page_number(self.image, power, self.fill)
         
         if bbox:
+            w, h = self.image.size
+            left, upper, right, lower = bbox
+            # don't crop more than 10% of image
+            bbox = (min(0.1*w, left), min(0.1*h, upper), max(0.9*w, right), max(0.9*h, lower))
             self.maybeCrop(bbox, minimum)
 
     def cropMargin(self, power, minimum):
         bbox = get_bbox_crop_margin(self.image, power, self.fill)
         
         if bbox:
+            w, h = self.image.size
+            left, upper, right, lower = bbox
+            # don't crop more than 10% of image
+            bbox = (min(0.1*w, left), min(0.1*h, upper), max(0.9*w, right), max(0.9*h, lower))
             self.maybeCrop(bbox, minimum)
 
     def cropInterPanelEmptySections(self, direction):
         self.image = crop_empty_inter_panel(self.image, direction, background_color=self.fill)
 
 class Cover:
-    def __init__(self, source, target, opt, tomeid):
+    def __init__(self, source, opt):
         self.options = opt
         self.source = source
-        self.target = target
-        if tomeid == 0:
-            self.tomeid = 1
-        else:
-            self.tomeid = tomeid
         self.image = Image.open(source)
         # backwards compatibility for Pillow >9.1.0
         if not hasattr(Image, 'Resampling'):
@@ -428,31 +555,52 @@ class Cover:
 
     def process(self):
         self.image = self.image.convert('RGB')
-        self.image = ImageOps.autocontrast(self.image)
+        self.image = ImageOps.autocontrast(self.image, preserve_tone=True)
         if not self.options.forcecolor:
             self.image = self.image.convert('L')
+        self.crop_main_cover()
+
+        size = list(self.options.profileData[1])
+        if self.options.kindle_scribe_azw3:
+            size[1] = min(size[1], 1920)
+        self.image.thumbnail(tuple(size), Image.Resampling.LANCZOS)
+
+    def crop_main_cover(self):
         w, h = self.image.size
         if w / h > 2:
             if self.options.righttoleft:
                 self.image = self.image.crop((w/6, 0, w/2 - w * 0.02, h))
             else:
                 self.image = self.image.crop((w/2 + w * 0.02, 0, 5/6 * w, h))
-        elif w / h > 1.3:
+        elif w / h > 1.34:
             if self.options.righttoleft:
                 self.image = self.image.crop((0, 0, w/2 - w * 0.03, h))
             else:
                 self.image = self.image.crop((w/2 + w * 0.03, 0, w, h))
-        self.image.thumbnail(self.options.profileData[1], Image.Resampling.LANCZOS)
-        self.save()
 
-    def save(self):
+    def save_to_epub(self, target, tomeid, len_tomes=0):
         try:
-            self.image.save(self.target, "JPEG", optimize=1, quality=85)
+            if tomeid == 0:
+                self.image.save(target, "JPEG", optimize=1, quality=85)
+            else:
+                copy = self.image.copy()
+                draw = ImageDraw.Draw(copy)
+                w, h = copy.size
+                draw.text(
+                    xy=(w/2, h * .85),
+                    text=f'{tomeid}/{len_tomes}',
+                    anchor='ms',
+                    font_size=h//7,
+                    fill=255,
+                    stroke_fill=0,
+                    stroke_width=25
+                )
+                copy.save(target, "JPEG", optimize=1, quality=85)
         except IOError:
             raise RuntimeError('Failed to save cover.')
 
     def saveToKindle(self, kindle, asin):
-        self.image = self.image.resize((300, 470), Image.Resampling.LANCZOS)
+        self.image = ImageOps.contain(self.image, (300, 470), Image.Resampling.LANCZOS)
         try:
             self.image.save(os.path.join(kindle.path.split('documents')[0], 'system', 'thumbnails',
                                          'thumbnail_' + asin + '_EBOK_portrait.jpg'), 'JPEG', optimize=1, quality=85)

kindlecomicconverter/inter_panel_crop_alg.py

@@ -1,8 +1,10 @@
-from PIL import Image, ImageFilter, ImageOps
+from PIL import Image, ImageFilter, ImageOps, ImageFile
 import numpy as np
 from typing import Literal
 from .common_crop import threshold_from_power, group_close_values
 
+ImageFile.LOAD_TRUNCATED_IMAGES = True
+
 
 '''
 Crops inter-panel empty spaces (ignores empty spaces near borders - for that use crop margins).
@@ -19,10 +21,10 @@ def crop_empty_inter_panel(img, direction: Literal["horizontal", "vertical", "bo
     img_temp = img
     
     if img.mode != 'L':
-        img_temp = ImageOps.grayscale(img)
+        img_temp = ImageOps.grayscale(img_temp)
         
     if background_color != 'white':
-        img_temp = ImageOps.invert(img)
+        img_temp = ImageOps.invert(img_temp)
         
     img_mat = np.array(img)
     

kindlecomicconverter/metadata.py

@@ -123,4 +123,4 @@ class MetadataParser:
                 cbx.addFile(tmpXML)
             except OSError as e:
                 raise UserWarning(e)
-            rmtree(workdir)
+            rmtree(workdir, True)

kindlecomicconverter/page_number_crop_alg.py

@@ -1,7 +1,9 @@
-from PIL import ImageOps, ImageFilter
+from PIL import ImageOps, ImageFilter, ImageFile
 import numpy as np
 from .common_crop import threshold_from_power, group_close_values
 
+ImageFile.LOAD_TRUNCATED_IMAGES = True
+
 
 '''
 Some assupmptions on the page number sizes
@@ -52,6 +54,7 @@ def get_bbox_crop_margin_page_number(img, power=1, background_color='white'):
     '''
     threshold = threshold_from_power(power)
     bw_img = img.point(lambda p: 255 if p <= threshold else 0)
+    ignore_pixels_near_edge(bw_img)
     bw_bbox = bw_img.getbbox()
     if not bw_bbox: # bbox cannot be found in case that the entire resulted image is black.
         return None
@@ -141,9 +144,26 @@ def get_bbox_crop_margin(img, power=1, background_color='white'):
     '''
     threshold = threshold_from_power(power)
     bw_img = img.point(lambda p: 255 if p <= threshold else 0)
+    
+    ignore_pixels_near_edge(bw_img)
 
     return bw_img.getbbox()
 
+def ignore_pixels_near_edge(bw_img):
+    w, h = bw_img.size
+    edge_bbox = [
+        (0, 0, w, int(0.02 * h)),
+        (0, int(0.98 * h), w, h),
+        (0, 0, int(0.02 * w), h),
+        (int(0.98 * w), 0, w, h)
+    ]
+    for box in edge_bbox:
+        edge = bw_img.crop(box)
+        h = edge.histogram()
+        imperfections = h[255] / (edge.height * edge.width)
+        if imperfections > 0 and imperfections < .02:
+            bw_img.paste(im=0, box=box)
+
 
 def box_intersect(box1, box2, max_dist):
     return not (box2[0]-max_dist[0] > box1[1]

kindlecomicconverter/pdfjpgextract.py

@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013-2019 Pawel Jastrzebski <pawelj@iosphe.re>
-#
-# Based upon the code snippet by Ned Batchelder
-# (http://nedbatchelder.com/blog/200712/extracting_jpgs_from_pdfs.html)
-#
-# Permission to use, copy, modify, and/or distribute this software for
-# any purpose with or without fee is hereby granted, provided that the
-# above copyright notice and this permission notice appear in all
-# copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
-# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-#
-
-import os
-from random import choice
-from string import ascii_uppercase, digits
-
-# skip stray images a few pixels in size in some PDFs
-# typical images are many thousands in length
-# https://github.com/ciromattia/kcc/pull/546
-STRAY_IMAGE_LENGTH_THRESHOLD = 300
-
-
-class PdfJpgExtract:
-    def __init__(self, fname):
-        self.fname = fname
-        self.filename = os.path.splitext(fname)
-        self.path = self.filename[0] + "-KCC-" + ''.join(choice(ascii_uppercase + digits) for _ in range(3))
-
-    def getPath(self):
-        return self.path
-
-    def extract(self):
-        pdf = open(self.fname, "rb").read()
-        startmark = b"\xff\xd8"
-        startfix = 0
-        endmark = b"\xff\xd9"
-        endfix = 2
-        i = 0
-        njpg = 0
-        os.makedirs(self.path)
-        while True:
-            istream = pdf.find(b"stream", i)
-            if istream < 0:
-                break
-            istart = pdf.find(startmark, istream, istream + 20)
-            if istart < 0:
-                i = istream + 20
-                continue
-            iend = pdf.find(b"endstream", istart)
-            if iend < 0:
-                raise Exception("Didn't find end of stream!")
-            iend = pdf.find(endmark, iend - 20)
-            if iend < 0:
-                raise Exception("Didn't find end of JPG!")
-            istart += startfix
-            iend += endfix
-            i = iend
-
-            if iend - istart < STRAY_IMAGE_LENGTH_THRESHOLD:
-                continue
-
-            jpg = pdf[istart:iend]
-            jpgfile = open(self.path + "/jpg%d.jpg" % njpg, "wb")
-            jpgfile.write(jpg)
-            jpgfile.close()
-            njpg += 1
-
-        return self.path, njpg

kindlecomicconverter/rainbow_artifacts_eraser.py

@@ -0,0 +1,249 @@
+import numpy as np
+from PIL import Image, ImageFile
+
+ImageFile.LOAD_TRUNCATED_IMAGES = True
+
+       
+def fourier_transform_image(img):
+    """
+    Memory-optimized version that modifies the array in place when possible.
+    """
+    # Convert with minimal copy
+    img_array = np.asarray(img, dtype=np.float32)
+    
+    # Use rfft2 if the image is real to save memory
+    # and computation time (approximately 2x faster)
+    fft_result = np.fft.rfft2(img_array)
+    
+    return fft_result
+     
+def attenuate_diagonal_frequencies(fft_spectrum, freq_threshold=0.30, target_angle=135, 
+                                     angle_tolerance=10, attenuation_factor=0.10):
+    """
+    Attenuates specific frequencies in the Fourier domain (optimized version for rfft2).
+    
+    Args:
+        fft_spectrum: Result of 2D real Fourier transform (from rfft2)
+        freq_threshold: Frequency threshold in cycles/pixel (default: 0.3, theoretical max: 0.5)
+        target_angle: Target angle in degrees (default: 135)
+        angle_tolerance: Angular tolerance in degrees (default: 15)
+        attenuation_factor: Attenuation factor (0.1 = 90% attenuation)
+    
+    Returns:
+        np.ndarray: Modified FFT with applied attenuation (same format as input)
+    """
+    
+    # Get dimensions of the rfft2 result
+    if fft_spectrum.ndim == 2:
+        height, width_rfft = fft_spectrum.shape
+    else:  # 3D array (color channels)
+        height, width_rfft = fft_spectrum.shape[:2]
+    
+    # For rfft2, the original width is (width_rfft - 1) * 2
+    width_original = (width_rfft - 1) * 2
+    
+    # Create frequency grids for rfft2 format
+    freq_y = np.fft.fftfreq(height, d=1.0)
+    freq_x = np.fft.rfftfreq(width_original, d=1.0)  # Use rfftfreq for the X dimension
+    
+    
+    # Use broadcasting to create grids without meshgrid (more efficient)
+    freq_y_grid = freq_y.reshape(-1, 1)  # Column
+    freq_x_grid = freq_x.reshape(1, -1)   # Row
+    
+    # Calculate squared radial frequencies (avoid sqrt)
+    freq_radial_sq = freq_x_grid**2 + freq_y_grid**2
+    freq_threshold_sq = freq_threshold**2
+    
+    # Frequency condition
+    freq_condition = freq_radial_sq >= freq_threshold_sq
+    
+    # Early exit if no frequency satisfies the condition
+    if not np.any(freq_condition):
+        return fft_spectrum
+    
+    # Calculate angles only where necessary
+    # Use atan2 directly with broadcasting
+    angles_rad = np.arctan2(freq_y_grid, freq_x_grid)
+    
+    # Convert to degrees and normalize in a single operation
+    angles_deg = np.rad2deg(angles_rad) % 360
+    
+    # Calculation of complementary angle
+    target_angle_2 = (target_angle + 180) % 360
+    
+    # Calulation of perpendicular angles (135° + 45° to maximize compatibility until we know for sure which angle configure for each device)
+    target_angle_3 = (target_angle + 90) % 360
+    target_angle_4 = (target_angle_3 + 180) % 360
+    
+    # Create angular conditions in a vectorized way
+    angle_condition = np.zeros_like(angles_deg, dtype=bool)
+    
+    # Process both angles simultaneously
+    for angle in [target_angle, target_angle_2, target_angle_3, target_angle_4]:
+        min_angle = (angle - angle_tolerance) % 360
+        max_angle = (angle + angle_tolerance) % 360
+        
+        if min_angle > max_angle:  # Interval crosses 0°
+            angle_condition |= (angles_deg >= min_angle) | (angles_deg <= max_angle)
+        else:  # Normal interval
+            angle_condition |= (angles_deg >= min_angle) & (angles_deg <= max_angle)
+    
+    # Combine conditions
+    combined_condition = freq_condition & angle_condition
+    
+    # Apply attenuation directly (avoid creating a full mask)
+    if attenuation_factor == 0:
+        # Special case: complete suppression
+        if fft_spectrum.ndim == 2:
+            fft_spectrum[combined_condition] = 0
+        else:  # 3D array
+            fft_spectrum[combined_condition, :] = 0
+        return fft_spectrum
+    elif attenuation_factor == 1:
+        # Special case: no attenuation
+        return fft_spectrum
+    else:
+        # General case: partial attenuation
+        if fft_spectrum.ndim == 2:
+            fft_spectrum[combined_condition] *= attenuation_factor
+        else:  # 3D array
+            fft_spectrum[combined_condition, :] *= attenuation_factor
+        return fft_spectrum
+    
+def inverse_fourier_transform_image(fft_spectrum, is_color, original_shape=None):
+    """
+    Performs an optimized inverse Fourier transform to reconstruct a PIL image.
+    
+    Args:
+        fft_spectrum: Fourier transform result (complex array from rfft2)
+        is_color: Boolean indicating if the image is to be treated as color
+    
+    Returns:
+        PIL.Image: Reconstructed image
+    """    
+    # Perform inverse Fourier transform with original shape if provided
+    if original_shape is not None:
+        img_reconstructed = np.fft.irfft2(fft_spectrum, s=original_shape)
+    else:
+        img_reconstructed = np.fft.irfft2(fft_spectrum)
+    
+    # Normalize values between 0 and 255
+    img_reconstructed = np.clip(img_reconstructed, 0, 255)
+    img_reconstructed = img_reconstructed.astype(np.uint8)
+    
+    # Convert to PIL image
+    if is_color and img_reconstructed.ndim == 3:
+        pil_image = Image.fromarray(img_reconstructed, mode='RGB')
+    else:
+        pil_image = Image.fromarray(img_reconstructed, mode='L')
+    
+    return pil_image
+
+def rgb_to_yuv(rgb_array):
+    """
+    Convert RGB to YUV color space.
+    Y = luminance, U and V = chrominance
+    """
+    # Coefficients for RGB to YUV conversion
+    rgb_to_yuv_matrix = np.array([
+        [0.299, 0.587, 0.114],      # Y
+        [-0.14713, -0.28886, 0.436],  # U
+        [0.615, -0.51499, -0.10001]   # V
+    ])
+    
+    # Reshape for matrix multiplication
+    original_shape = rgb_array.shape
+    rgb_flat = rgb_array.reshape(-1, 3)
+    
+    # Apply transformation
+    yuv_flat = rgb_flat @ rgb_to_yuv_matrix.T
+    
+    # Reshape back
+    yuv_array = yuv_flat.reshape(original_shape)
+    
+    return yuv_array
+
+def yuv_to_rgb(yuv_array):
+    """
+    Convert YUV to RGB color space.
+    """
+    # Coefficients for YUV to RGB conversion
+    yuv_to_rgb_matrix = np.array([
+        [1.0, 0.0, 1.13983],         # R
+        [1.0, -0.39465, -0.58060],   # G
+        [1.0, 2.03211, 0.0]          # B
+    ])
+    
+    # Reshape for matrix multiplication
+    original_shape = yuv_array.shape
+    yuv_flat = yuv_array.reshape(-1, 3)
+    
+    # Apply transformation
+    rgb_flat = yuv_flat @ yuv_to_rgb_matrix.T
+    
+    # Reshape back
+    rgb_array = rgb_flat.reshape(original_shape)
+    
+    return rgb_array
+
+def erase_rainbow_artifacts(img, is_color):
+    """
+    Remove rainbow artifacts from grayscale or color images.
+    
+    Args:
+        img: PIL Image (grayscale or RGB)
+        is_color: Boolean indicating if the image is to be treated as color
+    
+    Returns:
+        PIL.Image: Cleaned image
+    """
+    # Auto-detect color mode if not specified
+    if is_color is None:
+        color = img.mode in ('RGB', 'RGBA', 'L') and len(np.array(img).shape) == 3
+    
+    if is_color and img.mode in ('RGB', 'RGBA'):
+        # Convert to RGB if needed
+        if img.mode == 'RGBA':
+            img = img.convert('RGB')
+        
+        # Convert to numpy array
+        img_array = np.array(img, dtype=np.float32)
+        
+        # Convert to YUV color space
+        yuv_array = rgb_to_yuv(img_array)
+        
+        # Extract luminance channel (Y)
+        luminance = yuv_array[:, :, 0]
+        
+        # Process only the luminance channel
+        fft_spectrum = fourier_transform_image(luminance)
+        clean_spectrum = attenuate_diagonal_frequencies(fft_spectrum)
+        clean_luminance = np.fft.irfft2(clean_spectrum, s=luminance.shape)
+        
+        # Normalize and clip luminance
+        clean_luminance = np.clip(clean_luminance, 0, 255)
+        
+        # Replace luminance in YUV array
+        yuv_array[:, :, 0] = clean_luminance
+        
+        # Convert back to RGB
+        rgb_array = yuv_to_rgb(yuv_array)
+        rgb_array = np.clip(rgb_array, 0, 255).astype(np.uint8)
+        
+        # Convert back to PIL image
+        clean_image = Image.fromarray(rgb_array, mode='RGB')
+        
+    else:
+        # Grayscale processing (original behavior)
+        if img.mode != 'L':
+            img = img.convert('L')
+
+        # Get original image dimensions
+        original_shape = (img.height, img.width)
+
+        fft_spectrum = fourier_transform_image(img)
+        clean_spectrum = attenuate_diagonal_frequencies(fft_spectrum)
+        clean_image = inverse_fourier_transform_image(clean_spectrum, is_color, original_shape)
+    
+    return clean_image

kindlecomicconverter/shared.py

@@ -18,9 +18,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-from functools import lru_cache
 import os
-from hashlib import md5
 from html.parser import HTMLParser
 import subprocess
 from packaging.version import Version
@@ -29,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)
@@ -47,15 +48,17 @@ class HTMLStripper(HTMLParser):
         pass
 
 
+def dot_clean(filetree):
+    for root, _, files in os.walk(filetree, topdown=False):
+        for name in files:
+            if name.startswith('._') or name == '.DS_Store':
+                if os.path.exists(os.path.join(root, name)):
+                    os.remove(os.path.join(root, name))
+
+
 def getImageFileName(imgfile):
     name, ext = os.path.splitext(imgfile)
     ext = ext.lower()
-    if (name.startswith('.') and len(name) == 1):
-        return None
-    if name.startswith('._'):
-        return None
-    if ext not in ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.jp2', '.j2k', '.jpx']:
-        return None
     return [name, ext]
 
 
@@ -98,10 +101,10 @@ def dependencyCheck(level):
     if level > 2:
         try:
             from PySide6.QtCore import qVersion as qtVersion
-            if Version('6.5.1') > Version(qtVersion()):
+            if Version('6.0.0') > Version(qtVersion()):
-                missing.append('PySide 6.5.1+')
+                missing.append('PySide 6.0.0')
         except ImportError:
-            missing.append('PySide 6.5.1+')
+            missing.append('PySide 6.0.0+')
         try:
             import raven
         except ImportError:
@@ -124,27 +127,20 @@ def dependencyCheck(level):
             missing.append('python-slugify 1.2.1+')
     try:
         from PIL import __version__ as pillowVersion
-        if Version('5.2.0') > Version(pillowVersion):
+        if Version('8.3.0') > Version(pillowVersion):
-            missing.append('Pillow 5.2.0+')
+            missing.append('Pillow 8.3.0+')
     except ImportError:
-        missing.append('Pillow 5.2.0+')
+        missing.append('Pillow 8.3.0+')
+    try:
+        from pymupdf import __version__ as pymupdfVersion
+        if Version('1.16.1') > Version(pymupdfVersion):
+            missing.append('PyMuPDF 1.16.1+')
+    except ImportError:
+        missing.append('PyMuPDF 1.16.1+')
     if len(missing) > 0:
         print('ERROR: ' + ', '.join(missing) + ' is not installed!')
         sys.exit(1)
 
-@lru_cache
-def available_archive_tools():
-    available = []
-
-    for tool in ['tar', '7z', 'unar', 'unrar']:
-        try:
-            subprocess_run([tool], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            available.append(tool)
-        except FileNotFoundError:
-            pass
-    
-    return available
-
 def subprocess_run(command, **kwargs):
     if (os.name == 'nt'):
         kwargs.setdefault('creationflags', subprocess.CREATE_NO_WINDOW)

requirements-docker.txt

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

requirements-osx-legacy.txt

@@ -0,0 +1,12 @@
+PySide6==6.5.2
+Pillow>=11.3.0
+psutil>=5.9.5
+requests>=2.31.0
+python-slugify>=1.2.1
+raven>=6.0.0
+packaging>=23.2
+mozjpeg-lossless-optimization>=1.2.0
+natsort>=8.4.0
+distro>=1.8.0
+numpy<2
+PyMuPDF>=1.26.1

requirements-win7.txt

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

requirements.txt

@@ -1,11 +1,12 @@
-PySide6>=6.5.1
+PySide6<6.10
-Pillow>=5.2.0
+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.1.2
+mozjpeg-lossless-optimization>=1.2.0
 natsort>=8.4.0
 distro>=1.8.0
-numpy>=1.22.4,<2.0.0
+numpy>=1.22.4
+PyMuPDF>=1.18.0

setup.py

@@ -8,6 +8,8 @@ Install as Python package:
 
 Create EXE/APP:
     python3 setup.py build_binary
+    python3 setup.py build_c2e
+    python3 setup.py build_c2p
 """
 
 import os
@@ -38,10 +40,17 @@ class BuildBinaryCommand(setuptools.Command):
         if sys.platform == 'darwin':
             os.system('pyinstaller --hidden-import=_cffi_backend -y -D -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s kcc.py')
             # TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v
-            os.system(f'appdmg kcc.json dist/kcc_macos_{platform.processor()}_{VERSION}.dmg')
+            min_os = os.getenv('MACOSX_DEPLOYMENT_TARGET')
+            if min_os:
+                os.system(f'appdmg kcc.json dist/kcc_osx_{min_os.replace(".", "_")}_legacy_{VERSION}.dmg')
+            else:
+                os.system(f'appdmg kcc.json dist/kcc_macos_{platform.processor()}_{VERSION}.dmg')
             sys.exit(0)
         elif sys.platform == 'win32':
-            os.system('pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n KCC_' + VERSION + ' -w --noupx kcc.py')
+            if os.getenv('WINDOWS_7'):
+                os.system('pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n kcc_win7_legacy_' + VERSION + ' -w --noupx kcc.py')
+            else:
+                os.system('pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n KCC_' + VERSION + ' -w --noupx kcc.py')
             sys.exit(0)
         elif sys.platform == 'linux':
             os.system(
@@ -50,10 +59,75 @@ class BuildBinaryCommand(setuptools.Command):
         else:
             sys.exit(0)
 
+# noinspection PyUnresolvedReferences
+class BuildC2ECommand(setuptools.Command):
+    description = 'build binary c2e release'
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    # noinspection PyShadowingNames
+    def run(self):
+        VERSION = __version__
+        if sys.platform == 'darwin':
+            os.system('pyinstaller --hidden-import=_cffi_backend -y -D -i icons/comic2ebook.icns -n "KCC C2E" -c -s kcc-c2e.py')
+            # TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v
+            sys.exit(0)
+        elif sys.platform == 'win32':
+            if os.getenv('WINDOWS_7'):
+                os.system('pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n kcc_c2e_win7_legacy_' + VERSION + ' -c --noupx kcc-c2e.py')
+            else:
+                os.system('pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n kcc_c2e_' + VERSION + ' -c --noupx kcc-c2e.py')
+            sys.exit(0)
+        elif sys.platform == 'linux':
+            os.system(
+                'pyinstaller --hidden-import=_cffi_backend --hidden-import=queue -y -F -i icons/comic2ebook.ico -n kcc_c2e_linux_' + VERSION + ' kcc-c2e.py')
+            sys.exit(0)
+        else:
+            sys.exit(0)
+
+
+# noinspection PyUnresolvedReferences
+class BuildC2PCommand(setuptools.Command):
+    description = 'build binary c2p release'
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    # noinspection PyShadowingNames
+    def run(self):
+        VERSION = __version__
+        if sys.platform == 'darwin':
+            os.system('pyinstaller --hidden-import=_cffi_backend -y -n "KCC C2P" -c -s kcc-c2p.py')
+            # TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v
+            sys.exit(0)
+        elif sys.platform == 'win32':
+            if os.getenv('WINDOWS_7'):
+                os.system('pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n kcc_c2p_win7_legacy_' + VERSION + ' -c --noupx kcc-c2p.py')
+            else:
+                os.system('pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n kcc_c2p_' + VERSION + ' -c --noupx kcc-c2p.py')
+            sys.exit(0)
+        elif sys.platform == 'linux':
+            os.system(
+                'pyinstaller --hidden-import=_cffi_backend --hidden-import=queue -y -F -i icons/comic2ebook.ico -n kcc_c2p_linux_' + VERSION + ' kcc-c2p.py')
+            sys.exit(0)
+        else:
+            sys.exit(0)
+
 
 setuptools.setup(
     cmdclass={
         'build_binary': BuildBinaryCommand,
+        'build_c2e': BuildC2ECommand,
+        'build_c2p': BuildC2PCommand,
     },
     name=NAME,
     version=VERSION,
@@ -74,16 +148,17 @@ setuptools.setup(
     },
     packages=['kindlecomicconverter'],
     install_requires=[
-        'pyside6>=6.5.1',
+        'PySide6>=6.0.0',
-        'Pillow>=5.2.0',
+        'Pillow>=9.3.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,<2.0.0'
+        'numpy>=1.22.4',
+        'PyMuPDF>=1.16.1',
     ],
     classifiers=[],
     zip_safe=False,