From 97e2c838d0e6e4920ce4e1f4d71688979f57b68d Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Fri, 24 Sep 2010 10:50:50 +0100 Subject: [PATCH] 1) Fix of json codec. 2) make dump_metadata set get_cover=False --- src/calibre/ebooks/metadata/book/json_codec.py | 3 ++- src/calibre/library/database2.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/metadata/book/json_codec.py b/src/calibre/ebooks/metadata/book/json_codec.py index 2550089473..c02d4e953d 100644 --- a/src/calibre/ebooks/metadata/book/json_codec.py +++ b/src/calibre/ebooks/metadata/book/json_codec.py @@ -75,7 +75,8 @@ class JsonCodec(object): self.field_metadata = FieldMetadata() def encode_to_file(self, file, booklist): - json.dump(self.encode_booklist_metadata(booklist), file, indent=2, encoding='utf-8') + file.write(json.dumps(self.encode_booklist_metadata(booklist), + indent=2, encoding='utf-8')) def encode_booklist_metadata(self, booklist): result = [] diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 6a0d442927..773a4bdc9f 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -561,7 +561,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): for book_id in book_ids: if not self.data.has_id(book_id): continue - mi = self.get_metadata(book_id, index_is_id=True, get_cover=True) + mi = self.get_metadata(book_id, index_is_id=True, get_cover=False) # Always set cover to cover.jpg. Even if cover doesn't exist, # no harm done. This way no need to call dirtied when # cover is set/removed