Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle named entities in XML and fix regression in single instance detection for calibre GUI on windows

Browse Source
This commit is contained in:
Kovid Goyal 2009-07-22 10:57:01 -06:00
parent 5c1bc1de41
commit a7b2d2ab83
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/ebooks/oeb/base.py
View File

@ -759,6 +759,15 @@ class Manifest(object):
return u'Item(id=%r, href=%r, media_type=%r)' \ return u'Item(id=%r, href=%r, media_type=%r)' \
% (self.id, self.href, self.media_type) % (self.id, self.href, self.media_type)
def _parse_xml(self, data):
try:
return etree.fromstring(data)
except etree.XMLSyntaxError, err:
if getattr(err, 'code', 0) == 26 or str(err).startswith('Entity'):
data = xml_to_unicode(data, strip_encoding_pats=True,
resolve_entities=True)[0]
return etree.fromstring(data)
def _parse_xhtml(self, data): def _parse_xhtml(self, data):
self.oeb.log.debug('Parsing', self.href, '...') self.oeb.log.debug('Parsing', self.href, '...')
# Convert to Unicode and normalize line endings # Convert to Unicode and normalize line endings
@ -952,7 +961,7 @@ class Manifest(object):
elif self.media_type.lower() in OEB_DOCS: elif self.media_type.lower() in OEB_DOCS:
data = self._parse_xhtml(data) data = self._parse_xhtml(data)
elif self.media_type.lower()[-4:] in ('+xml', '/xml'): elif self.media_type.lower()[-4:] in ('+xml', '/xml'):
data = etree.fromstring(data) data = self._parse_xml(data)
elif self.media_type.lower() in OEB_STYLES: elif self.media_type.lower() in OEB_STYLES:
data = self._parse_css(data) data = self._parse_css(data)
elif 'text' in self.media_type.lower(): elif 'text' in self.media_type.lower():

10
src/calibre/gui2/main.py
View File

@ -1873,13 +1873,19 @@ def main(args=sys.argv):
return run_gui(opts, args, actions, listener, app) return run_gui(opts, args, actions, listener, app)
else: else:
return run_gui(opts, args, actions, listener, app) return run_gui(opts, args, actions, listener, app)
otherinstance = False
try: try:
listener = Listener(address=ADDRESS) listener = Listener(address=ADDRESS)
except socket.error: # Good si is correct except socket.error: # Good si is correct (on UNIX)
communicate(args) otherinstance = True
else: else:
# On windows only singleinstance can be trusted
otherinstance = True if iswindows else False
if not otherinstance:
return run_gui(opts, args, actions, listener, app) return run_gui(opts, args, actions, listener, app)
communicate(args)
return 0 return 0