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

lrs2lrf: Handle missing style labels gracefully

Browse Source
This commit is contained in:
Kovid Goyal 2009-07-26 12:09:21 -06:00
parent 2c5d951139
commit a80d705049
2 changed files with 54 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/lrf/lrs/convert_from.py
View File

@ -167,7 +167,7 @@ class LrsParser(object):
settings = self.attrs_to_dict(tag, map[tag.name][1]+['objid', 'objlabel']) settings = self.attrs_to_dict(tag, map[tag.name][1]+['objid', 'objlabel'])
for a in ('pagestyle', 'blockstyle', 'textstyle'): for a in ('pagestyle', 'blockstyle', 'textstyle'):
label = tag.get(a, False) label = tag.get(a, False)
if label: if label and label in self._style_labels:
_obj = self.parsed_objects[label] if \ _obj = self.parsed_objects[label] if \
self.parsed_objects.has_key(label) else \ self.parsed_objects.has_key(label) else \
self._style_labels[label] self._style_labels[label]

14
src/calibre/utils/filenames.py
View File

@ -5,7 +5,19 @@ meaning as possible.
from calibre.ebooks.unidecode.unidecoder import Unidecoder from calibre.ebooks.unidecode.unidecoder import Unidecoder
from calibre import sanitize_file_name from calibre import sanitize_file_name
from calibre.constants import preferred_encoding
udc = Unidecoder() udc = Unidecoder()
def ascii_text(orig):
try:
ascii = udc.decode(orig)
except:
if isinstance(orig, unicode):
ascii = orig.encode('ascii', 'replace')
ascii = orig.decode(preferred_encoding,
'replace').encode('ascii', 'replace')
return ascii
def ascii_filename(orig): def ascii_filename(orig):
return sanitize_file_name(udc.decode(orig).replace('?', '_')) return sanitize_file_name(ascii_text(orig).replace('?', '_'))