Merge branch 'mb/feature' into develop

1 files changed, 16 insertions, 9 deletions

diff --git a/bsie/apps/index.py b/bsie/apps/index.py
index 1dbfdd8..21c2318 100644
--- a/bsie/apps/index.py
+++ b/bsie/apps/index.py
@@ -4,16 +4,16 @@ Part of the bsie module.
 A copy of the license is provided with the project.
 Author: Matthias Baumgartner, 2022
 """
-# imports
+# standard imports
 import argparse
 import os
 import typing
 
 # bsie imports
-from bsie.base import errors
-from bsie.lib import BSIE
-from bsie.tools import builder
-from bsie.utils import bsfs
+from bsie.extractor import ExtractorBuilder
+from bsie.lib import BSIE, PipelineBuilder
+from bsie.reader import ReaderBuilder
+from bsie.utils import bsfs, errors
 
 # exports
 __all__: typing.Sequence[str] = (
@@ -44,9 +44,9 @@ def main(argv):
 
     # FIXME: Read reader/extractor configs from a config file
     # reader builder
-    rbuild = builder.ReaderBuilder({})
+    rbuild = ReaderBuilder()
     # extractor builder
-    ebuild = builder.ExtractorBuilder([
+    ebuild = ExtractorBuilder([
         {'bsie.extractor.generic.path.Path': {}},
         {'bsie.extractor.generic.stat.Stat': {}},
         {'bsie.extractor.generic.constant.Constant': dict(
@@ -58,9 +58,14 @@ def main(argv):
                     bsfs:unique "true"^^xsd:boolean .
                 ''',
             )},
+        {'bsie.extractor.image.colors_spatial.ColorsSpatial': {
+            'width': 2,
+            'height': 2,
+            'exp': 2,
+            }},
         ])
     # pipeline builder
-    pbuild = builder.PipelineBuilder(
+    pbuild = PipelineBuilder(
         bsfs.Namespace(args.user + ('/' if not args.user.endswith('/') else '')),
         rbuild,
         ebuild,
@@ -82,7 +87,9 @@ def main(argv):
 
         # index input paths
         for path in args.input_file:
-            if os.path.isdir(path) and args.recursive:
+            if not os.path.exists(path):
+                pass # FIXME: notify the user
+            elif os.path.isdir(path) and args.recursive:
                 for dirpath, _, filenames in os.walk(path, topdown=True, followlinks=args.follow):
                     for filename in filenames:
                         for node, pred, value in bsie.from_file(os.path.join(dirpath, filename)):