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

Use immutable objects for hierarchical_categories for better performance

Browse Source
This commit is contained in:
Kovid Goyal 2023-10-12 08:12:20 +05:30
parent 505b11010e
commit ac7957941f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/db/categories.py
View File

@ -159,7 +159,7 @@ def sort_key_for_rating(x, hierarchical_categories=None):
# sort above "foo a.bar". Without this substitution "foo.bar" sorts below "foo # sort above "foo a.bar". Without this substitution "foo.bar" sorts below "foo
# a.bar" because '.' sorts higher than space. # a.bar" because '.' sorts higher than space.
def sort_key_for_name_and_first_letter(x, hierarchical_categories=set()): def sort_key_for_name_and_first_letter(x, hierarchical_categories=()):
v1 = icu_upper(x.sort or x.name) v1 = icu_upper(x.sort or x.name)
if x.category in hierarchical_categories: if x.category in hierarchical_categories:
v1 = v1.replace('.', '\t') v1 = v1.replace('.', '\t')
@ -170,7 +170,7 @@ def sort_key_for_name_and_first_letter(x, hierarchical_categories=set()):
return (c if numeric_collation and c.isdigit() else '9999999999', return (c if numeric_collation and c.isdigit() else '9999999999',
collation_order(v2), sort_key(v1)) collation_order(v2), sort_key(v1))
def sort_key_for_name(x, hierarchical_categories=set()): def sort_key_for_name(x, hierarchical_categories=()):
v = x.sort or x.name v = x.sort or x.name
if x.category not in hierarchical_categories: if x.category not in hierarchical_categories:
return sort_key(v) return sort_key(v)
@ -184,7 +184,7 @@ category_sort_keys[True]['name'] = sort_key_for_name_and_first_letter
category_sort_keys[False]['name'] = sort_key_for_name category_sort_keys[False]['name'] = sort_key_for_name
# Various parts of calibre depend on the the order of fields in the returned # Various parts of calibre depend on the order of fields in the returned
# dict being in the default display order: standard fields, custom in alpha order, # dict being in the default display order: standard fields, custom in alpha order,
# user categories, then saved searches. This works because the backend adds # user categories, then saved searches. This works because the backend adds
# custom columns to field metadata in the right order. # custom columns to field metadata in the right order.
@ -192,7 +192,7 @@ def get_categories(dbcache, sort='name', book_ids=None, first_letter_sort=False)
if sort not in CATEGORY_SORTS: if sort not in CATEGORY_SORTS:
raise ValueError('sort ' + sort + ' not a valid value') raise ValueError('sort ' + sort + ' not a valid value')
hierarchical_categories = set(dbcache.pref('categories_using_hierarchy', [])) hierarchical_categories = frozenset(dbcache.pref('categories_using_hierarchy', ()))
fm = dbcache.field_metadata fm = dbcache.field_metadata
book_rating_map = dbcache.fields['rating'].book_value_map book_rating_map = dbcache.fields['rating'].book_value_map
lang_map = dbcache.fields['languages'].book_value_map lang_map = dbcache.fields['languages'].book_value_map