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

Catalogs: Fix regression that broke sorting of non series titles before series titles

Browse Source
This commit is contained in:
Kovid Goyal 2012-08-30 19:19:30 +05:30
parent 653ea57586
commit 847e906001
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/library/catalogs/epub_mobi_builder.py
View File

@ -1294,7 +1294,7 @@ Author '{0}':
def add_books_to_HTML_by_month(this_months_list, dtc): def add_books_to_HTML_by_month(this_months_list, dtc):
if len(this_months_list): if len(this_months_list):
this_months_list = sorted(this_months_list, key=self.booksByAuthorSorter_author_sort) this_months_list = sorted(this_months_list, key=lambda x: sort_key(self.booksByAuthorSorter_author_sort(x)))
# Create a new month anchor # Create a new month anchor
date_string = strftime(u'%B %Y', current_date.timetuple()) date_string = strftime(u'%B %Y', current_date.timetuple())
@ -3091,14 +3091,14 @@ Author '{0}':
Sort non-series books before series books Sort non-series books before series books
''' '''
if not book['series']: if not book['series']:
key = '%s %s' % (capitalize(book['author_sort']), key = '%s ~%s' % (capitalize(book['author_sort']),
capitalize(book['title_sort'])) capitalize(book['title_sort']))
else: else:
index = book['series_index'] index = book['series_index']
integer = int(index) integer = int(index)
fraction = index-integer fraction = index-integer
series_index = '%04d%s' % (integer, str('%0.4f' % fraction).lstrip('0')) series_index = '%04d%s' % (integer, str('%0.4f' % fraction).lstrip('0'))
key = '%s ~%s %s' % (capitalize(book['author_sort']), key = '%s %s %s' % (capitalize(book['author_sort']),
self.generateSortTitle(book['series']), self.generateSortTitle(book['series']),
series_index) series_index)
return key return key
@ -3228,9 +3228,9 @@ Author '{0}':
# Hack to force the cataloged leading letter to be # Hack to force the cataloged leading letter to be
# an unadorned character if the accented version sorts before the unaccented # an unadorned character if the accented version sorts before the unaccented
exceptions = { exceptions = {
u'Ä':u'A', u'??':u'A',
u'Ö':u'O', u'??':u'O',
u'Ü':u'U' u'??':u'U'
} }
if key is not None: if key is not None: