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

Abort running questions when closing tab.

Browse Source 
Fixes #306.
This commit is contained in:
Florian Bruhin 2014-12-08 16:04:56 +01:00
parent 91fcac4735
commit edfc0e24b2
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
qutebrowser/network/networkmanager.py
View File

@ -19,7 +19,7 @@
"""Our own QNetworkAccessManager.""" """Our own QNetworkAccessManager."""
from PyQt5.QtCore import pyqtSlot, PYQT_VERSION, QCoreApplication from PyQt5.QtCore import pyqtSlot, pyqtSignal, PYQT_VERSION, QCoreApplication
from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkReply from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkReply
try: try:
@ -43,8 +43,13 @@ class NetworkManager(QNetworkAccessManager):
_scheme_handlers: A dictionary (scheme -> handler) of supported custom _scheme_handlers: A dictionary (scheme -> handler) of supported custom
schemes. schemes.
_win_id: The window ID this NetworkManager is associated with. _win_id: The window ID this NetworkManager is associated with.
Signals:
shutting_down: Emitted when the QNAM is shutting down.
""" """
shutting_down = pyqtSignal()
def __init__(self, win_id, parent=None): def __init__(self, win_id, parent=None):
log.init.debug("Initializing NetworkManager") log.init.debug("Initializing NetworkManager")
with log.disable_qt_msghandler(): with log.disable_qt_msghandler():
@ -74,6 +79,26 @@ class NetworkManager(QNetworkAccessManager):
self.proxyAuthenticationRequired.connect( self.proxyAuthenticationRequired.connect(
self.on_proxy_authentication_required) self.on_proxy_authentication_required)
def _ask(self, win_id, message, mode):
"""Ask a blocking question in the statusbar.
Args:
win_id: The ID of the window which is calling this function.
message: The message to display to the user.
mode: A PromptMode.
Return:
The answer the user gave or None if the prompt was cancelled.
"""
q = usertypes.Question()
q.text = message
q.mode = mode
self.shutting_down.connect(q.abort)
bridge = objreg.get('message-bridge', scope='window', window=win_id)
bridge.ask(q, blocking=True)
q.deleteLater()
return q.answer
def _fill_authenticator(self, authenticator, answer): def _fill_authenticator(self, authenticator, answer):
"""Fill a given QAuthenticator object with an answer.""" """Fill a given QAuthenticator object with an answer."""
if answer is not None: if answer is not None:
@ -90,6 +115,7 @@ class NetworkManager(QNetworkAccessManager):
for request in self._requests: for request in self._requests:
request.abort() request.abort()
request.deleteLater() request.deleteLater()
self.shutting_down.emit()
@pyqtSlot('QNetworkReply*', 'QList<QSslError>') @pyqtSlot('QNetworkReply*', 'QList<QSslError>')
def on_ssl_errors(self, reply, errors): def on_ssl_errors(self, reply, errors):
@ -104,10 +130,9 @@ class NetworkManager(QNetworkAccessManager):
ssl_strict = config.get('network', 'ssl-strict') ssl_strict = config.get('network', 'ssl-strict')
if ssl_strict == 'ask': if ssl_strict == 'ask':
err_string = '\n'.join('- ' + err.errorString() for err in errors) err_string = '\n'.join('- ' + err.errorString() for err in errors)
answer = message.ask( answer = self._ask(self._win_id,
self._win_id, 'SSL errors - continue?\n{}'.format(err_string),
'SSL errors - continue?\n{}'.format(err_string), mode=usertypes.PromptMode.yesno)
mode=usertypes.PromptMode.yesno)
if answer: if answer:
reply.ignoreSslErrors() reply.ignoreSslErrors()
elif ssl_strict: elif ssl_strict:
@ -123,15 +148,15 @@ class NetworkManager(QNetworkAccessManager):
@pyqtSlot('QNetworkReply', 'QAuthenticator') @pyqtSlot('QNetworkReply', 'QAuthenticator')
def on_authentication_required(self, _reply, authenticator): def on_authentication_required(self, _reply, authenticator):
"""Called when a website needs authentication.""" """Called when a website needs authentication."""
answer = message.ask(self._win_id, answer = self._ask(self._win_id,
"Username ({}):".format(authenticator.realm()), "Username ({}):".format(authenticator.realm()),
mode=usertypes.PromptMode.user_pwd) mode=usertypes.PromptMode.user_pwd)
self._fill_authenticator(authenticator, answer) self._fill_authenticator(authenticator, answer)
@pyqtSlot('QNetworkProxy', 'QAuthenticator') @pyqtSlot('QNetworkProxy', 'QAuthenticator')
def on_proxy_authentication_required(self, _proxy, authenticator): def on_proxy_authentication_required(self, _proxy, authenticator):
"""Called when a proxy needs authentication.""" """Called when a proxy needs authentication."""
answer = message.ask(self._win_id, "Proxy username ({}):".format( answer = self._ask(self._win_id, "Proxy username ({}):".format(
authenticator.realm()), mode=usertypes.PromptMode.user_pwd) authenticator.realm()), mode=usertypes.PromptMode.user_pwd)
self._fill_authenticator(authenticator, answer) self._fill_authenticator(authenticator, answer)