Merge branch 'development' into feat-use-jnml-from-pyneuroml

Author: sanjayankur31

omv/engines/jneuromlvalidate.py

@@ -28,10 +28,14 @@ def run(self):
             path_s = resolve_paths(self.modelpath)
 
             inform(
-                "Path [%s] expanded to: %s" % (self.modelpath, path_s),
+                "Path [%s] expanded to: \n        %s" % (self.modelpath, '\n        '.join(path_s)),
                 indent=1,
                 verbosity=1,
             )
+            if len(path_s) == 0:
+                raise EngineExecutionError(
+                    "Could not determine list of files for validation from string: %s" % self.modelpath
+                )
 
             from omv.engines.jneuroml import JNeuroMLEngine
 

omv/engines/utils/__init__.py

@@ -6,16 +6,22 @@ def resolve_paths(path_s):
     Make explicit list from: '*.nml myfile.xml' etc.
     """
 
-    if "*" in path_s:
-        import glob
+    import glob
+
+    if PATH_DELIMITER in path_s:
+        all_paths = []
+        for p in path_s.split(PATH_DELIMITER):
+            for g in glob.glob(p):
+                print('Found path:', g)
+                all_paths.append(g)
+        path_s = all_paths
+    else:
+        all_paths = []
+
+        for g in glob.glob(path_s):
+            print('Found path:', g)
+            all_paths.append(g)
+        path_s = all_paths
 
-        if PATH_DELIMITER in path_s:
-            all_paths = []
-            for p in path_s.split(PATH_DELIMITER):
-                for g in glob.glob(p):
-                    all_paths.append(g)
-            path_s = all_paths
-        else:
-            path_s = glob.glob(path_s)
 
     return path_s