From b273de2da91d6cf693d3ea112fd3b8b7d89c2e1c Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Fri, 30 Oct 2026 12:26:11 -0700 Subject: [PATCH] fix converting files with unicode inner folders [12.1.2 regression] (#1492) --- kcc-c2e.spec | 2 +- kcc-c2p.spec | 2 +- kcc-macos.spec | 2 +- kcc.spec | 2 +- setup.py | 18 +++++++++--------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/kcc-c2e.spec b/kcc-c2e.spec index dbfce2b6..33a41909 100644 --- a/kcc-c2e.spec +++ b/kcc-c2e.spec @@ -8,7 +8,7 @@ a = Analysis(['kcc-c2e.py'], pathex=['.'], binaries=[], datas=[], - hiddenimports=['_cffi_backend'], + hiddenimports=['_cffi_backend', 'text_unidecode'], hookspath=[], runtime_hooks=[], excludes=['pkg_resources'], diff --git a/kcc-c2p.spec b/kcc-c2p.spec index 4f150625..4196614c 100644 --- a/kcc-c2p.spec +++ b/kcc-c2p.spec @@ -8,7 +8,7 @@ a = Analysis(['kcc-c2p.py'], pathex=['.'], binaries=[], datas=[], - hiddenimports=['_cffi_backend'], + hiddenimports=['_cffi_backend', 'text_unidecode'], hookspath=[], runtime_hooks=[], excludes=['pkg_resources'], diff --git a/kcc-macos.spec b/kcc-macos.spec index 386a2e6a..87873499 100644 --- a/kcc-macos.spec +++ b/kcc-macos.spec @@ -12,7 +12,7 @@ a = Analysis( pathex=[], binaries=[], datas=[], - hiddenimports=['_cffi_backend'], + hiddenimports=['_cffi_backend', 'text_unidecode'], hookspath=[], hooksconfig={}, runtime_hooks=[], diff --git a/kcc.spec b/kcc.spec index b55e810e..b2cbec87 100644 --- a/kcc.spec +++ b/kcc.spec @@ -8,7 +8,7 @@ a = Analysis(['kcc.py'], pathex=['.'], binaries=[], datas=[], - hiddenimports=['_cffi_backend'], + hiddenimports=['_cffi_backend', 'text_unidecode'], hookspath=[], runtime_hooks=[], excludes=['pkg_resources'], diff --git a/setup.py b/setup.py index bb39da90..23b9676f 100644 --- a/setup.py +++ b/setup.py @@ -50,13 +50,13 @@ class BuildBinaryCommand(setuptools.Command): if os.getenv('WINDOWS_7'): os.system('pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n kcc_win7_legacy_' + VERSION + ' -w --noupx kcc.py') elif platform.machine() == 'ARM64': - os.system(f'pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n KCC_{platform.machine()}_' + VERSION + ' -w --noupx kcc.py') + os.system(f'pyinstaller --hidden-import=_cffi_backend --hidden-import=text_unidecode -y -F -i icons\\comic2ebook.ico -n KCC_{platform.machine()}_' + VERSION + ' -w --noupx kcc.py') else: - os.system('pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n KCC_' + VERSION + ' -w --noupx kcc.py') + os.system('pyinstaller --hidden-import=_cffi_backend --hidden-import=text_unidecode -y -F -i icons\\comic2ebook.ico -n KCC_' + VERSION + ' -w --noupx kcc.py') sys.exit(0) elif sys.platform == 'linux': os.system( - 'pyinstaller --hidden-import=_cffi_backend --hidden-import=queue -y -F -i icons/comic2ebook.ico -n kcc_linux_' + VERSION + ' kcc.py') + 'pyinstaller --hidden-import=_cffi_backend --hidden-import=text_unidecode --hidden-import=queue -y -F -i icons/comic2ebook.ico -n kcc_linux_' + VERSION + ' kcc.py') sys.exit(0) else: sys.exit(0) @@ -76,18 +76,18 @@ class BuildC2ECommand(setuptools.Command): def run(self): VERSION = __version__ if sys.platform == 'darwin': - os.system('pyinstaller --hidden-import=_cffi_backend -y -D -i icons/comic2ebook.icns -n "KCC C2E" -c -s kcc-c2e.py') + os.system('pyinstaller --hidden-import=_cffi_backend --hidden-import=text_unidecode -y -D -i icons/comic2ebook.icns -n "KCC C2E" -c -s kcc-c2e.py') # TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v sys.exit(0) elif sys.platform == 'win32': if os.getenv('WINDOWS_7'): os.system('pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n kcc_c2e_win7_legacy_' + VERSION + ' -c --noupx kcc-c2e.py') else: - os.system(f'pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n tool_cli_c2e_{VERSION}_{platform.machine()} -c --noupx kcc-c2e.py') + os.system(f'pyinstaller --hidden-import=_cffi_backend --hidden-import=text_unidecode -y -F -i icons\\comic2ebook.ico -n tool_cli_c2e_{VERSION}_{platform.machine()} -c --noupx kcc-c2e.py') sys.exit(0) elif sys.platform == 'linux': os.system( - 'pyinstaller --hidden-import=_cffi_backend --hidden-import=queue -y -F -i icons/comic2ebook.ico -n kcc_c2e_linux_' + VERSION + ' kcc-c2e.py') + 'pyinstaller --hidden-import=_cffi_backend --hidden-import=text_unidecode --hidden-import=queue -y -F -i icons/comic2ebook.ico -n kcc_c2e_linux_' + VERSION + ' kcc-c2e.py') sys.exit(0) else: sys.exit(0) @@ -108,18 +108,18 @@ class BuildC2PCommand(setuptools.Command): def run(self): VERSION = __version__ if sys.platform == 'darwin': - os.system('pyinstaller --hidden-import=_cffi_backend -y -n "KCC C2P" -c -s kcc-c2p.py') + os.system('pyinstaller --hidden-import=_cffi_backend --hidden-import=text_unidecode -y -n "KCC C2P" -c -s kcc-c2p.py') # TODO /usr/bin/codesign --force -s "$MACOS_CERTIFICATE_NAME" --options runtime dist/Applications/Kindle\ Comic\ Converter.app -v sys.exit(0) elif sys.platform == 'win32': if os.getenv('WINDOWS_7'): os.system('pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n kcc_c2p_win7_legacy_' + VERSION + ' -c --noupx kcc-c2p.py') else: - os.system(f'pyinstaller --hidden-import=_cffi_backend -y -F -i icons\\comic2ebook.ico -n tool_cli_c2p_{VERSION}_{platform.machine()} -c --noupx kcc-c2p.py') + os.system(f'pyinstaller --hidden-import=_cffi_backend --hidden-import=text_unidecode -y -F -i icons\\comic2ebook.ico -n tool_cli_c2p_{VERSION}_{platform.machine()} -c --noupx kcc-c2p.py') sys.exit(0) elif sys.platform == 'linux': os.system( - 'pyinstaller --hidden-import=_cffi_backend --hidden-import=queue -y -F -i icons/comic2ebook.ico -n kcc_c2p_linux_' + VERSION + ' kcc-c2p.py') + 'pyinstaller --hidden-import=_cffi_backend --hidden-import=text_unidecode --hidden-import=queue -y -F -i icons/comic2ebook.ico -n kcc_c2p_linux_' + VERSION + ' kcc-c2p.py') sys.exit(0) else: sys.exit(0)