node naming policy

2 files changed, 10 insertions, 7 deletions

diff --git a/bsie/apps/index.py b/bsie/apps/index.py
index 21c2318..a870364 100644
--- a/bsie/apps/index.py
+++ b/bsie/apps/index.py
@@ -11,7 +11,7 @@ import typing
 
 # bsie imports
 from bsie.extractor import ExtractorBuilder
-from bsie.lib import BSIE, PipelineBuilder
+from bsie.lib import BSIE, PipelineBuilder, DefaultNamingPolicy
 from bsie.reader import ReaderBuilder
 from bsie.utils import bsfs, errors
 
@@ -26,7 +26,9 @@ __all__: typing.Sequence[str] = (
 def main(argv):
     """Index files or directories into BSFS."""
     parser = argparse.ArgumentParser(description=main.__doc__, prog='index')
-    parser.add_argument('--user', type=bsfs.URI, default=bsfs.URI('http://example.com/me'),
+    parser.add_argument('--host', type=bsfs.URI, default=bsfs.URI('http://example.com'),
+        help='')
+    parser.add_argument('--user', type=str, default='me',
         help='')
     parser.add_argument('--collect', action='append', default=[],
         help='')
@@ -66,16 +68,19 @@ def main(argv):
         ])
     # pipeline builder
     pbuild = PipelineBuilder(
-        bsfs.Namespace(args.user + ('/' if not args.user.endswith('/') else '')),
         rbuild,
         ebuild,
         )
 
     # build pipeline
     pipeline = pbuild.build()
+    # build the naming policy
+    naming_policy = DefaultNamingPolicy(
+        host=args.host,
+        user=args.user,
+        )
     # build BSIE frontend
-    bsie = BSIE(pipeline, args.collect, args.discard)
-
+    bsie = BSIE(pipeline, naming_policy, args.collect, args.discard)
 
     def walk(handle):
         """Walk through given input files."""
@@ -83,7 +88,6 @@ def main(argv):
         # FIXME: simplify code (below but maybe also above)
         # FIXME: How to handle dependencies between data?
         #        E.g. do I still want to link to a tag despite not being permitted to set its label?
-        # FIXME: node renaming?
 
         # index input paths
         for path in args.input_file:
diff --git a/bsie/apps/info.py b/bsie/apps/info.py
index 64a4eba..4e948fc 100644
--- a/bsie/apps/info.py
+++ b/bsie/apps/info.py
@@ -54,7 +54,6 @@ def main(argv):
         ])
     # pipeline builder
     pbuild = PipelineBuilder(
-        bsfs.Namespace('http://example.com/me/'), # not actually used
         rbuild,
         ebuild,
         )