Merge pull request #233 from VesnaT/fix_path_subfolder

ImportImages: Assure valid path

orangecontrib/imageanalytics/import_images.py

@@ -200,10 +200,10 @@ def create_table(image_meta, categories=None, start_dir=None):
                 basename = os.path.basename(imgmeta.path)
                 imgname, _ = os.path.splitext(basename)
 
+                path = imgmeta.path[len(start_dir)+1:] if start_dir else imgmeta.path
+                path = path.replace(os.path.sep, "/")
                 meta_data.append(
-                    [imgname,
-                     imgmeta.path[len(start_dir)+1:] if start_dir else imgmeta.path,
-                     imgmeta.size, imgmeta.width, imgmeta.height]
+                    [imgname, path, imgmeta.size, imgmeta.width, imgmeta.height]
                 )
             else:
                 n_skipped += 1

orangecontrib/imageanalytics/tests/test_import_images.py

@@ -2,8 +2,6 @@
 import unittest
 from os.path import dirname, join
 
-from pkg_resources import get_distribution
-
 from orangecontrib.imageanalytics.import_images import ImportImages
 
 
@@ -31,8 +29,19 @@ def test_import_various_formats(self):
         includes all currently supported formats by QImageReader
         """
         table, n_skipped = self.import_images(join(dirname(__file__), "test_images"))
-        self.assertEqual(16, len(table))
+        self.assertEqual(18, len(table))
+        self.assertEqual(0, n_skipped)
+
+    def test_import_subfolder(self):
+        """
+        Check if paths are valid for all operating systems.
+        """
+        table, n_skipped = \
+            self.import_images(join(dirname(__file__), "test_images"))
+        self.assertEqual(18, len(table))
         self.assertEqual(0, n_skipped)
+        self.assertEqual(table.metas[-2, 1], "img/example_image_a.jpg")
+        self.assertEqual(table.metas[-1, 1], "img/inner/example_image_b.jpg")
 
 
 if __name__ == "__main__":

setup.py

@@ -42,7 +42,7 @@
 PACKAGE_DATA = {
     'orangecontrib.imageanalytics.widgets': ['icons/*.svg'],
     'orangecontrib.imageanalytics.widgets.tests': ['test_images/*'],
-    'orangecontrib.imageanalytics.tests': ['test_images/*']
+    'orangecontrib.imageanalytics.tests': ['test_images/*', 'test_images/img/*', 'test_images/img/inner/*'],
 }
 
 ENTRY_POINTS = {