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

Collapse whitespace in metadata. Improve logging slightly.

Browse Source
This commit is contained in:
Marshall T. Vandegrift 2009-01-10 10:27:55 -05:00
parent 6fb37e2422
commit ed6f3b6702
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/ebooks/mobi/writer.py
View File

@ -88,7 +88,6 @@ class Serializer(object):
NSRMAP = {'': None, XML_NS: 'xml', XHTML_NS: '', MBP_NS: 'mbp'} NSRMAP = {'': None, XML_NS: 'xml', XHTML_NS: '', MBP_NS: 'mbp'}
def __init__(self, oeb, images): def __init__(self, oeb, images):
oeb.logger.info('Serializing markup content...')
self.oeb = oeb self.oeb = oeb
self.images = images self.images = images
self.id_offsets = {} self.id_offsets = {}
@ -226,6 +225,8 @@ class Serializer(object):
class MobiWriter(object): class MobiWriter(object):
COLLAPSE_RE = re.compile(r'[ \t\r\n\v]+')
def __init__(self, compression=None, logger=FauxLogger()): def __init__(self, compression=None, logger=FauxLogger()):
self._compression = compression or UNCOMPRESSED self._compression = compression or UNCOMPRESSED
self._logger = logger self._logger = logger
@ -296,6 +297,7 @@ class MobiWriter(object):
return data, overlap return data, overlap
def _generate_text(self): def _generate_text(self):
self._oeb.logger.info('Serializing markup content...')
serializer = Serializer(self._oeb, self._images) serializer = Serializer(self._oeb, self._images)
breaks = serializer.breaks breaks = serializer.breaks
text = serializer.text text = serializer.text
@ -371,6 +373,7 @@ class MobiWriter(object):
return data return data
def _generate_images(self): def _generate_images(self):
self._oeb.logger.warn('Serializing images...')
images = [(index, href) for href, index in self._images.items()] images = [(index, href) for href, index in self._images.items()]
images.sort() images.sort()
metadata = self._oeb.metadata metadata = self._oeb.metadata
@ -421,7 +424,8 @@ class MobiWriter(object):
if term not in EXTH_CODES: continue if term not in EXTH_CODES: continue
code = EXTH_CODES[term] code = EXTH_CODES[term]
for item in oeb.metadata[term]: for item in oeb.metadata[term]:
data = unicode(item).encode('utf-8') data = self.COLLAPSE_RE.sub(' ', unicode(item))
data = data.encode('utf-8')
exth.write(pack('>II', code, len(data) + 8)) exth.write(pack('>II', code, len(data) + 8))
exth.write(data) exth.write(data)
nrecs += 1 nrecs += 1
@ -473,7 +477,7 @@ class MobiWriter(object):
def main(argv=sys.argv): def main(argv=sys.argv):
from calibre.ebooks.oeb.base import DirWriter from calibre.ebooks.oeb.base import DirWriter
inpath, outpath = argv[1:] inpath, outpath = argv[1:]
context = Context('Firefox', 'MobiDesktop') context = Context('Firefox', 'EZReader')
oeb = OEBBook(inpath) oeb = OEBBook(inpath)
#writer = MobiWriter(compression=PALMDOC) #writer = MobiWriter(compression=PALMDOC)
writer = MobiWriter(compression=UNCOMPRESSED) writer = MobiWriter(compression=UNCOMPRESSED)