Bump actions/setup-python from 6 to 7

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6 to 7.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v6...v7)

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

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

.github/workflows/package-linux.yml

@@ -27,7 +27,7 @@ jobs:
     steps:
     - uses: actions/checkout@v7
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
         python-version: 3.11
         cache: 'pip'

.github/workflows/package-macos.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: 3.11
           cache: 'pip'

.github/workflows/package-windows.yml

@@ -37,7 +37,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: 3.11
           cache: 'pip'

.github/workflows/package-windows7.yml

@@ -29,7 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: 3.8
           cache: 'pip'

README.md

@@ -42,6 +42,7 @@ KCC avoids many common formatting issues (some of which occur [even on the Kindl
 4) incorrect page turn direction for manga that's read right to left
 5) unaligned two page spreads in landscape, where pages are shifted over by 1
 6) Removing without blur the rainbow effect on color eink Kaleido 3 due to manga screentones
+7) Fixing page order problems due to Windows sort being different than Kindle/Kobo sort
 
 The GUI looks like this, built in Qt6, with my most commonly used settings:
 

kindlecomicconverter/comic2ebook.py

@@ -979,9 +979,16 @@ def getWorkFolder(afile, workdir=None):
                             os.path.join(fullPath, tdir[0], 'ComicInfo.xml')
                         )
                 if len(tdir) == 1 and os.path.isdir(os.path.join(fullPath, tdir[0])):
+                    if options.tempdir:
+                        workdir2 = mkdtemp('', 'KCC-', os.path.dirname(afile))
+                    else:
+                        workdir2 = mkdtemp('', 'KCC-')
+                    fullPath2 = os.path.join(workdir2, 'OEBPS', 'Images')
+                    os.makedirs(fullPath2, exist_ok=True)
                     for file in os.listdir(os.path.join(fullPath, tdir[0])):
-                        move(os.path.join(fullPath, tdir[0], file), fullPath)
+                        move(os.path.join(fullPath, tdir[0], file), fullPath2)
-                    os.rmdir(os.path.join(fullPath, tdir[0]))
+                    rmtree(workdir, True)
+                    return workdir2
 
                 if options.legacyextract:
                     return workdir