Merge branch 'develop'v0.23.03

3 files changed, 46 insertions, 20 deletions

diff --git a/bsfs/apps/__init__.py b/bsfs/apps/__init__.py
index 7efaa87..62dc5b5 100644
--- a/bsfs/apps/__init__.py
+++ b/bsfs/apps/__init__.py
@@ -1,20 +1,53 @@
-"""
+#!/usr/bin/env python3
 
-Part of the BlackStar filesystem (bsfs) module.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
 # imports
+import argparse
 import typing
 
+# bsfs imports
+import bsfs
+
 # inner-module imports
 from .init import main as init
 from .migrate import main as migrate
 
 # exports
 __all__: typing.Sequence[str] = (
+    'main',
     'init',
     'migrate',
     )
 
+# config
+apps = {
+    'init'      : init,
+    'migrate'   : migrate,
+    }
+
+
+## code ##
+
+def main(argv=None):
+    """Black Star File System maintenance tools."""
+    parser = argparse.ArgumentParser(description=main.__doc__, prog='bsfs')
+    # version
+    parser.add_argument('--version', action='version',
+        version='%(prog)s version {}.{}.{}'.format(*bsfs.version_info)) # pylint: disable=C0209
+    # application selection
+    parser.add_argument('app', choices=apps.keys(),
+        help='Select the application to run.')
+    # dangling args
+    parser.add_argument('rest', nargs=argparse.REMAINDER)
+    # parse
+    args = parser.parse_args(argv)
+    # run application
+    apps[args.app](args.rest)
+
+
+## main ##
+
+if __name__ == '__main__':
+    import sys
+    main(sys.argv[1:])
+
 ## EOF ##
diff --git a/bsfs/apps/init.py b/bsfs/apps/init.py
index 3e2ef37..9afbdd5 100644
--- a/bsfs/apps/init.py
+++ b/bsfs/apps/init.py
@@ -1,9 +1,5 @@
-"""
+#!/usr/bin/env python3
 
-Part of the BlackStar filesystem (bsfs) module.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
 # imports
 import argparse
 import json
@@ -60,9 +56,10 @@ def main(argv):
     # print config
     if args.output is not None:
         with open(args.output, mode='wt', encoding='UTF-8') as ofile:
-            json.dump(config, ofile)
+            json.dump(config, ofile, indent=4)
     else:
-        json.dump(config, sys.stdout)
+        json.dump(config, sys.stdout, indent=4)
+        print('')
 
 
 ## main ##
diff --git a/bsfs/apps/migrate.py b/bsfs/apps/migrate.py
index 91c1661..34ea2e7 100644
--- a/bsfs/apps/migrate.py
+++ b/bsfs/apps/migrate.py
@@ -1,9 +1,5 @@
-"""
+#!/usr/bin/env python3
 
-Part of the BlackStar filesystem (bsfs) module.
-A copy of the license is provided with the project.
-Author: Matthias Baumgartner, 2022
-"""
 # imports
 import argparse
 import json
@@ -42,15 +38,15 @@ def main(argv):
     graph = bsfs.Open(config)
 
     # initialize schema
-    schema = bsfs.schema.Schema.Empty()
+    schema = bsfs.schema.Schema()
     if len(args.schema) == 0:
         # assemble schema from standard input
-        schema = schema + bsfs.schema.Schema.from_string(sys.stdin.read())
+        schema = schema + bsfs.schema.from_string(sys.stdin.read())
     else:
         # assemble schema from input files
         for pth in args.schema:
             with open(pth, mode='rt', encoding='UTF-8') as ifile:
-                schema = schema + bsfs.schema.Schema.from_string(ifile.read())
+                schema = schema + bsfs.schema.from_string(ifile.read())
 
     # migrate schema
     graph.migrate(schema, not args.remove)