From 8c2aa4182cd85ea9679d559bc3b992bd00db3d45 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 15 Dec 2021 08:15:26 +0530 Subject: [PATCH] DRYer --- src/calibre/gui2/tweak_book/preview.py | 5 +++-- src/calibre/gui2/viewer/web_view.py | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/tweak_book/preview.py b/src/calibre/gui2/tweak_book/preview.py index 8bcce528ac..adac53e6c6 100644 --- a/src/calibre/gui2/tweak_book/preview.py +++ b/src/calibre/gui2/tweak_book/preview.py @@ -341,12 +341,13 @@ class WebPage(QWebEnginePage): prints('%s:%s: %s' % (source_id, linenumber, msg)) def acceptNavigationRequest(self, url, req_type, is_main_frame): - if req_type == QWebEngineUrlRequestInfo.NavigationType.NavigationTypeReload: + if req_type in (QWebEngineUrlRequestInfo.NavigationType.NavigationTypeReload, QWebEngineUrlRequestInfo.NavigationType.NavigationTypeBackForward): return True if url.scheme() in (FAKE_PROTOCOL, 'data'): return True - if req_type == QWebEnginePage.NavigationType.NavigationTypeLinkClicked: + if url.scheme() in ('http', 'https') and req_type == QWebEnginePage.NavigationType.NavigationTypeLinkClicked: safe_open_url(url) + prints('Blocking navigation request to:', url.toString()) return False def go_to_anchor(self, anchor): diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py index f6edd0e2f6..4799c3bad9 100644 --- a/src/calibre/gui2/viewer/web_view.py +++ b/src/calibre/gui2/viewer/web_view.py @@ -370,9 +370,7 @@ class WebPage(QWebEnginePage): pass def acceptNavigationRequest(self, url, req_type, is_main_frame): - if req_type == QWebEngineUrlRequestInfo.NavigationType.NavigationTypeReload: - return True - if req_type == QWebEngineUrlRequestInfo.NavigationType.NavigationTypeBackForward: + if req_type in (QWebEngineUrlRequestInfo.NavigationType.NavigationTypeReload, QWebEngineUrlRequestInfo.NavigationType.NavigationTypeBackForward): return True if url.scheme() in (FAKE_PROTOCOL, 'data'): return True