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 #799171 (In 0.8.6 on Mac: Loading HTML pkg as ZIP file no longer picks up external style sheet from folder)

Browse Source
This commit is contained in:
Kovid Goyal 2011-06-18 10:00:57 -06:00
parent 5b20799629
commit 954e04a52d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/html/input.py
View File

@ -457,7 +457,7 @@ class HTMLInput(InputFormatPlugin):
href=bhref) href=bhref)
guessed = self.guess_type(href)[0] guessed = self.guess_type(href)[0]
media_type = guessed or self.BINARY_MIME media_type = guessed or self.BINARY_MIME
if 'text' in media_type: if media_type == 'text/plain':
self.log.warn('Ignoring link to text file %r'%link_) self.log.warn('Ignoring link to text file %r'%link_)
return None return None

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

@ -1162,7 +1162,7 @@ class Manifest(object):
data = self._parse_xml(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 self.media_type.lower() == 'text/plain':
self.oeb.log.warn('%s contains data in TXT format'%self.href, self.oeb.log.warn('%s contains data in TXT format'%self.href,
'converting to HTML') 'converting to HTML')
data = self._parse_txt(data) data = self._parse_txt(data)