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

Catalogs: Fix an error creating catalogs in ebook format when one of the books contains HTML entities in its title

Browse Source
This commit is contained in:
Kovid Goyal 2014-02-10 07:33:42 +05:30
parent 3f4211cfeb
commit d720c82cbe
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/calibre/library/catalogs/epub_mobi_builder.py
View File

@ -3,12 +3,12 @@
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2010, Greg Riker' __copyright__ = '2010, Greg Riker'
import datetime, htmlentitydefs, os, platform, re, shutil, time, unicodedata, zlib import datetime, os, platform, re, shutil, time, unicodedata, zlib
from copy import deepcopy from copy import deepcopy
from xml.sax.saxutils import escape from xml.sax.saxutils import escape
from calibre import (prepare_string_for_xml, strftime, force_unicode, from calibre import (prepare_string_for_xml, strftime, force_unicode,
isbytestring) isbytestring, replace_entities)
from calibre.constants import isosx, cache_dir from calibre.constants import isosx, cache_dir
from calibre.customize.conversion import DummyReporter from calibre.customize.conversion import DummyReporter
from calibre.customize.ui import output_profiles from calibre.customize.ui import output_profiles
@ -432,28 +432,7 @@ class CatalogBuilder(object):
Return: Return:
s (str): converted string s (str): converted string
""" """
matches = re.findall("&#\d+;", s) return replace_entities(s)
if len(matches) > 0:
hits = set(matches)
for hit in hits:
name = hit[2:-1]
try:
entnum = int(name)
s = s.replace(hit, unichr(entnum))
except ValueError:
pass
matches = re.findall("&\w+;", s)
hits = set(matches)
amp = "&"
if amp in hits:
hits.remove(amp)
for hit in hits:
name = hit[1:-1]
if htmlentitydefs.name2codepoint in name:
s = s.replace(hit, unichr(htmlentitydefs.name2codepoint[name]))
s = s.replace(amp, "&")
return s
def copy_catalog_resources(self): def copy_catalog_resources(self):
""" Copy resources from calibre source to self.catalog_path. """ Copy resources from calibre source to self.catalog_path.