Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Comic Input: When sorting the pages inside a comic, recognize numbers, so that page2 sorts before page10

Browse Source
This commit is contained in:
Kovid Goyal 2014-07-26 08:58:33 +05:30
parent ef3e10d033
commit db3b08247e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/ebooks/comic/input.py
View File

@ -13,6 +13,7 @@ from Queue import Empty
from calibre import extract, prints, walk from calibre import extract, prints, walk
from calibre.constants import filesystem_encoding from calibre.constants import filesystem_encoding
from calibre.ptempfile import PersistentTemporaryDirectory from calibre.ptempfile import PersistentTemporaryDirectory
from calibre.utils.icu import numeric_sort_key
from calibre.utils.ipc.server import Server from calibre.utils.ipc.server import Server
from calibre.utils.ipc.job import ParallelJob from calibre.utils.ipc.job import ParallelJob
@ -57,11 +58,11 @@ def find_pages(dir, sort_on_mtime=False, verbose=False):
pages.append(path) pages.append(path)
break break
if sort_on_mtime: if sort_on_mtime:
comparator = lambda x, y : cmp(os.stat(x).st_mtime, os.stat(y).st_mtime) key = lambda x:os.stat(x).st_mtime
else: else:
comparator = lambda x, y : cmp(os.path.basename(x), os.path.basename(y)) key = lambda x:numeric_sort_key(os.path.basename(x))
pages.sort(cmp=comparator) pages.sort(key=key)
if verbose: if verbose:
prints('Found comic pages...') prints('Found comic pages...')
prints('\t'+'\n\t'.join([os.path.basename(p) for p in pages])) prints('\t'+'\n\t'.join([os.path.basename(p) for p in pages]))