MirrorHub/atlas
0
0
Fork 0
mirror of https://github.com/placeAtlas/atlas.git synced 2025-01-16 13:27:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix behavior when merging edit patches

Browse source
This commit is contained in:
Hans5958 2023-06-20 22:59:29 +07:00
parent d47ff9d704
commit 414ee149ef
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/merge_out.py
View file

@ -63,21 +63,23 @@
out_ids.append(reddit_id)
del entry['_reddit_id']
# This wouldn't work if it is an edit.
# If needed, we can add a type to the patch to be more foolproof.
# if entry['id'] in out_ids:
# print(f"{filename}: Submission from {entry['id']} has been included! This will be ignored from the merge.")
# continue
if '_author' in entry:
author = entry['_author']
if author not in authors:
authors.append(author)
del entry['_author']
if entry['id'] in out_ids:
print(f"{filename}: Submission from {entry['id']} has been included! This will be ignored from the merge.")
continue
if entry['id'] < 1:
if entry['id'] is int and entry['id'] < 1:
last_id += 1
print(f"{filename}: Entry is new, assigned ID {last_id}")
entry['id'] = str(last_id)
else:
elif entry['id'] not in out_ids:
out_ids.append(entry['id'])
if entry['id'] in atlas_ids: