Revert "Build windows GUI version normally without docker" (#835)

* Revert "remove GUI windows docker"

This reverts commit 4fc5cc9dfb.

* build windows gui version with docker

* cffi

* bump 7.2.2

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

@@ -25,6 +25,11 @@ jobs:
 #      - 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:
@@ -38,6 +43,7 @@ jobs:
       - 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

kcc.spec

@@ -0,0 +1,39 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(['kcc.py'],
+             pathex=['.'],
+             binaries=[],
+             datas=[],
+             hiddenimports=['_cffi_backend'],
+             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')

kindlecomicconverter/__init__.py

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

kindlecomicconverter/comic2ebook.py

@@ -645,6 +645,7 @@ def getWorkFolder(afile):
         if afile.lower().endswith('.pdf'):
             pdf = pdfjpgextract.PdfJpgExtract(afile)
             path, njpg = pdf.extract()
+            workdir = path
             sanitizePermissions(path)
             if njpg == 0:
                 rmtree(path, True)
@@ -828,12 +829,11 @@ def sanitizePermissions(filetree):
             os.chmod(os.path.join(root, name), S_IWRITE | S_IREAD | S_IEXEC)
 
 
-def batch_directory(path):
+def chunk_directory(path):
     level = -1
     for root, _, files in os.walk(os.path.join(path, 'OEBPS', 'Images')):
         for f in files:
-            if f.endswith('.jpg') or f.endswith('.jpeg') or f.endswith('.png') or f.endswith('.gif') or \
+            if getImageFileName(f):
-                    f.endswith('.webp'):
                 newLevel = os.path.join(root, f).replace(os.path.join(path, 'OEBPS', 'Images'), '').count(os.sep)
                 if level != -1 and level != newLevel:
                     level = 0
@@ -842,16 +842,16 @@ def batch_directory(path):
                     level = newLevel
     if level > 0:
         parent = pathlib.Path(path).parent
-        batcher = batch_process(os.path.join(path, 'OEBPS', 'Images'), level, parent)
+        chunker = chunk_process(os.path.join(path, 'OEBPS', 'Images'), level, parent)
         path = [path]
-        for tome in batcher:
+        for tome in chunker:
             path.append(tome)
         return path
     else:
         raise UserWarning('Unsupported directory structure.')
 
 
-def batch_process(path, mode, parent):
+def chunk_process(path, mode, parent):
     output = []
     currentSize = 0
     currentTarget = path
@@ -1196,7 +1196,7 @@ def makeBook(source, qtgui=None):
         GUI.progressBarTick.emit('1')
     chapterNames = sanitizeTree(os.path.join(path, 'OEBPS', 'Images'))
     if options.batchsplit > 0:
-        tomes = batch_directory(path)
+        tomes = chunk_directory(path)
     else:
         tomes = [path]
     filepath = []

kindlecomicconverter/shared.py

@@ -49,7 +49,7 @@ class HTMLStripper(HTMLParser):
 def getImageFileName(imgfile):
     name, ext = os.path.splitext(imgfile)
     ext = ext.lower()
-    if (name.startswith('.') and len(name) == 1) or ext not in ['.png', '.jpg', '.jpeg', '.gif', '.webp']:
+    if (name.startswith('.') and len(name) == 1) or ext not in ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.jp2', '.j2k', '.jpx']:
         return None
     return [name, ext]