From 266c2c9a072bf3289fd7f2d75278b7d59528378c Mon Sep 17 00:00:00 2001
From: Matthias Baumgartner <dev@igsor.net>
Date: Sat, 24 Dec 2022 10:27:09 +0100
Subject: package restructuring: base

* Reader and Extractor to respective reader/extractor modules
* ReaderBuilder to reader module
* ExtractorBuilder to extractor module
* Loading module in utils (safe_load, unpack_name)
* Pipeline and PipelineBuilder to lib module
* errors to utils
* documentation: "standard import" and "external import"
---
 bsie/apps/index.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'bsie/apps/index.py')

diff --git a/bsie/apps/index.py b/bsie/apps/index.py
index 1dbfdd8..0c6296f 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(
@@ -60,7 +60,7 @@ def main(argv):
             )},
         ])
     # pipeline builder
-    pbuild = builder.PipelineBuilder(
+    pbuild = PipelineBuilder(
         bsfs.Namespace(args.user + ('/' if not args.user.endswith('/') else '')),
         rbuild,
         ebuild,
-- 
cgit v1.2.3


From bffe6bb52d00e60665b4e8e2144ab91e4465173e Mon Sep 17 00:00:00 2001
From: Matthias Baumgartner <dev@igsor.net>
Date: Mon, 16 Jan 2023 20:54:25 +0100
Subject: minor bugfixes

---
 bsie/apps/index.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'bsie/apps/index.py')

diff --git a/bsie/apps/index.py b/bsie/apps/index.py
index 0c6296f..7cf94d3 100644
--- a/bsie/apps/index.py
+++ b/bsie/apps/index.py
@@ -82,7 +82,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)):
-- 
cgit v1.2.3


From 02bbad817077e9a23f7b24b82845fcde24de63a9 Mon Sep 17 00:00:00 2001
From: Matthias Baumgartner <dev@igsor.net>
Date: Mon, 16 Jan 2023 20:55:13 +0100
Subject: image feature integration test

---
 bsie/apps/index.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'bsie/apps/index.py')

diff --git a/bsie/apps/index.py b/bsie/apps/index.py
index 7cf94d3..25e006f 100644
--- a/bsie/apps/index.py
+++ b/bsie/apps/index.py
@@ -44,7 +44,10 @@ def main(argv):
 
     # FIXME: Read reader/extractor configs from a config file
     # reader builder
-    rbuild = ReaderBuilder({})
+    rbuild = ReaderBuilder({
+        'bsie.reader.image.Image': {
+            'cfg': {}}, # FIXME: cfg should be optional!
+        })
     # extractor builder
     ebuild = ExtractorBuilder([
         {'bsie.extractor.generic.path.Path': {}},
@@ -58,6 +61,11 @@ def main(argv):
                     bsfs:unique "true"^^xsd:boolean .
                 ''',
             )},
+        {'bsie.extractor.image.colors_spatial.ColorsSpatial': {
+            'width': 2,
+            'height': 2,
+            'exp': 2,
+            }},
         ])
     # pipeline builder
     pbuild = PipelineBuilder(
-- 
cgit v1.2.3


From 8439089807bbad92e95ad9062dc74c3d71f5d7eb Mon Sep 17 00:00:00 2001
From: Matthias Baumgartner <dev@igsor.net>
Date: Mon, 16 Jan 2023 21:35:19 +0100
Subject: ReaderBuilder optional config

---
 bsie/apps/index.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'bsie/apps/index.py')

diff --git a/bsie/apps/index.py b/bsie/apps/index.py
index 25e006f..21c2318 100644
--- a/bsie/apps/index.py
+++ b/bsie/apps/index.py
@@ -44,10 +44,7 @@ def main(argv):
 
     # FIXME: Read reader/extractor configs from a config file
     # reader builder
-    rbuild = ReaderBuilder({
-        'bsie.reader.image.Image': {
-            'cfg': {}}, # FIXME: cfg should be optional!
-        })
+    rbuild = ReaderBuilder()
     # extractor builder
     ebuild = ExtractorBuilder([
         {'bsie.extractor.generic.path.Path': {}},
-- 
cgit v1.2.3