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

Expose $QUTE_COUNT to userscripts

Browse Source
This commit is contained in:
wishfort36 2018-08-12 21:21:01 +02:00
parent 8e6f79755d
commit 359eefe1ab
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/help/commands.asciidoc
View File

@ -1200,6 +1200,9 @@ Spawn a command in a shell.
* +*-o*+, +*--output*+: Whether the output should be shown in a new tab. * +*-o*+, +*--output*+: Whether the output should be shown in a new tab.
* +*-d*+, +*--detach*+: Whether the command should be detached from qutebrowser. * +*-d*+, +*--detach*+: Whether the command should be detached from qutebrowser.
==== count
Given to userscripts as $QUTE_COUNT.
==== note ==== note
* This command does not split arguments after the last argument and handles quotes literally. * This command does not split arguments after the last argument and handles quotes literally.

10
qutebrowser/browser/commands.py
View File

@ -1173,8 +1173,9 @@ class CommandDispatcher:
@cmdutils.register(instance='command-dispatcher', scope='window', @cmdutils.register(instance='command-dispatcher', scope='window',
maxsplit=0, no_replace_variables=True) maxsplit=0, no_replace_variables=True)
@cmdutils.argument('count', count=True)
def spawn(self, cmdline, userscript=False, verbose=False, def spawn(self, cmdline, userscript=False, verbose=False,
output=False, detach=False): output=False, detach=False, count=None):
"""Spawn a command in a shell. """Spawn a command in a shell.
Args: Args:
@ -1188,6 +1189,7 @@ class CommandDispatcher:
output: Whether the output should be shown in a new tab. output: Whether the output should be shown in a new tab.
detach: Whether the command should be detached from qutebrowser. detach: Whether the command should be detached from qutebrowser.
cmdline: The commandline to execute. cmdline: The commandline to execute.
count: Given to userscripts as $QUTE_COUNT.
""" """
cmdutils.check_exclusive((userscript, detach), 'ud') cmdutils.check_exclusive((userscript, detach), 'ud')
try: try:
@ -1211,7 +1213,7 @@ class CommandDispatcher:
if userscript: if userscript:
def _selection_callback(s): def _selection_callback(s):
try: try:
runner = self._run_userscript(s, cmd, args, verbose) runner = self._run_userscript(s, cmd, args, verbose, count)
runner.finished.connect(_on_proc_finished) runner.finished.connect(_on_proc_finished)
except cmdexc.CommandError as e: except cmdexc.CommandError as e:
message.error(str(e)) message.error(str(e))
@ -1238,17 +1240,19 @@ 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, selection, cmd, args, verbose): def _run_userscript(self, selection, cmd, args, verbose, count):
"""Run a userscript given as argument. """Run a userscript given as argument.
Args: Args:
cmd: The userscript to run. cmd: The userscript to run.
args: Arguments to pass to the userscript. args: Arguments to pass to the userscript.
verbose: Show notifications when the command started/exited. verbose: Show notifications when the command started/exited.
count: Exposed to the userscript.
""" """
env = { env = {
'QUTE_MODE': 'command', 'QUTE_MODE': 'command',
'QUTE_SELECTED_TEXT': selection, 'QUTE_SELECTED_TEXT': selection,
'QUTE_COUNT': str(count), # must be a string
} }
idx = self._current_index() idx = self._current_index()