Collectors: Raise SystemExit on ValueError

coalib/collecting/Collectors.py

@@ -32,17 +32,28 @@ def _import_bears(file_path, kinds):
 
 
 @yield_once
-def icollect(file_paths, files=True, dirs=True):
+def icollect(file_paths, files=True, dirs=True, log_printer=ConsolePrinter()):
     """
-    Evaluate globs in file paths and return all matching files
-    :param file_paths: list of file paths that can include globs
-    :param files: True if files are to be collected
-    :param dirs: True if dirs are to be collected
-    :return: iterator that yields paths of all matching files
+    Evaluate globs in file paths and return all matching files.
+
+    :param file_paths:  list of file paths that can include globs
+    :param files:       True if files are to be collected
+    :param dirs:        True if dirs are to be collected
+    :param log_printer: where to log things that go wrong
+    :return:            iterator that yields paths of all matching files
+    :raises SystemExit: when getting an invalid pattern
     """
     for file_path in file_paths:
-        for match in iglob(file_path, files=files, dirs=dirs):
-            yield match
+        try:
+            for match in iglob(file_path, files=files, dirs=dirs):
+                yield match
+        except ValueError as exception:
+            log_printer.err(
+                _("The given glob '{glob}' contains an invalid pattern. "
+                  "Detailed error is: {error_message}").format(
+                    glob=file_path,
+                    error_message=str(exception)))
+            raise SystemExit(-1)
 
 
 def collect_files(file_paths):

coalib/tests/collecting/CollectorsTest.py

@@ -23,6 +23,9 @@ def test_file_empty(self):
     def test_file_invalid(self):
         self.assertEqual(collect_files(["invalid_path"]), [])
 
+    def test_expression_invalid(self):
+        self.assertRaises(SystemExit, collect_files, ["**d"])
+
     def test_file_collection(self):
         self.assertEqual(collect_files([os.path.join(self.collectors_test_dir,
                                                      "others",
@@ -47,6 +50,9 @@ def test_dir_empty(self):
     def test_dir_invalid(self):
         self.assertEqual(collect_dirs(["invalid_path"]), [])
 
+    def test_expression_invalid(self):
+        self.assertRaises(SystemExit, collect_files, ["**d"])
+
     def test_dir_collection(self):
         self.assertEqual(
             sorted(collect_dirs([os.path.join(self.collectors_test_dir,
@@ -74,6 +80,9 @@ def test_bear_invalid(self):
                                        ["invalid_name"],
                                        ["invalid kind"]), [])
 
+    def test_expression_invalid(self):
+        self.assertRaises(SystemExit, collect_files, ["**d"])
+
     def test_simple_single(self):
         self.assertEqual(len(collect_bears([os.path.join(
             self.collectors_test_dir, "bears")],