rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve workaround for missing error pages

Browse Source
This commit is contained in:
Florian Bruhin 2018-02-24 23:17:35 +01:00
parent bfb3a6594f
commit 638e880604
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qutebrowser/browser/webengine/webenginetab.py
View File

@ -22,6 +22,7 @@
import math import math
import functools import functools
import sys import sys
import re
import html as html_utils import html as html_utils
import sip import sip
@ -873,12 +874,27 @@ class WebEngineTab(browsertab.AbstractTab):
if not ok: if not ok:
self._load_finished_fake.emit(False) self._load_finished_fake.emit(False)
def _error_page_workaround(self, html):
"""Check if we're displaying a Chromium error page.
This gets only called if we got loadFinished(False) without JavaScript,
so we can display at least some error page.
WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66643
Needs to check the page content as a WORKAROUND for
https://bugreports.qt.io/browse/QTBUG-66661
"""
match = re.search(r'"errorCode":"([^"]*)"', html)
if match is None:
return
self._show_error_page(self.url(), error=match.group(1))
@pyqtSlot(bool) @pyqtSlot(bool)
def _on_load_finished(self, ok): def _on_load_finished(self, ok):
"""Display a static error page if JavaScript is disabled."""
super()._on_load_finished(ok) super()._on_load_finished(ok)
if not ok and not self.settings.test_attribute('content.javascript.enabled'): if not ok and not self.settings.test_attribute('content.javascript.enabled'):
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-66643 self.dump_async(self._error_page_workaround)
self._show_error_page(self.url(), error="")
@pyqtSlot(QUrl) @pyqtSlot(QUrl)
def _on_url_changed(self, url): def _on_url_changed(self, url):