Fix regression in automatic adding in 0.8.46 that broke automatic adding if adding of duplicates is enabled and auto convert is also enabled

This commit is contained in:
Kovid Goyal 2012-04-08 10:36:43 +05:30
parent df3896d585
commit 82731ae9b2

View File

@ -3289,7 +3289,8 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
paths = list(duplicate[0] for duplicate in duplicates) paths = list(duplicate[0] for duplicate in duplicates)
formats = list(duplicate[1] for duplicate in duplicates) formats = list(duplicate[1] for duplicate in duplicates)
metadata = list(duplicate[2] for duplicate in duplicates) metadata = list(duplicate[2] for duplicate in duplicates)
return (paths, formats, metadata), len(ids) return (paths, formats, metadata), (ids if return_ids else
len(ids))
return None, (ids if return_ids else len(ids)) return None, (ids if return_ids else len(ids))
def import_book(self, mi, formats, notify=True, import_hooks=True, def import_book(self, mi, formats, notify=True, import_hooks=True,