fuzzy_url uses path check function
This commit is contained in:
parent
594b0d2910
commit
4500bc24d4
@ -171,22 +171,10 @@ def fuzzy_url(urlstr, cwd=None, relative=False, do_search=True):
|
|||||||
A target QUrl to a search page or the original URL.
|
A target QUrl to a search page or the original URL.
|
||||||
"""
|
"""
|
||||||
urlstr = urlstr.strip()
|
urlstr = urlstr.strip()
|
||||||
expanded = os.path.expanduser(urlstr)
|
path = get_path_if_valid(urlstr, cwd = cwd, relative = relative,
|
||||||
|
check_exists = True)
|
||||||
|
|
||||||
if os.path.isabs(expanded):
|
if path is not None:
|
||||||
path = expanded
|
|
||||||
elif relative and cwd:
|
|
||||||
path = os.path.join(cwd, expanded)
|
|
||||||
elif relative:
|
|
||||||
try:
|
|
||||||
path = os.path.abspath(expanded)
|
|
||||||
except OSError:
|
|
||||||
path = None
|
|
||||||
else:
|
|
||||||
path = None
|
|
||||||
|
|
||||||
if path is not None and os.path.exists(path):
|
|
||||||
log.url.debug("URL is a local file")
|
|
||||||
url = QUrl.fromLocalFile(path)
|
url = QUrl.fromLocalFile(path)
|
||||||
elif (not do_search) or is_url(urlstr):
|
elif (not do_search) or is_url(urlstr):
|
||||||
# probably an address
|
# probably an address
|
||||||
|
Loading…
Reference in New Issue
Block a user