From f78fcf1f4be725d86d7b2c023bfe8c7fa0c9796a Mon Sep 17 00:00:00 2001 From: Jared Hess Date: Tue, 29 Dec 2015 20:56:38 -0800 Subject: [PATCH 01/10] test file --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test diff --git a/test b/test new file mode 100644 index 0000000..e69de29 From 647f332b55c51c60a31de4eba11956b5ee8f68b4 Mon Sep 17 00:00:00 2001 From: Jared Hess Date: Tue, 29 Dec 2015 20:57:27 -0800 Subject: [PATCH 02/10] remove test file --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test diff --git a/test b/test deleted file mode 100644 index e69de29..0000000 From 45a76cd05817a5e8c23446f06b751fec7615ead4 Mon Sep 17 00:00:00 2001 From: Jared Hess Date: Tue, 29 Dec 2015 21:07:36 -0800 Subject: [PATCH 03/10] another test file --- test1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test1 diff --git a/test1 b/test1 new file mode 100644 index 0000000..e69de29 From c185467ddd88163737fe4c93e5580ec32352eb0a Mon Sep 17 00:00:00 2001 From: Jared Hess Date: Tue, 29 Dec 2015 21:13:29 -0800 Subject: [PATCH 04/10] remove test file --- test1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test1 diff --git a/test1 b/test1 deleted file mode 100644 index e69de29..0000000 From c391c7f3941a7243763b98ed4a0e9e872db08564 Mon Sep 17 00:00:00 2001 From: Jared Hess Date: Wed, 30 Dec 2015 01:28:45 -0800 Subject: [PATCH 05/10] Add support for adding multiple paths. Change to use abs path instead of unicode str. --- bin/autojump | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/autojump b/bin/autojump index 9660128..ab0afd0 100755 --- a/bin/autojump +++ b/bin/autojump @@ -101,7 +101,7 @@ def parse_arguments(): 'directory', metavar='DIRECTORY', nargs='*', default='', help='directory to jump to') parser.add_argument( - '-a', '--add', metavar='DIRECTORY', + '-a', '--add', metavar='DIRECTORY', nargs='+', help='add path') parser.add_argument( '-i', '--increase', metavar='WEIGHT', nargs='?', type=int, @@ -135,7 +135,7 @@ def add_path(data, path, weight=10): with resulting duplicate entries in the database than a single canonical path. """ - path = unico(path).rstrip(os.sep) + path = os.path.abspath(path) if path == os.path.expanduser('~'): return data, Entry(path, 0) @@ -361,7 +361,9 @@ def main(args): # noqa # all arguments are mutually exclusive if args.add: - save(config, first(add_path(load(config), args.add))) + print(type(args.add)) + for arg in args.add: + save(config, first(add_path(load(config), arg))) elif args.complete: handle_tab_completion( needle=first(chain(sanitize(args.directory), [''])), From 9aeee1b9b6a144d59aef606488540def14f773bb Mon Sep 17 00:00:00 2001 From: Jared Hess Date: Wed, 30 Dec 2015 01:45:27 -0800 Subject: [PATCH 06/10] Only allow adding of existing directories --- bin/autojump | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/autojump b/bin/autojump index ab0afd0..bb33c45 100755 --- a/bin/autojump +++ b/bin/autojump @@ -139,6 +139,9 @@ def add_path(data, path, weight=10): if path == os.path.expanduser('~'): return data, Entry(path, 0) + if not os.path.isdir(path): + return data, Entry(path, 0) + data[path] = sqrt((data.get(path, 0) ** 2) + (weight ** 2)) return data, Entry(path, data[path]) From f80338d60b46ba6e8ebcce4364a9bb172a662d4e Mon Sep 17 00:00:00 2001 From: Jared Hess Date: Wed, 30 Dec 2015 01:54:24 -0800 Subject: [PATCH 07/10] Remove debug printing --- bin/autojump | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/autojump b/bin/autojump index bb33c45..408fc3e 100755 --- a/bin/autojump +++ b/bin/autojump @@ -364,7 +364,6 @@ def main(args): # noqa # all arguments are mutually exclusive if args.add: - print(type(args.add)) for arg in args.add: save(config, first(add_path(load(config), arg))) elif args.complete: From 531a8733822de3e5d9bbf170bb4608b4d4eb29f0 Mon Sep 17 00:00:00 2001 From: Jared Hess Date: Wed, 30 Dec 2015 03:15:34 -0800 Subject: [PATCH 08/10] Change help text to indicate support for adding multiple paths --- bin/autojump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/autojump b/bin/autojump index bb33c45..9deaf31 100755 --- a/bin/autojump +++ b/bin/autojump @@ -102,7 +102,7 @@ def parse_arguments(): help='directory to jump to') parser.add_argument( '-a', '--add', metavar='DIRECTORY', nargs='+', - help='add path') + help='add paths') parser.add_argument( '-i', '--increase', metavar='WEIGHT', nargs='?', type=int, const=10, default=False, From 825a21bc6ecba7aa226465a7bcca1319414a3b8f Mon Sep 17 00:00:00 2001 From: Jared Hess Date: Wed, 30 Dec 2015 03:25:57 -0800 Subject: [PATCH 09/10] Remove debug print --- bin/autojump | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/autojump b/bin/autojump index 9deaf31..b600543 100755 --- a/bin/autojump +++ b/bin/autojump @@ -364,7 +364,6 @@ def main(args): # noqa # all arguments are mutually exclusive if args.add: - print(type(args.add)) for arg in args.add: save(config, first(add_path(load(config), arg))) elif args.complete: From 5241d67efc6fcb16292b14dd65689667b98ce644 Mon Sep 17 00:00:00 2001 From: Jared Hess Date: Wed, 30 Dec 2015 17:30:45 -0800 Subject: [PATCH 10/10] Add back in unicode handling. --- bin/autojump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/autojump b/bin/autojump index b600543..22e919e 100755 --- a/bin/autojump +++ b/bin/autojump @@ -135,7 +135,7 @@ def add_path(data, path, weight=10): with resulting duplicate entries in the database than a single canonical path. """ - path = os.path.abspath(path) + path = os.path.abspath(unico(path)) if path == os.path.expanduser('~'): return data, Entry(path, 0)