mirror of
https://github.com/placeAtlas/atlas.git
synced 2024-09-27 12:39:18 +02:00
Support editing on script, submitted_by to contributors, merge to atlas script
This commit is contained in:
parent
dd5e809e4f
commit
1e1c007d31
2 changed files with 58 additions and 3 deletions
41
tools/merge_out.py
Normal file
41
tools/merge_out.py
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
import praw
|
||||||
|
import json
|
||||||
|
import time
|
||||||
|
import re
|
||||||
|
import os
|
||||||
|
import traceback
|
||||||
|
from formatter import format_all, per_line_entries
|
||||||
|
|
||||||
|
out_ids = []
|
||||||
|
out_dupe_ids = []
|
||||||
|
atlas_ids = []
|
||||||
|
|
||||||
|
with open('temp_atlas.json', 'r', encoding='utf-8') as out_file:
|
||||||
|
out_json = json.loads(out_file)
|
||||||
|
|
||||||
|
with open('../atlas.json', 'r', encoding='utf-8') as atlas_file:
|
||||||
|
atlas_json = json.loads(atlas_file)
|
||||||
|
|
||||||
|
for entry in atlas_json:
|
||||||
|
atlas_ids.append(entry['id'])
|
||||||
|
|
||||||
|
for entry in out_json:
|
||||||
|
if (entry['id'] in out_ids):
|
||||||
|
print(f"Entry {entry['id']} has duplicates! Please resolve this conflict. This will be excluded from the merge.")
|
||||||
|
out_dupe_ids.append(entry['id'])
|
||||||
|
out_ids.append(entry['id'])
|
||||||
|
|
||||||
|
for entry in out_json:
|
||||||
|
if entry['id'] in out_dupe_ids:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if ('edit' in entry and entry['edit']) or entry['id'] in out_ids:
|
||||||
|
index = next((i for i, item in enumerate(atlas_json) if item["id"] == entry['id']), None)
|
||||||
|
if 'edit' in entry:
|
||||||
|
del entry['edit']
|
||||||
|
atlas_json[index] = entry
|
||||||
|
else:
|
||||||
|
atlas_json.append(entry)
|
||||||
|
|
||||||
|
with open('../atlas.json', 'w', encoding='utf-8') as atlas_file:
|
||||||
|
atlas_file.write(per_line_entries(atlas_json))
|
|
@ -101,11 +101,25 @@ def set_flair(submission, flair):
|
||||||
|
|
||||||
if submission_json:
|
if submission_json:
|
||||||
|
|
||||||
submission_json_dummy = {"id": submission.id, "submitted_by": ""}
|
submission_json_dummy = {"id": submission.id, "edit": True, "contributors": []}
|
||||||
|
|
||||||
|
if (submission_json.id != 0):
|
||||||
|
submission_json_dummy["id"] = submission_json.id
|
||||||
|
else:
|
||||||
|
del submission_json_dummy["edit"]
|
||||||
|
|
||||||
|
if "submitted_by" in submission_json:
|
||||||
|
submission_json_dummy["contributors"].append(submission_json['submitted_by'])
|
||||||
|
del submission_json['submitted_by']
|
||||||
|
elif "contributors" in submission_json:
|
||||||
|
submission_json_dummy["contributors"] = submission_json["contributors"]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
submission_json_dummy["submitted_by"] = submission.author.name
|
if not submission.author.name in submission_json_dummy:
|
||||||
|
submission_json_dummy["contributors"].append(submission.author.name)
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
submission_json_dummy["submitted_by"] = "unknown"
|
submission_json_dummy["contributors"].append("unknown")
|
||||||
|
|
||||||
for key in submission_json:
|
for key in submission_json:
|
||||||
if not key in submission_json_dummy:
|
if not key in submission_json_dummy:
|
||||||
submission_json_dummy[key] = submission_json[key];
|
submission_json_dummy[key] = submission_json[key];
|
||||||
|
|
Loading…
Reference in a new issue