diff options
author | Matthias Baumgartner <dev@igsor.net> | 2023-01-16 21:35:19 +0100 |
---|---|---|
committer | Matthias Baumgartner <dev@igsor.net> | 2023-01-16 21:35:19 +0100 |
commit | 8439089807bbad92e95ad9062dc74c3d71f5d7eb (patch) | |
tree | ce29913fe4dc60beeddca254a99d7465b8c0290b /bsie | |
parent | e7dff4f04b2b02d135bd166b9d340291517e47e8 (diff) | |
download | bsie-8439089807bbad92e95ad9062dc74c3d71f5d7eb.tar.gz bsie-8439089807bbad92e95ad9062dc74c3d71f5d7eb.tar.bz2 bsie-8439089807bbad92e95ad9062dc74c3d71f5d7eb.zip |
ReaderBuilder optional config
Diffstat (limited to 'bsie')
-rw-r--r-- | bsie/apps/index.py | 5 | ||||
-rw-r--r-- | bsie/apps/info.py | 7 | ||||
-rw-r--r-- | bsie/reader/builder.py | 6 | ||||
-rw-r--r-- | bsie/reader/chain.py | 2 | ||||
-rw-r--r-- | bsie/reader/image/__init__.py | 2 |
5 files changed, 9 insertions, 13 deletions
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': {}}, diff --git a/bsie/apps/info.py b/bsie/apps/info.py index 5b6fb0e..d8a70a6 100644 --- a/bsie/apps/info.py +++ b/bsie/apps/info.py @@ -32,12 +32,7 @@ def main(argv): # FIXME: Read reader/extractor configs from a config file # reader builder - rbuild = ReaderBuilder({ - 'bsie.reader.image.Image': { - 'bsie.reader.image._raw.RawImage': { - } - } - }) + rbuild = ReaderBuilder() # extractor builder ebuild = ExtractorBuilder([ {'bsie.extractor.generic.path.Path': {}}, diff --git a/bsie/reader/builder.py b/bsie/reader/builder.py index bce5397..8699e75 100644 --- a/bsie/reader/builder.py +++ b/bsie/reader/builder.py @@ -40,7 +40,11 @@ class ReaderBuilder(): # cached readers _cache: typing.Dict[str, base.Reader] - def __init__(self, kwargs: typing.Dict[str, typing.Dict[str, typing.Any]]): + def __init__( + self, + kwargs: typing.Optional[typing.Dict[str, typing.Dict[str, typing.Any]]] = None): + if kwargs is None: + kwargs = {} self._kwargs = kwargs self._cache = {} diff --git a/bsie/reader/chain.py b/bsie/reader/chain.py index db7c2d5..5e9e0d5 100644 --- a/bsie/reader/chain.py +++ b/bsie/reader/chain.py @@ -37,7 +37,7 @@ class ReaderChain(base.Reader, typing.Generic[T_CONTENT]): def __init__( self, subreader_names: typing.Iterable[str], - cfg: typing.Any, + cfg: typing.Optional[typing.Any] = None, ): rbuild = builder.ReaderBuilder(cfg) children = [] diff --git a/bsie/reader/image/__init__.py b/bsie/reader/image/__init__.py index b7587e7..1f290b5 100644 --- a/bsie/reader/image/__init__.py +++ b/bsie/reader/image/__init__.py @@ -31,7 +31,7 @@ __all__: typing.Sequence[str] = ( class Image(chain.ReaderChain[PIL.Image.Image]): # pylint: disable=too-few-public-methods """Read an image file.""" - def __init__(self, cfg): + def __init__(self, cfg: typing.Optional[typing.Any] = None): super().__init__(_FILE_FORMAT_READERS, cfg) ## EOF ## |