diff --git a/tools/formatter.py b/tools/formatter.py index fe4c2ab8..c0177163 100644 --- a/tools/formatter.py +++ b/tools/formatter.py @@ -386,35 +386,36 @@ def print_(*args, **kwargs): print_("Completed!") return entry + +def go(path): + + print(f"Formatting {path}...") + + with open(path, "r+", encoding='UTF-8') as f1: + entries = json.loads(f1.read()) + + for i in range(len(entries)): + try: + entry_formatted = format_all(entries[i], True) + validation_status = validate(entries[i]) + if validation_status > 2: + print(f"Entry {entry_formatted['id']} will be removed! {json.dumps(entry_formatted)}") + entries[i] = None + else: + entries[i] = entry_formatted + except Exception: + print(f"Exception occured when formatting ID {entries[i]['id']}") + print(traceback.format_exc()) + if not (i % 200): + print(f"{i} checked.") + + print(f"{len(entries)} checked. Writing...") + + with open(path, "w", encoding='utf-8', newline='\n') as f2: + f2.write(per_line_entries(entries)) + + print("Writing completed. All done.") + if __name__ == '__main__': - def go(path): - - print(f"Formatting {path}...") - - with open(path, "r+", encoding='UTF-8') as f1: - entries = json.loads(f1.read()) - - for i in range(len(entries)): - try: - entry_formatted = format_all(entries[i], True) - validation_status = validate(entries[i]) - if validation_status > 2: - print(f"Entry {entry_formatted['id']} will be removed! {json.dumps(entry_formatted)}") - entries[i] = None - else: - entries[i] = entry_formatted - except Exception: - print(f"Exception occured when formatting ID {entries[i]['id']}") - print(traceback.format_exc()) - if not (i % 200): - print(f"{i} checked.") - - print(f"{len(entries)} checked. Writing...") - - with open(path, "w", encoding='utf-8', newline='\n') as f2: - f2.write(per_line_entries(entries)) - - print("Writing completed. All done.") - go("../web/atlas.json") diff --git a/tools/merge_out.py b/tools/merge_out.py index fadba24b..19cef60b 100644 --- a/tools/merge_out.py +++ b/tools/merge_out.py @@ -1,11 +1,14 @@ import json import os +import formatter import scale_back -from formatter import per_line_entries from scale_back import ScaleConfig merge_source_file = 'temp_atlas.json' + +formatter.go(merge_source_file) + base_image_path = os.path.join('..', 'web', '_img', 'canvas', 'place30') ScaleConfig.image1 = os.path.join(base_image_path, '159.png') scale_back.swap_source_dest('164', '165', os.path.join(base_image_path, '163_159.png')) @@ -57,7 +60,7 @@ print('Writing...') with open('../web/atlas.json', 'w', encoding='utf-8') as atlas_file: - atlas_file.write(per_line_entries(atlas_json)) + atlas_file.write(formatter.per_line_entries(atlas_json)) with open('../data/read-ids.txt', 'a', encoding='utf-8') as read_ids_file: with open('read-ids-temp.txt', 'r', encoding='utf-8') as read_ids_temp_file: diff --git a/tools/redditcrawl.py b/tools/redditcrawl.py index f43e957f..977cffd5 100755 --- a/tools/redditcrawl.py +++ b/tools/redditcrawl.py @@ -29,7 +29,6 @@ import re import traceback from formatter import format_all, validate -from migrate_atlas_format import migrate_atlas_format OUT_FILE = open('temp_atlas.json', 'w', encoding='utf-8') READ_IDS_FILE = open('read-ids-temp.txt', 'w') @@ -125,8 +124,6 @@ def set_flair(submission, flair): assert validation_status < 3, \ "Submission invalid after validation. This may be caused by not enough points on the path." - submission_json = migrate_atlas_format(submission_json) - add_comma_line = len(OUT_FILE_LINES) - 2 if len(OUT_FILE_LINES[add_comma_line]) > 2: OUT_FILE_LINES[add_comma_line] = OUT_FILE_LINES[add_comma_line].replace('\n', ',\n')