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

Improve original URL handling

Browse Source 
When setting self._orig_url by hand, sometimes on redirects the wrong
URL was picked up.
This commit is contained in:
Florian Bruhin 2016-06-10 14:37:29 +02:00
parent 66938ed44b
commit ff7d6250c6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qutebrowser/browser/webview.py
View File

@ -119,7 +119,6 @@ class WebView(QWebView):
self.destroyed.connect(functools.partial( self.destroyed.connect(functools.partial(
cfg.changed.disconnect, self.init_neighborlist)) cfg.changed.disconnect, self.init_neighborlist))
self.cur_url = QUrl() self.cur_url = QUrl()
self._orig_url = QUrl()
self.progress = 0 self.progress = 0
self.registry = objreg.ObjectRegistry() self.registry = objreg.ObjectRegistry()
self.tab_id = next(tab_id_gen) self.tab_id = next(tab_id_gen)
@ -151,11 +150,12 @@ class WebView(QWebView):
"""Add url to history now that we have displayed something.""" """Add url to history now that we have displayed something."""
history = objreg.get('web-history') history = objreg.get('web-history')
no_formatting = QUrl.UrlFormattingOption(0) no_formatting = QUrl.UrlFormattingOption(0)
if (self._orig_url.isValid() and orig_url = self.page().mainFrame().requestedUrl()
not self._orig_url.matches(self.cur_url, no_formatting)): if (orig_url.isValid() and
not orig_url.matches(self.cur_url, no_formatting)):
# If the url of the page is different than the url of the link # If the url of the page is different than the url of the link
# originally clicked, save them both. # originally clicked, save them both.
history.add_url(self._orig_url, self.title(), redirect=True) history.add_url(orig_url, self.title(), redirect=True)
history.add_url(self.cur_url, self.title()) history.add_url(self.cur_url, self.title())
def _init_page(self): def _init_page(self):
@ -197,8 +197,6 @@ class WebView(QWebView):
log.webview.debug("load status for {}: {}".format(repr(self), val)) log.webview.debug("load status for {}: {}".format(repr(self), val))
self.load_status = val self.load_status = val
self.load_status_changed.emit(val.name) self.load_status_changed.emit(val.name)
if val == LoadStatus.loading:
self._orig_url = self.cur_url
def _set_bg_color(self): def _set_bg_color(self):
"""Set the webpage background color as configured.""" """Set the webpage background color as configured."""