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

move max_matches logic into parse_args()

Browse Source
This commit is contained in:
William Ting 2013-05-14 21:58:00 -05:00
parent 2fcaefb017
commit 57de0881da
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bin/autojump
View File

@ -205,6 +205,7 @@ def set_defaults():
config['ignore_case'] = False config['ignore_case'] = False
config['keep_symlinks'] = False config['keep_symlinks'] = False
config['debug'] = False config['debug'] = False
config['match_cnt'] = 1
xdg_data = os.environ.get('XDG_DATA_HOME') or \ xdg_data = os.environ.get('XDG_DATA_HOME') or \
os.path.join(config['home'], '.local', 'share') os.path.join(config['home'], '.local', 'share')
@ -308,6 +309,10 @@ def parse_arg(config):
print("\ndb file: %s" % config['db']) print("\ndb file: %s" % config['db'])
sys.exit(0) sys.exit(0)
if args.complete:
config['match_cnt'] = 9
config['ignore_case'] = True
config['args'] = args config['args'] = args
return config return config
@ -371,7 +376,7 @@ def match(path, pattern, only_end=False, ignore_case=False):
else: else:
return (False, path[find_idx+len(pattern):]) return (False, path[find_idx+len(pattern):])
def find_matches(config, db, patterns, max_matches=1, ignore_case=False, fuzzy=False): def find_matches(config, db, patterns, ignore_case=False, fuzzy=False):
""" """
Find paths matching patterns up to max_matches. Find paths matching patterns up to max_matches.
""" """
@ -438,7 +443,8 @@ def find_matches(config, db, patterns, max_matches=1, ignore_case=False, fuzzy=F
if path not in results: if path not in results:
results.append(path) results.append(path)
if len(results) >= max_matches:
if len(results) >= config['match_cnt']:
break break
# if current directory is the only match, add it to results # if current directory is the only match, add it to results
@ -449,6 +455,7 @@ def find_matches(config, db, patterns, max_matches=1, ignore_case=False, fuzzy=F
def main(): def main():
config = parse_arg(parse_env(set_defaults())) config = parse_arg(parse_env(set_defaults()))
sep = config['separator']
db = Database(config) db = Database(config)
# checking command line directory arguments # checking command line directory arguments
@ -468,23 +475,16 @@ def main():
if tab_match: if tab_match:
patterns[-1] = tab_match.group(1) patterns[-1] = tab_match.group(1)
# on tab completion show max results results = find_matches(config, db, patterns,
if config['args'].complete or tab_choice != -1: ignore_case=config['ignore_case'])
max_matches = 9
else:
max_matches = 1
results = []
if not config['ignore_case']:
results = find_matches(config, db, patterns, max_matches, ignore_case=False)
# if no results, try ignoring case # if no results, try ignoring case
if not results or config['args'].complete: if not results and not config['ignore_case']:
results = find_matches(config, db, patterns, max_matches, ignore_case=True) results = find_matches(config, db, patterns, ignore_case=True)
# if no results, try approximate matching # if no results, try approximate matching
if not results: if not results:
results = find_matches(config, db, patterns, max_matches, ignore_case=True, results = find_matches(config, db, patterns, ignore_case=True,
fuzzy=True) fuzzy=True)
if tab_choice and len(results) > (tab_choice-1): if tab_choice and len(results) > (tab_choice-1):