From 68da853e42f2e46f959f81fb7aab0481fb5727b7 Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Thu, 9 Nov 2023 15:00:44 -0800 Subject: [PATCH] fix page order in pdf and more by using natural sort instead of python sort (#589) * use natsorted * Add fast --- kindlecomicconverter/comic2ebook.py | 3 ++- requirements.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py index 31a1f3b7..7007bb1d 100755 --- a/kindlecomicconverter/comic2ebook.py +++ b/kindlecomicconverter/comic2ebook.py @@ -32,6 +32,7 @@ from shutil import move, copytree, rmtree, copyfile from multiprocessing import Pool from uuid import uuid4 +from natsort import natsorted from slugify import slugify as slugify_ext from PIL import Image from subprocess import STDOUT, PIPE @@ -762,7 +763,7 @@ def getPanelViewSize(deviceres, size): def sanitizeTree(filetree): chapterNames = {} for root, dirs, files in os.walk(filetree, False): - for i, name in enumerate(sorted(files)): + for i, name in enumerate(natsorted(files)): splitname = os.path.splitext(name) # file needs kcc at front AND back to avoid renaming issues diff --git a/requirements.txt b/requirements.txt index 7e852a9c..c0bd4ed4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,5 @@ python-slugify>=1.2.1 raven>=6.0.0 # PyQt5-tools mozjpeg-lossless-optimization>=1.1.2 +natsort[fast]>=8.4.0 distro