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

Add a do_search argument to fuzzy_url.

Browse Source 
This turns off searching no matter what autosearch is set to, and also makes it
possible to use fuzzy_url before the config is up.

For now, we use this for quickmarks and the startpage.
This commit is contained in:
Florian Bruhin 2015-02-27 08:07:40 +01:00
parent a76868c0f4
commit 6d51fcfb2e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/app.py
View File

@ -387,7 +387,7 @@ class Application(QApplication):
log.init.debug("Opening startpage") log.init.debug("Opening startpage")
for urlstr in config.get('general', 'startpage'): for urlstr in config.get('general', 'startpage'):
try: try:
url = urlutils.fuzzy_url(urlstr) url = urlutils.fuzzy_url(urlstr, do_search=False)
except urlutils.FuzzyUrlError as e: except urlutils.FuzzyUrlError as e:
message.error(0, "Error when opening startpage: " message.error(0, "Error when opening startpage: "
"{}".format(e)) "{}".format(e))

2
qutebrowser/browser/quickmarks.py
View File

@ -137,7 +137,7 @@ class QuickmarkManager(QObject):
"Quickmark '{}' does not exist!".format(name)) "Quickmark '{}' does not exist!".format(name))
urlstr = self.marks[name] urlstr = self.marks[name]
try: try:
url = urlutils.fuzzy_url(urlstr) url = urlutils.fuzzy_url(urlstr, do_search=False)
except urlutils.FuzzyUrlError: except urlutils.FuzzyUrlError:
raise cmdexc.CommandError( raise cmdexc.CommandError(
"Invalid URL for quickmark {}: {} ({})".format( "Invalid URL for quickmark {}: {} ({})".format(

7
qutebrowser/utils/urlutils.py
View File

@ -138,13 +138,14 @@ def _is_url_dns(url):
return not info.error() return not info.error()
def fuzzy_url(urlstr, cwd=None, relative=False): def fuzzy_url(urlstr, cwd=None, relative=False, do_search=True):
"""Get a QUrl based on an user input which is URL or search term. """Get a QUrl based on an user input which is URL or search term.
Args: Args:
urlstr: URL to load as a string. urlstr: URL to load as a string.
cwd: The current working directory, or None. cwd: The current working directory, or None.
relative: Whether to resolve relative files. relative: Whether to resolve relative files.
do_search: Whether to perform a search on non-URLs.
Return: Return:
A target QUrl to a searchpage or the original URL. A target QUrl to a searchpage or the original URL.
@ -166,7 +167,7 @@ def fuzzy_url(urlstr, cwd=None, relative=False):
if path is not None and os.path.exists(path): if path is not None and os.path.exists(path):
log.url.debug("URL is a local file") log.url.debug("URL is a local file")
url = QUrl.fromLocalFile(path) url = QUrl.fromLocalFile(path)
elif is_url(stripped): elif (not do_search) or is_url(stripped):
# probably an address # probably an address
log.url.debug("URL is a fuzzy address") log.url.debug("URL is a fuzzy address")
url = qurl_from_user_input(urlstr) url = qurl_from_user_input(urlstr)
@ -178,7 +179,7 @@ def fuzzy_url(urlstr, cwd=None, relative=False):
url = qurl_from_user_input(stripped) url = qurl_from_user_input(stripped)
log.url.debug("Converting fuzzy term {} to URL -> {}".format( log.url.debug("Converting fuzzy term {} to URL -> {}".format(
urlstr, url.toDisplayString())) urlstr, url.toDisplayString()))
if config.get('general', 'auto-search'): if do_search and config.get('general', 'auto-search'):
qtutils.ensure_valid(url) qtutils.ensure_valid(url)
else: else:
if not url.isValid(): if not url.isValid():