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

misc comments

Browse Source
This commit is contained in:
William Ting 2013-07-13 17:38:21 -05:00
parent 46aaeb193b
commit c8c7911c86
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -36,4 +36,4 @@ tar:
sha1sum autojump_v$(VERSION).tar.gz sha1sum autojump_v$(VERSION).tar.gz
test: test:
@tests/runtests.py @python tests/autojump_test.py

26
bin/autojump
View File

@ -19,7 +19,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
""" """
from __future__ import division, print_function from __future__ import division
from __future__ import print_function
import collections import collections
import difflib import difflib
@ -193,7 +194,11 @@ class Database:
self.save() self.save()
return removed return removed
def set_defaults(): #
# Environment Functions
#
def config_defaults():
config = {} config = {}
config['version'] = 'release-v21.7.0' config['version'] = 'release-v21.7.0'
@ -203,6 +208,7 @@ def set_defaults():
config['ignore_case'] = False config['ignore_case'] = False
config['keep_symlinks'] = False config['keep_symlinks'] = False
# TODO(ting|2013-07-06): remove debug flag
config['debug'] = False config['debug'] = False
config['match_cnt'] = 1 config['match_cnt'] = 1
@ -213,7 +219,8 @@ def set_defaults():
return config return config
def parse_env(config): def parse_env_args(config):
# TODO(ting|2013-07-06): refactor with .get() defaults
if 'AUTOJUMP_DATA_DIR' in os.environ: if 'AUTOJUMP_DATA_DIR' in os.environ:
config['data'] = os.environ.get('AUTOJUMP_DATA_DIR') config['data'] = os.environ.get('AUTOJUMP_DATA_DIR')
config['db'] = config['data'] + '/autojump.txt' config['db'] = config['data'] + '/autojump.txt'
@ -231,7 +238,7 @@ def parse_env(config):
return config return config
def parse_arg(config): def parse_args():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description='Automatically jump to directory passed as an argument.', description='Automatically jump to directory passed as an argument.',
epilog="Please see autojump(1) man pages for full documentation.") epilog="Please see autojump(1) man pages for full documentation.")
@ -265,6 +272,11 @@ def parse_arg(config):
'-v', '--version', action="version", version="%(prog)s " + '-v', '--version', action="version", version="%(prog)s " +
config['version'], help='show version information and exit') config['version'], help='show version information and exit')
# TODO(ting|2013-07-06): move logic outside of function
# return parser.parse_args()
# config = parse_env_args(config_defaults())
# args = parse_args()
args = parser.parse_args() args = parser.parse_args()
db = Database(config) db = Database(config)
@ -464,7 +476,11 @@ def find_matches(config, db, patterns, ignore_case=False, fuzzy=False):
return results return results
def main(): def main():
config = parse_arg(parse_env(set_defaults())) # TODO(ting|2013-07-06): replace with ChainMap (Python 3.3+)
# config = parse_env_args(config_defaults())
# args = parse_args()
config = parse_args(parse_env_args(config_defaults()))
sep = config['separator'] sep = config['separator']
db = Database(config) db = Database(config)