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

Fetch selection for userscripts

Browse Source
This commit is contained in:
Artur Shaikhullin 2017-11-23 20:18:43 +06:00
parent e7a66d92a8
commit 8a64ce19c3
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qutebrowser/browser/commands.py
View File

@ -1217,7 +1217,17 @@ class CommandDispatcher:
cmd, args, userscript)) cmd, args, userscript))
if userscript: if userscript:
# ~ expansion is handled by the userscript module. # ~ expansion is handled by the userscript module.
self._run_userscript(cmd, *args, verbose=verbose) # dirty hack for async call because of:
# https://bugreports.qt.io/browse/QTBUG-53134
# until it fixed or blocked async call implemented:
# https://github.com/qutebrowser/qutebrowser/issues/3327
self.userscript_object = {
'cmd': cmd,
'args': args,
'verbose': verbose
}
caret = self._current_widget().caret
caret.selection(False, self._selection_callback)
else: else:
cmd = os.path.expanduser(cmd) cmd = os.path.expanduser(cmd)
proc = guiprocess.GUIProcess(what='command', verbose=verbose, proc = guiprocess.GUIProcess(what='command', verbose=verbose,
@ -1232,7 +1242,10 @@ class CommandDispatcher:
"""Open main startpage in current tab.""" """Open main startpage in current tab."""
self.openurl(config.val.url.start_pages[0]) self.openurl(config.val.url.start_pages[0])
def _run_userscript(self, cmd, *args, verbose=False): def _selection_callback(self, s):
self._run_userscript(s)
def _run_userscript(self, selection):
"""Run a userscript given as argument. """Run a userscript given as argument.
Args: Args:
@ -1250,7 +1263,7 @@ class CommandDispatcher:
tab = self._tabbed_browser.currentWidget() tab = self._tabbed_browser.currentWidget()
if tab is not None and tab.caret.has_selection(): if tab is not None and tab.caret.has_selection():
env['QUTE_SELECTED_TEXT'] = tab.caret.selection() env['QUTE_SELECTED_TEXT'] = selection
try: try:
env['QUTE_SELECTED_HTML'] = tab.caret.selection(html=True) env['QUTE_SELECTED_HTML'] = tab.caret.selection(html=True)
except browsertab.UnsupportedOperationError: except browsertab.UnsupportedOperationError:
@ -1266,10 +1279,13 @@ class CommandDispatcher:
env['QUTE_URL'] = url.toString(QUrl.FullyEncoded) env['QUTE_URL'] = url.toString(QUrl.FullyEncoded)
try: try:
userscripts.run_async(tab, cmd, *args, win_id=self._win_id, userscripts.run_async(tab, self.userscript_object['cmd'],
env=env, verbose=verbose) *self.userscript_object['args'], win_id=self._win_id,
env=env, verbose=self.userscript_object['verbose'])
except userscripts.Error as e: except userscripts.Error as e:
raise cmdexc.CommandError(e) raise cmdexc.CommandError(e)
finally:
self.userscript_object = None
@cmdutils.register(instance='command-dispatcher', scope='window') @cmdutils.register(instance='command-dispatcher', scope='window')
def quickmark_save(self): def quickmark_save(self):