Allow direct matching of files without extension in _find_sources_rec…

…ursive (cvat-ai#378) * small fix in _find_sources_recursive * Add tests Co-authored-by: Maxim Zhiltsov <[email protected]>
TOsmanov · Jul 28, 2021 · 990df27 · 990df27
1 parent f11071f
commit 990df27
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/datumaro/components/extractor.py b/datumaro/components/extractor.py
@@ -797,7 +797,7 @@ def _find_sources_recursive(cls, path: str, ext: Optional[str],
                 ext = '.' + ext
             ext = ext.lower()
 
-        if (ext and path.lower().endswith(ext) and osp.isfile(path)) or \
+        if (path.lower().endswith(ext) and osp.isfile(path)) or \
                 (not ext and dirname and osp.isdir(path) and \
                 os.sep + osp.normpath(dirname.lower()) + os.sep in \
                     osp.abspath(path.lower()) + os.sep):

diff --git a/tests/test_cifar_format.py b/tests/test_cifar_format.py
@@ -256,6 +256,11 @@ def test_can_import_10(self):
     def test_can_detect_10(self):
         self.assertTrue(CifarImporter.detect(DUMMY_10_DATASET_DIR))
 
+    @mark_requirement(Requirements.DATUM_GENERAL_REQ)
+    def test_can_detect_10_subset(self):
+        self.assertTrue(CifarImporter.detect(
+            osp.join(DUMMY_10_DATASET_DIR, 'data_batch_1')))
+
     @mark_requirement(Requirements.DATUM_GENERAL_REQ)
     def test_can_import_100(self):
         # Unless simple dataset merge can't overlap labels and add parent
@@ -301,3 +306,8 @@ def test_can_import_100(self):
     @mark_requirement(Requirements.DATUM_GENERAL_REQ)
     def test_can_detect_100(self):
         self.assertTrue(CifarImporter.detect(DUMMY_100_DATASET_DIR))
+
+    @mark_requirement(Requirements.DATUM_GENERAL_REQ)
+    def test_can_detect_100_subset(self):
+        self.assertTrue(CifarImporter.detect(
+            osp.join(DUMMY_100_DATASET_DIR, 'train')))