Merge branch 'pyicu' into develop

.github/workflows/build.yaml

@@ -80,6 +80,20 @@ jobs:
         run: |
           choco install -y zip
         if: runner.os == 'Windows'
+      - name: Install macos dependencies
+        run: |
+          brew install icu4c pkg-config
+          export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig";
+          export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH"
+          python -m pip install --no-binary=:pyicu: pyicu
+        if: runner.os == 'macOS'
+      - name: Install linux dependencies
+        run: |
+          sudo apt-get install pkg-config libicu-dev
+          export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig";
+          export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH"
+          python -m pip install --no-binary=:pyicu: pyicu
+        if: runner.os == 'Linux'
 
       - name: Build and install PyPi packages
         run: |

.github/workflows/package.yaml

@@ -41,12 +41,25 @@ jobs:
         run: |
           choco install -y zip
         if: runner.os == 'Windows'
+      - name: Install macos dependencies
+        run: |
+          brew install icu4c pkg-config
+          export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig";
+          export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH"
+          python -m pip install --no-binary=:pyicu: pyicu
+        if: runner.os == 'macOS'
+      - name: Install linux dependencies
+        run: |
+          sudo apt-get install pkg-config libicu-dev
+          export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig";
+          export PATH="/usr/local/opt/icu4c/bin:/usr/local/opt/icu4c/sbin:$PATH"
+          python -m pip install --no-binary=:pyicu: pyicu
+        if: runner.os == 'Linux'
 
       - name: Build, Install and Test PyPi packages
         run: |
           make clean pydist
           python -m pip install "dist/$(python setup.py --fullname)-py3-none-any.whl[all]"
-          echo "CT_FULL_NAME=$(python setup.py --fullname)" >> $GITHUB_ENV
           python -m flake8
           python -m pytest
 
@@ -69,4 +82,4 @@ jobs:
           draft: false
           files: |
             dist/!(*Linux).zip
-            dist/*.whl
+            dist/*${{ fromJSON('["never", ""]')[runner.os == 'Linux'] }}.whl

comicapi/comicarchive.py

@@ -148,7 +148,7 @@ class SevenZipArchiver(UnknownArchiver):
     def get_filename_list(self) -> list[str]:
         try:
             with py7zr.SevenZipFile(self.path, "r") as zf:
-                namelist: list[str] = zf.getnames()
+                namelist: list[str] = [file.filename for file in zf.list() if not file.is_directory]
 
             return namelist
         except (py7zr.Bad7zFile, OSError) as e:
@@ -248,7 +248,7 @@ class ZipArchiver(UnknownArchiver):
     def get_filename_list(self) -> list[str]:
         try:
             with zipfile.ZipFile(self.path, mode="r") as zf:
-                namelist = zf.namelist()
+                namelist = [file.filename for file in zf.infolist() if not file.is_dir()]
             return namelist
         except (zipfile.BadZipfile, OSError) as e:
             logger.error("Error listing files in zip archive [%s]: %s", e, self.path)
@@ -934,7 +934,7 @@ class ComicArchive:
             # seems like some archive creators are on Windows, and don't know about case-sensitivity!
             if sort_list:
 
-                files = cast(list[str], natsort.natsorted(files, alg=natsort.ns.IC | natsort.ns.I | natsort.ns.U))
+                files = cast(list[str], natsort.os_sorted(files))
 
             # make a sub-list of image files
             self.page_list = []

requirements.txt

@@ -5,6 +5,7 @@ pathvalidate
 pillow>=9.1.0
 py7zr
 pycountry
+pyicu; sys_platform == 'linux' or sys_platform == 'darwin'
 requests==2.*
 text2digits
 thefuzz>=0.19.0

tests/comicarchive_test.py

@@ -15,6 +15,8 @@ def test_getPageNameList():
     pageNameList = c.get_page_name_list()
 
     assert pageNameList == [
+        "!cover.jpg",
+        "00.jpg",
         "page0.jpg",
         "Page1.jpeg",
         "Page2.png",