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

newdb: Handle renaming of many-many items when new name contains separator

Browse Source 
Fix a regression that broke splitting of multiple valued field like tags
into many items during a rename. Fixes #1216699 [Renaming tags and adding "," to split tags does not work anymore](https://bugs.launchpad.net/calibre/+bug/1216699)
This commit is contained in:
Kovid Goyal 2013-08-26 09:25:11 +05:30
parent a94af603ff
commit a9992f90b8
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1388,12 +1388,22 @@ class Cache(object):
affected_books = set()
moved_books = set()
id_map = {}
try:
sv = f.metadata['is_multiple']['ui_to_list']
except (TypeError, KeyError, AttributeError):
sv = None
for item_id, new_name in item_id_to_new_name_map.iteritems():
books, new_id = func(item_id, new_name, self.backend)
new_names = tuple(x.strip() for x in new_name.split(sv)) if sv else (new_name,)
books, new_id = func(item_id, new_names[0], self.backend)
affected_books.update(books)
id_map[item_id] = new_id
if new_id != item_id:
moved_books.update(books)
if len(new_names) > 1:
# Add the extra items to the books
extra = new_names[1:]
self._set_field(field, {book_id:self._fast_field_for(f, book_id) + extra for book_id in books})
if affected_books:
if field == 'authors':
self._set_field('author_sort',
@ -1401,7 +1411,7 @@ class Cache(object):
self._update_path(affected_books, mark_as_dirtied=False)
elif change_index and hasattr(f, 'index_field') and tweaks['series_index_auto_increment'] != 'no_change':
for book_id in moved_books:
self._set_field(f.index_field.name, {book_id:self._get_next_series_num_for(self._field_for(field, book_id), field=field)})
self._set_field(f.index_field.name, {book_id:self._get_next_series_num_for(self._fast_field_for(f, book_id), field=field)})
self._mark_as_dirty(affected_books)
return affected_books, id_map

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

@ -554,6 +554,20 @@ class WritingTest(BaseTest):
self.assertEqual(c.field_for('#series', 2), 'My Series Two')
self.assertEqual(c.field_for('#series_index', 1), 3.0)
self.assertEqual(c.field_for('#series_index', 2), 4.0)
# Test renaming many-many items to multiple items
cache = self.init_cache(self.cloned_library)
t = {v:k for k, v in cache.get_id_map('tags').iteritems()}['Tag One']
affected_books, id_map = cache.rename_items('tags', {t:'Something, Else, Entirely'})
self.assertEqual({1, 2}, affected_books)
tmap = cache.get_id_map('tags')
self.assertEqual('Something', tmap[id_map[t]])
self.assertEqual(1, len(id_map))
f1, f2 = cache.field_for('tags', 1), cache.field_for('tags', 2)
for f in (f1, f2):
for t in 'Something,Else,Entirely'.split(','):
self.assertIn(t, f)
self.assertNotIn('Tag One', f)
# }}}
def test_composite_cache(self): # {{{