Archives/wting_autojump
1
0
Fork 0
mirror of https://github.com/wting/autojump synced 2025-06-13 12:54:07 +00:00
Code Issues Releases Wiki Activity

Factor out current directory check for speedup.

Browse Source
This commit is contained in:
jez 2011-05-27 07:42:06 +00:00
parent 7a3b8a8e7f
commit 2a93e3c570
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
autojump
View File

@ -90,13 +90,6 @@ def clean_dict(sorted_dirs, path_dict):
def match(path, pattern, ignore_case=False, only_end=False): def match(path, pattern, ignore_case=False, only_end=False):
"""Check whether a path matches a particular pattern""" """Check whether a path matches a particular pattern"""
try:
if os.path.realpath(os.curdir) == path :
return False
#Sometimes the current path doesn't exist anymore.
#In that case, jump if possible.
except OSError:
pass
if only_end: if only_end:
match_string = "/".join(path.split('/')[-1-pattern.count('/'):]) match_string = "/".join(path.split('/')[-1-pattern.count('/'):])
else: else:
@ -200,7 +193,14 @@ def shell_utility():
endmatch = re.match("(.*)"+COMPLETION_SEPARATOR, patterns[-1]) endmatch = re.match("(.*)"+COMPLETION_SEPARATOR, patterns[-1])
if endmatch: patterns[-1] = endmatch.group(1) if endmatch: patterns[-1] = endmatch.group(1)
dirs = list(path_dict.items()) try:
cwd = os.path.realpath(os.curdir)
#Sometimes the current path doesn't exist anymore.
#In that case, jump if possible.
except OSError:
cwd = None
dirs = list((path, count) for path, count in path_dict.items()
if path != cwd)
dirs.sort(key=itemgetter(1), reverse=True) dirs.sort(key=itemgetter(1), reverse=True)
if completion or userchoice != -1: if completion or userchoice != -1:
max_matches = 9 max_matches = 9