Better error message when user specifies embed font family that does not exist

This commit is contained in:
Kovid Goyal 2016-02-19 21:05:25 +05:30
parent f4f82d689a
commit fb778e5a2d

View file

@ -194,11 +194,18 @@ def get_embed_font_info(self, family, failure_critical=True):
body_font_family = None
if not family:
return body_font_family, efi
from calibre.utils.fonts.scanner import font_scanner
from calibre.utils.fonts.scanner import font_scanner, NoFonts
from calibre.utils.fonts.utils import panose_to_css_generic_family
faces = font_scanner.fonts_for_family(family)
try:
faces = font_scanner.fonts_for_family(family)
except NoFonts:
msg = (u'No embeddable fonts found for family: %r'%family)
if failure_critical:
raise ValueError(msg)
self.oeb.log.warn(msg)
return body_font_family, efi
if not faces:
msg = (u'No embeddable fonts found for family: %r'%self.opts.embed_font_family)
msg = (u'No embeddable fonts found for family: %r'%family)
if failure_critical:
raise ValueError(msg)
self.oeb.log.warn(msg)