docker update (#521 )

Crop images within 3% of device aspect ratio (#495 )
* Crop images within 3% of device aspect ratio * use pad instead of expand+fit * reafactor threshold check * remove default val
2026-04-17 14:38:47 +00:00 · 2023-05-14 17:10:40 +00:00 · 2023-05-14 16:34:11 +00:00 · 2023-05-14 16:32:06 +00:00 · 2023-05-14 16:31:45 +00:00 · 2023-05-14 16:31:31 +00:00
29 changed files with 840 additions and 836 deletions
--- a/.github/workflows/docker-base-publish.yml
+++ b/.github/workflows/docker-base-publish.yml
@@ -0,0 +1,34 @@
+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
@@ -2,10 +2,7 @@ name: Docker

 on:
  workflow_dispatch:
-  #schedule:
-  #  - cron: '39 5 * * *'
  push:
-#    branches: [ master, pipeline_test, docker_test ]
    # Publish semver tags as releases.
    tags: [ 'v*.*.*' ]
    
--- a/.github/workflows/package-linux.yml
+++ b/.github/workflows/package-linux.yml
@@ -7,7 +7,7 @@ on:
  push:
    tags:
      - "v*.*.*"
-    
+
    # Don't trigger if it's just a documentation update
    paths-ignore:
      - '**.md'
@@ -23,9 +23,9 @@ on:

 jobs:
  build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
    - name: Set up Python
      uses: actions/setup-python@v4
      with:
@@ -34,18 +34,13 @@ jobs:
    - name: Install python dependencies
      run: |
        sudo apt-get update 
-        sudo apt-get install -y libpng-dev libjpeg-dev p7zip-full python3-pyqt5 squashfs-tools 
-        python -m pip install --upgrade pip setuptools wheel pyinstaller
-        pip install -r requirements.txt
+        sudo apt-get install -y libpng-dev libjpeg-dev p7zip-full p7zip-rar python3-pyqt5 python3-pip squashfs-tools libfuse2
+        python -m pip install --upgrade pip setuptools wheel certifi pyinstaller PyQt6 --no-binary pyinstaller 
+        python -m pip install -r requirements.txt
    - name: build binary
      run: |
        python setup.py build_binary
        chmod +x dist/kcc_linux*
-    - name: upload build
-      uses: actions/upload-artifact@v3
-      with:
-        name: linux-build
-        path: dist/kcc_linux*
 #    issue with this action, disabled and commented out
 #        see https://github.com/AppImageCrafters/build-appimage/issues/5
 #        see https://appimage-builder.readthedocs.io/en/latest/intro/install.html#install-appimagetool
@@ -63,9 +58,8 @@ jobs:
        appimage-builder --recipe AppImageBuilder.yml --skip-test
      env:
        UPDATE_INFO: gh-releases-zsync|ciromattia|kcc|latest|*x86_64.AppImage.zsync
-
    - name: upload artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
      with:
        name: AppImage
        path: './*.AppImage*'
@@ -78,5 +72,4 @@ jobs:
        files: |
          CHANGELOG.md
          LICENSE.txt
-          dist/kcc_linux*
          *.AppImage*
--- a/.github/workflows/package-macos.yml
+++ b/.github/workflows/package-macos.yml
@@ -25,7 +25,7 @@ jobs:
  build:
    runs-on: macos-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - name: Set up Python
        uses: actions/setup-python@v4
        with:
@@ -33,13 +33,45 @@ jobs:
          cache: 'pip'
      - name: Install python dependencies
        run: |
-          python -m pip install --upgrade pip setuptools wheel pyinstaller
+          python -m pip install --upgrade pip setuptools wheel pyinstaller certifi
          pip install -r requirements.txt
+      - name: Install the Apple certificate and provisioning profile
+#        TODO signing
+#        https://federicoterzi.com/blog/automatic-code-signing-and-notarization-for-macos-apps-using-github-actions/
+        if: ${{ false }}
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          # create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+          
+          # import certificate and provisioning profile from secrets
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
+          echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
+          
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          
+          # import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
+          
+          # apply provisioning profile
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
      - uses: actions/setup-node@v3
        with:
          node-version: 16
      - run: npm install -g appdmg
      - name: build binary
+#        TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v
        run: |
          python setup.py build_binary
      - name: upload build
@@ -56,4 +88,11 @@ jobs:
          files: |
            CHANGELOG.md
            LICENSE.txt
-            dist/*.dmg
+            dist/*.dmg
+      - name: Clean up keychain and provisioning profile
+#        TODO signing
+        if: ${{ false }}
+#        if: ${{ always() }}
+        run: |
+          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
+          rm ~/Library/MobileDevice/Provisioning\ Profiles/build_pp.mobileprovision
--- a/.github/workflows/package-windows-with-docker.yml
+++ b/.github/workflows/package-windows-with-docker.yml
@@ -0,0 +1,63 @@
+# 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:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+#      - name: Set up Python
+#        uses: actions/setup-python@v4
+#        with:
+#          python-version: 3.11
+#          cache: 'pip'
+#      - name: Install python dependencies
+#        run: |
+#          python -m pip install --upgrade pip setuptools wheel pyinstaller
+#          pip install -r requirements.txt
+#      - name: build binary
+#        run: |
+#          pyi-makespec -F -i icons\\comic2ebook.ico -n KCC_test -w --noupx kcc.py
+      - name: Package Application
+        uses: JackMcKew/pyinstaller-action-windows@main
+        with:
+          path: .
+          spec: ./kcc.spec
+      - name: Package Application
+        uses: JackMcKew/pyinstaller-action-windows@main
+        with:
+          path: .
+          spec: ./kcc-c2e.spec
+      - name: Package Application
+        uses: JackMcKew/pyinstaller-action-windows@main
+        with:
+          path: .
+          spec: ./kcc-c2p.spec
+      - name: rename binaries
+        run: |   
+          version_built=$(cat kindlecomicconverter/__init__.py | grep version | awk '{print $3}' | sed "s/[^.0-9b]//g")
+          mv dist/windows/kcc.exe dist/windows/kcc_${version_built}.exe 
+          mv dist/windows/kcc-c2e.exe dist/windows/kcc-c2e_${version_built}.exe 
+          mv dist/windows/kcc-c2p.exe dist/windows/kcc-c2p_${version_built}.exe
+      - name: upload build
+        uses: actions/upload-artifact@v3
+        with:
+          name: windows-build
+          path: dist/windows/*.exe
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          prerelease: true
+          generate_release_notes: true
+          files: |
+            CHANGELOG.md
+            LICENSE.txt
+            dist/windows/*.exe
--- a/.github/workflows/package-windows.yml
+++ b/.github/workflows/package-windows.yml
@@ -25,16 +25,19 @@ jobs:
  build:
    runs-on: windows-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
      - name: Set up Python
        uses: actions/setup-python@v4
        with:
          python-version: 3.11
          cache: 'pip'
-      - name: Install python dependencies
+      - name: Install dependencies
+        env:
+          PYINSTALLER_COMPILE_BOOTLOADER: 1
        run: |
-          python -m pip install --upgrade pip setuptools wheel pyinstaller
+          python -m pip install --upgrade pip setuptools wheel
          pip install -r requirements.txt
+          pip install certifi pyinstaller --no-binary pyinstaller
      - name: build binary
        run: |
          python setup.py build_binary
--- a/.github/workflows/python-package-test.yml
+++ b/.github/workflows/python-package-test.yml
@@ -1,50 +0,0 @@
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Publish Python distributions to TestPyPI
-
-on:
-  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:
-  release:
-    if: github.repository == 'darodi/kcc'
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.11
-        cache: 'pip'
-    - name: Install python dependencies
-      run: |
-        python -m pip install --upgrade pip setuptools wheel pyinstaller
-        pip install -r requirements.txt
-    - name: Build Dist
-      run: |
-        sed -i "s#NAME = 'KindleComicConverter'#NAME = 'KindleComicConverterDarodi'#" setup.py 
-        python setup.py sdist
-    - name: Release On TestPyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        user: __token__
-        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-        repository_url: https://test.pypi.org/legacy/
-        skip_existing: true
-        verbose: true
-        print_hash: true
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -1,44 +0,0 @@
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Publish Python distributions to PyPI
-
-on:
-  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:
-  release:
-    if: github.repository == 'ciromattia/kcc'
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.11
-        cache: 'pip'
-    - name: Install python dependencies
-      run: |
-        python -m pip install --upgrade pip setuptools wheel pyinstaller
-        pip install -r requirements.txt
-    - name: Build Dist
-      run: |
-        python setup.py sdist
-    - name: Publish a Python distribution to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
--- a/AppImageBuilder.yml
+++ b/AppImageBuilder.yml
@@ -19,24 +19,21 @@ AppDir:
    - amd64
    allow_unauthenticated: true
    sources:
-    - sourceline: deb http://archive.ubuntu.com/ubuntu focal main restricted
-    - sourceline: deb http://archive.ubuntu.com/ubuntu focal-updates main restricted
-    - sourceline: deb http://archive.ubuntu.com/ubuntu focal universe
-    - sourceline: deb http://archive.ubuntu.com/ubuntu focal-updates universe
-    - sourceline: deb http://archive.ubuntu.com/ubuntu focal multiverse
-    - sourceline: deb http://archive.ubuntu.com/ubuntu focal-updates multiverse
-    - sourceline: deb http://archive.ubuntu.com/ubuntu focal-backports main restricted
+    - sourceline: deb http://archive.ubuntu.com/ubuntu jammy main restricted
+    - sourceline: deb http://archive.ubuntu.com/ubuntu jammy-updates main restricted
+    - sourceline: deb http://archive.ubuntu.com/ubuntu jammy universe
+    - sourceline: deb http://archive.ubuntu.com/ubuntu jammy-updates universe
+    - sourceline: deb http://archive.ubuntu.com/ubuntu jammy multiverse
+    - sourceline: deb http://archive.ubuntu.com/ubuntu jammy-updates multiverse
+    - sourceline: deb http://archive.ubuntu.com/ubuntu jammy-backports main restricted
        universe multiverse
-    - sourceline: deb http://security.ubuntu.com/ubuntu focal-security main restricted
-    - sourceline: deb http://security.ubuntu.com/ubuntu focal-security universe
-    - sourceline: deb http://security.ubuntu.com/ubuntu focal-security multiverse
+    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security main restricted
+    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security universe
+    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security multiverse
    include:
-    - zlib1g:amd64
+      - libc6:amd64
  files:
-    include:
-    - /lib/x86_64-linux-gnu/libGLX.so.0
-    - /lib/x86_64-linux-gnu/libGLdispatch.so.0
-    - /usr/lib/locale/locale-archive
+    include: []
    exclude:
    - usr/share/man
    - usr/share/doc/*/README.*
--- a/152
+++ b/152
@@ -1,147 +1,5 @@
-FROM --platform=linux/amd64 python:3.11-slim-buster 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 python3-pyqt5 && \
-    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.11-slim-buster 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"]
-
-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+=(python-pyqt5) && \
-    KEPT_PACKAGES+=(qt5-default) && \
-    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 pip install -r /opt/kcc/requirements.txt && \
-    python -m venv /opt/venv && \
-    python -m pip install --upgrade pillow python-slugify psutil raven mozjpeg-lossless-optimization
-
-
-######################################################################################
-
-FROM --platform=linux/arm/v7 python:3.11-slim-buster 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"]
-
-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+=(python-pyqt5) && \
-    KEPT_PACKAGES+=(qt5-default) && \
-    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 pip install -r /opt/kcc/requirements.txt && \
-    python -m venv /opt/venv && \
-    python -m pip install --upgrade pillow python-slugify psutil raven mozjpeg-lossless-optimization
-
-
-######################################################################################
-FROM --platform=linux/amd64 python:3.11-slim-buster as build-amd64
-COPY --from=compile-amd64 /opt/venv /opt/venv
-
-FROM --platform=linux/arm64 python:3.11-slim-buster as build-arm64
-COPY --from=compile-arm64 /opt/venv /opt/venv
-
-FROM --platform=linux/arm/v7 python:3.11-slim-buster as build-armv7
-COPY --from=compile-armv7 /opt/venv /opt/venv
-######################################################################################
-
 # Select final stage based on TARGETARCH ARG
-FROM build-${TARGETARCH}${TARGETVARIANT}
+FROM ghcr.io/ciromattia/kcc:docker-base-20230514
 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'
@@ -154,14 +12,8 @@ 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
 COPY . /opt/kcc
-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 && \
-    cat /opt/kcc/kindlecomicconverter/__init__.py | grep version | awk '{print $3}' | sed "s/'//g" > /IMAGE_VERSION
+RUN cat /opt/kcc/kindlecomicconverter/__init__.py | grep version | awk '{print $3}' | sed "s/'//g" > /IMAGE_VERSION

 ENTRYPOINT ["/opt/kcc/kcc-c2e.py"]
 CMD ["-h"]
--- a/162
+++ b/162
@@ -0,0 +1,162 @@
+FROM --platform=linux/amd64 python:3.11-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 python3-pyqt5 && \
+    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.11-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"]
+
+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+=(python3-pyqt5) && \
+    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 pip install -r /opt/kcc/requirements.txt && \
+    python -m venv /opt/venv && \
+    python -m pip install --upgrade pillow python-slugify psutil raven mozjpeg-lossless-optimization
+
+
+######################################################################################
+
+FROM --platform=linux/arm/v7 python:3.11-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"]
+
+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+=(python3-pyqt5) && \
+    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 pip install -r /opt/kcc/requirements.txt && \
+    python -m venv /opt/venv && \
+    python -m pip install --upgrade pillow python-slugify psutil raven mozjpeg-lossless-optimization
+
+
+######################################################################################
+FROM --platform=linux/amd64 python:3.11-slim-bullseye as build-amd64
+COPY --from=compile-amd64 /opt/venv /opt/venv
+
+FROM --platform=linux/arm64 python:3.11-slim-bullseye as build-arm64
+COPY --from=compile-arm64 /opt/venv /opt/venv
+
+FROM --platform=linux/arm/v7 python:3.11-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-20230514 > /IMAGE_VERSION
+
--- a/README.md
+++ b/README.md
@@ -1,16 +1,10 @@
 # KCC

-[![GitHub release](https://img.shields.io/github/v/release/ciromattia/kcc?display_name=tag&include_prereleases&label=pre-release)](https://github.com/ciromattia/kcc/releases) 
-[![PyPI](https://img.shields.io/github/v/release/darodi/kcc?display_name=tag&include_prereleases&label=testPypi)](https://test.pypi.org/project/KindleComicConverterDarodi/) 
-
-[![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) 
-
-[//]: # ([![AUR]&#40;https://img.shields.io/aur/version/kcc-beta.svg?color=orange&#41;]&#40;https://aur.archlinux.org/packages/kcc-beta&#41;)


 [![GitHub release](https://img.shields.io/github/release/ciromattia/kcc.svg)](https://github.com/ciromattia/kcc/releases) 
-[![PyPI](https://img.shields.io/pypi/v/KindleComicConverter.svg)](https://pypi.python.org/pypi/KindleComicConverter) 
-[![AUR](https://img.shields.io/aur/version/kcc.svg)](https://aur.archlinux.org/packages/kcc/)
+[![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) 
+

 **Kindle Comic Converter** is a Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ.
 It was initially developed for Kindle but since version 4.6 it outputs valid EPUB 3.0 so _**despite its name, KCC is
@@ -38,138 +32,18 @@ If you find **KCC** valuable you can consider donating to the authors:

 ## INSTALLATION 

-
-
 ### BINARY RELEASES
 You can find the latest binary at the following link:

 - **https://github.com/ciromattia/kcc/releases**
-
+- flatpak : https://flathub.org/apps/details/io.github.ciromattia.kcc
+- Docker: https://github.com/ciromattia/kcc/pkgs/container/kcc

 ~~- **[Windows](http://kcc.iosphe.re/Windows/) (64-bit only)**~~  
 ~~- **[macOS](http://kcc.iosphe.re/OSX/) (10.14+)**~~  
-~~- **Linux:** Currently unavailable.~~  
-
-
-
-#### MacOS installation    
-##### x86_64 version
-see: KindleComicConverter_osx_*.dmg in **https://github.com/ciromattia/kcc/releases**   
-If you can't open the last beta and the OS says it's damaged, fix it with:
-```
-xattr -d com.apple.quarantine /Applications/Kindle\ Comic\ Converter.app
-```
-
-##### M1/M2 arm64 version
-
-Building is not available in github on M1 arch.  
-See this building method, to build it locally:  
-_Originally posted by @celogeek in https://github.com/darodi/kcc/issues/4#issuecomment-1364553511_
-      
-
-If you can't open the last beta and the OS says it's damaged, fix it with:
-```
-xattr -d com.apple.quarantine /Applications/Kindle\ Comic\ Converter.app
-```
-
-Or you could also have a look at this other project:
-https://github.com/celogeek/go-comic-converter
-
-#### Linux installation    
- - make binary executable  
-    ```bash
-    $ chmod a+x kcc_linux
-    ```
- - install 7zip
-   ```bash
-   $ sudo apt-get install -y p7zip-full
-   ```
- - Download kindlegen
-   ```bash
-   $ wget -qO- https://archive.org/download/kindlegen_linux_2_6_i386_v2_9/kindlegen_linux_2.6_i386_v2_9.tar.gz | tar xvz kindlegen
-   ```
-  - copy kindlegen into '/usr/local/bin' and grant execute permissions for MOBI conversion.
-    ```bash
-    $ sudo cp -R kindlegen /usr/local/bin && sudo chmod a+x /usr/local/bin/kindlegen 
-    ```
- - run with backend x11 or it might not work with fedora
-    ```bash
-    $ GDK_BACKEND=x11 ./kcc_linux
-    ```
-
-
-
-
-
-
-### PYPI
-**KCC** is also available on PyPI.  
-On Debian based distributions these two commands should install all needed dependencies:
-```bash
-$ sudo apt-get install python3 python3-dev python3-pip libpng-dev libjpeg-dev p7zip-full python3-pyqt5
-$ pip3 install --user --upgrade pillow python-slugify psutil pyqt5 raven
-```
-beta version 
-```bash
-$ pip install --index-url https://test.pypi.org/simple/  KindleComicConverterDarodi
-```
-
-stable version
-```bash
-$ pip install --user KindleComicConverter
-```
-
-
-
-
-### APPIMAGE
- install 7zip
-  ```bash
-  $ sudo apt-get install -y p7zip-full
-  ```
- Download kindlegen
-  ```bash
-  $ wget -qO- https://archive.org/download/kindlegen_linux_2_6_i386_v2_9/kindlegen_linux_2.6_i386_v2_9.tar.gz | tar xvz kindlegen
-  ```
- copy kindlegen into '/usr/local/bin' and grant execute permissions for MOBI conversion.
-  ```bash
-  $ sudo cp -R kindlegen /usr/local/bin && sudo chmod a+x /usr/local/bin/kindlegen 
-  ```
- make appImage executable
-    ```bash
-    $ chmod a+x kindleComicConverter-latest-x86_64.AppImage
-    ```
- run with backend x11 or it might not work with fedora
-    ```bash
-    $ GDK_BACKEND=x11 ./kindleComicConverter-latest-x86_64.AppImage
-    ```
-
-
-### DOCKER
-
-install kindlegen in your working directory and get last docker image
-```bash
-$ wget -qO- https://archive.org/download/kindlegen_linux_2_6_i386_v2_9/kindlegen_linux_2.6_i386_v2_9.tar.gz | tar xvz kindlegen
-```
-```bash
-$ docker pull ghcr.io/ciromattia/kcc:latest
-```
-
-execute kcc-c2e
-```bash
-$ docker run --rm -v "$(pwd):/app" ghcr.io/ciromattia/kcc:latest 
-```
-
-example
-```bash
-$ docker run --rm -v "$(pwd):/app" ghcr.io/ciromattia/kcc:latest -p KPW5 ./1.cbz
-```
-
-execute kcc-c2p
-```bash
-$ docker run --entrypoint /opt/kcc/kcc-c2p.py --rm -v "$(pwd):/app" ghcr.io/ciromattia/kcc:latest 
-```
+~~- **Linux:** Currently unavailable.~~

+more information on [installation](https://github.com/ciromattia/kcc/wiki/Installation)

 ### DEPENDENCIES
 Following software is required to run Linux version of **KCC** and/or bare sources:
@@ -181,92 +55,27 @@ Following software is required to run Linux version of **KCC** and/or bare sourc
 - [raven](https://pypi.python.org/pypi/raven) 6.0.0+ (only needed for GUI)

 On Debian based distributions these two commands should install all needed dependencies:
-```bash
-$ sudo apt-get install python3 python3-dev python3-pip libpng-dev libjpeg-dev p7zip-full python3-pyqt5

-$ pip3 install --user --upgrade pillow python-slugify psutil pyqt5 raven
+
+
+```bash
+$ sudo apt-get install -y python3 python3-dev libpng-dev libjpeg-dev p7zip-full p7zip-rar unrar-free libgl1 python3-pyqt5 && \
+    python -m pip install --upgrade pip && \
+    python -m pip install --upgrade -r requirements.txt
 ```

+
 #### Optional dependencies
 - Qt platform integration plugin for Deepin Desktop Environment
 ```bash
 $ sudo apt-get install qt5dxcb-plugin
 ```

- KindleGen ~~[deprecated link](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211)~~ v2.9+ in a directory reachable by your _PATH_ or in _KCC_ directory *(For MOBI generation)
- – which offers a command line interface and supports [Linux](https://archive.org/details/kindlegen2.9) [(mirror1)](https://archive.org/download/kindlegen_linux_2_6_i386_v2_9/kindlegen_linux_2.6_i386_v2_9.tar.gz), [Mac OSX](https://web.archive.org/web/20190905040839/https://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211) and [Windows](https://archive.org/details/kindlegen_win32_v2_9) – has been deprecated, but binaries can still be found on the internet.
+- KindleGen ~~[deprecated link](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211)~~ v2.9+ in a directory reachable by your _PATH_ or in _KCC_ directory *(For MOBI generation) 
+  - It can be found in [Kindle Previewer](https://www.amazon.com/Kindle-Previewer/b?ie=UTF8&node=21381691011)
+    `Amazon Kindle Previewer 3 Folder\lib\fc\bin`, the usual location in windows is in windows is `C:\Users\user\AppData\Local\Amazon\Kindle Previewer 3\lib\fc\bin\`
 - [7z](http://www.7-zip.org/download.html) *(For CBZ/ZIP, CBR/RAR, 7z/CB7 support)*
-
-### INSTALL FROM SOURCES
-
-_Originally posted by @hhtien1408 in https://github.com/ciromattia/kcc/issues/438#issuecomment-1281159452_
-
-```bash
-$ git clone https://github.com/ciromattia/kcc.git
-```
-On Debian based distributions these two commands should install all needed dependencies:
-```bash
-$ sudo apt-get install python3 python3-dev python3-pip libpng-dev libjpeg-dev p7zip-full python3-pyqt5
-```
-Then install the necessary packages. You can do it by running the following command. The requirements.txt file is inside this repository, you will see it when you clone the repo.
-
-```bash
-$ pip3 install -r 'requirements.txt' 
-```
-
-This should install the required packages. You can check the version by running
-
-```bash
-$ pip3 freeze
-```
-
-If the packages are in the wrong version, you can try to upgrade them by running
-
-```bash
-$ pip3 install --upgrade name_of_the_package
-```
-
-Download kindlegen.
-
-```bash
-$ wget https://archive.org/download/kindlegen_linux_2_6_i386_v2_9/kindlegen_linux_2.6_i386_v2_9.tar.gz | tar xvzf kindlegen
-```
-Copy kindlegen into '/usr/local/bin' and grant execute permissions for MOBI conversion.
-
-```bash
-$ sudo cp -R '/home/user/Desktop/kindlegen' '/usr/local/bin'
-
-$ sudo chmod +rwx '/usr/local/bin/kindlegen' 
-```
-
-
-Run python file for KCC GUI
-```bash
-$ python3 kcc.py
-```
-
-If everything goes well, you now should be able to use it. 
-
-Create destop file in '~/.local/share/applications' with codes:
-
-```
-#!/usr/bin/env xdg-open
-
-[Desktop Entry]
-Type=Application
-Name=Kindle Comic Converter
-Icon=kcc
-Exec=python3 '/home/user/kcc/kcc.py'
-Terminal=false
-StartupWMClass=kcc
-Name[en_US]=Kindle Comic Converter
-```
-
-Copy icon file into '/home/user/.local/share/icons'
-
-```bash
-$ sudo cp -R 'icons/comic2ebook.png' '/home/user/.local/share/icons'
-```
+- Unrar (no rar in 7z on Fedora)



@@ -278,6 +87,8 @@ $ sudo cp -R 'icons/comic2ebook.png' '/home/user/.local/share/icons'
 - CB7, 7Z *(With `7z` executable)*
 - PDF *(Only extracting JPG images)*

+Add 7z to PATH via `setx path "%path%;C:\Program Files\7-Zip"`
+
 ## USAGE

 Should be pretty self-explanatory. All options have detailed information in tooltips.
@@ -325,85 +136,81 @@ sudo apt-get install python3 p7zip-full python3-pil python3-psutil python3-slugi
 ### Standalone `kcc-c2e.py` usage:

 ```
-Usage: kcc-c2e [options] comic_file|comic_folder
+usage: kcc-c2e [options] [input]

-Options:
-  MAIN:
-    -p PROFILE, --profile=PROFILE
-                        Device profile (Available options: K1, K2, K34, K578,
-                        KDX, KPW, KPW5, KV, KO, K11, KS, KoMT, KoG, KoGHD,
-                        KoA, KoAHD, KoAH2O, KoAO, KoN, KoC, KoL, KoF, KoS,
-                        KoE) [Default=KV]
-    -m, --manga-style   Manga style (right-to-left reading and splitting)
-    -q, --hq            Try to increase the quality of magnification
-    -2, --two-panel     Display two not four panels in Panel View mode
-    -w, --webtoon       Webtoon processing mode
-    --targetsize=TARGETSIZE
-                        the maximal size of output file in MB. [Default=100MB
-                        for webtoon and 400MB for others]
+MANDATORY:
+  input                 Full path to comic folder or file(s) to be processed.

-  OUTPUT SETTINGS:
-    -o OUTPUT, --output=OUTPUT
-                        Output generated file to specified directory or file
-    -t TITLE, --title=TITLE
-                        Comic title [Default=filename or directory name]
-    -f FORMAT, --format=FORMAT
-                        Output format (Available options: Auto, MOBI, EPUB,
-                        CBZ, KFX, MOBI+EPUB) [Default=Auto]
-    -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]
+MAIN:
+  -p PROFILE, --profile PROFILE
+                        Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KPW5, KV, KO, K11, KS, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O, KoAO, KoN, KoC, KoL, KoF, KoS, KoE) [Default=KV]
+  -m, --manga-style     Manga style (right-to-left reading and splitting)
+  -q, --hq              Try to increase the quality of magnification
+  -2, --two-panel       Display two not four panels in Panel View mode
+  -w, --webtoon         Webtoon processing mode
+  --ts TARGETSIZE, --targetsize TARGETSIZE
+                        the maximal size of output file in MB. [Default=100MB for webtoon and 400MB for others]

-  PROCESSING:
-    -n, --noprocessing  Do not modify image and ignore any profil 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]
-    -c CROPPING, --cropping=CROPPING
-                        Set cropping mode. 0: Disabled 1: Margins 2: Margins +
-                        page numbers [Default=2]
-    --cp=CROPPINGP, --croppingpower=CROPPINGP
+PROCESSING:
+  -n, --noprocessing    Do not modify image and ignore any profil 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]
+  -c CROPPING, --cropping CROPPING
+                        Set cropping mode. 0: Disabled 1: Margins 2: Margins + page numbers [Default=2]
+  --cp CROPPINGP, --croppingpower CROPPINGP
                        Set cropping power [Default=1.0]
-    --blackborders      Disable autodetection and force black borders
-    --whiteborders      Disable autodetection and force white borders
-    --forcecolor        Don't convert images to grayscale
-    --forcepng          Create PNG files instead JPEG
-    --mozjpeg           Create JPEG files using mozJpeg
-    --maximizestrips    Turn 1x4 strips to 2x2 strips
+  --cm CROPPINGM, --croppingminimum CROPPINGM
+                        Set cropping minimum area ratio [Default=0.0]
+  --blackborders        Disable autodetection and force black borders
+  --whiteborders        Disable autodetection and force white borders
+  --forcecolor          Don't convert images to grayscale
+  --forcepng            Create PNG files instead JPEG
+  --mozjpeg             Create JPEG files using mozJpeg
+  --maximizestrips      Turn 1x4 strips to 2x2 strips
+  -d, --delete          Delete source file(s) or a directory. It's not recoverable.

-  CUSTOM PROFILE:
-    --customwidth=CUSTOMWIDTH
+OUTPUT SETTINGS:
+  -o OUTPUT, --output OUTPUT
+                        Output generated file to specified directory or file
+  -t TITLE, --title TITLE
+                        Comic title [Default=filename or directory name]
+  -f FORMAT, --format FORMAT
+                        Output format (Available options: Auto, MOBI, EPUB, CBZ, KFX, MOBI+EPUB) [Default=Auto]
+  -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]
+
+CUSTOM PROFILE:
+  --customwidth CUSTOMWIDTH
                        Replace screen width provided by device profile
-    --customheight=CUSTOMHEIGHT
+  --customheight CUSTOMHEIGHT
                        Replace screen height provided by device profile

-  OTHER:
-    -h, --help          Show this help message and exit
+OTHER:
+  -h, --help            Show this help message and exit
+
 ```

 ### Standalone `kcc-c2p.py` usage:

 ```
-Usage: kcc-c2p [options] comic_folder
+usage: kcc-c2p [options] [input]

-Options:
-  MANDATORY:
-    -y HEIGHT, --height=HEIGHT
+MANDATORY:
+  input                 Full path to comic folder(s) to be processed. Separate multiple inputs with spaces.
+
+MAIN:
+  -y HEIGHT, --height HEIGHT
                        Height of the target device screen
-    -i, --in-place      Overwrite source directory
-    -m, --merge         Combine every directory into a single image before
-                        splitting
+  -i, --in-place        Overwrite source directory
+  -m, --merge           Combine every directory into a single image before splitting

-  OTHER:
-    -d, --debug         Create debug file for every split image
-    -h, --help          Show this help message and exit
+OTHER:
+  -d, --debug           Create debug file for every split image
+  -h, --help            Show this help message and exit
 ```

 ## CREDITS
--- a/environment.yml
+++ b/environment.yml
@@ -0,0 +1,15 @@
+name: kcc
+channels:
+  - conda-forge
+  - defaults
+dependencies:
+  - python=3.8
+  - Pillow>=5.2.0
+  - psutil>=5.0.0
+  - python-slugify>=1.2.1
+  - raven>=6.0.0
+  - distro
+  - pip
+  - pip:
+    - mozjpeg-lossless-optimization>=1.1.2
+    - PyQt5>=5.6.0
--- a/gui/KCC.ui
+++ b/gui/KCC.ui
@@ -175,10 +175,20 @@
         </property>
        </widget>
       </item>
+       <item row="4" column="1">
+        <widget class="QCheckBox" name="deleteBox">
+         <property name="toolTip">
+          <string>Delete input file(s) or directory. It's not recoverable!</string>
+         </property>
+         <property name="text">
+          <string>Delete input</string>
+         </property>
+        </widget>
+       </item>
       <item row="4" column="2">
        <widget class="QCheckBox" name="disableProcessingBox">
         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Do not process any image, ignore profil and processing options&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;pre style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Do not process any image, ignore profile and processing options&lt;/pre&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Disable processing</string>
@@ -257,7 +267,7 @@
       <item>
        <widget class="QSlider" name="croppingPowerSlider">
         <property name="maximum">
-          <number>10</number>
+          <number>200</number>
         </property>
         <property name="singleStep">
          <number>1</number>
@@ -600,6 +610,7 @@
  <tabstop>croppingBox</tabstop>
  <tabstop>mozJpegBox</tabstop>
  <tabstop>maximizeStrips</tabstop>
+  <tabstop>deleteBox</tabstop>
  <tabstop>disableProcessingBox</tabstop>
  <tabstop>editorButton</tabstop>
  <tabstop>wikiButton</tabstop>
--- a/kcc-c2e.py
+++ b/kcc-c2e.py
@@ -19,8 +19,9 @@
 # PERFORMANCE OF THIS SOFTWARE.

 import sys
-if sys.version_info[0] != 3:
-    print('ERROR: This is Python 3 script!')
+
+if sys.version_info < (3, 8, 0):
+    print('ERROR: This is a Python 3.8+ script!')
    exit(1)

 from multiprocessing import freeze_support, set_start_method
--- a/kcc-c2e.spec
+++ b/kcc-c2e.spec
@@ -0,0 +1,39 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(['kcc-c2e.py'],
+             pathex=['.'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,  
+          [],
+          name='kcc-c2e',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=False,
+          upx_exclude=[],
+          runtime_tmpdir=None,
+          console=True,
+          disable_windowed_traceback=False,
+          target_arch=None,
+          codesign_identity=None,
+          entitlements_file=None , icon='icons\\comic2ebook.ico')
--- a/kcc-c2p.py
+++ b/kcc-c2p.py
@@ -19,8 +19,9 @@
 # PERFORMANCE OF THIS SOFTWARE.

 import sys
-if sys.version_info[0] != 3:
-    print('ERROR: This is Python 3 script!')
+
+if sys.version_info < (3, 8, 0):
+    print('ERROR: This is a Python 3.8+ script!')
    exit(1)

 from multiprocessing import freeze_support, set_start_method
--- a/kcc-c2p.spec
+++ b/kcc-c2p.spec
@@ -0,0 +1,39 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(['kcc-c2p.py'],
+             pathex=['.'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,  
+          [],
+          name='kcc-c2p',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=False,
+          upx_exclude=[],
+          runtime_tmpdir=None,
+          console=True,
+          disable_windowed_traceback=False,
+          target_arch=None,
+          codesign_identity=None,
+          entitlements_file=None , icon='icons\\comic2ebook.ico')
--- a/kcc.py
+++ b/kcc.py
@@ -19,8 +19,9 @@
 # PERFORMANCE OF THIS SOFTWARE.

 import sys
-if sys.version_info[0] != 3:
-    print('ERROR: This is Python 3 script!')
+
+if sys.version_info < (3, 8, 0):
+    print('ERROR: This is a Python 3.8+ script!')
    exit(1)

 # OS specific workarounds
@@ -28,16 +29,20 @@ import os
 if sys.platform.startswith('darwin'):
    if getattr(sys, 'frozen', False):
        os.environ['PATH'] = os.path.dirname(os.path.abspath(sys.executable)) + \
-                             '/../Resources:/Applications/Kindle Comic Creator/Kindle Comic Creator.app/Contents/' \
-                             'MacOS:/usr/local/bin:/usr/bin:/bin'
+                             '/../Resources:/Applications/Kindle Comic Creator/Kindle Comic Creator.app/Contents/MacOS:' \
+                             '/Applications/Kindle Previewer 3.app/Contents/lib/fc/bin/:/usr/local/bin:/usr/bin:/bin'
        os.chdir(os.path.dirname(os.path.abspath(sys.executable)) + '/../Resources')
    else:
        os.chdir(os.path.dirname(os.path.abspath(__file__)))
 elif sys.platform.startswith('win'):
    if getattr(sys, 'frozen', False):
+        os.environ['PATH'] = '%LOCALAPPDATA%\\Amazon\\Kindle Previewer 3\\lib\\fc\\bin\\;' + \
+                             os.environ['PATH']
        os.chdir(os.path.dirname(os.path.abspath(sys.executable)))
    else:
-        os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/windows/;' + os.environ['PATH']
+        os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/windows/;' \
+                             '%LOCALAPPDATA%\\Amazon\\Kindle Previewer 3\\lib\\fc\\bin\\;' + \
+                             os.environ['PATH']
        os.chdir(os.path.dirname(os.path.abspath(__file__)))
 # Load additional Sentry configuration
 # if getattr(sys, 'frozen', False):
--- a/kcc.spec
+++ b/kcc.spec
@@ -0,0 +1,39 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(['kcc.py'],
+             pathex=['.'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,  
+          [],
+          name='kcc',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=False,
+          upx_exclude=[],
+          runtime_tmpdir=None,
+          console=False,
+          disable_windowed_traceback=False,
+          target_arch=None,
+          codesign_identity=None,
+          entitlements_file=None , icon='icons\\comic2ebook.ico')
--- a/kindlecomicconverter/KCC_gui.py
+++ b/kindlecomicconverter/KCC_gui.py
@@ -16,11 +16,12 @@
 # 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 json
 import os
+import re
 import sys
 from urllib.parse import unquote
-from urllib.request import urlretrieve
+from urllib.request import urlretrieve, urlopen
 from time import sleep
 from shutil import move, rmtree
 from subprocess import STDOUT, PIPE
@@ -142,64 +143,27 @@ class VersionThread(QtCore.QThread):
        self.wait()

    def run(self):
-        # TODO adapt with github releases
-        pass
+        try:
+            last_version_url = urlopen("https://api.github.com/repos/ciromattia/kcc/releases/latest")
+            data = last_version_url.read()
+            encoding = last_version_url.info().get_content_charset('utf-8')
+            json_parser = json.loads(data.decode(encoding))

-        # try:
-        #     XML = parse(urlopen(Request('https://kcc.iosphe.re/Version/',
-        #                                 headers={'User-Agent': 'KindleComicConverter/' + __version__})))
-        # except Exception:
-        #     return
-        # latestVersion = XML.childNodes[0].getElementsByTagName('LatestVersion')[0].childNodes[0].toxml()
-        # if ("beta" not in __version__ and StrictVersion(latestVersion) > StrictVersion(__version__)) \
-        #         or ("beta" in __version__
-        #             and StrictVersion(latestVersion) >= StrictVersion(re.sub(r'-beta.*', '', __version__))):
-        #     if sys.platform.startswith('win'):
-        #         self.newVersion = latestVersion
-        #         self.md5 = XML.childNodes[0].getElementsByTagName('MD5')[0].childNodes[0].toxml()
-        #         MW.showDialog.emit('<b>New version released!</b> <a href="https://github.com/ciromattia/kcc/releases/">'
-        #                            'See changelog.</a><br/><br/>Installed version: ' + __version__ +
-        #                            '<br/>Current version: ' + latestVersion +
-        #                            '<br/><br/>Would you like to start automatic update?', 'question')
-        #         self.getNewVersion()
-        #     else:
-        #         MW.addMessage.emit('<a href="https://kcc.iosphe.re/">'
-        #                            '<b>The new version is available!</b></a> '
-        #                            '(<a href="https://github.com/ciromattia/kcc/releases/">'
-        #                            'Changelog</a>)', 'warning', False)
+            html_url = json_parser["html_url"]
+            latest_version = json_parser["tag_name"]
+            latest_version = re.sub(r'^v', "", latest_version)
+
+            if ("b" not in __version__ and StrictVersion(latest_version) > StrictVersion(__version__)) \
+                    or ("b" in __version__
+                        and StrictVersion(latest_version) >= StrictVersion(re.sub(r'b.*', '', __version__))):
+                MW.addMessage.emit('<a href="' + html_url + '"><b>The new version is available!</b></a>', 'warning',
+                                   False)
+        except Exception:
+            return

    def setAnswer(self, dialoganswer):
        self.answer = dialoganswer

-    def getNewVersion(self):
-        while self.answer is None:
-            sleep(1)
-        if self.answer == QtWidgets.QMessageBox.Yes:
-            try:
-                MW.modeConvert.emit(-1)
-                MW.progressBarTick.emit('Downloading update')
-                path = urlretrieve('https://kcc.iosphe.re/Windows/KindleComicConverter_win_' +
-                                   self.newVersion + '.exe', reporthook=self.getNewVersionTick)
-                if self.md5 != md5Checksum(path[0]):
-                    raise Exception
-                move(path[0], path[0] + '.exe')
-                MW.hideProgressBar.emit()
-                MW.modeConvert.emit(1)
-                Popen(path[0] + '.exe  /SP- /silent /noicons', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
-                MW.forceShutdown.emit()
-            except Exception:
-                MW.addMessage.emit('Failed to download the update!', 'warning', False)
-                MW.hideProgressBar.emit()
-                MW.modeConvert.emit(1)
-
-    def getNewVersionTick(self, size, blocksize, totalsize):
-        progress = int((size / (totalsize // blocksize)) * 100)
-        if size == 0:
-            MW.progressBarTick.emit('100')
-        if progress > self.barProgress:
-            self.barProgress = progress
-            MW.progressBarTick.emit('tick')
-

 class ProgressThread(QtCore.QThread):
    def __init__(self):
@@ -255,7 +219,7 @@ class WorkerThread(QtCore.QThread):
        MW.modeConvert.emit(0)

        parser = comic2ebook.makeParser()
-        options, _ = parser.parse_args()
+        options = parser.parse_args()
        argv = ''
        currentJobs = []

@@ -294,6 +258,8 @@ class WorkerThread(QtCore.QThread):
            options.maximizestrips = True
        if GUI.disableProcessingBox.isChecked():
            options.noprocessing = True
+        if GUI.deleteBox.isChecked():
+            options.delete = True
        if GUI.mozJpegBox.checkState() == 1:
            options.forcepng = True
        elif GUI.mozJpegBox.checkState() == 2:
@@ -504,7 +470,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
            fnames = QtWidgets.QFileDialog.getOpenFileNames(MW, 'Select file', self.lastPath,
                                                            'Comic (*.cbz *.cbr *.cb7 *.zip *.rar *.7z *.pdf);;All (*.*)')
        else:
-            fnames = QtWidgets.QFileDialog.getOpenFileNames(MW, 'Select file', self.lastPath, 'Comic (*.pdf);;All (*.*)')
+            fnames = QtWidgets.QFileDialog.getOpenFileNames(MW, 'Select file', self.lastPath,
+                                                            'Comic (*.pdf);;All (*.*)')
        for fname in fnames[0]:
            if fname != '':
                if sys.platform.startswith('win'):
@@ -615,7 +582,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):

    def togglecroppingBox(self, value):
        if value:
-             GUI.croppingWidget.setVisible(True)
+            GUI.croppingWidget.setVisible(True)
        else:
            GUI.croppingWidget.setVisible(False)
            self.changeCroppingPower(100)  # 1.0
@@ -729,8 +696,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
            QtWidgets.QMessageBox.critical(MW, 'KCC - Error', message, QtWidgets.QMessageBox.Ok)
        elif kind == 'question':
            GUI.versionCheck.setAnswer(QtWidgets.QMessageBox.question(MW, 'KCC - Question', message,
-                                                                          QtWidgets.QMessageBox.Yes,
-                                                                          QtWidgets.QMessageBox.No))
+                                                                      QtWidgets.QMessageBox.Yes,
+                                                                      QtWidgets.QMessageBox.No))

    def updateProgressbar(self, command):
        if command == 'tick':
@@ -786,7 +753,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                    if sys.platform.startswith('win'):
                        self.addMessage('Download it and place EXE in KCC directory.', 'error')
                    elif sys.platform.startswith('darwin'):
-                        self.addMessage('Install it using <a href="http://brew.sh/">Brew</a>.', 'error')
+                        self.addMessage('Install it using <a href="http://brew.sh/">Homebrew</a>.', 'error')
                    else:
                        self.addMessage('Download it and place executable in /usr/local/bin directory.', 'error')
                    self.needClean = True
@@ -823,6 +790,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                                           'mozJpegBox': GUI.mozJpegBox.checkState(),
                                           'widthBox': GUI.widthBox.value(),
                                           'heightBox': GUI.heightBox.value(),
+                                           'deleteBox': GUI.deleteBox.checkState(),
                                           'maximizeStrips': GUI.maximizeStrips.checkState(),
                                           'gammaSlider': float(self.gammaValue) * 100})
        self.settings.sync()
@@ -896,8 +864,9 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
                if sys.platform.startswith('win'):
                    self.addMessage('Download it and place EXE in KCC directory.', 'error')
                elif sys.platform.startswith('darwin'):
-                    self.addMessage('Install it using <a href="http://brew.sh/">Brew</a>: <i>brew cask install kindle-c'
-                                    'omic-creator</i>', 'error')
+                    self.addMessage('Install it using <a href="http://brew.sh/">Homebrew</a>: '
+                                    '<i>brew install --cask kindle-comic-creator</i> or '
+                                    '<i>brew install --cask kindle-previewer</i>', 'error')
                else:
                    self.addMessage('Download it and place executable in /usr/local/bin directory.', 'error')

@@ -1071,7 +1040,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
            self.sevenzip = True
        else:
            self.sevenzip = False
-            self.addMessage('Cannot find <a href="http://www.7-zip.org/download.html">7z</a>!'
+            self.addMessage('Add <a href="http://www.7-zip.org/download.html">7z</a> to PATH!'
                            ' Processing of archives will be disabled.', 'warning')
        self.detectKindleGen(True)

@@ -1149,7 +1118,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
        self.versionCheck.start()
        self.tray.show()

-        # Cleanup unfisnished conversion
+        # Cleanup unfinished conversion
        for root, dirs, _ in walkLevel(gettempdir(), 0):
            for tempdir in dirs:
                if tempdir.startswith('KCC-'):
--- a/kindlecomicconverter/KCC_ui.py
+++ b/kindlecomicconverter/KCC_ui.py
@@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file 'gui/KCC.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.7
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -70,6 +70,9 @@ class Ui_mainWindow(object):
        self.croppingBox.setTristate(True)
        self.croppingBox.setObjectName("croppingBox")
        self.gridLayout_2.addWidget(self.croppingBox, 3, 2, 1, 1)
+        self.deleteBox = QtWidgets.QCheckBox(self.optionWidget)
+        self.deleteBox.setObjectName("deleteBox")
+        self.gridLayout_2.addWidget(self.deleteBox, 4, 1, 1, 1)
        self.disableProcessingBox = QtWidgets.QCheckBox(self.optionWidget)
        self.disableProcessingBox.setObjectName("disableProcessingBox")
        self.gridLayout_2.addWidget(self.disableProcessingBox, 4, 2, 1, 1)
@@ -254,7 +257,8 @@ class Ui_mainWindow(object):
        mainWindow.setTabOrder(self.colorBox, self.croppingBox)
        mainWindow.setTabOrder(self.croppingBox, self.mozJpegBox)
        mainWindow.setTabOrder(self.mozJpegBox, self.maximizeStrips)
-        mainWindow.setTabOrder(self.maximizeStrips, self.disableProcessingBox)
+        mainWindow.setTabOrder(self.maximizeStrips, self.deleteBox)
+        mainWindow.setTabOrder(self.deleteBox, self.disableProcessingBox)
        mainWindow.setTabOrder(self.disableProcessingBox, self.editorButton)
        mainWindow.setTabOrder(self.editorButton, self.wikiButton)
        mainWindow.setTabOrder(self.wikiButton, self.jobList)
@@ -290,7 +294,9 @@ class Ui_mainWindow(object):
        self.maximizeStrips.setText(_translate("mainWindow", "1x4 to 2x2 strips"))
        self.croppingBox.setToolTip(_translate("mainWindow", "<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>"))
        self.croppingBox.setText(_translate("mainWindow", "Cropping mode"))
-        self.disableProcessingBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Do not process any image, ignore profil and processing options</p></body></html>"))
+        self.deleteBox.setToolTip(_translate("mainWindow", "Delete input file(s) or directory. It\'s not recoverable!"))
+        self.deleteBox.setText(_translate("mainWindow", "Delete input"))
+        self.disableProcessingBox.setToolTip(_translate("mainWindow", "<html><head/><body><pre style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Do not process any image, ignore profile and processing options</pre></body></html>"))
        self.disableProcessingBox.setText(_translate("mainWindow", "Disable processing"))
        self.gammaLabel.setText(_translate("mainWindow", "Gamma: Auto"))
        self.croppingPowerLabel.setText(_translate("mainWindow", "Cropping power:"))
--- a/kindlecomicconverter/init.py
+++ b/kindlecomicconverter/init.py
@@ -1,4 +1,4 @@
-__version__ = '5.6.1'
+__version__ = '5.6.2'
 __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
@@ -20,6 +20,7 @@

 import os
 import sys
+from argparse import ArgumentParser
 from time import strftime, gmtime
 from copy import copy
 from glob import glob, escape
@@ -28,10 +29,9 @@ from stat import S_IWRITE, S_IREAD, S_IEXEC
 from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
 from tempfile import mkdtemp, gettempdir, TemporaryFile
 from shutil import move, copytree, rmtree, copyfile
-from optparse import OptionParser, OptionGroup
 from multiprocessing import Pool
 from uuid import uuid4
-from slugify import slugify as slugifyExt
+from slugify import slugify as slugify_ext
 from PIL import Image
 from subprocess import STDOUT, PIPE
 from psutil import Popen, virtual_memory, disk_usage
@@ -54,23 +54,23 @@ from . import __version__
 def main(argv=None):
    global options
    parser = makeParser()
-    optionstemplate, args = parser.parse_args(argv)
-    if len(args) == 0:
+    args = parser.parse_args(argv)
+    options = copy(args)
+    if not argv or options.input == []:
        parser.print_help()
        return 0
    if sys.platform.startswith('win'):
-        sources = set([source for arg in args for source in glob(escape(arg))])
+        sources = set([source for option in options.input for source in glob(escape(option))])
    else:
-        sources = set(args)
+        sources = set(options.input)
    if len(sources) == 0:
        print('No matching files found.')
        return 1
    for source in sources:
        source = source.rstrip('\\').rstrip('/')
-        options = copy(optionstemplate)
+        options = copy(args)
        options = checkOptions(options)
-        if len(sources) > 1:
-            print('Working on ' + source + '...')
+        print('Working on ' + source + '...')
        makeBook(source)
    return 0

@@ -546,7 +546,7 @@ def imgDirectoryProcessing(path):
        GUI.progressBarTick.emit(str(pagenumber))
    if len(work) > 0:
        for i in work:
-            workerPool.apply_async(func=imgFileProcessing, args=(i, ), callback=imgFileProcessingTick)
+            workerPool.apply_async(func=imgFileProcessing, args=(i,), callback=imgFileProcessingTick)
        workerPool.close()
        workerPool.join()
        if GUI and not GUI.conversionAlive:
@@ -910,9 +910,9 @@ def createNewTome():

 def slugify(value, isdir):
    if isdir:
-        value = slugifyExt(value, regex_pattern=r'[^-a-z0-9_\.]+').strip('.')
+        value = slugify_ext(value, regex_pattern=r'[^-a-z0-9_\.]+').strip('.')
    else:
-        value = slugifyExt(value).strip('.')
+        value = slugify_ext(value).strip('.')
    value = sub(r'0*([0-9]{4,})', r'\1', sub(r'([0-9]+)', r'0000\1', value, count=2))
    return value

@@ -933,82 +933,84 @@ def makeZIP(zipfilename, basedir, isepub=False):


 def makeParser():
-    psr = OptionParser(usage="Usage: kcc-c2e [options] comic_file|comic_folder", add_help_option=False)
+    psr = ArgumentParser(prog="kcc-c2e", usage="kcc-c2e [options] [input]", add_help=False)

-    mainOptions = OptionGroup(psr, "MAIN")
-    processingOptions = OptionGroup(psr, "PROCESSING")
-    outputOptions = OptionGroup(psr, "OUTPUT SETTINGS")
-    customProfileOptions = OptionGroup(psr, "CUSTOM PROFILE")
-    otherOptions = OptionGroup(psr, "OTHER")
+    mandatory_options = psr.add_argument_group("MANDATORY")
+    main_options = psr.add_argument_group("MAIN")
+    processing_options = psr.add_argument_group("PROCESSING")
+    output_options = psr.add_argument_group("OUTPUT SETTINGS")
+    custom_profile_options = psr.add_argument_group("CUSTOM PROFILE")
+    other_options = psr.add_argument_group("OTHER")

-    mainOptions.add_option("-p", "--profile", action="store", dest="profile", default="KV",
-                           help="Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KPW5, KV, KO, "
-                                "K11, KS, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O, KoAO, KoN, KoC, KoL, KoF, KoS, KoE)"
-                                " [Default=KV]")
-    mainOptions.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
-                           help="Manga style (right-to-left reading and splitting)")
-    mainOptions.add_option("-q", "--hq", action="store_true", dest="hq", default=False,
-                           help="Try to increase the quality of magnification")
-    mainOptions.add_option("-2", "--two-panel", action="store_true", dest="autoscale", default=False,
-                           help="Display two not four panels in Panel View mode")
-    mainOptions.add_option("-w", "--webtoon", action="store_true", dest="webtoon", default=False,
-                           help="Webtoon processing mode"),
-    mainOptions.add_option("--targetsize", type="int", dest="targetsize", default=None,
-                           help="the maximal size of output file in MB."
-                                " [Default=100MB for webtoon and 400MB for others]")
+    mandatory_options.add_argument("input", action="extend", nargs="*", default=None,
+                                   help="Full path to comic folder or file(s) to be processed.")

-    outputOptions.add_option("-o", "--output", action="store", dest="output", default=None,
-                             help="Output generated file to specified directory or file")
-    outputOptions.add_option("-t", "--title", action="store", dest="title", default="defaulttitle",
-                             help="Comic title [Default=filename or directory name]")
-    outputOptions.add_option("-f", "--format", action="store", dest="format", default="Auto",
-                             help="Output format (Available options: Auto, MOBI, EPUB, CBZ, KFX, MOBI+EPUB) "
-                                  "[Default=Auto]")
-    outputOptions.add_option("-b", "--batchsplit", type="int", dest="batchsplit", default="0",
-                             help="Split output into multiple files. 0: Don't split 1: Automatic mode "
-                                  "2: Consider every subdirectory as separate volume [Default=0]")
+    main_options.add_argument("-p", "--profile", action="store", dest="profile", default="KV",
+                              help="Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KPW5, KV, KO, "
+                                   "K11, KS, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O, KoAO, KoN, KoC, KoL, KoF, KoS, KoE)"
+                                   " [Default=KV]")
+    main_options.add_argument("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
+                              help="Manga style (right-to-left reading and splitting)")
+    main_options.add_argument("-q", "--hq", action="store_true", dest="hq", default=False,
+                              help="Try to increase the quality of magnification")
+    main_options.add_argument("-2", "--two-panel", action="store_true", dest="autoscale", default=False,
+                              help="Display two not four panels in Panel View mode")
+    main_options.add_argument("-w", "--webtoon", action="store_true", dest="webtoon", default=False,
+                              help="Webtoon processing mode"),
+    main_options.add_argument("--ts", "--targetsize", type=int, dest="targetsize", default=None,
+                              help="the maximal size of output file in MB."
+                                   " [Default=100MB for webtoon and 400MB for others]")

-    processingOptions.add_option("-n", "--noprocessing", action="store_true", dest="noprocessing", default=False,
-                                 help="Do not modify image and ignore any profil or processing option")
-    processingOptions.add_option("-u", "--upscale", action="store_true", dest="upscale", default=False,
-                                 help="Resize images smaller than device's resolution")
-    processingOptions.add_option("-s", "--stretch", action="store_true", dest="stretch", default=False,
-                                 help="Stretch images to device's resolution")
-    processingOptions.add_option("-r", "--splitter", type="int", dest="splitter", default="0",
-                                 help="Double page parsing mode. 0: Split 1: Rotate 2: Both [Default=0]")
-    processingOptions.add_option("-g", "--gamma", type="float", dest="gamma", default="0.0",
-                                 help="Apply gamma correction to linearize the image [Default=Auto]")
-    processingOptions.add_option("-c", "--cropping", type="int", dest="cropping", default="2",
-                                 help="Set cropping mode. 0: Disabled 1: Margins 2: Margins + page numbers [Default=2]")
-    processingOptions.add_option("--cp", "--croppingpower", type="float", dest="croppingp", default="1.0",
-                                 help="Set cropping power [Default=1.0]")
-    processingOptions.add_option("--cm", "--croppingminimum", type="float", dest="croppingm", default="0.0",
-                                 help="Set cropping minimum area ratio [Default=0.0]")
-    processingOptions.add_option("--blackborders", action="store_true", dest="black_borders", default=False,
-                                 help="Disable autodetection and force black borders")
-    processingOptions.add_option("--whiteborders", action="store_true", dest="white_borders", default=False,
-                                 help="Disable autodetection and force white borders")
-    processingOptions.add_option("--forcecolor", action="store_true", dest="forcecolor", default=False,
-                                 help="Don't convert images to grayscale")
-    processingOptions.add_option("--forcepng", action="store_true", dest="forcepng", default=False,
-                                 help="Create PNG files instead JPEG")
-    processingOptions.add_option("--mozjpeg", action="store_true", dest="mozjpeg", default=False,
-                                 help="Create JPEG files using mozJpeg")
-    processingOptions.add_option("--maximizestrips", action="store_true", dest="maximizestrips", default=False,
-                                 help="Turn 1x4 strips to 2x2 strips")
-    customProfileOptions.add_option("--customwidth", type="int", dest="customwidth", default=0,
-                                    help="Replace screen width provided by device profile")
-    customProfileOptions.add_option("--customheight", type="int", dest="customheight", default=0,
-                                    help="Replace screen height provided by device profile")
+    output_options.add_argument("-o", "--output", action="store", dest="output", default=None,
+                                help="Output generated file to specified directory or file")
+    output_options.add_argument("-t", "--title", action="store", dest="title", default="defaulttitle",
+                                help="Comic title [Default=filename or directory name]")
+    output_options.add_argument("-f", "--format", action="store", dest="format", default="Auto",
+                                help="Output format (Available options: Auto, MOBI, EPUB, CBZ, KFX, MOBI+EPUB) "
+                                     "[Default=Auto]")
+    output_options.add_argument("-b", "--batchsplit", type=int, dest="batchsplit", default="0",
+                                help="Split output into multiple files. 0: Don't split 1: Automatic mode "
+                                     "2: Consider every subdirectory as separate volume [Default=0]")

-    otherOptions.add_option("-h", "--help", action="help",
-                            help="Show this help message and exit")
+    processing_options.add_argument("-n", "--noprocessing", action="store_true", dest="noprocessing", default=False,
+                                    help="Do not modify image and ignore any profil or processing option")
+    processing_options.add_argument("-u", "--upscale", action="store_true", dest="upscale", default=False,
+                                    help="Resize images smaller than device's resolution")
+    processing_options.add_argument("-s", "--stretch", action="store_true", dest="stretch", default=False,
+                                    help="Stretch images to device's resolution")
+    processing_options.add_argument("-r", "--splitter", type=int, dest="splitter", default="0",
+                                    help="Double page parsing mode. 0: Split 1: Rotate 2: Both [Default=0]")
+    processing_options.add_argument("-g", "--gamma", type=float, dest="gamma", default="0.0",
+                                    help="Apply gamma correction to linearize the image [Default=Auto]")
+    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",
+                                    help="Set cropping power [Default=1.0]")
+    processing_options.add_argument("--cm", "--croppingminimum", type=float, dest="croppingm", default="0.0",
+                                    help="Set cropping minimum area ratio [Default=0.0]")
+    processing_options.add_argument("--blackborders", action="store_true", dest="black_borders", default=False,
+                                    help="Disable autodetection and force black borders")
+    processing_options.add_argument("--whiteborders", action="store_true", dest="white_borders", default=False,
+                                    help="Disable autodetection and force white borders")
+    processing_options.add_argument("--forcecolor", action="store_true", dest="forcecolor", default=False,
+                                    help="Don't convert images to grayscale")
+    processing_options.add_argument("--forcepng", action="store_true", dest="forcepng", default=False,
+                                    help="Create PNG files instead JPEG")
+    processing_options.add_argument("--mozjpeg", action="store_true", dest="mozjpeg", default=False,
+                                    help="Create JPEG files using mozJpeg")
+    processing_options.add_argument("--maximizestrips", action="store_true", dest="maximizestrips", default=False,
+                                    help="Turn 1x4 strips to 2x2 strips")
+    processing_options.add_argument("-d", "--delete", action="store_true", dest="delete", default=False,
+                                    help="Delete source file(s) or a directory. It's not recoverable.")
+
+    custom_profile_options.add_argument("--customwidth", type=int, dest="customwidth", default=0,
+                                        help="Replace screen width provided by device profile")
+    custom_profile_options.add_argument("--customheight", type=int, dest="customheight", default=0,
+                                        help="Replace screen height provided by device profile")
+
+    other_options.add_argument("-h", "--help", action="help",
+                               help="Show this help message and exit")

-    psr.add_option_group(mainOptions)
-    psr.add_option_group(outputOptions)
-    psr.add_option_group(processingOptions)
-    psr.add_option_group(customProfileOptions)
-    psr.add_option_group(otherOptions)
    return psr


@@ -1019,7 +1021,7 @@ def checkOptions(options):
    options.bordersColor = None
    options.keep_epub = False
    if options.format == 'EPUB-200MB':
-        options.targetsize = 200
+        options.targetsize = 195
        options.format = 'EPUB'
        if options.batchsplit != 2:
            options.batchsplit = 1
@@ -1089,6 +1091,10 @@ def checkOptions(options):
        image.ProfileData.Profiles["Custom"] = newProfile
        options.profile = "Custom"
    options.profileData = image.ProfileData.Profiles[options.profile]
+    # kindle scribe conversion to mobi is limited in resolution by kindlegen, same with send to kindle and epub
+    if options.profile == 'KS' and (options.format == 'MOBI' or options.format == 'EPUB'):
+        options.profileData = list(options.profileData)
+        options.profileData[1] = (1440, 1920)
    return options


@@ -1144,7 +1150,7 @@ def makeBook(source, qtgui=None):
        y = image.ProfileData.Profiles[options.profile][1][1]
        comic2panel.main(['-y ' + str(y), '-i', '-m', path], qtgui)
    if options.noprocessing:
-        print("Do not process image, ignore any profil or processing option")
+        print("Do not process image, ignore any profile or processing option")
    else:
        print("Processing images...")
        if GUI:
@@ -1225,6 +1231,12 @@ def makeBook(source, qtgui=None):
                os.remove(i.replace('.epub', '.mobi') + '_toclean')
            if k.path and k.coverSupport:
                options.covers[filepath.index(i)][0].saveToKindle(k, options.covers[filepath.index(i)][1])
+    if options.delete:
+        if os.path.isfile(source):
+            os.remove(source)
+        elif os.path.isdir(source):
+            rmtree(source)
+
    return filepath


--- a/kindlecomicconverter/comic2panel.py
+++ b/kindlecomicconverter/comic2panel.py
@@ -20,8 +20,8 @@

 import os
 import sys
+from argparse import ArgumentParser
 from shutil import rmtree, copytree, move
-from optparse import OptionParser, OptionGroup
 from multiprocessing import Pool
 from PIL import Image, ImageChops, ImageOps, ImageDraw
 from .shared import getImageFileName, walkLevel, walkSort, sanitizeTrace
@@ -102,7 +102,7 @@ def splitImage(work):
        opt = work[2]
        filePath = os.path.join(path, name)
        Image.warnings.simplefilter('error', Image.DecompressionBombWarning)
-        Image.MAX_IMAGE_PIXELS = 1000000000    
+        Image.MAX_IMAGE_PIXELS = 1000000000
        imgOrg = Image.open(filePath).convert('RGB')
        imgProcess = Image.open(filePath).convert('1')
        widthImg, heightImg = imgOrg.size
@@ -116,7 +116,7 @@ def splitImage(work):
            panelDetected = False
            panels = []
            while yWork < heightImg:
-                tmpImg = imgProcess.crop([4, yWork, widthImg-4, yWork + 4])
+                tmpImg = imgProcess.crop((4, yWork, widthImg-4, yWork + 4))
                solid = detectSolid(tmpImg)
                if not solid and not panelDetected:
                    panelDetected = True
@@ -149,7 +149,7 @@ def splitImage(work):

            if opt.debug:
                for panel in panelsProcessed:
-                    draw.rectangle([(0, panel[0]), (widthImg, panel[1])], (0, 255, 0, 128), (0, 0, 255, 255))
+                    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.save(os.path.join(path, os.path.splitext(name)[0] + '-debug.png'), 'PNG')

@@ -182,7 +182,7 @@ def splitImage(work):
                if pageHeight > 15:
                    newPage = Image.new('RGB', (widthImg, pageHeight))
                    for panel in page:
-                        panelImg = imgOrg.crop([0, panelsProcessed[panel][0], widthImg, panelsProcessed[panel][1]])
+                        panelImg = imgOrg.crop((0, panelsProcessed[panel][0], widthImg, panelsProcessed[panel][1]))
                        newPage.paste(panelImg, (0, targetHeight))
                        targetHeight += panelsProcessed[panel][2]
                    newPage.save(os.path.join(path, os.path.splitext(name)[0] + '-' + str(pageNumber) + '.png'), 'PNG')
@@ -193,97 +193,100 @@ def splitImage(work):


 def main(argv=None, qtgui=None):
-    global options, GUI, splitWorkerPool, splitWorkerOutput, mergeWorkerPool, mergeWorkerOutput
-    parser = OptionParser(usage="Usage: kcc-c2p [options] comic_folder", add_help_option=False)
-    mainOptions = OptionGroup(parser, "MANDATORY")
-    otherOptions = OptionGroup(parser, "OTHER")
-    mainOptions.add_option("-y", "--height", type="int", dest="height", default=0,
-                           help="Height of the target device screen")
-    mainOptions.add_option("-i", "--in-place", action="store_true", dest="inPlace", default=False,
-                           help="Overwrite source directory")
-    mainOptions.add_option("-m", "--merge", action="store_true", dest="merge", default=False,
-                           help="Combine every directory into a single image before splitting")
-    otherOptions.add_option("-d", "--debug", action="store_true", dest="debug", default=False,
-                            help="Create debug file for every split image")
-    otherOptions.add_option("-h", "--help", action="help",
-                            help="Show this help message and exit")
-    parser.add_option_group(mainOptions)
-    parser.add_option_group(otherOptions)
-    options, args = parser.parse_args(argv)
+    global args, GUI, splitWorkerPool, splitWorkerOutput, mergeWorkerPool, mergeWorkerOutput
+    parser = ArgumentParser(prog="kcc-c2p", usage="kcc-c2p [options] [input]", add_help=False)
+
+    mandatory_options = parser.add_argument_group("MANDATORY")
+    main_options = parser.add_argument_group("MAIN")
+    other_options = parser.add_argument_group("OTHER")
+    mandatory_options.add_argument("input", action="extend", nargs="*", default=None,
+                              help="Full path to comic folder(s) to be processed. Separate multiple inputs"
+                                   " 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("-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,
+                              help="Combine every directory into a single image before splitting")
+    other_options.add_argument("-d", "--debug", action="store_true", dest="debug", default=False,
+                               help="Create debug file for every split image")
+    other_options.add_argument("-h", "--help", action="help",
+                               help="Show this help message and exit")
+    args = parser.parse_args(argv)
    if qtgui:
        GUI = qtgui
    else:
        GUI = None
-    if len(args) != 1:
+    if not argv or args.input == []:
        parser.print_help()
        return 1
-    if options.height > 0:
-        options.sourceDir = args[0]
-        options.targetDir = args[0] + "-Splitted"
-        if os.path.isdir(options.sourceDir):
-            rmtree(options.targetDir, True)
-            copytree(options.sourceDir, options.targetDir)
-            work = []
-            pagenumber = 1
-            splitWorkerOutput = []
-            splitWorkerPool = Pool(maxtasksperchild=10)
-            if options.merge:
-                print("Merging images...")
-                directoryNumer = 1
-                mergeWork = []
-                mergeWorkerOutput = []
-                mergeWorkerPool = Pool(maxtasksperchild=10)
-                mergeWork.append([options.targetDir])
-                for root, dirs, files in os.walk(options.targetDir, False):
-                    dirs, files = walkSort(dirs, files)
-                    for directory in dirs:
-                        directoryNumer += 1
-                        mergeWork.append([os.path.join(root, directory)])
+    if args.height > 0:
+        for sourceDir in args.input:
+            targetDir = sourceDir + "-Splitted"
+            if os.path.isdir(sourceDir):
+                rmtree(targetDir, True)
+                copytree(sourceDir, targetDir)
+                work = []
+                pagenumber = 1
+                splitWorkerOutput = []
+                splitWorkerPool = Pool(maxtasksperchild=10)
+                if args.merge:
+                    print("Merging images...")
+                    directoryNumer = 1
+                    mergeWork = []
+                    mergeWorkerOutput = []
+                    mergeWorkerPool = Pool(maxtasksperchild=10)
+                    mergeWork.append([targetDir])
+                    for root, dirs, files in os.walk(targetDir, False):
+                        dirs, files = walkSort(dirs, files)
+                        for directory in dirs:
+                            directoryNumer += 1
+                            mergeWork.append([os.path.join(root, directory)])
+                    if GUI:
+                        GUI.progressBarTick.emit('Combining images')
+                        GUI.progressBarTick.emit(str(directoryNumer))
+                    for i in mergeWork:
+                        mergeWorkerPool.apply_async(func=mergeDirectory, args=(i, ), callback=mergeDirectoryTick)
+                    mergeWorkerPool.close()
+                    mergeWorkerPool.join()
+                    if GUI and not GUI.conversionAlive:
+                        rmtree(targetDir, True)
+                        raise UserWarning("Conversion interrupted.")
+                    if len(mergeWorkerOutput) > 0:
+                        rmtree(targetDir, True)
+                        raise RuntimeError("One of workers crashed. Cause: " + mergeWorkerOutput[0][0],
+                                           mergeWorkerOutput[0][1])
+                print("Splitting images...")
+                for root, _, files in os.walk(targetDir, False):
+                    for name in files:
+                        if getImageFileName(name) is not None:
+                            pagenumber += 1
+                            work.append([root, name, args])
+                        else:
+                            os.remove(os.path.join(root, name))
                if GUI:
-                    GUI.progressBarTick.emit('Combining images')
-                    GUI.progressBarTick.emit(str(directoryNumer))
-                for i in mergeWork:
-                    mergeWorkerPool.apply_async(func=mergeDirectory, args=(i, ), callback=mergeDirectoryTick)
-                mergeWorkerPool.close()
-                mergeWorkerPool.join()
-                if GUI and not GUI.conversionAlive:
-                    rmtree(options.targetDir, True)
-                    raise UserWarning("Conversion interrupted.")
-                if len(mergeWorkerOutput) > 0:
-                    rmtree(options.targetDir, True)
-                    raise RuntimeError("One of workers crashed. Cause: " + mergeWorkerOutput[0][0],
-                                       mergeWorkerOutput[0][1])
-            print("Splitting images...")
-            for root, _, files in os.walk(options.targetDir, False):
-                for name in files:
-                    if getImageFileName(name) is not None:
-                        pagenumber += 1
-                        work.append([root, name, options])
-                    else:
-                        os.remove(os.path.join(root, name))
-            if GUI:
-                GUI.progressBarTick.emit('Splitting images')
-                GUI.progressBarTick.emit(str(pagenumber))
-                GUI.progressBarTick.emit('tick')
-            if len(work) > 0:
-                for i in work:
-                    splitWorkerPool.apply_async(func=splitImage, args=(i, ), callback=splitImageTick)
-                splitWorkerPool.close()
-                splitWorkerPool.join()
-                if GUI and not GUI.conversionAlive:
-                    rmtree(options.targetDir, True)
-                    raise UserWarning("Conversion interrupted.")
-                if len(splitWorkerOutput) > 0:
-                    rmtree(options.targetDir, True)
-                    raise RuntimeError("One of workers crashed. Cause: " + splitWorkerOutput[0][0],
-                                       splitWorkerOutput[0][1])
-                if options.inPlace:
-                    rmtree(options.sourceDir)
-                    move(options.targetDir, options.sourceDir)
+                    GUI.progressBarTick.emit('Splitting images')
+                    GUI.progressBarTick.emit(str(pagenumber))
+                    GUI.progressBarTick.emit('tick')
+                if len(work) > 0:
+                    for i in work:
+                        splitWorkerPool.apply_async(func=splitImage, args=(i, ), callback=splitImageTick)
+                    splitWorkerPool.close()
+                    splitWorkerPool.join()
+                    if GUI and not GUI.conversionAlive:
+                        rmtree(targetDir, True)
+                        raise UserWarning("Conversion interrupted.")
+                    if len(splitWorkerOutput) > 0:
+                        rmtree(targetDir, True)
+                        raise RuntimeError("One of workers crashed. Cause: " + splitWorkerOutput[0][0],
+                                           splitWorkerOutput[0][1])
+                    if args.inPlace:
+                        rmtree(sourceDir)
+                        move(targetDir, sourceDir)
+                else:
+                    rmtree(targetDir, True)
+                    raise UserWarning("Source directory is empty.")
            else:
-                rmtree(options.targetDir, True)
-                raise UserWarning("Source directory is empty.")
-        else:
-            raise UserWarning("Provided path is not a directory.")
+                raise UserWarning("Provided input is not a directory.")
    else:
        raise UserWarning("Target height is not set.")
--- a/kindlecomicconverter/comicarchive.py
+++ b/kindlecomicconverter/comicarchive.py
@@ -19,6 +19,7 @@
 #

 import os
+import distro
 from psutil import Popen
 from shutil import move
 from subprocess import STDOUT, PIPE
@@ -38,30 +39,34 @@ class ComicArchive:
                self.type = line.rstrip().decode().split(' = ')[1].upper()
                break
        process.communicate()
-        if process.returncode != 0:
+        if process.returncode != 0 and distro.id() == 'fedora':
            process = Popen('unrar l -y -p1 "' + self.filepath + '"', stderr=STDOUT, stdout=PIPE, stdin=PIPE, shell=True)
            for line in process.stdout:
                if b'Details: ' in line:
                    self.type = line.rstrip().decode().split(' ')[1].upper()
-                    print(self.type)
                    break
-            if(self.type != 'RAR'):
+            process.communicate()
+            if process.returncode != 0:
                raise OSError('Archive is corrupted or encrypted.')
+            elif self.type not in ['7Z', 'RAR', 'RAR5', 'ZIP']:
+                raise OSError('Unsupported archive format.')
        elif self.type not in ['7Z', 'RAR', 'RAR5', 'ZIP']:
            raise OSError('Unsupported archive format.')

    def extract(self, targetdir):
        if not os.path.isdir(targetdir):
-            raise OSError('Target directory don\'t exist.')
+            raise OSError('Target directory doesn\'t exist.')
        process = Popen('7z x -y -xr!__MACOSX -xr!.DS_Store -xr!thumbs.db -xr!Thumbs.db -o"' + targetdir + '" "' +
                        self.filepath + '"', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
        process.communicate()
-        if process.returncode != 0:
+        if process.returncode != 0 and distro.id() == 'fedora':
            process = Popen('unrar x -y -x__MACOSX -x.DS_Store -xthumbs.db -xThumbs.db "' + self.filepath + '" "' +
                    targetdir + '"', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
            process.communicate()
            if process.returncode != 0:
                raise OSError('Failed to extract archive.')
+        elif process.returncode != 0:
+            raise OSError('Failed to extract archive. Check if p7zip-rar is installed.')
        tdir = os.listdir(targetdir)
        if 'ComicInfo.xml' in tdir:
            tdir.remove('ComicInfo.xml')
--- a/kindlecomicconverter/image.py
+++ b/kindlecomicconverter/image.py
@@ -24,6 +24,13 @@ import mozjpeg_lossless_optimization
 from PIL import Image, ImageOps, ImageStat, ImageChops, ImageFilter
 from .shared import md5Checksum

+# 0.045 was determined by
+# 1200 / 824 = 1.456 (Kindle DX resolution)
+# 2250 / 1500 = 1.5 (Typical manga page resolution)
+# 1.5 - 1.456 < 0.045
+# 0.045 / 1.5 = 0.03 (So maximum 3% of is cropped)
+AUTO_CROP_THRESHOLD = 0.045
+

 class ProfileData:
    def __init__(self):
@@ -265,6 +272,7 @@ class ComicPage:
            if self.fill != 'white':
                flags.append('BlackBackground')
            if self.opt.forcepng:
+                self.image.info["transparency"] = None
                self.targetPath += '.png'
                self.image.save(self.targetPath, 'PNG', optimize=1)
            else:
@@ -305,36 +313,32 @@ class ComicPage:
        self.image = self.image.quantize(palette=palImg)

    def resizeImage(self):
-        if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]:
-            method = Image.Resampling.BICUBIC
-        else:
-            method = Image.Resampling.LANCZOS
+        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()
        if self.opt.stretch:
-        # if self.opt.stretch or (self.opt.kfx and ('-KCC-B' in self.targetPath or '-KCC-C' in self.targetPath)):
            self.image = self.image.resize(self.size, method)
-        elif self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1] and not self.opt.upscale:
+        elif method == Image.Resampling.BICUBIC and not self.opt.upscale:
            if self.opt.format == 'CBZ' or self.opt.kfx:
                borderw = int((self.size[0] - self.image.size[0]) / 2)
                borderh = int((self.size[1] - self.image.size[1]) / 2)
                self.image = ImageOps.expand(self.image, border=(borderw, borderh), fill=self.fill)
                if self.image.size[0] != self.size[0] or self.image.size[1] != self.size[1]:
-                    self.image = ImageOps.fit(self.image, self.size, method=Image.Resampling.BICUBIC, centering=(0.5, 0.5))
-        else:
-            if self.opt.format == 'CBZ' or self.opt.kfx:
-                ratioDev = float(self.size[0]) / float(self.size[1])
-                if (float(self.image.size[0]) / float(self.image.size[1])) < ratioDev:
-                    diff = int(self.image.size[1] * ratioDev) - self.image.size[0]
-                    self.image = ImageOps.expand(self.image, border=(int(diff / 2), 0), fill=self.fill)
-                elif (float(self.image.size[0]) / float(self.image.size[1])) > ratioDev:
-                    diff = int(self.image.size[0] / ratioDev) - self.image.size[1]
-                    self.image = ImageOps.expand(self.image, border=(0, int(diff / 2)), fill=self.fill)
-                self.image = ImageOps.fit(self.image, self.size, method=method, centering=(0.5, 0.5))
+                    self.image = ImageOps.fit(self.image, self.size, method=method)
+        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:
+                self.image = ImageOps.pad(self.image, self.size, method=method, color=self.fill)
            else:
-                hpercent = self.size[1] / float(self.image.size[1])
-                wsize = int((float(self.image.size[0]) * float(hpercent)))
-                self.image = self.image.resize((wsize, self.size[1]), method)
-                if self.image.size[0] > self.size[0] or self.image.size[1] > self.size[1]:
-                    self.image.thumbnail(self.size, Image.Resampling.LANCZOS)
+                self.image = ImageOps.contain(self.image, self.size, method=method)
+
+    def resize_method(self):
+        if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]:
+            method = Image.Resampling.BICUBIC
+        else:
+            method = Image.Resampling.LANCZOS
+        return method

    def getBoundingBox(self, tmptmg):
        min_margin = [int(0.005 * i + 0.5) for i in tmptmg.size]
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,8 @@
 PyQt5>=5.6.0
 Pillow>=5.2.0
 psutil>=5.0.0
-python-slugify>=1.2.1,<8.0.0
+python-slugify>=1.2.1
 raven>=6.0.0
 # PyQt5-tools
-mozjpeg-lossless-optimization
+mozjpeg-lossless-optimization>=1.1.2
+distro
--- a/setup.py
+++ b/setup.py
@@ -55,6 +55,7 @@ class BuildBinaryCommand(distutils.cmd.Command):
            shutil.copy('LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources')
            shutil.copy('other/windows/Additional-LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources')
            os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/7z', 0o777)
+            # TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v
            os.system('appdmg kcc.json dist/KindleComicConverter_osx_' + VERSION + '.dmg')
            exit(0)
        elif sys.platform == 'win32':
@@ -94,7 +95,7 @@ setuptools.setup(
        'PyQt5>=5.6.0',
        'Pillow>=5.2.0',
        'psutil>=5.0.0',
-        'python-slugify>=1.2.1,<8.0.0',
+        'python-slugify>=1.2.1,<9.0.0',
        'raven>=6.0.0',
        'mozjpeg-lossless-optimization>=1.1.2',
    ],
Author	SHA1	Message	Date
darodi	c98d6179c3	docker update (#521 )	2023-05-14 17:10:40 +00:00
Alex Xu	37200bdca0	Crop images within 3% of device aspect ratio (#495 ) * Crop images within 3% of device aspect ratio * use pad instead of expand+fit * reafactor threshold check * remove default val	2023-05-14 16:34:11 +00:00
Jaroslaw Janas	0193bcd00a	conda environment (#520 )	2023-05-14 16:32:06 +00:00
darodi	0bbe9348a2	OptionParser to ArgumentParser (#517 )	2023-05-14 16:31:45 +00:00
darodi	d16628dc59	last version check (#518 )	2023-05-14 16:31:31 +00:00
darodi	85c1801417	change version	2023-05-13 18:40:24 +02:00
darodi	b28ee08d01	Merge pull request #515 from darodi/unrar_for_fedora use unrar for fedora only	2023-05-13 16:25:06 +00:00
darodi	dba927c351	use unrar for fedora only	2023-05-13 18:24:18 +02:00
cookie99999	dd5fd621db	Update README.md Recommend to install p7zip-rar on Debian based systems, as it is needed to properly decompress rar files (As explained under "supported formats" on https://packages.debian.org/sid/p7zip-full). (cherry picked from commit `f3ee9b770b`)	2023-05-13 18:20:01 +02:00
darodi	21a167b3ee	limit kindle scribe image size to (1440, 1920) when using kindlegen (#516 )	2023-05-13 15:50:27 +00:00
darodi	1c9eeee52d	use unrar for fedora only	2023-05-13 14:11:50 +02:00
darodi	611ee31526	Merge pull request #513 from axu2/patch-3 add 7z to PATH	2023-05-13 01:46:01 +00:00
darodi	7c4fdf9d1a	Merge pull request #514 from darodi/limit_kindle_scribe_size_with_kindlegen limit kindle scribe image size to (1440, 1920) when using kindlegen	2023-05-13 01:44:12 +00:00
darodi	b14f59e77a	limit kindle scribe image size to (1440, 1920) when using kindlegen	2023-05-13 03:40:52 +02:00
Alex Xu	b4ec0b4a74	update wording	2023-05-12 14:17:18 -07:00
Alex Xu	a90b4c82c5	add UI 7z path	2023-05-12 13:06:09 -07:00
Alex Xu	390d58bf08	add 7z to PATH	2023-05-12 12:20:37 -07:00
darodi	e1aa6cd0af	Merge pull request #503 from darodi/epub_200MB_above_200MB Even with EPUB-200MB option selected, created file is above 200MB	2023-04-17 17:50:42 +00:00
darodi	718fda2f0c	Even with EPUB-200MB option selected, created file is above 200MB	2023-04-17 19:49:14 +02:00
darodi	9d7904f63b	Merge pull request #502 from darodi/master_revert_499 revert #499	2023-04-17 17:46:57 +00:00
darodi	ec58964c7c	Revert "Disable Panel View for kindle scribe" This reverts commit `9bc1f92c8c`.	2023-04-17 19:45:20 +02:00
darodi	0b687ebadc	Merge pull request #499 from darodi/disable_panel_view_kindle_scribe Disable Panel View for kindle scribe	2023-04-06 17:21:31 +00:00
darodi	9bc1f92c8c	Disable Panel View for kindle scribe	2023-04-06 19:13:56 +02:00
darodi	56f6c6962f	Merge pull request #491 from thatrobotdev/brew-gui-change Updates GUI text for new Homebrew version	2023-03-27 22:48:27 +00:00
darodi	dfd15ab572	Updates GUI text for new Homebrew version	2023-03-28 00:46:25 +02:00
James Kerrane	5588ad9250	Updates GUI text for new Homebrew version	2023-03-28 00:46:25 +02:00
dependabot[bot]	0c2adb517e	Update python-slugify requirement from <8.0.0,>=1.2.1 to >=1.2.1,<9.0.0 (#473 ) Updates the requirements on [python-slugify](https://github.com/un33k/python-slugify) to permit the latest version. - [Release notes](https://github.com/un33k/python-slugify/releases) - [Changelog](https://github.com/un33k/python-slugify/blob/master/CHANGELOG.md) - [Commits](https://github.com/un33k/python-slugify/compare/1.2.1...v8.0.0) --- updated-dependencies: - dependency-name: python-slugify dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-03-27 22:16:07 +00:00
Alex Xu	9ab1cd359c	remove transparency from image info	2023-03-27 22:04:35 +00:00
darodi	41d24e77e1	GUI delete option checkBox	2023-03-02 23:42:11 +01:00
Constantin Hong	17206ddf8b	GUI delete option checkBox (closes #458 ) (#488 ) * gui/func: add delete button (closes ciromattia#458) * Update KCC_ui.py fix typo * GUI delete option checkBox --------- Co-authored-by: darodi <4682830+darodi@users.noreply.github.com>	2023-03-02 23:38:27 +01:00
darodi	896c05a72f	Add command line executables to CI/pipelines (#487 )	2023-03-02 21:07:45 +01:00
darodi	f83106f35b	Merge pull request #485 from Constantin1489/master comic2ebook/func: Add a delete option	2023-03-02 17:34:16 +01:00
darodi	dfca136a2d	comic2ebook/func: Add a delete option and function (closes #458 )	2023-03-02 17:31:33 +01:00
Constantin Hong	92ced5f415	comic2ebook/func: Add a delete option and function (closes #458 )	2023-03-02 17:12:46 +01:00
darodi	d18275d525	supporting Kindle Previewer (#486 )	2023-03-02 17:09:45 +01:00
dependabot[bot]	c049adc3a1	Bump actions/checkout from 2 to 3 (#484 ) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [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/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout 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>	2023-02-27 21:31:42 +01:00
darodi	a3ce26983e	new AppImage (#483 )	2023-02-23 18:26:05 +01:00
dependabot[bot]	fe8195cfed	Bump actions/upload-artifact from 2 to 3 (#468 ) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact 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>	2023-02-15 20:38:25 +01:00
darodi	3a1737e8d0	supporting Kindle Previewer	2023-01-22 18:27:50 +01:00
darodi	fb0c0231f3	build pipeline : drop pypi	2023-01-22 17:42:09 +01:00
darodi	2e807e23e1	update README.md	2023-01-22 14:25:37 +01:00
darodi	27841abb83	Update README.md	2023-01-22 14:08:44 +01:00
darodi	b71d056559	prepare pipeline for signing	2023-01-22 10:30:06 +01:00