Revert "Revert "remove GUI windows docker""

This reverts commit 57a0450026.

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

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

@@ -1,39 +0,0 @@
-# -*- 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.3'
+__version__ = '7.2.1'
 __license__ = 'ISC'
 __copyright__ = '2012-2022, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>, darodi'
 __docformat__ = 'restructuredtext en'

kindlecomicconverter/comic2ebook.py

@@ -657,14 +657,16 @@ def getWorkFolder(afile):
                 path = cbx.extract(workdir)
                 sanitizePermissions(path)
                 tdir = os.listdir(workdir)
+                is_nested_single_dir = False
                 if len(tdir) == 2 and 'ComicInfo.xml' in tdir:
                     tdir.remove('ComicInfo.xml')
-                    if os.path.isdir(os.path.join(workdir, tdir[0])):
+                    is_nested_single_dir = os.path.isdir(os.path.join(workdir, tdir[0]))
+                    if is_nested_single_dir:
                         os.replace(
                             os.path.join(workdir, 'ComicInfo.xml'),
                             os.path.join(workdir, tdir[0], 'ComicInfo.xml')
                         )
-                if len(tdir) == 1 and os.path.isdir(os.path.join(workdir, tdir[0])):
+                if len(tdir) == 1 and is_nested_single_dir:
                     path = os.path.join(workdir, tdir[0])           
             except OSError as e:
                 rmtree(workdir, True)
@@ -672,7 +674,8 @@ def getWorkFolder(afile):
     else:
         raise UserWarning("Failed to open source file/directory.")
     newpath = mkdtemp('', 'KCC-', os.path.dirname(afile))
-    os.renames(path, os.path.join(newpath, 'OEBPS', 'Images'))
+    copytree(path, os.path.join(newpath, 'OEBPS', 'Images'))
+    rmtree(workdir, True)
     return newpath
 
 
@@ -887,7 +890,8 @@ def chunk_process(path, mode, parent):
                     firstTome = False
     return output
 
-def detectSuboptimalProcessing(tmppath, orgpath):
+
+def detectCorruption(tmppath, orgpath):
     imageNumber = 0
     imageSmaller = 0
     alreadyProcessed = False
@@ -903,6 +907,9 @@ def detectSuboptimalProcessing(tmppath, orgpath):
                     raise RuntimeError('Image file %s is corrupted.' % pathOrg)
                 try:
                     img = Image.open(path)
+                    img.verify()
+                    img = Image.open(path)
+                    img.load()
                     imageNumber += 1
                     if options.profileData[1][0] > img.size[0] and options.profileData[1][1] > img.size[1]:
                         imageSmaller += 1
@@ -1174,7 +1181,7 @@ def makeBook(source, qtgui=None):
     path = getWorkFolder(source)
     print("Checking images...")
     getComicInfo(os.path.join(path, "OEBPS", "Images"), source)
-    detectSuboptimalProcessing(os.path.join(path, "OEBPS", "Images"), source)
+    detectCorruption(os.path.join(path, "OEBPS", "Images"), source)
     if options.webtoon:
         y = image.ProfileData.Profiles[options.profile][1][1]
         comic2panel.main(['-y ' + str(y), '-i', '-m', path], qtgui)

kindlecomicconverter/comicarchive.py

@@ -76,8 +76,6 @@ class ComicArchive:
                 ['unar', self.filepath, '-f', '-o', targetdir]
             )
 
-        extraction_commands.reverse()
-
         if distro.id() == 'fedora' or distro.like() == 'fedora':
             extraction_commands.append(
                 ['unrar', 'x', '-y', '-x__MACOSX', '-x.DS_Store', '-xthumbs.db', '-xThumbs.db', self.filepath, targetdir]

kindlecomicconverter/image.py

@@ -141,13 +141,7 @@ class ComicPageParser:
         self.source = source
         self.size = self.opt.profileData[1]
         self.payload = []
-
-        # Detect corruption in source image, let caller catch any exceptions triggered.
-        srcImgPath = os.path.join(source[0], source[1])
-        self.image = Image.open(srcImgPath)
-        self.image.verify()
-        self.image = Image.open(srcImgPath).convert('RGB')
-
+        self.image = Image.open(os.path.join(source[0], source[1])).convert('RGB')
         self.color = self.colorCheck()
         self.fill = self.fillCheck()
         # backwards compatibility for Pillow >9.1.0