WIP: Rolle | MAS #2

Draft
roydfalk wants to merge 22 commits from dev-mas into main
Showing only changes of commit 8e73310fae - Show all commits

View file

@ -103,16 +103,23 @@ def main():
data = {} data = {}
### base ### base
if True: if True:
data_ = _json.loads(file_read(args.base_file_path)) data = dict_merge(
data = dict_merge(data, data_) data,
_json.loads(file_read(args.base_file_path))
)
### clients ### clients
if True: if True:
for name in _os.listdir(args.clients_directory_path): data = dict_merge(
data__ = _json.loads(file_read(_os.path.join(args.clients_directory_path, name))) data,
data_ = { {
"clients": data__ "clients": list(
map(
lambda name: _json.loads(file_read(_os.path.join(args.clients_directory_path, name))),
_os.listdir(args.clients_directory_path)
)
),
} }
data = dict_merge(data, data_) )
## output ## output
if True: if True:
if (args.output_format == "json"): if (args.output_format == "json"):