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,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
 

.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

kindlecomicconverter/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '7.3.1'
+__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

@@ -77,14 +77,15 @@ def main(argv=None):
     return 0
 
 
-def buildHTML(path, imgfile):
+def buildHTML(path, imgfile, imgfilepath):
+    key = pathlib.Path(imgfilepath).name
     filename = getImageFileName(imgfile)
     deviceres = options.profileData[1]
-    if not options.noprocessing and "Rotated" in imgfile:
+    if not options.noprocessing and "Rotated" in options.imgMetadata[key]:
         rotatedPage = True
     else:
         rotatedPage = False
-    if not options.noprocessing and "BlackBackground" in imgfile:
+    if not options.noprocessing and "BlackBackground" in options.imgMetadata[key]:
         additionalStyle = 'background-color:#000000;'
     else:
         additionalStyle = ''
@@ -215,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":
@@ -243,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)]
@@ -255,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)]
@@ -517,11 +518,14 @@ def buildEPUB(path, chapternames, tomenumber, ischunked):
             if not chapter:
                 chapterlist.append((dirpath.replace('Images', 'Text'), afile))
                 chapter = True
-            filelist.append(buildHTML(dirpath, afile))
+            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
@@ -534,7 +538,7 @@ 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
@@ -556,6 +560,7 @@ def imgDirectoryProcessing(path):
     global workerPool, workerOutput
     workerPool = Pool(maxtasksperchild=100)
     workerOutput = []
+    options.imgMetadata = {}
     work = []
     pagenumber = 0
     for dirpath, _, filenames in os.walk(path):
@@ -587,7 +592,10 @@ def imgFileProcessingTick(output):
     if isinstance(output, tuple):
         workerOutput.append(output)
         workerPool.terminate()
-
+    else:
+        for page in output:
+            if page is not None:
+                options.imgMetadata[page[0]] = page[1]
     if GUI:
         GUI.progressBarTick.emit('tick')
         if not GUI.conversionAlive:
@@ -708,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':
@@ -750,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)

kindlecomicconverter/image.py

@@ -299,12 +299,13 @@ class ComicPage:
 
     def saveToDir(self):
         try:
+            flags = []
             if not self.opt.forcecolor and not self.opt.forcepng:
                 self.image = self.image.convert('L')
             if self.rotated:
-                self.targetPath += '-Rotated'
+                flags.append('Rotated')
             if self.fill != 'white':
-                self.targetPath += '-BlackBackground'
+                flags.append('BlackBackground')
             if self.opt.forcepng:
                 self.image.info["transparency"] = None
                 self.targetPath += '.png'
@@ -322,7 +323,7 @@ class ComicPage:
                     self.image.save(self.targetPath, 'JPEG', optimize=1, quality=85)
             if os.path.isfile(self.orgPath):
                 os.remove(self.orgPath)
-            return Path(self.targetPath).name
+            return [Path(self.targetPath).name, flags]
         except IOError as err:
             raise RuntimeError('Cannot save image. ' + str(err))