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 #2350 (conversion of a mobipocket file (huffdic compressed) fail)

Browse Source
This commit is contained in:
Kovid Goyal 2009-04-26 15:25:25 -07:00
parent 54dd263be1
commit 8e68f9d4dd
2 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/ebooks/mobi/reader.py
View File

@ -382,6 +382,7 @@ class MobiReader(object):
} }
mobi_version = self.book_header.mobi_version mobi_version = self.book_header.mobi_version
for tag in root.iter(etree.Element): for tag in root.iter(etree.Element):
tag.attrib.pop('xmlns', '')
if tag.tag in ('country-region', 'place', 'placetype', 'placename', if tag.tag in ('country-region', 'place', 'placetype', 'placename',
'state', 'city', 'street', 'address', 'content'): 'state', 'city', 'street', 'address', 'content'):
tag.tag = 'div' if tag.tag == 'content' else 'span' tag.tag = 'div' if tag.tag == 'content' else 'span'

2
src/calibre/utils/terminfo.py
View File

@ -177,6 +177,8 @@ class ProgressBar:
self.width = self.term.COLS or 75 self.width = self.term.COLS or 75
self.bar = term.render(self.BAR) self.bar = term.render(self.BAR)
self.header = self.term.render(self.HEADER % header.center(self.width)) self.header = self.term.render(self.HEADER % header.center(self.width))
if isinstance(self.header, unicode):
self.header = self.header.encode('utf-8')
self.cleared = 1 #: true if we haven't drawn the bar yet. self.cleared = 1 #: true if we haven't drawn the bar yet.
def update(self, percent, message=''): def update(self, percent, message=''):