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

Fix output encodings for ztxt and palmdoc. Modify error message to fit dialog.

Browse Source
This commit is contained in:
John Schember 2009-05-31 17:41:51 -04:00
parent a68d4899dd
commit 520e1549ce
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/pdb/palmdoc/writer.py
View File

@ -34,7 +34,7 @@ class Writer(FormatWriter):
self.log.info('Compessing data...') self.log.info('Compessing data...')
for i in range(0, len(txt_records)): for i in range(0, len(txt_records)):
self.log.debug('\tCompressing record %i' % i) self.log.debug('\tCompressing record %i' % i)
txt_records[i] = compress_doc(txt_records[i].encode('utf-8')) txt_records[i] = compress_doc(txt_records[i].encode('cp1252', 'replace'))
section_lengths.append(len(txt_records[i])) section_lengths.append(len(txt_records[i]))
out_stream.seek(0) out_stream.seek(0)

2
src/calibre/ebooks/pdb/ztxt/writer.py
View File

@ -33,7 +33,7 @@ class Writer(FormatWriter):
self.log.info('Compressing data...') self.log.info('Compressing data...')
for i in range(0, len(txt_records)): for i in range(0, len(txt_records)):
self.log.debug('\tCompressing record %i' % i) self.log.debug('\tCompressing record %i' % i)
txt_records[i] = compressor.compress(txt_records[i].encode('utf-8')) txt_records[i] = compressor.compress(txt_records[i].encode('cp1252', 'replace'))
txt_records[i] = txt_records[i] + compressor.flush(zlib.Z_FULL_FLUSH) txt_records[i] = txt_records[i] + compressor.flush(zlib.Z_FULL_FLUSH)
section_lengths.append(len(txt_records[i])) section_lengths.append(len(txt_records[i]))
crc32 = zlib.crc32(txt_records[i], crc32) & 0xffffffff crc32 = zlib.crc32(txt_records[i], crc32) & 0xffffffff

4
src/calibre/gui2/viewer/main.py
View File

@ -55,7 +55,7 @@ class Worker(Thread):
try: try:
Thread.run(self) Thread.run(self)
self.exception = self.traceback = None self.exception = self.traceback = None
except Exception, err: except Exception as err:
self.exception = err self.exception = err
self.traceback = traceback.format_exc() self.traceback = traceback.format_exc()
@ -544,7 +544,7 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
error_dialog(self, _('DRM Error'), _('<p>This book is protected by <a href="%s">DRM</a>')%'http://wiki.mobileread.com/wiki/DRM').exec_() error_dialog(self, _('DRM Error'), _('<p>This book is protected by <a href="%s">DRM</a>')%'http://wiki.mobileread.com/wiki/DRM').exec_()
else: else:
error_dialog(self, _('Could not open ebook'), error_dialog(self, _('Could not open ebook'),
unicode(worker.exception), det_msg=worker.traceback, show=True) unicode(worker.exception.reason), det_msg=worker.traceback, show=True)
self.close_progress_indicator() self.close_progress_indicator()
else: else:
self.metadata.show_opf(self.iterator.opf) self.metadata.show_opf(self.iterator.opf)