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

Fix changed author sort name not being used when adding another book by the author to the library. Fixes #1886492 [custom author_sort skipped when adding books](https://bugs.launchpad.net/calibre/+bug/1886492)

Browse Source
This commit is contained in:
Kovid Goyal 2020-07-06 22:01:43 +05:30
parent e203712395
commit 51e4651c34
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ from calibre.db.tables import VirtualTable
from calibre.db.write import get_series_values, uniq
from calibre.db.lazy import FormatMetadata, FormatsList, ProxyMetadata
from calibre.ebooks import check_ebook_format
from calibre.ebooks.metadata import string_to_authors, author_to_author_sort, authors_to_sort_string
from calibre.ebooks.metadata import string_to_authors, author_to_author_sort
from calibre.ebooks.metadata.book.base import Metadata
from calibre.ebooks.metadata.opf2 import metadata_to_opf
from calibre.ptempfile import (base_dir, PersistentTemporaryFile,
@ -1365,7 +1365,7 @@ class Cache(object):
val = mi.get('author_sort', None)
if authors_changed and (not val or mi.is_null('author_sort')):
val = authors_to_sort_string(mi.authors)
val = self._author_sort_from_authors(mi.authors)
if authors_changed or (force_changes and val is not None) or not mi.is_null('author_sort'):
protected_set_field('author_sort', val)
@ -1600,7 +1600,7 @@ class Cache(object):
series_index = 1.0
if not mi.authors:
mi.authors = (_('Unknown'),)
aus = mi.author_sort if mi.author_sort else self._author_sort_from_authors(mi.authors)
aus = mi.author_sort if not mi.is_null('author_sort') else self._author_sort_from_authors(mi.authors)
mi.title = mi.title or _('Unknown')
if isbytestring(aus):
aus = aus.decode(preferred_encoding, 'replace')

5
src/calibre/db/tests/writing.py
View File

@ -442,6 +442,11 @@ class WritingTest(BaseTest):
mi = Metadata('empty', ['a1', 'a2'])
cache.set_metadata(1, mi)
self.assertEqual('a1 & a2', cache.field_for('author_sort', 1))
cache.set_sort_for_authors({cache.get_item_id('authors', 'a1'): 'xy'})
self.assertEqual('xy & a2', cache.field_for('author_sort', 1))
mi = Metadata('empty', ['a1'])
cache.set_metadata(1, mi)
self.assertEqual('xy', cache.field_for('author_sort', 1))
# }}}