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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2024-10-21 18:36:21 +05:30
commit d9a8b6abad
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/db/tables.py
View File

@ -373,6 +373,7 @@ class ManyToOneTable(Table):
# We have to replace # We have to replace
new_id = existing_item new_id = existing_item
self.id_map.pop(item_id, None) self.id_map.pop(item_id, None)
self.link_map.pop(item_id, None)
books = self.col_book_map.pop(item_id, set()) books = self.col_book_map.pop(item_id, set())
for book_id in books: for book_id in books:
self.book_col_map[book_id] = existing_item self.book_col_map[book_id] = existing_item
@ -522,6 +523,7 @@ class ManyToManyTable(ManyToOneTable):
# We have to replace # We have to replace
new_id = existing_item new_id = existing_item
self.id_map.pop(item_id, None) self.id_map.pop(item_id, None)
self.link_map.pop(item_id, None)
books = self.col_book_map.pop(item_id, set()) books = self.col_book_map.pop(item_id, set())
# Replacing item_id with existing_item could cause the same id to # Replacing item_id with existing_item could cause the same id to
# appear twice in the book list. Handle that by removing existing # appear twice in the book list. Handle that by removing existing
@ -615,7 +617,6 @@ class AuthorsTable(ManyToManyTable):
def rename_item(self, item_id, new_name, db): def rename_item(self, item_id, new_name, db):
ret = ManyToManyTable.rename_item(self, item_id, new_name, db) ret = ManyToManyTable.rename_item(self, item_id, new_name, db)
if item_id not in self.id_map: if item_id not in self.id_map:
self.link_map.pop(item_id, None)
self.asort_map.pop(item_id, None) self.asort_map.pop(item_id, None)
else: else:
# Was a simple rename, update the author sort value # Was a simple rename, update the author sort value