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

Split off _yank_url from :yank

Browse Source
This commit is contained in:
Florian Bruhin 2016-09-06 18:16:32 +02:00
parent d3e19ec8fc
commit 7c4548ece1
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qutebrowser/browser/commands.py
View File

@ -673,6 +673,20 @@ class CommandDispatcher:
"Numeric argument is too large for internal int " "Numeric argument is too large for internal int "
"representation.") "representation.")
def _yank_url(self, what):
"""Helper method for yank() to get the URL to copy."""
assert what in ['url', 'pretty-url'], what
flags = QUrl.RemovePassword
if what != 'pretty-url':
flags |= QUrl.FullyEncoded
url = QUrl(self._current_url())
url_query = QUrlQuery(url)
for key in dict(url_query.queryItems()):
if key in config.get('general', 'yank-ignored-url-parameters'):
url_query.removeQueryItem(key)
url.setQuery(url_query)
return url.toString(flags)
@cmdutils.register(instance='command-dispatcher', scope='window') @cmdutils.register(instance='command-dispatcher', scope='window')
@cmdutils.argument('what', choices=['selection', 'url', 'pretty-url', @cmdutils.argument('what', choices=['selection', 'url', 'pretty-url',
'title', 'domain']) 'title', 'domain'])
@ -699,16 +713,7 @@ class CommandDispatcher:
self._current_url().host(), self._current_url().host(),
':' + str(port) if port > -1 else '') ':' + str(port) if port > -1 else '')
elif what in ['url', 'pretty-url']: elif what in ['url', 'pretty-url']:
flags = QUrl.RemovePassword s = self._yank_url(what)
if what != 'pretty-url':
flags |= QUrl.FullyEncoded
url = QUrl(self._current_url())
url_query = QUrlQuery(url)
for key in dict(url_query.queryItems()):
if key in config.get('general', 'yank-ignored-url-parameters'):
url_query.removeQueryItem(key)
url.setQuery(url_query)
s = url.toString(flags)
what = 'URL' # For printing what = 'URL' # For printing
elif what == 'selection': elif what == 'selection':
caret = self._current_widget().caret caret = self._current_widget().caret