From 0ecf1b4e3b32af1a1ade649884a9204a166087bd Mon Sep 17 00:00:00 2001 From: Calum Smith Date: Thu, 29 Sep 2016 17:00:31 -0400 Subject: [PATCH 1/3] Fixed order of match precedence and match_anywhere example --- bin/autojump | 4 ++-- bin/autojump_match.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/autojump b/bin/autojump index f4494ea..7ab7c08 100755 --- a/bin/autojump +++ b/bin/autojump @@ -193,8 +193,8 @@ def find_matches(entries, needles, check_entries=True): lambda entry: not is_cwd(entry) and path_exists(entry), chain( match_consecutive(needles, data, ignore_case), - match_fuzzy(needles, data, ignore_case), - match_anywhere(needles, data, ignore_case))) + match_anywhere(needles, data, ignore_case), + match_fuzzy(needles, data, ignore_case))) def handle_tab_completion(needle, entries): diff --git a/bin/autojump_match.py b/bin/autojump_match.py index 75f9aca..cf166b9 100644 --- a/bin/autojump_match.py +++ b/bin/autojump_match.py @@ -32,7 +32,7 @@ def match_anywhere(needles, haystack, ignore_case=False): ] result = [ - (path='/moo/foo/baz', weight=10), + (path='/foo/bar/baz', weight=10), (path='/foo/baz', weight=10), ] """ From 575b14a13f13ef915141e011c5dd8582a9e09d33 Mon Sep 17 00:00:00 2001 From: Calum Smith Date: Thu, 29 Sep 2016 17:25:30 -0400 Subject: [PATCH 2/3] Improved handling multiple directory needles --- bin/autojump_match.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/autojump_match.py b/bin/autojump_match.py index cf166b9..03095c7 100644 --- a/bin/autojump_match.py +++ b/bin/autojump_match.py @@ -20,14 +20,15 @@ else: def match_anywhere(needles, haystack, ignore_case=False): """ Matches needles anywhere in the path as long as they're in the same (but - not necessary consecutive) order. + not necessary consecutive) order, and the last needle is at the end. For example: needles = ['foo', 'baz'] - regex needle = r'.*foo.*baz.*' + regex needle = r'foo.*/.*baz[^/]*$' haystack = [ (path='/foo/bar/baz', weight=10), (path='/baz/foo/bar', weight=10), + (path='/foo/baz/bar', weight=11), (path='/foo/baz', weight=10), ] @@ -36,8 +37,9 @@ def match_anywhere(needles, haystack, ignore_case=False): (path='/foo/baz', weight=10), ] """ - regex_needle = '.*' + '.*'.join(imap(re.escape, needles)) + '.*' - regex_flags = re.IGNORECASE | re.UNICODE if ignore_case else re.UNICODE + regex_some_seps = '.*' + os.sep + '.*' + regex_no_sep_end = '[^' + os.sep + ']*$' + regex_needle = regex_some_seps.join(imap(re.escape, needles)) + regex_no_sep_end found = lambda haystack: re.search( regex_needle, haystack.path, From 463ad780de8fd817a04db3b946be778dacbf9ff1 Mon Sep 17 00:00:00 2001 From: Calum Smith Date: Mon, 3 Oct 2016 01:59:37 -0400 Subject: [PATCH 3/3] Restored regex_flags to match_consecutive --- bin/autojump_match.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/autojump_match.py b/bin/autojump_match.py index 03095c7..0da31d4 100644 --- a/bin/autojump_match.py +++ b/bin/autojump_match.py @@ -40,6 +40,7 @@ def match_anywhere(needles, haystack, ignore_case=False): regex_some_seps = '.*' + os.sep + '.*' regex_no_sep_end = '[^' + os.sep + ']*$' regex_needle = regex_some_seps.join(imap(re.escape, needles)) + regex_no_sep_end + regex_flags = re.IGNORECASE | re.UNICODE if ignore_case else re.UNICODE found = lambda haystack: re.search( regex_needle, haystack.path,