Fix bug #4252: Nook driver writes cover image and uses default image when no cover is associated with book.

This commit is contained in:
John Schember 2009-12-19 20:32:40 -05:00
parent 2debc774d9
commit 32b02e627b
3 changed files with 28 additions and 6 deletions

View File

@ -47,7 +47,7 @@ class CYBOOKG3(USBMS):
DELETE_EXTS = ['.mbp', '.dat', '_6090.t2b']
SUPPORTS_SUB_DIRS = True
def upload_cover(self, path, name, coverdata):
def upload_cover(self, path, name, coverdata, metadata):
with open('%s_6090.t2b' % os.path.join(path, name), 'wb') as t2bfile:
t2b.write_t2b(t2bfile, coverdata)

View File

@ -8,6 +8,14 @@ __docformat__ = 'restructuredtext en'
Device driver for Barns and Nobel's Nook
'''
try:
from PIL import Image, ImageDraw
Image
except ImportError:
import Image
import cStringIO
from calibre.devices.usbms.driver import USBMS
class NOOK(USBMS):
@ -38,10 +46,24 @@ class NOOK(USBMS):
EBOOK_DIR_MAIN = 'my documents'
SUPPORTS_SUB_DIRS = True
def upload_cover(self, path, name, coverdata):
if coverdata:
with open('%s.jpg' % os.path.join(path, name), 'wb') as coverfile:
coverfile.write(coverdata)
def upload_cover(self, path, name, coverdata, metadata):
if not coverdata:
coverdata = open(I('library.png'), 'rb').read()
im = Image.open(cStringIO.StringIO(coverdata))
im.thumbnail((96, 144), Image.ANTIALIAS)
if not coverdata:
draw = ImageDraw.Draw(im)
draw.text((0, 29), metadata.title)
draw.text((0, 115), ', '.join(metadata.authors))
data = cStringIO.StringIO()
im.save(data, 'JPG')
coverdata = data.getvalue()
with open('%s.jpg' % os.path.join(path, name), 'wb') as coverfile:
coverfile.write(coverdata)
def windows_sort_drives(self, drives):
main = drives.get('main', None)

View File

@ -115,7 +115,7 @@ class USBMS(CLI, Device):
coverdata = mdata.get('cover', None)
if coverdata:
coverdata = coverdata[2]
self.upload_cover(os.path.dirname(filepath), os.path.splitext(os.path.basename(filepath))[0], coverdata)
self.upload_cover(os.path.dirname(filepath), os.path.splitext(os.path.basename(filepath))[0], coverdata, mdata)
self.report_progress((i+1) / float(len(files)), _('Transferring books to device...'))