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

[review] docstrings, url logging, etc.

Browse Source
This commit is contained in:
Anton S 2017-10-10 14:13:49 +03:00
parent e537826ff5
commit e1f5da3eff
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qutebrowser/app.py
View File

@ -293,10 +293,11 @@ def process_pos_args(args, via_ipc=False, cwd=None, target_arg=None):
cwd = None cwd = None
try: try:
url = urlutils.fuzzy_url(cmd, cwd, relative=True) url = urlutils.fuzzy_url(cmd, cwd, relative=True)
win_id = open_url(url, target=open_target)
except urlutils.InvalidUrlError as e: except urlutils.InvalidUrlError as e:
message.error("Error in startup argument '{}': {}".format( message.error("Error in startup argument '{}': {}".format(
cmd, e)) cmd, e))
else:
win_id = open_url(url, target=open_target)
def open_url(url, target=None, force_raise=None): def open_url(url, target=None, force_raise=None):
@ -305,6 +306,13 @@ def open_url(url, target=None, force_raise=None):
Args: Args:
url: An URL to open url: An URL to open
target: same as new_instance_open_target (used as a default) target: same as new_instance_open_target (used as a default)
force_raise: control target window raising:
* None - obey new_instance_open_target
* True - always raise
* False - never raise
Return:
ID of a window that was used to open URL
""" """
target = target or config.val.new_instance_open_target target = target or config.val.new_instance_open_target
background = target in {'tab-bg', 'tab-bg-silent'} background = target in {'tab-bg', 'tab-bg-silent'}
@ -312,7 +320,7 @@ def open_url(url, target=None, force_raise=None):
force_raise=force_raise) force_raise=force_raise)
tabbed_browser = objreg.get('tabbed-browser', scope='window', tabbed_browser = objreg.get('tabbed-browser', scope='window',
window=win_id) window=win_id)
log.init.debug("About to open URL {}".format(url)) log.init.debug("About to open URL: {}".format(url.toDisplayString()))
tabbed_browser.tabopen(url, background=background, related=False) tabbed_browser.tabopen(url, background=background, related=False)
return win_id return win_id

7
qutebrowser/mainwindow/mainwindow.py
View File

@ -51,6 +51,13 @@ def get_window(via_ipc, force_window=False, force_tab=False,
force_window: Whether to force opening in a window. force_window: Whether to force opening in a window.
force_tab: Whether to force opening in a tab. force_tab: Whether to force opening in a tab.
force_target: Override the new_instance_open_target config force_target: Override the new_instance_open_target config
force_raise: control target window raising:
* None - obey new_instance_open_target
* True - always raise
* False - never raise
Return:
ID of a window that was used to open URL
""" """
if force_window and force_tab: if force_window and force_tab:
raise ValueError("force_window and force_tab are mutually exclusive!") raise ValueError("force_window and force_tab are mutually exclusive!")