diff options
Diffstat (limited to 'api/ruleset.py')
| -rw-r--r-- | api/ruleset.py | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/api/ruleset.py b/api/ruleset.py index b42b4e9..92c7077 100644 --- a/api/ruleset.py +++ b/api/ruleset.py @@ -15,23 +15,23 @@ rulesets = { } } + # resolve ruleset from ruleset name or dict def resolve_ruleset(ruleset): - # create return variable - export = {} - try: - # try to parse the ruleset as json - export = json.loads(ruleset) - merged = dict(rulesets["default"]) - - # fill missing keys in dict - merge(merged, export) - export = merged - except ValueError as e: - # if the ruleset is a name like 'default' or 'columns+2', read it from the predefined rulesets - if ruleset in rulesets: - export = rulesets[ruleset] - if not export: - export = rulesets["default"] - return export + # create return variable + export = {} + try: + # try to parse the ruleset as json + export = json.loads(ruleset) + merged = dict(rulesets["default"]) + # fill missing keys in dict + merge(merged, export) + export = merged + except ValueError as e: + # if the ruleset is a name like 'default' or 'columns+2', read it from the predefined rulesets + if ruleset in rulesets: + export = rulesets[ruleset] + if not export: + export = rulesets["default"] + return export |