From 6021b772382f3aa6ad9f3ebaf084eb63d2c6a3ec Mon Sep 17 00:00:00 2001 From: Filippo Maria Castelli Date: Thu, 23 Apr 2020 18:49:18 +0200 Subject: [PATCH 1/3] print usage if no args are used --- ximage.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ximage.py b/ximage.py index d14450f..c4e6298 100644 --- a/ximage.py +++ b/ximage.py @@ -914,7 +914,12 @@ def ximage_main(prog_name='ximage'): parser_stats = subparsers.add_parser('stats', help='Show some indexed directory statistics') parser_stats.add_argument('-D', '--root', type=str, required=False, default=os.getcwd(), help='Root directory path (default: cwd)') parser_stats.set_defaults(func=ximage_stats) - + + # print usage if no args are used + if len(sys.argv) == 1: + parser.print_help(sys.stderr) + sys.exit(1) + args = parser.parse_args() sys.exit(args.func(args)) From 2d8f97c4c78d359bc3911a4a2d756b0080849275 Mon Sep 17 00:00:00 2001 From: Filippo Maria Castelli Date: Thu, 23 Apr 2020 19:24:50 +0200 Subject: [PATCH 2/3] python3 compatibility --- ximage.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ximage.py b/ximage.py index c4e6298..94a4760 100644 --- a/ximage.py +++ b/ximage.py @@ -9,6 +9,7 @@ from datetime import datetime from string import Template import pickle +from functools import reduce XMP_NS_ALIQUIS = 'http://bioretics.com/aliquis' @@ -361,7 +362,8 @@ def build_hierarchy(blobs_children, parent): for root in roots: parent.children.append(root) build_hierarchy(blobs_children, root) - + + mask = cv2.imread(args.mask, -1) # Count number of classes @@ -565,7 +567,7 @@ def _ximage_index_connect(args, create=False): sqlite3.register_converter('uuid', lambda buf: UUID(bytes=buf)) sqlite3.register_adapter(XValue, lambda x: pickle.dumps(x.val)) sqlite3.register_adapter(np.ndarray, lambda a: np.getbuffer(a)) - sqlite3.register_adapter(UUID, lambda uuid: buffer(uuid.get_bytes())) + sqlite3.register_adapter(UUID, lambda uuid: memoryview(uuid.get_bytes())) index_path = os.path.join(args.root, '.ximage-index.db') if not create: From 16facda20273d07b0e58ae6a05dd503a4739bddc Mon Sep 17 00:00:00 2001 From: Filippo Maria Castelli Date: Thu, 23 Apr 2020 19:30:37 +0200 Subject: [PATCH 3/3] python2/3 compatibility for _ximage_index_connect --- ximage.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ximage.py b/ximage.py index 94a4760..2f9bb77 100644 --- a/ximage.py +++ b/ximage.py @@ -363,7 +363,6 @@ def build_hierarchy(blobs_children, parent): parent.children.append(root) build_hierarchy(blobs_children, root) - mask = cv2.imread(args.mask, -1) # Count number of classes @@ -567,7 +566,11 @@ def _ximage_index_connect(args, create=False): sqlite3.register_converter('uuid', lambda buf: UUID(bytes=buf)) sqlite3.register_adapter(XValue, lambda x: pickle.dumps(x.val)) sqlite3.register_adapter(np.ndarray, lambda a: np.getbuffer(a)) - sqlite3.register_adapter(UUID, lambda uuid: memoryview(uuid.get_bytes())) + + if sys.version_info[0] == 2: + sqlite3.register_adapter(UUID, lambda uuid: buffer(uuid.get_bytes())) + else: + sqlite3.register_adapter(UUID, lambda uuid: memoryview(uuid.get_bytes())) index_path = os.path.join(args.root, '.ximage-index.db') if not create: