Bump actions/checkout from 6 to 7

Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [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/v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/docker-publish.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v4

.github/workflows/package-linux.yml

@@ -25,7 +25,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up Python
       uses: actions/setup-python@v6
       with:

.github/workflows/package-macos.yml

@@ -30,7 +30,7 @@ jobs:
     env:
       MACOSX_DEPLOYMENT_TARGET: '14.0'
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:

.github/workflows/package-osx-legacy.yml

@@ -31,7 +31,7 @@ jobs:
       PYTHON_VERSION: 3.11.9
       MACOSX_DEPLOYMENT_TARGET: '10.14'
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Get Python
         run: curl https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg -o "python.pkg"
       - name: Install Python

.github/workflows/package-windows.yml

@@ -35,7 +35,7 @@ jobs:
             command: build_c2p
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:

.github/workflows/package-windows7.yml

@@ -27,7 +27,7 @@ jobs:
     env:
       WINDOWS_7: 1
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Python
         uses: actions/setup-python@v6
         with:

kindlecomicconverter/KCC_gui.py

@@ -393,7 +393,10 @@ class WorkerThread(QThread):
             for job in currentJobs:
                 bookDir.append(job)
             try:
+                fusion_source_parent = str(Path(bookDir[0]).parent)
                 comic2ebook.options = comic2ebook.checkOptions(copy(options))
+                if options.output is None:
+                    options.output = fusion_source_parent
                 currentJobs.clear()
                 currentJobs.append(comic2ebook.makeFusion(bookDir))
                 MW.addMessage.emit('Created fusion at ' + currentJobs[0], 'info', False)
@@ -557,13 +560,6 @@ class WorkerThread(QThread):
                                 move(item, GUI.targetDirectory)
                             except Exception:
                                 pass
-        if options.filefusion:
-            for path in currentJobs:
-                if os.path.isfile(path):
-                    os.remove(path)
-                elif os.path.isdir(path):
-                    rmtree(path, True)
-            comic2ebook.checkPre('LLL-')
         GUI.progress.content = ''
         GUI.progress.stop()
         MW.hideProgressBar.emit()
@@ -1193,6 +1189,11 @@ class KCCGUI(KCC_ui.Ui_mainWindow):
             self.kindleGen = False
             if startup:
                 self.display_kindlegen_missing()
+        except OSError as e:
+            self.kindleGen = False
+            if startup:
+                error = f"kindlegen: {e.strerror}\n\n Re-install Rosetta/Kindle Previewer/other Intel app?\n\nPlease email Amazon to make Kindle Previewer Apple silicon native at amazon.com/kindle-help"
+                self.showDialog(error, 'error')
 
     def __init__(self, kccapp, kccwindow):
         global APP, MW, GUI

kindlecomicconverter/comic2ebook.py

@@ -76,23 +76,19 @@ def main(argv=None):
         print('No matching files found.')
         return 1
     if options.filefusion:
+        fusion_source_parent = str(Path(sources[0]).parent)
         fusion_path = makeFusion(list(sources))
         sources.clear()
         sources.append(fusion_path)
     for source in sources:
         source = source.rstrip('\\').rstrip('/')
         options = copy(args)
+        if options.filefusion and options.output is None:
+            options.output = fusion_source_parent
         options = checkOptions(options)
         print('Working on ' + source + '...')
         makeBook(source)
 
-    if options.filefusion:
-        for path in sources:
-            if os.path.isfile(path):
-                os.remove(path)
-            elif os.path.isdir(path):
-                rmtree(path, True)
-        checkPre('LLL-')
     return 0
 
 
@@ -979,10 +975,11 @@ def getWorkFolder(afile, workdir=None):
                         manifest_dict[manifest_item.attrib.get('id')] = manifest_item.attrib.get('href')
                     ordered_image_paths = []
                     for i, spine_item in enumerate(spine):
-                        if spine_item not in manifest_dict:
+                        try:
+                            page_path = os.path.join(os.path.dirname(opf_path), manifest_dict[spine_item])
+                            page = ET.parse(page_path)
+                        except Exception:
                             continue
-                        page_path = os.path.join(os.path.dirname(opf_path), manifest_dict[spine_item])
-                        page = ET.parse(page_path)
                         imgs = page.findall(r'.//{*}img') + page.findall(r'.//{*}image')
 
                         largest_size = 0
@@ -1676,6 +1673,11 @@ def checkTools(source):
         except (FileNotFoundError, CalledProcessError):
             print('ERROR: KindleGen is missing!')
             sys.exit(1)
+        except OSError as e:
+            print(f"kindlegen: {e.strerror}")
+            print('Re-install Rosetta/Kindle Previewer/other Intel app?')
+            print('Please email Amazon to make Kindle Previewer Apple silicon native at amazon.com/kindle-help')
+            sys.exit(1)
 
 
 def checkPre(source='KCC-'):
@@ -1690,8 +1692,8 @@ def makeFusion(sources: List[str]):
         raise UserWarning('Fusion requires at least 2 sources. Did you forget to uncheck fusion?')
     start = perf_counter()
     first_path = Path(sources[0])
-    
-    if True:
+
+    if options.tempdir:
         fusion_parent = first_path.parent
     else:
         # LLL is after KCC
@@ -1899,11 +1901,11 @@ def makeBook(source, qtgui=None, job_progress=''):
 
     end = perf_counter()
     print(f"{job_progress}makeBook: {end - start} seconds")
-    # Clean up temporary workspace
-    try:
-        rmtree(path, True)
-    except Exception:
-        pass
+
+    if options.filefusion:
+        rmtree(source, True)
+        checkPre('LLL-')
+
     return filepath
 
 
@@ -1936,8 +1938,11 @@ def makeMOBIWorker(item):
     kindlegenError = ''
     try:
         if os.path.getsize(item) < 629145600:
+            start = perf_counter()
             output = subprocess_run(['kindlegen', '-dont_append_source', '-locale', 'en', item],
                            stdout=PIPE, stderr=STDOUT, encoding='UTF-8', errors='ignore', check=True)
+            end = perf_counter()
+            print(f"kindlegen: {end - start} sec")
         else:
             # ERROR: EPUB too big
             kindlegenErrorCode = 23026

requirements-win7.txt

@@ -7,5 +7,5 @@ packaging>=26.2
 mozjpeg-lossless-optimization>=1.2.0
 natsort>=8.4.0
 distro>=1.8.0
-numpy==1.23.0
+numpy==1.23.5
 PyMuPDF>=1.16