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

E-book viewer: Fix an occassional hang on startup at "Loading section". Fixes #1950673 [Opening books using the book reader fails to load.](https://bugs.launchpad.net/calibre/+bug/1950673)

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-30 00:10:37 +05:30
parent d8671c8e9e
commit ce49820ffc
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/viewer/web_view.py
View File

@ -153,12 +153,9 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
return self.fail_request(rq) return self.fail_request(rq)
if name.startswith('book/'): if name.startswith('book/'):
name = name.partition('/')[2] name = name.partition('/')[2]
if name == '__index__': if name in ('__index__', '__popup__'):
send_reply(rq, 'text/html', b'<div>\xa0</div>') send_reply(rq, 'text/html', b'<div>\xa0</div>')
return return
elif name == '__popup__':
send_reply(rq, 'text/html', b'<div id="calibre-viewer-footnote-iframe">\xa0</div>')
return
try: try:
data, mime_type = get_data(name) data, mime_type = get_data(name)
if data is None: if data is None:
@ -196,7 +193,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler):
if fail_code is None: if fail_code is None:
fail_code = QWebEngineUrlRequestJob.Error.UrlNotFound fail_code = QWebEngineUrlRequestJob.Error.UrlNotFound
rq.fail(fail_code) rq.fail(fail_code)
prints("Blocking FAKE_PROTOCOL request: {}".format(rq.requestUrl().toString())) prints("Blocking FAKE_PROTOCOL request: {} with code: {}".format(rq.requestUrl().toString(), fail_code))
# }}} # }}}

4
src/pyj/iframe_comm.pyj
View File

@ -55,7 +55,7 @@ class IframeWrapper:
self.messenger = Messenger() self.messenger = Messenger()
self.iframe_id = ensure_id(iframe, 'content-iframe') self.iframe_id = ensure_id(iframe, 'content-iframe')
if ':' in entry_point: if ':' in entry_point:
self.needs_init = False self.needs_init = iframe.src is not entry_point
self.srcdoc_created = True self.srcdoc_created = True
self.constructor_url = entry_point self.constructor_url = entry_point
self.entry_point = None self.entry_point = None
@ -115,6 +115,8 @@ class IframeWrapper:
self.encrypted_communications = False self.encrypted_communications = False
def _send_message(self, action, encrypted, data): def _send_message(self, action, encrypted, data):
if not self.ready:
return
data.action = action data.action = action
msg = {'data':data, 'encrypted': encrypted} msg = {'data':data, 'encrypted': encrypted}
if encrypted: if encrypted:

3
src/pyj/read_book/iframe.pyj
View File

@ -1006,4 +1006,5 @@ class IframeBoss:
def main(): def main():
main.boss = IframeBoss() if not main.boss:
main.boss = IframeBoss()

6
src/pyj/read_book/view.pyj
View File

@ -885,12 +885,14 @@ class View:
is_current_book = self.book and self.book.key == book.key is_current_book = self.book and self.book.key == book.key
self.book_load_started = True self.book_load_started = True
if not is_current_book: if not is_current_book:
self.iframe_wrapper.reset() if self.book:
self.content_popup_overlay.reset() self.iframe_wrapper.reset()
self.content_popup_overlay.reset()
self.loaded_resources = {} self.loaded_resources = {}
self.content_popup_overlay.loaded_resources = {} self.content_popup_overlay.loaded_resources = {}
self.timers.start_book(book) self.timers.start_book(book)
self.search_overlay.clear_caches(book) self.search_overlay.clear_caches(book)
self.iframe_wrapper.init()
unkey = username_key(get_interface_data().username) unkey = username_key(get_interface_data().username)
self.book = current_book.book = book self.book = current_book.book = book
hl = None hl = None

7
src/pyj/viewer-main.pyj
View File

@ -442,8 +442,7 @@ if window is window.top:
, 0) # We do this after event loop ticks over to avoid catching popstate events that some browsers send on page load , 0) # We do this after event loop ticks over to avoid catching popstate events that some browsers send on page load
else: else:
# iframe # iframe
div = document.getElementById('calibre-viewer-footnote-iframe') if document.location.pathname.endsWith('/__index__'):
if div:
footnotes_main()
else:
iframe_main() iframe_main()
elif document.location.pathname.endsWith('/__popup__'):
footnotes_main()