Fixed problems when importing filter from multiple files.

- The 2nd load discarded alredy imported filters
Fixes #114
This commit is contained in:
Salvador E. Tropea 2021-11-22 12:45:06 -03:00
parent 98bb4b0cfb
commit 4dcb289e73
2 changed files with 2 additions and 10 deletions

View File

@ -346,9 +346,9 @@ class CfgYamlReader(object):
elif k == 'import':
outputs.extend(self._parse_import(v, fstream.name))
elif k == 'variants':
RegOutput.set_variants(self._parse_variants(v))
RegOutput.add_variants(self._parse_variants(v))
elif k == 'filters':
RegOutput.set_filters(self._parse_filters(v))
RegOutput.add_filters(self._parse_filters(v))
elif k == 'outputs':
outputs.extend(self._parse_outputs(v))
else:

View File

@ -45,10 +45,6 @@ class RegOutput(Optionable, Registrable):
def __init__(self):
super().__init__()
@staticmethod
def set_variants(variants):
RegOutput._def_variants = variants
@staticmethod
def add_variants(variants):
RegOutput._def_variants.update(variants)
@ -61,10 +57,6 @@ class RegOutput(Optionable, Registrable):
def get_variant(name):
return RegOutput._def_variants[name]
@staticmethod
def set_filters(filters):
RegOutput._def_filters = filters
@staticmethod
def add_filters(filters):
RegOutput._def_filters.update(filters)