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

newdb: set_metadata should not allow case changes

Browse Source 
set_metadata() was allowing case changes for is_multiple fields, causing
for instance, adding books to change the case of existing
tags/authors/etc. In the old backend it was inconsistent, case changes
were disallowed for most fields, but allowed for a few, for example,
series.
This commit is contained in:
Kovid Goyal 2013-08-12 18:53:22 +05:30
parent f7250683a4
commit f017da50aa
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1057,7 +1057,7 @@ class Cache(object):
@write_api @write_api
def set_metadata(self, book_id, mi, ignore_errors=False, force_changes=False, def set_metadata(self, book_id, mi, ignore_errors=False, force_changes=False,
set_title=True, set_authors=True): set_title=True, set_authors=True, allow_case_change=False):
''' '''
Set metadata for the book `id` from the `Metadata` object `mi` Set metadata for the book `id` from the `Metadata` object `mi`
@ -1078,13 +1078,13 @@ class Cache(object):
except (AttributeError, TypeError): except (AttributeError, TypeError):
pass pass
def set_field(name, val, **kwargs): def set_field(name, val):
self._set_field(name, {book_id:val}, **kwargs) self._set_field(name, {book_id:val}, do_path_update=False, allow_case_change=allow_case_change)
path_changed = False path_changed = False
if set_title and mi.title: if set_title and mi.title:
path_changed = True path_changed = True
set_field('title', mi.title, do_path_update=False) set_field('title', mi.title)
if set_authors: if set_authors:
path_changed = True path_changed = True
if not mi.authors: if not mi.authors:
@ -1092,7 +1092,7 @@ class Cache(object):
authors = [] authors = []
for a in mi.authors: for a in mi.authors:
authors += string_to_authors(a) authors += string_to_authors(a)
set_field('authors', authors, do_path_update=False) set_field('authors', authors)
if path_changed: if path_changed:
self._update_path({book_id}) self._update_path({book_id})

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

@ -420,6 +420,13 @@ class WritingTest(BaseTest):
ae(nmi2.get_extra('#series'), 1.0) ae(nmi2.get_extra('#series'), 1.0)
self.compare_metadata(nmi2, oldmi2, exclude={'last_modified', 'format_metadata', '#series_index'}) self.compare_metadata(nmi2, oldmi2, exclude={'last_modified', 'format_metadata', '#series_index'})
cache = self.init_cache(self.cloned_library)
mi = cache.get_metadata(1)
otags = mi.tags
mi.tags = [x.upper() for x in mi.tags]
cache.set_metadata(3, mi)
self.assertEqual(set(otags), set(cache.field_for('tags', 3)), 'case changes should not be allowed in set_metadata')
# }}} # }}}
def test_conversion_options(self): # {{{ def test_conversion_options(self): # {{{
@ -574,4 +581,3 @@ class WritingTest(BaseTest):
cache.add_format(1, 'ADD', BytesIO(b'xxxx')) cache.add_format(1, 'ADD', BytesIO(b'xxxx'))
test_invalidate() test_invalidate()
# }}} # }}}