Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-01 10:42:58 +02:00
Code Issues Projects Releases Wiki Activity

Make series sorting on library and tag views honor the the title_series_sorting flag (and rename the flag

Browse source
This commit is contained in:
Charles Haley 2010-06-10 21:48:01 +01:00
parent 30c209fd7e
commit cbe0b78aef
4 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
resources/default_tweaks.py
View file

@ -61,13 +61,13 @@
# default if not set: MMM yyyy
gui_pubdate_display_format = 'MMM yyyy'
# Control title sorting.
# Control title and series sorting in the library view.
# If set to 'library_order', Leading articles such as The and A will be ignored.
# If set to 'strictly_alphabetic', the titles will be sorted without processing
# For example, with library_order, The Client will sort under 'C'. With
# strictly_alphabetic, the book will sort under 'T'.
# This flag affects Calibre's library display. It has no effect on devices. In
# addition, books added before changing the flag will retain their order until
# the title is edited. Double-clicking on a title and hitting return without
# changing anything is sufficient to change the sort.
title_sorting = 'library_order'
# addition, titles for books added before changing the flag will retain their
# order until the title is edited. Double-clicking on a title and hitting return
# without changing anything is sufficient to change the sort.
title_series_sorting = 'library_order'

9
src/calibre/library/caches.py
View file

@ -619,9 +619,12 @@ def sort(self, field, ascending, subsort=False):
if self.first_sort:
subsort = True
self.first_sort = False
fcmp = self.seriescmp if field == 'series' else \
functools.partial(self.cmp, self.FIELD_MAP[field], subsort=subsort,
asstr=as_string)
fcmp = self.seriescmp \
if field == 'series' and \
tweaks['title_sorting'] == 'library_order' \
else \
functools.partial(self.cmp, self.FIELD_MAP[field],
subsort=subsort, asstr=as_string)
self._map.sort(cmp=fcmp, reverse=not ascending)
self._map_filtered = [id for id in self._map if id in self._map_filtered]

4
src/calibre/library/database2.py
View file

@ -736,7 +736,7 @@ def get_categories(self, sort_on_count=False, ids=None, icon_map=None):
icon=icon, tooltip = tooltip)
for r in data if item_not_zero_func(r)]
if category == 'series' and not sort_on_count:
if tweaks['title_sorting'] == 'library_order':
if tweaks['title_series_sorting'] == 'library_order':
ts = lambda x: title_sort(x)
else:
ts = lambda x:x
@ -954,7 +954,7 @@ def set_title(self, id, title, notify=True):
title = title.decode(preferred_encoding, 'replace')
self.conn.execute('UPDATE books SET title=? WHERE id=?', (title, id))
self.data.set(id, self.FIELD_MAP['title'], title, row_is_id=True)
if tweaks['title_sorting'] == 'library_order':
if tweaks['title_series_sorting'] == 'library_order':
self.data.set(id, self.FIELD_MAP['sort'], title_sort(title), row_is_id=True)
else:
self.data.set(id, self.FIELD_MAP['sort'], title, row_is_id=True)

2
src/calibre/library/sqlite.py
View file

@ -116,7 +116,7 @@ def connect(self):
self.conn.create_aggregate('concat', 1, Concatenate)
self.conn.create_aggregate('sortconcat', 2, SortedConcatenate)
self.conn.create_aggregate('sort_concat', 2, SafeSortedConcatenate)
if tweaks['title_sorting'] == 'library_order':
if tweaks['title_series_sorting'] == 'library_order':
self.conn.create_function('title_sort', 1, title_sort)
else:
self.conn.create_function('title_sort', 1, lambda x:x)