newdb: Fix passing in QImage to set_cover not working

This commit is contained in:
Kovid Goyal 2013-09-16 14:10:54 +05:30
parent 6a893e48d8
commit 3046339a18

View File

@ -1273,22 +1273,21 @@ class DB(object):
if callable(getattr(data, 'save', None)): if callable(getattr(data, 'save', None)):
from calibre.gui2 import pixmap_to_data from calibre.gui2 import pixmap_to_data
data = pixmap_to_data(data) data = pixmap_to_data(data)
else: elif callable(getattr(data, 'read', None)):
if callable(getattr(data, 'read', None)): data = data.read()
data = data.read() if data is None:
if data is None: if os.path.exists(path):
if os.path.exists(path):
try:
os.remove(path)
except (IOError, OSError):
time.sleep(0.2)
os.remove(path)
else:
try: try:
save_cover_data_to(data, path) os.remove(path)
except (IOError, OSError): except (IOError, OSError):
time.sleep(0.2) time.sleep(0.2)
save_cover_data_to(data, path) os.remove(path)
else:
try:
save_cover_data_to(data, path)
except (IOError, OSError):
time.sleep(0.2)
save_cover_data_to(data, path)
def copy_format_to(self, book_id, fmt, fname, path, dest, def copy_format_to(self, book_id, fmt, fname, path, dest,
windows_atomic_move=None, use_hardlink=False): windows_atomic_move=None, use_hardlink=False):