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

implement ignore_case for match_end()

Browse Source
This commit is contained in:
William Ting 2013-12-17 11:11:27 -06:00
parent c2189efb7b
commit 30d1b6d6f2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/autojump
View File

@ -205,8 +205,8 @@ 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
if len(needles) == 1: if len(needles) == 1:
# if one needle, match only against the last directory of each path
exact_matches = match_end(first(needles), data, ignore_case) exact_matches = match_end(first(needles), data, ignore_case)
else: else:
exact_matches = match_regex(needles, data, ignore_case) exact_matches = match_regex(needles, data, ignore_case)
@ -219,7 +219,10 @@ def find_matches(config, needles, count=1):
def match_end(needle, haystack, ignore_case=False): def match_end(needle, haystack, ignore_case=False):
"""Matches needle against the last directory of path.""" """Matches needle against the last directory of path."""
get_last_dir = lambda entry: second(os.path.split(entry.path)) get_last_dir = lambda entry: second(os.path.split(entry.path))
has_needle = lambda entry: needle in get_last_dir(entry) if ignore_case:
has_needle = lambda entry: needle in get_last_dir(entry).lower()
else:
has_needle = lambda entry: needle in get_last_dir(entry)
return ifilter(has_needle, haystack) return ifilter(has_needle, haystack)