Archives/wting_autojump
1
0
Fork 0
mirror of https://github.com/wting/autojump synced 2024-10-27 20:34:07 +00:00
Code Issues Releases Wiki Activity

match consecutive needles to paths

Browse Source
This commit is contained in:
William Ting 2013-12-17 11:54:40 -06:00
parent 30d1b6d6f2
commit 067f653b50
1 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
bin/autojump
View File

@ -205,25 +205,55 @@ def find_matches(config, needles, count=1):
needles = map(sanitize, needles) needles = map(sanitize, needles)
ignore_case = detect_smartcase(needles) ignore_case = detect_smartcase(needles)
# if one needle, match only against the last directory of each path exact_matches = match_consecutive(needles, data, ignore_case)
if len(needles) == 1:
exact_matches = match_end(first(needles), data, ignore_case)
else:
exact_matches = match_regex(needles, data, ignore_case)
exists = lambda entry: os.path.exists(entry.path) exists = lambda entry: os.path.exists(entry.path)
result = first(ifilter(exists, exact_matches)) result = first(ifilter(exists, exact_matches))
# TODO(ting|2013-12-17): remove debug print
print(result)
sys.exit(0)
return result.path if result else u'' return result.path if result else u''
def match_end(needle, haystack, ignore_case=False): def match_consecutive(needles, haystack, ignore_case=False):
"""Matches needle against the last directory of path.""" """
get_last_dir = lambda entry: second(os.path.split(entry.path)) Matches consecutive needles at the end of a path.
if ignore_case:
has_needle = lambda entry: needle in get_last_dir(entry).lower() For example:
else: needles = ['foo', 'baz']
has_needle = lambda entry: needle in get_last_dir(entry) haystack = [
return ifilter(has_needle, haystack) (path="/foo/bar/baz", 10),
(path="/foo/baz/moo", 10),
(path="/moo/foo/baz", 10),
(path="/foo/baz", 10)]
regex needle = re.compile(r'''
foo # needle #1
[^/]* # all characters except os.sep zero or more times
/ # os.sep
[^/]* # all characters except os.sep zero or more times
baz # needle #2
[^/]* # all characters except os.sep zero or more times
$ # end of string
'''
result = [
(path="/moo/foo/baz", 10),
(path="/foo/baz", 10)]
"""
regex_no_sep = '[^' + os.sep + ']*'
regex_one_sep = regex_no_sep + os.sep + regex_no_sep
regex_no_sep_end = regex_no_sep + '$'
# can't use compiled regex because of flags
needle = regex_one_sep.join(needles) + regex_no_sep_end
regex_flags = re.IGNORECASE | re.UNICODE if ignore_case else re.UNICODE
found = lambda haystack: re.search(
needle,
haystack.path,
flags=regex_flags)
return ifilter(found, haystack)
def match_regex(needles, haystack, ignore_case=False): def match_regex(needles, haystack, ignore_case=False):