Bump version to 9.3.4

Sync setup install_requires with requirements.txt (#1176 )
* 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>
2026-04-16 14:08:45 +00:00 · 2025-12-03 10:23:00 -08:00 · 2025-12-02 21:13:26 -08:00 · 2025-12-02 20:54:46 -08:00 · 2025-12-02 15:20:52 -08:00 · 2025-12-02 12:36:17 -08:00
32 changed files with 539 additions and 478 deletions
--- a/.dockerignore
+++ b/.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
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
--- a/.github/workflows/docker-base-publish.yml
+++ b/.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 }}
--- a/.github/workflows/docker-publish.yml
+++ b/.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: [ 'v*.*.*' ]
+    tags: 
+      - '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:
-    uses: sdr-enthusiasts/common-github-workflows/.github/workflows/build_and_push_image.yml@main
-    with:
-      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 }}
-    secrets:
-      ghcr_token: ${{ secrets.GITHUB_TOKEN }}
+  build_and_publish_base_image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          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
--- a/.github/workflows/package-linux.yml
+++ b/.github/workflows/package-linux.yml
@@ -25,7 +25,7 @@ jobs:
  build:
    runs-on: ubuntu-22.04
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
    - name: Set up Python
      uses: actions/setup-python@v6
      with:
@@ -59,7 +59,7 @@ jobs:
      env:
        UPDATE_INFO: gh-releases-zsync|ciromattia|kcc|latest|*x86_64.AppImage.zsync
    - name: upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
      with:
        name: AppImage
        path: './*.AppImage*'
--- a/.github/workflows/package-macos.yml
+++ b/.github/workflows/package-macos.yml
@@ -28,7 +28,7 @@ jobs:
        os: [ macos-13, macos-14 ]
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: Set up Python
        uses: actions/setup-python@v6
        with:
@@ -78,7 +78,7 @@ jobs:
        run: |
          python setup.py build_binary
      - name: upload build
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: mac-os-build-${{ runner.arch }}
          path: dist/*.dmg
@@ -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
--- a/.github/workflows/package-osx-legacy.yml
+++ b/.github/workflows/package-osx-legacy.yml
@@ -31,7 +31,7 @@ jobs:
      PYTHON_VERSION: 3.11.9
      MACOSX_DEPLOYMENT_TARGET: '10.14'
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: Get Python
        run: curl https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg -o "python.pkg"
      - name: Install Python
@@ -51,7 +51,7 @@ jobs:
        run: |
          python3 setup.py build_binary
      - name: upload build
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: osx-build-${{ runner.arch }}
          path: dist/*.dmg
--- a/.github/workflows/package-windows-with-docker.yml
+++ b/.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@v5
-
-      - 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.3
-        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
--- a/.github/workflows/package-windows.yml
+++ b/.github/workflows/package-windows.yml
@@ -23,9 +23,19 @@ 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@v5
+      - uses: actions/checkout@v6
      - name: Set up Python
        uses: actions/setup-python@v6
        with:
@@ -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.3
+        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
--- a/.github/workflows/package-windows7.yml
+++ b/.github/workflows/package-windows7.yml
@@ -27,7 +27,7 @@ jobs:
    env:
      WINDOWS_7: 1
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
      - name: Set up Python
        uses: actions/setup-python@v6
        with:
@@ -46,7 +46,7 @@ jobs:
          python setup.py build_binary
      - name: upload-unsigned-artifact
        id: upload-unsigned-artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: windows7-build
          path: dist/*.exe
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ dist/
 build/
 KindleComicConverter*.egg-info/
 .idea/
+.vscode/
 win7
 osx10.11
 /venv/
--- a/90
+++ b/90
@@ -1,19 +1,77 @@
-# Select final stage based on TARGETARCH ARG
-FROM ghcr.io/ciromattia/kcc:docker-base-20241116
-LABEL com.kcc.name="Kindle Comic Converter"
-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"
+# STAGE 1: BUILDER
+# Contains all build tools and dev dependencies, will be discarded
+FROM python:3.13-slim-bullseye AS builder

-COPY . /opt/kcc
-RUN cat /opt/kcc/kindlecomicconverter/__init__.py | grep version | awk '{print $3}' | sed "s/'//g" > /IMAGE_VERSION
+# Install system dependencies
+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"]
--- a/164
+++ b/164
@@ -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 pymupdf
-
-
-######################################################################################
-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
-
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ which have different requirements than normal LCD screens.
 Combining that with downscaling to your specific device's screen resolution
 can result in filesize reductions of hundreds of MB per volume with no visible quality loss on eink.
 This can also improve battery life, page turn speed, and general performance 
-on underpowered ereaders with small storage capacities.
+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.
@@ -104,7 +104,7 @@ For flatpak, Docker, and AppImage versions, refer to the wiki: https://github.co

 ## FAQ
 - Should I use Calibre?
-  - No. Calibre doesn't properly support fixed layout EPUB/MOBI, so modifying KCC output (even just metadata!) in Calibre will break the formatting.
+  - No. Calibre doesn't properly support fixed layout EPUB/MOBI, so modifying KCC output (even just metadata!) in Calibre can break the formatting.
    Viewing KCC output in Calibre will also not work properly.
    On 7th gen and later Kindles running firmware 5.15.1+, you can get cover thumbnails simply by USB dropping into documents folder.
    On 6th gen and older, you can get cover thumbnails by keeping Kindle plugged in during conversion.
@@ -116,6 +116,8 @@ For flatpak, Docker, and AppImage versions, refer to the wiki: https://github.co
  - 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?
@@ -272,6 +274,7 @@ OUTPUT SETTINGS:
  --spreadshift         Shift first page to opposite side in landscape for two page spread alignment
  --norotate            Do not rotate double page spreads in spread splitter option.
  --rotatefirst         Put rotated spread first in spread splitter option.
+  --filefusion          Combines all input files into a single file.
  --eraserainbow       Erase rainbow effect on color eink screen by attenuating interfering frequencies

 CUSTOM PROFILE:
@@ -315,6 +318,7 @@ Depending on your system [Python](https://www.python.org) may be called either `
 If you want to edit the code, a good code editor is [VS Code](https://code.visualstudio.com).

 If you want to edit the `.ui` files, use `pyside6-designer` which is included in the `pip install pyside6`.
+If new objects have been added, verify that correct tab order has been applied by using [Tab Order Editing Mode](https://doc.qt.io/qt-6/designer-tab-order.html).
 Then use the `gen_ui_files` scripts to autogenerate the python UI.

 An example PR adding a new checkbox is here: https://github.com/ciromattia/kcc/pull/785
--- a/entrypoint.sh
+++ b/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
--- a/gui/KCC.ui
+++ b/gui/KCC.ui
@@ -65,7 +65,7 @@
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Enable right-to-left reading.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
-          <string>Right-to-left mode</string>
+          <string>Right-to-left (manga)</string>
         </property>
        </widget>
       </item>
@@ -416,7 +416,7 @@
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of the target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="maximum">
-          <number>3200</number>
+          <number>6000</number>
         </property>
        </widget>
       </item>
@@ -442,7 +442,7 @@
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of the target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="maximum">
-          <number>5120</number>
+          <number>8000</number>
         </property>
        </widget>
       </item>
@@ -898,36 +898,47 @@
  </widget>
 </widget>
 <tabstops>
-  <tabstop>convertButton</tabstop>
+  <tabstop>jobList</tabstop>
+  <tabstop>fileButton</tabstop>
  <tabstop>clearButton</tabstop>
+  <tabstop>defaultOutputFolderButton</tabstop>
+  <tabstop>defaultOutputFolderBox</tabstop>
  <tabstop>deviceBox</tabstop>
+  <tabstop>widthBox</tabstop>
+  <tabstop>heightBox</tabstop>
  <tabstop>formatBox</tabstop>
+  <tabstop>convertButton</tabstop>
  <tabstop>mangaBox</tabstop>
  <tabstop>rotateBox</tabstop>
  <tabstop>qualityBox</tabstop>
  <tabstop>webtoonBox</tabstop>
  <tabstop>upscaleBox</tabstop>
  <tabstop>gammaBox</tabstop>
+  <tabstop>gammaSlider</tabstop>
  <tabstop>borderBox</tabstop>
  <tabstop>outputSplit</tabstop>
  <tabstop>colorBox</tabstop>
  <tabstop>mozJpegBox</tabstop>
  <tabstop>maximizeStrips</tabstop>
  <tabstop>croppingBox</tabstop>
+  <tabstop>croppingPowerSlider</tabstop>
+  <tabstop>preserveMarginBox</tabstop>
  <tabstop>spreadShiftBox</tabstop>
  <tabstop>deleteBox</tabstop>
  <tabstop>disableProcessingBox</tabstop>
-  <tabstop>chunkSizeBox</tabstop>
+  <tabstop>fileFusionBox</tabstop>
  <tabstop>noRotateBox</tabstop>
  <tabstop>interPanelCropBox</tabstop>
+  <tabstop>metadataTitleBox</tabstop>
+  <tabstop>chunkSizeCheckBox</tabstop>
+  <tabstop>chunkSizeBox</tabstop>
  <tabstop>eraseRainbowBox</tabstop>
-  <tabstop>heightBox</tabstop>
-  <tabstop>croppingPowerSlider</tabstop>
+  <tabstop>rotateFirstBox</tabstop>
+  <tabstop>autoLevelBox</tabstop>
+  <tabstop>autocontrastBox</tabstop>
  <tabstop>editorButton</tabstop>
+  <tabstop>kofiButton</tabstop>
  <tabstop>wikiButton</tabstop>
-  <tabstop>jobList</tabstop>
-  <tabstop>gammaSlider</tabstop>
-  <tabstop>widthBox</tabstop>
 </tabstops>
 <resources>
  <include location="KCC.qrc"/>
--- a/gui/MetaEditor.ui
+++ b/gui/MetaEditor.ui
@@ -192,6 +192,18 @@
   </item>
  </layout>
 </widget>
+ <tabstops>
+  <tabstop>seriesLine</tabstop>
+  <tabstop>volumeLine</tabstop>
+  <tabstop>titleLine</tabstop>
+  <tabstop>numberLine</tabstop>
+  <tabstop>writerLine</tabstop>
+  <tabstop>pencillerLine</tabstop>
+  <tabstop>inkerLine</tabstop>
+  <tabstop>coloristLine</tabstop>
+  <tabstop>okButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
 <resources>
  <include location="KCC.qrc"/>
 </resources>
--- a/kindlecomicconverter/KCC_gui.py
+++ b/kindlecomicconverter/KCC_gui.py
@@ -382,13 +382,14 @@ class WorkerThread(QThread):
            error_message = 'Process Failed. Custom title can\'t be set when processing more than 1 source.\nDid you forget to check fusion?'
            print(error_message)
            MW.addMessage.emit(error_message, 'error', True)
-        for job in currentJobs:
+        for i, job in enumerate(currentJobs, start=1):
+            job_progress_number = f'[{i}/{len(currentJobs)}] '
            sleep(0.5)
            if not self.conversionAlive:
                self.clean()
                return
            self.errors = False
-            MW.addMessage.emit('<b>Source:</b> ' + job, 'info', False)
+            MW.addMessage.emit(f'<b>{job_progress_number}Source:</b> ' + job, 'info', False)
            if gui_current_format == 'CBZ':
                MW.addMessage.emit('Creating CBZ files', 'info', False)
                GUI.progress.content = 'Creating CBZ files'
@@ -402,7 +403,7 @@ class WorkerThread(QThread):
            jobargv.append(job)
            try:
                comic2ebook.options = comic2ebook.checkOptions(copy(options))
-                outputPath = comic2ebook.makeBook(job, self)
+                outputPath = comic2ebook.makeBook(job, self, job_progress_number)
                MW.hideProgressBar.emit()
            except UserWarning as warn:
                if not self.conversionAlive:
@@ -444,7 +445,7 @@ class WorkerThread(QThread):
                else:
                    MW.addMessage.emit('Creating EPUB files... <b>Done!</b>', 'info', True)
                if 'MOBI' in gui_current_format:
-                    MW.progressBarTick.emit('Creating MOBI files')
+                    MW.progressBarTick.emit(f'{job_progress_number}Creating MOBI files')
                    MW.progressBarTick.emit(str(len(outputPath) * 2 + 1))
                    MW.progressBarTick.emit('tick')
                    MW.addMessage.emit('Creating MOBI files', 'info', False)
@@ -522,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:
@@ -876,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()
@@ -1025,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()
@@ -1056,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)
--- a/kindlecomicconverter/KCC_ui.py
+++ b/kindlecomicconverter/KCC_ui.py
@@ -221,7 +221,7 @@ class Ui_mainWindow(object):

        self.widthBox = QSpinBox(self.customWidget)
        self.widthBox.setObjectName(u"widthBox")
-        self.widthBox.setMaximum(3200)
+        self.widthBox.setMaximum(6000)

        self.gridLayout_3.addWidget(self.widthBox, 0, 1, 1, 1)

@@ -234,7 +234,7 @@ class Ui_mainWindow(object):

        self.heightBox = QSpinBox(self.customWidget)
        self.heightBox.setObjectName(u"heightBox")
-        self.heightBox.setMaximum(5120)
+        self.heightBox.setMaximum(8000)

        self.gridLayout_3.addWidget(self.heightBox, 0, 3, 1, 1)

@@ -469,35 +469,46 @@ class Ui_mainWindow(object):
        self.statusBar.setObjectName(u"statusBar")
        self.statusBar.setSizeGripEnabled(False)
        mainWindow.setStatusBar(self.statusBar)
-        QWidget.setTabOrder(self.convertButton, self.clearButton)
-        QWidget.setTabOrder(self.clearButton, self.deviceBox)
-        QWidget.setTabOrder(self.deviceBox, self.formatBox)
-        QWidget.setTabOrder(self.formatBox, self.mangaBox)
+        QWidget.setTabOrder(self.jobList, self.fileButton)
+        QWidget.setTabOrder(self.fileButton, self.clearButton)
+        QWidget.setTabOrder(self.clearButton, self.defaultOutputFolderButton)
+        QWidget.setTabOrder(self.defaultOutputFolderButton, self.defaultOutputFolderBox)
+        QWidget.setTabOrder(self.defaultOutputFolderBox, self.deviceBox)
+        QWidget.setTabOrder(self.deviceBox, self.widthBox)
+        QWidget.setTabOrder(self.widthBox, self.heightBox)
+        QWidget.setTabOrder(self.heightBox, self.formatBox)
+        QWidget.setTabOrder(self.formatBox, self.convertButton)
+        QWidget.setTabOrder(self.convertButton, self.mangaBox)
        QWidget.setTabOrder(self.mangaBox, self.rotateBox)
        QWidget.setTabOrder(self.rotateBox, self.qualityBox)
        QWidget.setTabOrder(self.qualityBox, self.webtoonBox)
        QWidget.setTabOrder(self.webtoonBox, self.upscaleBox)
        QWidget.setTabOrder(self.upscaleBox, self.gammaBox)
-        QWidget.setTabOrder(self.gammaBox, self.borderBox)
+        QWidget.setTabOrder(self.gammaBox, self.gammaSlider)
+        QWidget.setTabOrder(self.gammaSlider, self.borderBox)
        QWidget.setTabOrder(self.borderBox, self.outputSplit)
        QWidget.setTabOrder(self.outputSplit, self.colorBox)
        QWidget.setTabOrder(self.colorBox, self.mozJpegBox)
        QWidget.setTabOrder(self.mozJpegBox, self.maximizeStrips)
        QWidget.setTabOrder(self.maximizeStrips, self.croppingBox)
-        QWidget.setTabOrder(self.croppingBox, self.spreadShiftBox)
+        QWidget.setTabOrder(self.croppingBox, self.croppingPowerSlider)
+        QWidget.setTabOrder(self.croppingPowerSlider, self.preserveMarginBox)
+        QWidget.setTabOrder(self.preserveMarginBox, self.spreadShiftBox)
        QWidget.setTabOrder(self.spreadShiftBox, self.deleteBox)
        QWidget.setTabOrder(self.deleteBox, self.disableProcessingBox)
-        QWidget.setTabOrder(self.disableProcessingBox, self.chunkSizeBox)
-        QWidget.setTabOrder(self.chunkSizeBox, self.noRotateBox)
+        QWidget.setTabOrder(self.disableProcessingBox, self.fileFusionBox)
+        QWidget.setTabOrder(self.fileFusionBox, self.noRotateBox)
        QWidget.setTabOrder(self.noRotateBox, self.interPanelCropBox)
-        QWidget.setTabOrder(self.interPanelCropBox, self.eraseRainbowBox)
-        QWidget.setTabOrder(self.eraseRainbowBox, self.heightBox)
-        QWidget.setTabOrder(self.heightBox, self.croppingPowerSlider)
-        QWidget.setTabOrder(self.croppingPowerSlider, self.editorButton)
-        QWidget.setTabOrder(self.editorButton, self.wikiButton)
-        QWidget.setTabOrder(self.wikiButton, self.jobList)
-        QWidget.setTabOrder(self.jobList, self.gammaSlider)
-        QWidget.setTabOrder(self.gammaSlider, self.widthBox)
+        QWidget.setTabOrder(self.interPanelCropBox, self.metadataTitleBox)
+        QWidget.setTabOrder(self.metadataTitleBox, self.chunkSizeCheckBox)
+        QWidget.setTabOrder(self.chunkSizeCheckBox, self.chunkSizeBox)
+        QWidget.setTabOrder(self.chunkSizeBox, self.eraseRainbowBox)
+        QWidget.setTabOrder(self.eraseRainbowBox, self.rotateFirstBox)
+        QWidget.setTabOrder(self.rotateFirstBox, self.autoLevelBox)
+        QWidget.setTabOrder(self.autoLevelBox, self.autocontrastBox)
+        QWidget.setTabOrder(self.autocontrastBox, self.editorButton)
+        QWidget.setTabOrder(self.editorButton, self.kofiButton)
+        QWidget.setTabOrder(self.kofiButton, self.wikiButton)

        self.retranslateUi(mainWindow)

@@ -513,7 +524,7 @@ class Ui_mainWindow(object):
 #if QT_CONFIG(tooltip)
        self.mangaBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Enable right-to-left reading.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
-        self.mangaBox.setText(QCoreApplication.translate("mainWindow", u"Right-to-left mode", None))
+        self.mangaBox.setText(QCoreApplication.translate("mainWindow", u"Right-to-left (manga)", None))
 #if QT_CONFIG(tooltip)
        self.webtoonBox.setToolTip(QCoreApplication.translate("mainWindow", u"<html><head/><body><p style='white-space:pre'>Enable special parsing mode for Korean Webtoons.</p></body></html>", None))
 #endif // QT_CONFIG(tooltip)
--- a/kindlecomicconverter/KCC_ui_editor.py
+++ b/kindlecomicconverter/KCC_ui_editor.py
@@ -156,6 +156,15 @@ class Ui_editorDialog(object):

        self.verticalLayout.addWidget(self.optionWidget)

+        QWidget.setTabOrder(self.seriesLine, self.volumeLine)
+        QWidget.setTabOrder(self.volumeLine, self.titleLine)
+        QWidget.setTabOrder(self.titleLine, self.numberLine)
+        QWidget.setTabOrder(self.numberLine, self.writerLine)
+        QWidget.setTabOrder(self.writerLine, self.pencillerLine)
+        QWidget.setTabOrder(self.pencillerLine, self.inkerLine)
+        QWidget.setTabOrder(self.inkerLine, self.coloristLine)
+        QWidget.setTabOrder(self.coloristLine, self.okButton)
+        QWidget.setTabOrder(self.okButton, self.cancelButton)

        self.retranslateUi(editorDialog)

--- a/kindlecomicconverter/init.py
+++ b/kindlecomicconverter/init.py
@@ -1,4 +1,4 @@
-__version__ = '9.2.0'
+__version__ = '9.3.4'
 __license__ = 'ISC'
 __copyright__ = '2012-2022, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>, darodi'
 __docformat__ = 'restructuredtext en'
--- a/kindlecomicconverter/comic2ebook.py
+++ b/kindlecomicconverter/comic2ebook.py
@@ -43,7 +43,7 @@ from psutil import virtual_memory, disk_usage
 from html import escape as hescape
 import pymupdf

-from .shared import getImageFileName, walkSort, walkLevel, sanitizeTrace, subprocess_run, dot_clean
+from .shared import IMAGE_TYPES, getImageFileName, walkSort, walkLevel, sanitizeTrace, subprocess_run, dot_clean
 from .comicarchive import SEVENZIP, available_archive_tools
 from . import comic2panel
 from . import image
@@ -71,12 +71,23 @@ def main(argv=None):
    if len(sources) == 0:
        print('No matching files found.')
        return 1
+    if options.filefusion:
+        fusion_path = makeFusion(list(sources))
+        sources.clear()
+        sources.add(fusion_path)
    for source in sources:
        source = source.rstrip('\\').rstrip('/')
        options = copy(args)
        options = checkOptions(options)
        print('Working on ' + source + '...')
        makeBook(source)
+
+    if options.filefusion:
+        for path in sources:
+            if os.path.isfile(path):
+                os.remove(path)
+            elif os.path.isdir(path):
+                rmtree(path, True)
    return 0


@@ -445,7 +456,7 @@ def buildOPF(dstdir, title, filelist, originalpath, cover=None):
                  "</container>"])
    f.close()

-def buildEPUB(path, chapternames, tomenumber, ischunked, cover: image.Cover, originalpath, len_tomes=0):
+def buildEPUB(path, chapternames, tomenumber, ischunked, cover: image.Cover, originalpath, job_progress='', len_tomes=0):
    filelist = []
    chapterlist = []
    os.mkdir(os.path.join(path, 'OEBPS', 'Text'))
@@ -553,7 +564,7 @@ def buildEPUB(path, chapternames, tomenumber, ischunked, cover: image.Cover, ori
            else:
                filelist.append(buildHTML(dirpath, afile, os.path.join(dirpath, afile)))
    build_html_end = perf_counter()
-    print(f"buildHTML: {build_html_end - build_html_start} seconds")
+    print(f"{job_progress}buildHTML: {build_html_end - build_html_start} seconds")
    # Overwrite chapternames if ComicInfo.xml has bookmarks
    if ischunked:
       options.comicinfo_chapters = []
@@ -589,7 +600,7 @@ def buildEPUB(path, chapternames, tomenumber, ischunked, cover: image.Cover, ori
    buildOPF(path, options.title, filelist, originalpath, cover)


-def buildPDF(path, title, cover=None, output_file=None):
+def buildPDF(path, title, job_progress='', cover=None, output_file=None):
    """
    Build a PDF file from processed comic images.
    Images are combined into a single PDF optimized for e-readers.
@@ -614,11 +625,11 @@ def buildPDF(path, title, cover=None, output_file=None):
        # Save with optimizations for smaller file size
        doc.save(output_file, deflate=True, garbage=4, clean=True)
    end = perf_counter()
-    print(f"MuPDF output: {end-start} sec")
+    print(f"{job_progress}MuPDF output: {end-start} sec")
    return output_file


-def imgDirectoryProcessing(path):
+def imgDirectoryProcessing(path, job_progress=''):
    global workerPool, workerOutput
    workerPool = Pool(maxtasksperchild=100)
    workerOutput = []
@@ -638,7 +649,7 @@ def imgDirectoryProcessing(path):
        workerPool.close()
        workerPool.join()
        img_processing_end = perf_counter()
-        print(f"imgFileProcessing: {img_processing_end - img_processing_start} seconds")
+        print(f"{job_progress}imgFileProcessing: {img_processing_end - img_processing_start} seconds")

        # macOS 15 likes to add ._ files after multiprocessing
        dot_clean(path)
@@ -859,6 +870,9 @@ def getWorkFolder(afile):
            raise UserWarning("Not enough disk space to perform conversion.")
        if afile.lower().endswith('.pdf'):
            workdir = mkdtemp('', 'KCC-', os.path.dirname(afile))
+            fullPath = os.path.join(workdir, 'OEBPS', 'Images')
+            if not os.path.exists(fullPath):
+                os.makedirs(fullPath)
            path = workdir
            sanitizePermissions(path)
            target_height = options.profileData[1][1]
@@ -867,39 +881,42 @@ def getWorkFolder(afile):
            elif options.cropping == 2:
                target_height = target_height + target_height*0.25 #Account for possible margin at the top and bottom with page number
            try:
-                mupdf_pdf_process_pages_parallel(afile, workdir, target_height)
+                mupdf_pdf_process_pages_parallel(afile, fullPath, target_height)
            except Exception as e:
                rmtree(path, True)
                raise UserWarning(f"Failed to extract images from PDF file. {e}")
+            return workdir
        else:
            workdir = mkdtemp('', 'KCC-', os.path.dirname(afile))
+            fullPath = os.path.join(workdir, 'OEBPS', 'Images')
+            if not os.path.exists(fullPath):
+                os.makedirs(fullPath)
            try:
                cbx = comicarchive.ComicArchive(afile)
-                path = cbx.extract(workdir)
+                path = cbx.extract(fullPath)
                sanitizePermissions(path)

-                tdir = os.listdir(workdir)
+                tdir = os.listdir(fullPath)
                if len(tdir) == 2 and 'ComicInfo.xml' in tdir:
                    tdir.remove('ComicInfo.xml')
-                    if os.path.isdir(os.path.join(workdir, tdir[0])):
+                    if os.path.isdir(os.path.join(fullPath, tdir[0])):
                        os.replace(
-                            os.path.join(workdir, 'ComicInfo.xml'),
-                            os.path.join(workdir, tdir[0], 'ComicInfo.xml')
+                            os.path.join(fullPath, 'ComicInfo.xml'),
+                            os.path.join(fullPath, tdir[0], 'ComicInfo.xml')
                        )
-                if len(tdir) == 1 and os.path.isdir(os.path.join(workdir, tdir[0])):
-                    path = os.path.join(workdir, tdir[0])
+                if len(tdir) == 1 and os.path.isdir(os.path.join(fullPath, tdir[0])):
+                    path = os.path.join(fullPath, tdir[0])
+                return workdir
 
            except OSError as e:
                rmtree(workdir, True)
                raise UserWarning(e)
    else:
        raise UserWarning("Failed to open source file/directory.")
-    newpath = mkdtemp('', 'KCC-', os.path.dirname(afile))
-    os.renames(path, os.path.join(newpath, 'OEBPS', 'Images'))
-    return newpath


 def getOutputFilename(srcpath, wantedname, ext, tomenumber):
+    source_path = Path(srcpath)
    if srcpath[-1] == os.path.sep:
        srcpath = srcpath[:-1]
    if 'Ko' in options.profile and options.format == 'EPUB':
@@ -909,20 +926,29 @@ def getOutputFilename(srcpath, wantedname, ext, tomenumber):
        else:
            ext = '.kepub.epub'
    if wantedname is not None:
+        wanted_root, wanted_ext = os.path.splitext(wantedname)
        if wantedname.endswith(ext):
            filename = os.path.abspath(wantedname)
-        elif os.path.isdir(srcpath):
-            filename = os.path.join(os.path.abspath(options.output), os.path.basename(srcpath) + ext)
+        elif wanted_ext == '.mobi' and ext == '.epub':
+            filename = os.path.abspath(wanted_root + ext)
+        # output directory
        else:
-            filename = os.path.join(os.path.abspath(options.output),
-                                    os.path.basename(os.path.splitext(srcpath)[0]) + ext)
+            abs_path = os.path.abspath(options.output)
+            if not os.path.exists(abs_path):
+                os.mkdir(abs_path)
+            if source_path.is_file():
+                filename = os.path.join(os.path.abspath(options.output), source_path.stem + tomenumber + ext)
+            else:
+                filename = os.path.join(os.path.abspath(options.output), source_path.name + tomenumber + ext)
    elif os.path.isdir(srcpath):
        filename = srcpath + tomenumber + ext
    else:
        if 'Ko' in options.profile and options.format == 'EPUB':
-            src = pathlib.Path(srcpath)
-            name = re.sub(r'\W+', '_', src.stem) + tomenumber + ext
-            filename = src.with_name(name)
+            if source_path.is_file():
+                name = re.sub(r'\W+', '_', source_path.stem) + tomenumber + ext
+            else:
+                name = re.sub(r'\W+', '_', source_path.name) + tomenumber + ext
+            filename = source_path.with_name(name)
        else:
            filename = os.path.splitext(srcpath)[0] + tomenumber + ext
    if os.path.isfile(filename):
@@ -1028,7 +1054,7 @@ def removeNonImages(filetree):
    for root, dirs, files in os.walk(filetree):
        for name in files:
            _, ext = getImageFileName(name)
-            if ext not in ('.png', '.jpg', '.jpeg', '.gif', '.webp', '.jp2', '.avif'):
+            if ext not in IMAGE_TYPES:
                if os.path.exists(os.path.join(root, name)):
                    os.remove(os.path.join(root, name))
    # remove empty nested folders
@@ -1238,7 +1264,7 @@ def slugify(value, is_natural_sorted):
        value = sub(r'0*([0-9]{4,})', r'\1', sub(r'([0-9]+)', r'0000\1', value, count=2))
    return value

-def makeZIP(zipfilename, basedir, isepub=False):
+def makeZIP(zipfilename, basedir, job_progress='', isepub=False):
    start = perf_counter()
    zipfilename = os.path.abspath(zipfilename) + '.zip'
    if SEVENZIP in available_archive_tools():
@@ -1259,7 +1285,7 @@ def makeZIP(zipfilename, basedir, isepub=False):
                    zipOutput.write(path, aPath)
        zipOutput.close()
    end = perf_counter()
-    print(f"makeZIP time: {end - start} seconds")
+    print(f"{job_progress}makeZIP time: {end - start} seconds")
    return zipfilename

 def makeParser():
@@ -1330,6 +1356,8 @@ def makeParser():
                                help="Disable autocontrast.")
    output_options.add_argument("--colorautocontrast", action="store_true", dest="colorautocontrast", default=False,
                                help="Autocontrast color pages too. Skipped for pages without near blacks or whites.")
+    output_options.add_argument("--filefusion", action="store_true", dest="filefusion", default=False,
+                                help="Combines all input files into a single file.")
    processing_options.add_argument("-c", "--cropping", type=int, dest="cropping", default="2",
                                    help="Set cropping mode. 0: Disabled 1: Margins 2: Margins + page numbers [Default=2]")
    processing_options.add_argument("--cp", "--croppingpower", type=float, dest="croppingp", default="1.0",
@@ -1521,7 +1549,7 @@ def makeFusion(sources: List[str]):
    return str(fusion_path)


-def makeBook(source, qtgui=None):
+def makeBook(source, qtgui=None, job_progress=''):
    start = perf_counter()
    global GUI
    GUI = qtgui
@@ -1529,11 +1557,12 @@ def makeBook(source, qtgui=None):
        GUI.progressBarTick.emit('1')
    else:
        checkTools(source)
+    options.kindle_azw3 = options.iskindle and ('MOBI' in options.format or 'EPUB' in options.format)
    options.kindle_scribe_azw3 = options.profile == 'KS' and ('MOBI' in options.format or 'EPUB' in options.format)
    checkPre(source)
-    print("Preparing source images...")
+    print(f"{job_progress}Preparing source images...")
    path = getWorkFolder(source)
-    print("Checking images...")
+    print(f"{job_progress}Checking images...")
    getMetadata(os.path.join(path, "OEBPS", "Images"), source)
    removeNonImages(os.path.join(path, "OEBPS", "Images"))
    detectSuboptimalProcessing(os.path.join(path, "OEBPS", "Images"), source)
@@ -1544,14 +1573,14 @@ def makeBook(source, qtgui=None):

    if options.webtoon:
        x, y = image.ProfileData.Profiles[options.profile][1]
-        comic2panel.main(['-y ' + str(y), '-x' + str(x), '-i', '-m', path], qtgui)
+        comic2panel.main(['-y ' + str(y), '-x' + str(x), '-i', '-m', path], job_progress, qtgui)
    if options.noprocessing:
-        print("Do not process image, ignore any profile or processing option")
+        print(f"{job_progress}Do not process image, ignore any profile or processing option")
    else:
-        print("Processing images...")
+        print(f"{job_progress}Processing images...")
        if GUI:
-            GUI.progressBarTick.emit('Processing images')
-        imgDirectoryProcessing(os.path.join(path, "OEBPS", "Images"))
+            GUI.progressBarTick.emit(f'{job_progress}Processing images')
+        imgDirectoryProcessing(os.path.join(path, "OEBPS", "Images"), job_progress)
    if GUI:
        GUI.progressBarTick.emit('1')
    if options.batchsplit > 0 or options.targetsize:
@@ -1562,11 +1591,11 @@ def makeBook(source, qtgui=None):
    tomeNumber = 0
    if GUI:
        if options.format == 'CBZ':
-            GUI.progressBarTick.emit('Compressing CBZ files')
+            GUI.progressBarTick.emit(f'{job_progress}Compressing CBZ files')
        elif options.format == 'PDF':
-            GUI.progressBarTick.emit('Creating PDF files')
+            GUI.progressBarTick.emit(f'{job_progress}Creating PDF files')
        else:
-            GUI.progressBarTick.emit('Compressing EPUB files')
+            GUI.progressBarTick.emit(f'{job_progress}Compressing EPUB files')
        GUI.progressBarTick.emit(str(len(tomes) + 1))
        GUI.progressBarTick.emit('tick')
    options.baseTitle = options.title
@@ -1580,29 +1609,29 @@ def makeBook(source, qtgui=None):
            tomeNumber += 1
            options.title = options.baseTitle + ' [' + str(tomeNumber) + '/' + str(len(tomes)) + ']'
        if options.format == 'CBZ':
-            print("Creating CBZ file...")
+            print(f"{job_progress}Creating CBZ file...")
            if len(tomes) > 1:
                filepath.append(getOutputFilename(source, options.output, '.cbz', ' ' + str(tomeNumber)))
            else:
                filepath.append(getOutputFilename(source, options.output, '.cbz', ''))
-            makeZIP(tome + '_comic', os.path.join(tome, "OEBPS", "Images"))
+            makeZIP(tome + '_comic', os.path.join(tome, "OEBPS", "Images"), job_progress)
        elif options.format == 'PDF':
-            print("Creating PDF file with PyMuPDF...")
+            print(f"{job_progress}Creating PDF file with PyMuPDF...")
            # determine output filename based on source and tome count
            suffix = (' ' + str(tomeNumber)) if len(tomes) > 1 else ''
            output_file = getOutputFilename(source, options.output, '.pdf', suffix)
            # use optimized buildPDF logic with streaming and compression
-            output_pdf = buildPDF(tome, options.title, None, output_file)
+            output_pdf = buildPDF(tome, options.title, job_progress, None, output_file)
            filepath.append(output_pdf)
        else:
-            print("Creating EPUB file...")
+            print(f"{job_progress}Creating EPUB file...")
            if len(tomes) > 1:
-                buildEPUB(tome, chapterNames, tomeNumber, True, cover, source, len(tomes))
+                buildEPUB(tome, chapterNames, tomeNumber, True, cover, source, job_progress, len(tomes))
                filepath.append(getOutputFilename(source, options.output, '.epub', ' ' + str(tomeNumber)))
            else:
-                buildEPUB(tome, chapterNames, tomeNumber, False, cover, source)
+                buildEPUB(tome, chapterNames, tomeNumber, False, cover, source, job_progress)
                filepath.append(getOutputFilename(source, options.output, '.epub', ''))
-            makeZIP(tome + '_comic', tome, True)
+            makeZIP(tome + '_comic', tome, job_progress, True)
        # Copy files to final destination (PDF files are already saved directly)
        if options.format != 'PDF':
            copyfile(tome + '_comic.zip', filepath[-1])
@@ -1615,23 +1644,23 @@ def makeBook(source, qtgui=None):
        if GUI:
            GUI.progressBarTick.emit('tick')
    if not GUI and options.format == 'MOBI':
-        print("Creating MOBI files...")
+        print(f"{job_progress}Creating MOBI files...")
        work = []
        for i in filepath:
            work.append([i])
        output = makeMOBI(work, GUI)
        for errors in output:
            if errors[0] != 0:
-                print('Error: KindleGen failed to create MOBI!')
+                print(f"{job_progress}Error: KindleGen failed to create MOBI!")
                print(errors)
                return filepath
        k = kindle.Kindle(options.profile)
        if k.path and k.coverSupport:
-            print("Kindle detected. Uploading covers...")
+            print(f"{job_progress}Kindle detected. Uploading covers...")
        for i in filepath:
            output = makeMOBIFix(i, options.covers[filepath.index(i)][1])
            if not output[0]:
-                print('Error: Failed to tweak KindleGen output!')
+                print(f'{job_progress}Error: Failed to tweak KindleGen output!')
                return filepath
            else:
                os.remove(i.replace('.epub', '.mobi') + '_toclean')
@@ -1644,7 +1673,7 @@ def makeBook(source, qtgui=None):
            rmtree(source, True)

    end = perf_counter()
-    print(f"makeBook: {end - start} seconds")
+    print(f"{job_progress}makeBook: {end - start} seconds")
    # Clean up temporary workspace
    try:
        rmtree(path, True)
--- a/kindlecomicconverter/comic2panel.py
+++ b/kindlecomicconverter/comic2panel.py
@@ -24,10 +24,12 @@ import sys
 from argparse import ArgumentParser
 from shutil import rmtree
 from multiprocessing import Pool
-from PIL import Image, ImageChops, ImageOps, ImageDraw, ImageFilter
+from PIL import Image, ImageChops, ImageOps, ImageDraw, ImageFilter, ImageFile
 from PIL.Image import Dither
 from .shared import dot_clean, getImageFileName, walkLevel, walkSort, sanitizeTrace

+ImageFile.LOAD_TRUNCATED_IMAGES = True
+

 def mergeDirectoryTick(output):
    if output:
@@ -60,8 +62,8 @@ def mergeDirectory(work):
                imagesValid.append(i[0])
            # Silently drop directories that contain too many images
            # 131072 = GIMP_MAX_IMAGE_SIZE / 4
-            if targetHeight > 131072 * 2:
-                raise RuntimeError(f'Image too tall at {targetHeight} pixels.')
+            if targetHeight > 131072 * 3:
+                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:
@@ -219,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)

@@ -260,7 +262,7 @@ def main(argv=None, qtgui=None):
                splitWorkerOutput = []
                splitWorkerPool = Pool(maxtasksperchild=10)
                if args.merge:
-                    print("Merging images...")
+                    print(f"{job_progress}Merging images...")
                    directoryNumer = 1
                    mergeWork = []
                    mergeWorkerOutput = []
@@ -272,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)
@@ -285,7 +287,7 @@ def main(argv=None, qtgui=None):
                        rmtree(targetDir, True)
                        raise RuntimeError("One of workers crashed. Cause: " + mergeWorkerOutput[0][0],
                                           mergeWorkerOutput[0][1])
-                print("Splitting images...")
+                print(f"{job_progress}Splitting images...")
                dot_clean(targetDir)
                for root, _, files in os.walk(targetDir, False):
                    for name in files:
@@ -295,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:
--- a/kindlecomicconverter/comicarchive.py
+++ b/kindlecomicconverter/comicarchive.py
@@ -20,12 +20,13 @@

 from functools import cached_property, lru_cache
 import os
+from pathlib import Path
 import platform
 import distro
 from subprocess import STDOUT, PIPE, CalledProcessError
 from xml.dom.minidom import parseString
 from xml.parsers.expat import ExpatError
-from .shared import subprocess_run
+from .shared import IMAGE_TYPES, subprocess_run

 EXTRACTION_ERROR = 'Failed to extract archive. Try extracting file outside of KCC.'
 SEVENZIP = '7zz' if platform.system() == 'Darwin' else '7z'
@@ -65,6 +66,9 @@ class ComicArchive:
    def extract(self, targetdir):
        if not os.path.isdir(targetdir):
            raise OSError('Target directory doesn\'t exist.')
+        
+        if Path(self.basename).suffix.lower() in IMAGE_TYPES:
+            raise UserWarning('Put images into folder and drag and drop folder into KCC window.')

        missing = []

--- a/kindlecomicconverter/image.py
+++ b/kindlecomicconverter/image.py
@@ -24,13 +24,14 @@ 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, ImageDraw
+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:
@@ -85,6 +86,9 @@ class ProfileData:
    ]

    ProfilesKindleEBOK = {
+    }
+
+    ProfilesKindlePDOC = {
        'K1': ("Kindle 1", (600, 670), Palette4, 1.0),
        'K2': ("Kindle 2", (600, 670), Palette15, 1.0),
        'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.0),
@@ -92,9 +96,6 @@ class ProfileData:
        'K57': ("Kindle 5/7", (600, 800), Palette16, 1.0),
        'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.0),
        'KV': ("Kindle Voyage", (1072, 1448), Palette16, 1.0),
-    }
-
-    ProfilesKindlePDOC = {
        'KPW34': ("Kindle Paperwhite 3/4/Oasis", (1072, 1448), Palette16, 1.0),
        'K810': ("Kindle 8/10", (600, 800), Palette16, 1.0),
        'KO': ("Kindle Oasis 2/3/Paperwhite 12", (1264, 1680), Palette16, 1.0),
@@ -262,7 +263,6 @@ class ComicPage:
        _, self.size, self.palette, self.gamma = self.opt.profileData
        if self.opt.hq:
            self.size = (int(self.size[0] * 1.5), int(self.size[1] * 1.5))
-        self.kindle_scribe_azw3 = (options.profile == 'KS') and (options.format in ('MOBI', 'EPUB'))
        self.original_color_mode = image.mode
        # TODO: color check earlier
        self.image = image.convert("RGB")
@@ -296,9 +296,9 @@ class ComicPage:
    
    # 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, cr, cutoff=(2, 2)):
-        cb_hist = cb.histogram()
-        cr_hist = cr.histogram()
+    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
@@ -327,60 +327,50 @@ class ComicPage:
                    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()

-        # get rid of some jpg compression
-        cutoff = (.2, .2)
-        cb_hist, cr_hist = self.histograms_cutoff(cb, cr, 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
-        SPREAD_THRESHOLD = 5
-        if not self.opt.forcecolor and cb_spread < SPREAD_THRESHOLD and cr_spread < SPREAD_THRESHOLD:
-            return False
-        
-        # check for large amount of extreme colors
-        # 11 if too high. 10 is barely enough. If needed make it magnitude of both
-        DIFF_THRESHOLD = 10
-        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
-
-        # get ride of most jpg compression
-        cutoff = (2, 2)
-        cb_hist, cr_hist = self.histograms_cutoff(cb, cr, 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
-        SPREAD_THRESHOLD = 5
-        if not self.opt.forcecolor and cb_spread < SPREAD_THRESHOLD and cr_spread < SPREAD_THRESHOLD:
-            return False
-
-        # check for any amount of mild colors still remaining
-        DIFF_THRESHOLD = 6
-        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
-        else:
-            return False
+        # 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:
@@ -405,7 +395,7 @@ class ComicPage:

    def save_with_codec(self, image, targetPath):
        if self.opt.forcepng:
-            image.info["transparency"] = None
+            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)
@@ -490,6 +480,14 @@ class ComicPage:
            self.image = erase_rainbow_artifacts(self.image, is_color)

    def resizeImage(self):
+        if self.opt.norotate and self.targetPathOrder in ('-kcc-a', '-kcc-d') and not self.opt.kindle_scribe_azw3:
+            # TODO: Kindle Scribe case
+            if self.opt.kindle_azw3 and any(dim > 1920 for dim in self.image.size):
+                self.image = ImageOps.contain(self.image, (1920, 1920), Image.Resampling.LANCZOS)
+            elif self.image.size[0] > self.size[0] * 2 or self.image.size[1] > self.size[1]:
+                self.image = ImageOps.contain(self.image, (self.size[0] * 2, self.size[1], Image.Resampling.LANCZOS))
+            return
+        
        ratio_device = float(self.size[1]) / float(self.size[0])
        ratio_image = float(self.image.size[1]) / float(self.image.size[0])
        method = self.resize_method()
@@ -557,7 +555,7 @@ class Cover:

    def process(self):
        self.image = self.image.convert('RGB')
-        self.image = ImageOps.autocontrast(self.image)
+        self.image = ImageOps.autocontrast(self.image, preserve_tone=True)
        if not self.options.forcecolor:
            self.image = self.image.convert('L')
        self.crop_main_cover()
--- a/kindlecomicconverter/inter_panel_crop_alg.py
+++ b/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).
--- a/kindlecomicconverter/page_number_crop_alg.py
+++ b/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
--- a/kindlecomicconverter/rainbow_artifacts_eraser.py
+++ b/kindlecomicconverter/rainbow_artifacts_eraser.py
@@ -1,5 +1,8 @@
 import numpy as np
-from PIL import Image
+from PIL import Image, ImageFile
+
+ImageFile.LOAD_TRUNCATED_IMAGES = True
+
       
 def fourier_transform_image(img):
    """
--- a/kindlecomicconverter/shared.py
+++ b/kindlecomicconverter/shared.py
@@ -27,6 +27,9 @@ import sys
 from traceback import format_tb


+IMAGE_TYPES = ('.png', '.jpg', '.jpeg', '.gif', '.webp', '.jp2', '.avif')
+
+
 class HTMLStripper(HTMLParser):
    def __init__(self):
        HTMLParser.__init__(self)
--- a/requirements-docker.txt
+++ b/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
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ PySide6<6.10
 Pillow>=11.3.0
 psutil>=5.9.5
 requests>=2.31.0
-python-slugify>=1.2.1
+python-slugify>=1.2.1,<9.0.0
 raven>=6.0.0
 packaging>=23.2
 mozjpeg-lossless-optimization>=1.2.0
--- a/setup.py
+++ b/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
@@ -57,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,
@@ -81,16 +148,15 @@ setuptools.setup(
    },
    packages=['kindlecomicconverter'],
    install_requires=[
-        'pyside6>=6.0.0',
+        'PySide6>=6.0.0',
        'Pillow>=9.3.0',
-        'PyMuPDF>=1.18.0',
        'psutil>=5.9.5',
+        'requests>=2.31.0',
        'python-slugify>=1.2.1,<9.0.0',
        'raven>=6.0.0',
-        'requests>=2.31.0',
-        'mozjpeg-lossless-optimization>=1.1.2',
+        'mozjpeg-lossless-optimization>=1.2.0',
        'natsort>=8.4.0',
-        'distro',
+        'distro>=1.8.0',
        'numpy>=1.22.4',
        'PyMuPDF>=1.16.1',
    ],
Author	SHA1	Message	Date
Alex Xu	8ac58e361f	Bump version to 9.3.4	2025-12-03 10:23:00 -08:00
kiryl	61d6972e22	Sync setup install_requires with requirements.txt (#1176 ) * 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>	2025-12-02 21:13:26 -08:00
Alex Xu	c7c1557e72	add tomenumber when output folder checked (#1183 ) * add tomenumber when output checked * fix all cases	2025-12-02 20:54:46 -08:00
kiryl	cb93704e08	Mention tabulation order in README.md (#1181 )	2025-12-02 15:20:52 -08:00
kiryl	62c5183609	set tabulation order for KCC fields (#1178 ) * set tabulation order for KCC fields - loop through fields in more organized order including fields which visibility depends on some checkboxes state * don't change rc --------- Co-authored-by: Alex Xu <alexkurosakimh3@gmail.com>	2025-12-02 12:36:17 -08:00
kiryl	a629f267a1	set tabulation order for metadata editor fields (#1177 ) * set tabulation order for metadata editor fields - loop through fields in from top to down order * don't change rc --------- Co-authored-by: Alex Xu <alexkurosakimh3@gmail.com>	2025-12-02 12:33:38 -08:00
Alex Xu	aeec4dd294	fix output folder with period (#1180 )	2025-12-02 12:04:15 -08:00
Alex Xu	0d3076465b	use less file operations (#1174 )	2025-12-01 19:27:17 -08:00
Alex Xu	984d44b371	Bump version to 9.3.3	2025-11-25 19:06:17 -08:00
Alex Xu	1111263893	downscale nonrotated spreads to 2x device width (#1147 ) * don't downscale nonrotated spreads * maximum 2x screen downscale * only downscale if needed * don't do for kindle scribe	2025-11-25 19:04:22 -08:00
dependabot[bot]	5035c7403e	Bump signpath/github-action-submit-signing-request from 1.3 to 2.0 (#1139 ) Bumps [signpath/github-action-submit-signing-request](https://github.com/signpath/github-action-submit-signing-request) from 1.3 to 2.0. - [Release notes](https://github.com/signpath/github-action-submit-signing-request/releases) - [Commits](https://github.com/signpath/github-action-submit-signing-request/compare/v1.3...v2.0) --- updated-dependencies: - dependency-name: signpath/github-action-submit-signing-request dependency-version: '2.0' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-11-25 18:44:52 -08:00
dependabot[bot]	067aa68162	Bump actions/upload-artifact from 4 to 5 (#1140 ) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-11-25 18:44:43 -08:00
dependabot[bot]	72d07d53ea	Bump actions/checkout from 5 to 6 (#1169 ) Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-11-25 18:44:30 -08:00
Alex Xu	8c242d45d7	PDOC only (#1171 )	2025-11-25 18:44:10 -08:00
Alex Xu	c655922a57	rename RTL to Right-to-left (manga) (#1172 )	2025-11-25 18:42:18 -08:00
kiryl	77e8952f12	Keep sorted and unique list of sources (#1108 ) - sort items on the sources list alphabetically - - don't add item if it is already on the list	2025-11-24 22:21:32 -08:00
kiryl	5b069322a4	Update progress notification for bulk jobs (#1109 )	2025-11-24 13:45:02 -08:00
Alex Xu	2444a28127	Bump version to 9.3.2	2025-11-17 13:09:48 -08:00
Alex Xu	3aad79fc30	fix -o in c2e for real (#1167 )	2025-11-17 13:09:27 -08:00
Alex Xu	2dbc13303f	Revert "fix -o in c2e (#1161 )" (#1166 ) This reverts commit `9429bed91c`.	2025-11-17 12:04:27 -08:00
Alex Xu	4c36c7c586	update faq	2025-11-14 08:00:20 -08:00
Alex Xu	65007aec07	better error when attempting to add images directly (#1158 )	2025-11-12 15:52:34 -08:00
Alex Xu	9429bed91c	fix -o in c2e (#1161 )	2025-11-12 11:46:33 -08:00
José Cerezo	3a3ee15cba	Optimize docker image (#1160 ) * Updated workflow to checkout * Added kindlegen ln -s instruction	2025-11-12 09:45:49 -08:00
Alex Xu	2394aa3747	Bump version to 9.3.1	2025-11-11 18:43:26 -08:00
José Cerezo	b57992a754	Optimize docker image (#1157 ) * Optimized Docker image * Divided Dockerfile into two images * Fixed dockerfile path * Updated workflows * Added remaining packages in Dockerfile-base * Updated workflows * Unified workflows for docker images * Added LABELs to docker images * pull from ciromattia cache * docker2 * Optimized Docker image * fix tags * Added installation stage and optimized workflow for Docker image * Deleted one stage from the dockerfile to optimize build * copy requirements file after numpy and pymupdf * don't change primary requirements --------- Co-authored-by: Alex Xu <alexkurosakimh3@gmail.com>	2025-11-11 18:42:44 -08:00
Alex Xu	c7a62fdcd6	Clarify memory and storage capacities in README	2025-11-10 11:46:22 -08:00
Alex Xu	8861299d24	bump 9.2.2	2025-11-04 13:08:02 -08:00
Alex Xu	636447bb62	Partially check W/B Margins if you don't want KCC to extend the image margins in CBZ/PDF (#1152 )	2025-11-04 13:05:16 -08:00
Alex Xu	b23c7744cb	Make webtoon tall error more informative (#1151 ) * Make webtoon tall error more informative * fix mistake	2025-11-04 12:54:29 -08:00
Alex Xu	2398a5b1ac	raise max res to 6000x8000 (#1150 )	2025-11-04 12:40:23 -08:00
José Cerezo	2b2ac8ff55	Added file fusion to C2E (#1149 ) * Added file fusion to C2E * Updated README.md	2025-11-02 19:01:02 -08:00
Alex Xu	5209d9a7b8	fix cover autocontrast (#1141 )	2025-10-30 11:55:06 -07:00
Alex Xu	5336870097	fix webtoon too tall (#1146 )	2025-10-30 11:54:18 -07:00
Alex Xu	4371d14391	bump 9.2.1	2025-10-26 15:45:23 -07:00
Alex Xu	f96b7cb22b	further refine color detection	2025-10-26 14:11:13 -07:00
Alex Xu	4dfd2ea942	weird file structure message	2025-10-26 11:02:02 -07:00
Alex Xu	ba7f4336a5	add threshold comment	2025-10-25 23:16:52 -07:00
Alex Xu	9561b04bec	make color detection super precise (#1137 )	2025-10-25 23:14:53 -07:00
Alex Xu	2a8f8e9ab4	Fix png transparency (#1136 ) * remove transparency * pop transparency	2025-10-25 18:45:10 -07:00
Alex Xu	b9cef59912	remove pyinstaller-action	2025-10-24 21:12:07 -07:00
Alex Xu	f2ab730691	Fix tint color detection (#1135 ) * make color detection even more precise * fix tinted images	2025-10-24 20:55:18 -07:00
Alex Xu	44401583e4	fix typo	2025-10-24 10:58:03 -07:00
Alex Xu	28faf524c4	build windows command line versions directly using faster Python 3.11 (#1134 ) * draft CLI * fix windows c2e * fix typos * update github workflows	2025-10-24 10:52:31 -07:00
Alex Xu	2d288f72ea	fix truncated file read (#1133 )	2025-10-21 20:41:18 -07:00
Alex Xu	fb9b3c676b	add panel view to faq	2025-10-21 14:17:40 -07:00
Alex Xu	cff1de4fa5	Remove LICENSE.txt from package-macos.yml files list Removed LICENSE.txt from the files list in the workflow.	2025-10-21 14:00:54 -07:00