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

Merge 54e5cb0356 into ff75f542ae

Browse Source
This commit is contained in:
rico-chet 2023-09-01 12:10:03 -07:00 committed by GitHub
commit 12fe0f37ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bin/autojump
View File

@ -129,8 +129,8 @@ def parse_arguments():
help='show database entries and their key weights', help='show database entries and their key weights',
) )
parser.add_argument( parser.add_argument(
'-v', '--version', action='version', version='%(prog)s v' + '-v', '--version', action='version', version='%(prog)s v' + VERSION,
VERSION, help='show version information', help='show version information',
) )
return parser.parse_args() return parser.parse_args()
@ -188,18 +188,15 @@ def find_matches(entries, needles, check_entries=True):
else: else:
path_exists = lambda _: True path_exists = lambda _: True
data = sorted(
entries,
key=attrgetter('weight', 'path'),
reverse=True,
)
return ifilter( return ifilter(
lambda entry: not is_cwd(entry) and path_exists(entry), lambda entry: not is_cwd(entry) and path_exists(entry),
chain( sorted(
match_consecutive(needles, data, ignore_case), set(chain(
match_fuzzy(needles, data, ignore_case), match_consecutive(needles, entries, ignore_case),
match_anywhere(needles, data, ignore_case), match_fuzzy(needles, entries, ignore_case),
match_anywhere(needles, entries, ignore_case),
)), key=attrgetter('weight', 'path'),
reverse=True,
), ),
) )

1
bin/autojump.py Symbolic link
View File

@ -0,0 +1 @@
autojump

17
tests/integration/autojump_test.py Normal file
View File

@ -0,0 +1,17 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import os
import sys
sys.path.append(os.path.join(os.getcwd(), 'bin')) # noqa
from autojump import find_matches
from autojump_data import entriefy
def test_find_matches_returns_unique_results(tmpdir):
path = str(tmpdir)
needle = str(os.path.basename(tmpdir))
matches = find_matches(entriefy({path: 10}), [needle])
assert list(matches) == list(entriefy({path: 10}))

10
tests/unit/autojump_match_test.py
View File

@ -19,8 +19,8 @@ class TestMatchAnywhere(object):
entry4 = Entry('/中/zhong/国/guo', 10) entry4 = Entry('/中/zhong/国/guo', 10)
entry5 = Entry('/is\'t/this/a/b*tchin/edge/case?', 10) entry5 = Entry('/is\'t/this/a/b*tchin/edge/case?', 10)
win_entry1 = Entry('C:\\foo\\bar\\baz', 10) win_entry1 = Entry('C:\\foo\\bar\\baz', 10)
win_entry2 = Entry('D:\Program Files (x86)\GIMP', 10) win_entry2 = Entry('D:\\Program Files (x86)\\GIMP', 10)
win_entry3 = Entry('C:\Windows\System32', 10) win_entry3 = Entry('C:\\Windows\\System32', 10)
@pytest.fixture @pytest.fixture
def haystack(self): def haystack(self):
@ -75,9 +75,9 @@ class TestMatchConsecutive(object):
entry4 = Entry('/中/zhong/国/guo', 10) entry4 = Entry('/中/zhong/国/guo', 10)
entry5 = Entry('/日/本', 10) entry5 = Entry('/日/本', 10)
entry6 = Entry('/is\'t/this/a/b*tchin/edge/case?', 10) entry6 = Entry('/is\'t/this/a/b*tchin/edge/case?', 10)
win_entry1 = Entry('C:\Foo\Bar\Baz', 10) win_entry1 = Entry('C:\\Foo\\Bar\\Baz', 10)
win_entry2 = Entry('D:\Program Files (x86)\GIMP', 10) win_entry2 = Entry('D:\\Program Files (x86)\\GIMP', 10)
win_entry3 = Entry('C:\Windows\System32', 10) win_entry3 = Entry('C:\\Windows\\System32', 10)
@pytest.fixture @pytest.fixture
def haystack(self): def haystack(self):

2
tox.ini
View File

@ -19,7 +19,7 @@ deps =
pytest >= 2.9 pytest >= 2.9
commands = commands =
coverage run --source=bin/ --omit=bin/autojump_argparse.py -m \ coverage run --source=bin/ --omit=bin/autojump_argparse.py -m \
py.test -vv -rxs --tb native -s --strict {posargs:tests} py.test -vv -rxs --tb native -s --strict-markers {posargs:tests}
coverage report -m coverage report -m