add SignPath to Windows GUI workflow (#862)

* Revert "memory optimization: store metadata in filenames, not a global dict (…"

This reverts commit 9a2a09eab9.

* only remove imgOld

.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,14 +38,27 @@ 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
+
+      - name: upload-unsigned-artifact
+        id: upload-unsigned-artifact
         uses: actions/upload-artifact@v4
         with:
           name: windows-build
           path: dist/windows/*.exe
+      
+      - id: optional_step_id
+        uses: signpath/github-action-submit-signing-request@v1.1
+        with:
+          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+          organization-id: '1dc1bad6-4a8c-4f85-af30-5c5d3d392ea6'
+          project-slug: 'kcc'
+          signing-policy-slug: 'release-signing'
+          github-artifact-id: '${{ steps.upload-unsigned-artifact.outputs.artifact-id }}'
+          wait-for-completion: true
+          output-artifact-directory: 'dist/windows/signed/'
+      
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
@@ -60,4 +68,4 @@ jobs:
           files: |
             CHANGELOG.md
             LICENSE.txt
-            dist/windows/*.exe
+            dist/windows/signed/*.exe

.github/workflows/package-windows.yml

@@ -41,11 +41,22 @@ jobs:
       - name: build binary
         run: |
           python setup.py build_binary
-      - name: upload build
+      - name: upload-unsigned-artifact
+        id: upload-unsigned-artifact
         uses: actions/upload-artifact@v4
         with:
           name: windows-build
           path: dist/*.exe
+      - id: optional_step_id
+        uses: signpath/github-action-submit-signing-request@v1.1
+        with:
+         api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+         organization-id: '1dc1bad6-4a8c-4f85-af30-5c5d3d392ea6'
+         project-slug: 'kcc'
+         signing-policy-slug: 'release-signing'
+         github-artifact-id: '${{ steps.upload-unsigned-artifact.outputs.artifact-id }}'
+         wait-for-completion: true
+         output-artifact-directory: 'dist/windows/signed/'
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
@@ -55,4 +66,4 @@ jobs:
           files: |
             CHANGELOG.md
             LICENSE.txt
-            dist/*.exe
+            dist/windows/signed/*.exe

README.md

@@ -33,6 +33,9 @@ If you find **KCC** valuable you can consider donating to the authors:
 - Alex Xu (active 2023-Present)
   - [![Donate PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/donate/?business=QFJVE7A6LCP6U&no_recurring=0&item_name=Kindle+Comic+Converter&currency_code=USD)
 
+## Sponsors
+
+- Free code signing on Windows provided by [SignPath.io](https://about.signpath.io/), certificate by [SignPath Foundation](https://signpath.org/)
 
 ## DOWNLOADS
 

kindlecomicconverter/__init__.py

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

kindlecomicconverter/comic2ebook.py

@@ -40,7 +40,7 @@ from subprocess import STDOUT, PIPE
 from psutil import virtual_memory, disk_usage
 from html import escape as hescape
 
-from .shared import available_archive_tools, md5Checksum, getImageFileName, walkSort, walkLevel, sanitizeTrace, subprocess_run
+from .shared import available_archive_tools, getImageFileName, walkSort, walkLevel, sanitizeTrace, subprocess_run
 from . import comic2panel
 from . import image
 from . import comicarchive
@@ -78,14 +78,14 @@ def main(argv=None):
 
 
 def buildHTML(path, imgfile, imgfilepath):
-    imgfilepath = md5Checksum(imgfilepath)
+    key = pathlib.Path(imgfilepath).name
     filename = getImageFileName(imgfile)
     deviceres = options.profileData[1]
-    if not options.noprocessing and "Rotated" in options.imgMetadata[imgfilepath]:
+    if not options.noprocessing and "Rotated" in options.imgMetadata[key]:
         rotatedPage = True
     else:
         rotatedPage = False
-    if not options.noprocessing and "BlackBackground" in options.imgMetadata[imgfilepath]:
+    if not options.noprocessing and "BlackBackground" in options.imgMetadata[key]:
         additionalStyle = 'background-color:#000000;'
     else:
         additionalStyle = ''
@@ -216,7 +216,7 @@ def buildNCX(dstdir, title, chapters, chapternames):
         folder = chapter[0].replace(os.path.join(dstdir, 'OEBPS'), '').lstrip('/').lstrip('\\\\')
         filename = getImageFileName(os.path.join(folder, chapter[1]))
         navID = folder.replace('/', '_').replace('\\', '_')
-        if options.chapters:
+        if options.comicinfo_chapters:
             title = chapternames[chapter[1]]
             navID = filename[0].replace('/', '_').replace('\\', '_')
         elif os.path.basename(folder) != "Text":
@@ -244,7 +244,7 @@ def buildNAV(dstdir, title, chapters, chapternames):
     for chapter in chapters:
         folder = chapter[0].replace(os.path.join(dstdir, 'OEBPS'), '').lstrip('/').lstrip('\\\\')
         filename = getImageFileName(os.path.join(folder, chapter[1]))
-        if options.chapters:
+        if options.comicinfo_chapters:
             title = chapternames[chapter[1]]
         elif os.path.basename(folder) != "Text":
             title = chapternames[os.path.basename(folder)]
@@ -256,7 +256,7 @@ def buildNAV(dstdir, title, chapters, chapternames):
     for chapter in chapters:
         folder = chapter[0].replace(os.path.join(dstdir, 'OEBPS'), '').lstrip('/').lstrip('\\\\')
         filename = getImageFileName(os.path.join(folder, chapter[1]))
-        if options.chapters:
+        if options.comicinfo_chapters:
             title = chapternames[chapter[1]]
         elif os.path.basename(folder) != "Text":
             title = chapternames[os.path.basename(folder)]
@@ -425,7 +425,6 @@ def buildOPF(dstdir, title, filelist, cover=None):
                   "</container>"])
     f.close()
 
-
 def buildEPUB(path, chapternames, tomenumber, ischunked):
     filelist = []
     chapterlist = []
@@ -506,6 +505,7 @@ def buildEPUB(path, chapternames, tomenumber, ischunked):
                       "display: none;\n",
                       "}\n"])
     f.close()
+    build_html_start = perf_counter()
     for dirpath, dirnames, filenames in os.walk(os.path.join(path, 'OEBPS', 'Images')):
         chapter = False
         dirnames, filenames = walkSort(dirnames, filenames)
@@ -515,12 +515,17 @@ def buildEPUB(path, chapternames, tomenumber, ischunked):
                                      'cover' + getImageFileName(afile)[1])
                 options.covers.append((image.Cover(os.path.join(dirpath, afile), cover, options,
                                                    tomenumber), options.uuid))
-            filelist.append(buildHTML(dirpath, afile, os.path.join(dirpath, afile)))
             if not chapter:
-                chapterlist.append((dirpath.replace('Images', 'Text'), filelist[-1][1]))
+                chapterlist.append((dirpath.replace('Images', 'Text'), afile))
                 chapter = True
+            filelist.append(buildHTML(dirpath, afile, os.path.join(dirpath, afile)))
+    build_html_end = perf_counter()
+    print(f"buildHTML: {build_html_end - build_html_start} seconds")
     # Overwrite chapternames if tree is flat and ComicInfo.xml has bookmarks
-    if not chapternames and options.chapters and not ischunked:
+    if ischunked:
+       options.comicinfo_chapters = []
+    
+    if not chapternames and options.comicinfo_chapters:
         chapterlist = []
 
         global_diff = 0
@@ -533,13 +538,13 @@ def buildEPUB(path, chapternames, tomenumber, ischunked):
         elif options.splitter == 2:
             diff_delta = 2
 
-        for aChapter in options.chapters:
+        for aChapter in options.comicinfo_chapters:
             pageid = aChapter[0]
             cur_diff = global_diff
             global_diff = 0
 
             for x in range(0, pageid + cur_diff + 1):
-                if '-kcc-b' in filelist[x][1]:
+                if '-KCC-B' in filelist[x][1]:
                     pageid += diff_delta
                     global_diff += diff_delta
 
@@ -556,7 +561,6 @@ def imgDirectoryProcessing(path):
     workerPool = Pool(maxtasksperchild=100)
     workerOutput = []
     options.imgMetadata = {}
-    options.imgOld = []
     work = []
     pagenumber = 0
     for dirpath, _, filenames in os.walk(path):
@@ -566,19 +570,19 @@ def imgDirectoryProcessing(path):
     if GUI:
         GUI.progressBarTick.emit(str(pagenumber))
     if len(work) > 0:
+        img_processing_start = perf_counter()
         for i in work:
             workerPool.apply_async(func=imgFileProcessing, args=(i,), callback=imgFileProcessingTick)
         workerPool.close()
         workerPool.join()
+        img_processing_end = perf_counter()
+        print(f"imgFileProcessing: {img_processing_end - img_processing_start} seconds")
         if GUI and not GUI.conversionAlive:
             rmtree(os.path.join(path, '..', '..'), True)
             raise UserWarning("Conversion interrupted.")
         if len(workerOutput) > 0:
             rmtree(os.path.join(path, '..', '..'), True)
             raise RuntimeError("One of workers crashed. Cause: " + workerOutput[0][0], workerOutput[0][1])
-        for file in options.imgOld:
-            if os.path.isfile(file):
-                os.remove(file)
     else:
         rmtree(os.path.join(path, '..', '..'), True)
         raise UserWarning("Source directory is empty.")
@@ -592,7 +596,6 @@ def imgFileProcessingTick(output):
         for page in output:
             if page is not None:
                 options.imgMetadata[page[0]] = page[1]
-                options.imgOld.append(page[2])
     if GUI:
         GUI.progressBarTick.emit('tick')
         if not GUI.conversionAlive:
@@ -713,7 +716,7 @@ def getOutputFilename(srcpath, wantedname, ext, tomenumber):
 
 def getComicInfo(path, originalpath):
     xmlPath = os.path.join(path, 'ComicInfo.xml')
-    options.chapters = []
+    options.comicinfo_chapters = []
     options.summary = ''
     titleSuffix = ''
     if options.title == 'defaulttitle':
@@ -736,9 +739,7 @@ def getComicInfo(path, originalpath):
         except Exception:
             os.remove(xmlPath)
             return
-        if xml.data['Title']:
-            options.title = hescape(xml.data['Title'])
-        elif defaultTitle:
+        if defaultTitle:
             if xml.data['Series']:
                 options.title = hescape(xml.data['Series'])
             if xml.data['Volume']:
@@ -757,7 +758,7 @@ def getComicInfo(path, originalpath):
             else:
                 options.authors = ['KCC']
         if xml.data['Bookmarks']:
-            options.chapters = xml.data['Bookmarks']
+            options.comicinfo_chapters = xml.data['Bookmarks']
         if xml.data['Summary']:
             options.summary = hescape(xml.data['Summary'])
         os.remove(xmlPath)
@@ -797,13 +798,9 @@ def sanitizeTree(filetree):
         for name in files:
             splitname = os.path.splitext(name)
 
-            # file needs kcc at front AND back to avoid renaming issues
+            # 9999 page limit
             slugified = f'kcc-{page:04}'
             page += 1
-            for suffix in '-KCC', '-KCC-A', '-KCC-B', '-KCC-C':
-                if splitname[0].endswith(suffix):
-                    slugified += suffix.lower()
-                    break
 
             newKey = os.path.join(root, slugified + splitname[1])
             key = os.path.join(root, name)
@@ -1189,6 +1186,7 @@ def makeBook(source, qtgui=None):
     print("Checking images...")
     getComicInfo(os.path.join(path, "OEBPS", "Images"), source)
     detectSuboptimalProcessing(os.path.join(path, "OEBPS", "Images"), source)
+    chapterNames = sanitizeTree(os.path.join(path, 'OEBPS', 'Images'))
     if options.webtoon:
         y = image.ProfileData.Profiles[options.profile][1][1]
         comic2panel.main(['-y ' + str(y), '-i', '-m', path], qtgui)
@@ -1201,7 +1199,6 @@ def makeBook(source, qtgui=None):
         imgDirectoryProcessing(os.path.join(path, "OEBPS", "Images"))
     if GUI:
         GUI.progressBarTick.emit('1')
-    chapterNames = sanitizeTree(os.path.join(path, 'OEBPS', 'Images'))
     if options.batchsplit > 0:
         tomes = chunk_directory(path)
     else:

kindlecomicconverter/image.py

@@ -20,9 +20,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import io
 import os
+from pathlib import Path
 import mozjpeg_lossless_optimization
 from PIL import Image, ImageOps, ImageStat, ImageChops, ImageFilter
-from .shared import md5Checksum
 from .page_number_crop_alg import get_bbox_crop_margin_page_number, get_bbox_crop_margin
 from .inter_panel_crop_alg import crop_empty_inter_panel
 
@@ -321,7 +321,9 @@ class ComicPage:
                             output_jpeg_file.write(output_jpeg_bytes)
                 else:
                     self.image.save(self.targetPath, 'JPEG', optimize=1, quality=85)
-            return [md5Checksum(self.targetPath), flags, self.orgPath]
+            if os.path.isfile(self.orgPath):
+                os.remove(self.orgPath)
+            return [Path(self.targetPath).name, flags]
         except IOError as err:
             raise RuntimeError('Cannot save image. ' + str(err))
 

kindlecomicconverter/shared.py

@@ -75,16 +75,6 @@ def walkLevel(some_dir, level=1):
             del dirs[:]
 
 
-def md5Checksum(fpath):
-    with open(fpath, 'rb') as fh:
-        m = md5()
-        while True:
-            data = fh.read(8192)
-            if not data:
-                break
-            m.update(data)
-        return m.hexdigest()
-
 
 def sanitizeTrace(traceback):
     return ''.join(format_tb(traceback))\