Improve check for remote datasets (only 'url' and 'local_dir' are

mandatory).

Author: jff

smartBugs.py

@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 
-# import docker
 import yaml
-# import logging
 import argparse
 import os
 import sys
@@ -85,7 +83,7 @@ def exec_cmd(args: argparse.Namespace):
                     # local copy does not exist; we need to clone it
                     print('\x1b[1;37m' + "%s is a remote dataset. Do you want to create a local copy? [Y/n] " % base_name + '\x1b[0m')
                     answer = input()
-                    if answer in ['y', 'Y', 'Yes', 'YES', 'Ye', 'YE']:
+                    if answer in ['y', 'Y', 'yes', 'Yes', 'YES', '']:
                         sys.stdout.write('\x1b[1;37m' + 'Cloning remote dataset [%s <- %s]... ' % (base_path, remote_info['url']) + '\x1b[0m')
                         sys.stdout.flush()
                         git.Repo.clone_from(remote_info['url'], base_path)

src/interface/cli.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import yaml
-# import logging
 import argparse
 import os
 import sys
@@ -52,13 +51,29 @@ def __call__(self, parser, namespace, values, option_string=None):
 
 # Parser stuff
 def isRemoteDataset(cfg_dataset, name):
+    """Given a dataset file configuration and a dataset name, return True
+       if the dataset is remote and False otherwise.
+    """
     remote_info = cfg_dataset[name]
     if isinstance(remote_info, list):
-        for prop in (e['url'] for e in remote_info if isinstance(e, dict) and 'url' in e):
+        merged = {}
+        for d in remote_info:
+            if isinstance(d, dict):
+                merged = merge_two_dicts(merged, d)
+
+        # A remote dataset needs to define an url and a local dir
+        if 'url' in merged and 'local_dir' in merged:
             return True
     return False
 
 
+def merge_two_dicts(x, y):
+    """Given two dictionaries, merge them into a new dict as a shallow copy."""
+    z = x.copy()
+    z.update(y)
+    return z
+
+
 # transform remote dataset info in dictionary
 def getRemoteDataset(cfg_dataset, name):
     remote_dataset = {}
@@ -72,8 +87,11 @@ def getRemoteDataset(cfg_dataset, name):
 
     # at this point, subsets is a list of dicts
     # we want it to be a dictionary
-    remote_dataset['subsets'] = \
-        reduce(lambda a, b: dict(a, **b), remote_dataset['subsets'])
+    if 'subsets' in remote_dataset:
+        remote_dataset['subsets'] = \
+            reduce(lambda a, b: dict(a, **b), remote_dataset['subsets'])
+    else:
+        remote_dataset['subsets'] = {}
 
     return remote_dataset