Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-11-02 18:47:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Browser viewer: Fix inability to open books that contain zero-byte stylesheets/images

Browse Source
This commit is contained in:
Kovid Goyal 2018-07-21 11:04:00 +05:30
parent 079af7acf9
commit 86d58a2539
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/ebooks/oeb/polish/container.py
View File

@ -525,6 +525,11 @@ class Container(ContainerBase): # {{{
''' Return True iff a file with the same canonical name as that specified exists. Unlike :meth:`exists` this method is always case-sensitive. ''' ''' Return True iff a file with the same canonical name as that specified exists. Unlike :meth:`exists` this method is always case-sensitive. '''
return name and name in self.name_path_map return name and name in self.name_path_map
def has_name_and_is_not_empty(self, name):
if not self.has_name(name):
return False
return os.path.getsize(self.name_path_map[name]) > 0
def has_name_case_insensitive(self, name): def has_name_case_insensitive(self, name):
if not name: if not name:
return False return False

8
src/calibre/srv/render_book.py
View File

@ -176,11 +176,13 @@ class Container(ContainerBase):
log = log or default_log log = log or default_log
book_fmt, opfpath, input_fmt = extract_book(path_to_ebook, tdir, log=log) book_fmt, opfpath, input_fmt = extract_book(path_to_ebook, tdir, log=log)
ContainerBase.__init__(self, tdir, opfpath, log) ContainerBase.__init__(self, tdir, opfpath, log)
# We do not add zero byte sized files as the IndexedDB API in the
# browser has no good way to distinguish between zero byte files and
# load failures.
excluded_names = { excluded_names = {
name for name, mt in self.mime_map.iteritems() if name for name, mt in self.mime_map.iteritems() if
name == self.opf_name or mt == guess_type('a.ncx') or name.startswith('META-INF/') or name == self.opf_name or mt == guess_type('a.ncx') or name.startswith('META-INF/') or
name == 'mimetype' name == 'mimetype' or not self.has_name_and_is_not_empty(name)}
}
raster_cover_name, titlepage_name = self.create_cover_page(input_fmt.lower()) raster_cover_name, titlepage_name = self.create_cover_page(input_fmt.lower())
toc = get_toc(self).to_dict(count()) toc = get_toc(self).to_dict(count())
spine = [name for name, is_linear in self.spine_names] spine = [name for name, is_linear in self.spine_names]
@ -319,7 +321,7 @@ class Container(ContainerBase):
url, frag = purl.path, purl.fragment url, frag = purl.path, purl.fragment
name = self.href_to_name(url, base) name = self.href_to_name(url, base)
if name: if name:
if self.has_name(name): if self.has_name_and_is_not_empty(name):
frag = urlunquote(frag) frag = urlunquote(frag)
url = resource_template.format(encode_url(name, frag)) url = resource_template.format(encode_url(name, frag))
else: else: