From f4b85cead7aebb597d267fb11514aa2d93961d51 Mon Sep 17 00:00:00 2001 From: Vadim Date: Fri, 22 Apr 2022 15:12:42 +0300 Subject: [PATCH 1/4] add dump as json --- tonos_ts4/dump.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tonos_ts4/dump.py b/tonos_ts4/dump.py index 7dad52c..516c43f 100644 --- a/tonos_ts4/dump.py +++ b/tonos_ts4/dump.py @@ -142,3 +142,12 @@ def truncate_long_strings(msg): print('var nicknames = ' + dump_struct_str(globals.NICKNAMES) + ';', file = f) print('var allRuns = ' + dump_struct_str(all_runs) + ';', file = f) +def dump_json_data(): + all_runs = get_all_runs() + msgs = get_all_messages() + with open('msg_data.json', 'w') as f: + json.dump({ + 'allMessages': msgs, + 'nicknames': globals.NICKNAMES, + 'allRuns': all_runs, + }, indent=2, fp=f) From 5770ebdc99abbde637dac385312c55a8e9901e82 Mon Sep 17 00:00:00 2001 From: Vadim Date: Fri, 22 Apr 2022 15:15:23 +0300 Subject: [PATCH 2/4] add dump as json --- tonos_ts4/dump.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tonos_ts4/dump.py b/tonos_ts4/dump.py index 516c43f..9753093 100644 --- a/tonos_ts4/dump.py +++ b/tonos_ts4/dump.py @@ -142,12 +142,19 @@ def truncate_long_strings(msg): print('var nicknames = ' + dump_struct_str(globals.NICKNAMES) + ';', file = f) print('var allRuns = ' + dump_struct_str(all_runs) + ';', file = f) -def dump_json_data(): +def dump_json_data(fd=None): all_runs = get_all_runs() msgs = get_all_messages() - with open('msg_data.json', 'w') as f: + if fd: json.dump({ 'allMessages': msgs, 'nicknames': globals.NICKNAMES, 'allRuns': all_runs, }, indent=2, fp=f) + else: + with open('msg_data.json', 'w') as f: + json.dump({ + 'allMessages': msgs, + 'nicknames': globals.NICKNAMES, + 'allRuns': all_runs, + }, indent=2, fp=f) From d989ff2f67d057b82ad4ee9dc41d12b3271b99ef Mon Sep 17 00:00:00 2001 From: Vadim Date: Fri, 22 Apr 2022 15:23:17 +0300 Subject: [PATCH 3/4] add dump as json --- tonos_ts4/dump.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tonos_ts4/dump.py b/tonos_ts4/dump.py index 9753093..1168b2c 100644 --- a/tonos_ts4/dump.py +++ b/tonos_ts4/dump.py @@ -142,19 +142,19 @@ def truncate_long_strings(msg): print('var nicknames = ' + dump_struct_str(globals.NICKNAMES) + ';', file = f) print('var allRuns = ' + dump_struct_str(all_runs) + ';', file = f) -def dump_json_data(fd=None): +def dump_json_data(fp=None): all_runs = get_all_runs() msgs = get_all_messages() - if fd: + if fp: json.dump({ 'allMessages': msgs, 'nicknames': globals.NICKNAMES, 'allRuns': all_runs, - }, indent=2, fp=f) + }, indent=2, fp=fp) else: - with open('msg_data.json', 'w') as f: + with open('msg_data.json', 'w') as fp: json.dump({ 'allMessages': msgs, 'nicknames': globals.NICKNAMES, 'allRuns': all_runs, - }, indent=2, fp=f) + }, indent=2, fp=fp) From e8bd5daa78239856ec445b107d53f74d73225ee9 Mon Sep 17 00:00:00 2001 From: Vadim Date: Fri, 22 Apr 2022 15:32:09 +0300 Subject: [PATCH 4/4] add dump as json --- tonos_ts4/dump.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tonos_ts4/dump.py b/tonos_ts4/dump.py index 1168b2c..3ac424f 100644 --- a/tonos_ts4/dump.py +++ b/tonos_ts4/dump.py @@ -142,7 +142,8 @@ def truncate_long_strings(msg): print('var nicknames = ' + dump_struct_str(globals.NICKNAMES) + ';', file = f) print('var allRuns = ' + dump_struct_str(all_runs) + ';', file = f) -def dump_json_data(fp=None): +def dump_json_data(path = '.', fp=None): + fn = os.path.join(path, 'msg_data.json') all_runs = get_all_runs() msgs = get_all_messages() if fp: @@ -152,7 +153,7 @@ def dump_json_data(fp=None): 'allRuns': all_runs, }, indent=2, fp=fp) else: - with open('msg_data.json', 'w') as fp: + with open(fn, 'w') as fp: json.dump({ 'allMessages': msgs, 'nicknames': globals.NICKNAMES,