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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2026-01-03 12:41:14 +05:30
parent 389e31605d
commit 63fdf6340b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/db/cache.py
View File

@ -1057,7 +1057,7 @@ class Cache:
raise KeyError(f'No book with id {book_id!r} found in the library')
@read_api
def author_data(self, author_ids=None):
def author_data(self, author_ids=None) -> dict[int, dict[str, str]]:
'''
Return author data as a dictionary with keys: name, sort, link

19
src/calibre/gui2/library/bookshelf_view.py
View File

@ -796,6 +796,17 @@ def get_grouped_iterator(db: Cache, book_ids_iter: Iterable[int], field_name: st
yield '', 0
yield '', book_ids_iter
return
case 'authors':
def get_authors_field_id_map() -> dict[int, str]:
field_id_map = db.get_id_map('authors')
author_sort_map = db.author_data(field_id_map)
def gas(aid: int, au: str) -> str:
try:
return author_sort_map[aid]['sort']
except Exception:
return au
return {aid: gas(aid, au) for aid, au in field_id_map.items()}
get_field_id_map = get_authors_field_id_map
case 'languages':
lm = lang_map()
formatter = lambda x: lm.get(x, x) # noqa: E731
@ -821,14 +832,6 @@ def get_grouped_iterator(db: Cache, book_ids_iter: Iterable[int], field_name: st
formatter = lambda x: str(x) if x > UNDEFINED_DATE.year else ungrouped_name # noqa: E731
field_id_map = get_field_id_map()
if field_name == 'authors':
author_sort_map = db.author_data(field_id_map)
def gas(aid: int, au: str) -> str:
try:
return author_sort_map[aid]['sort']
except Exception:
return au
field_id_map = {aid: gas(aid, au) for aid, au in field_id_map.items()}
yield '', len(field_id_map)
seen = set()
for group in sorted(field_id_map, key=lambda fid: sort_key(field_id_map[fid])):