Lediver.se
/
fediverse-blocklist-deploy
2
0
Fork 0
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

Show nicer diff when merging

merge-fix
Julian-Samuel Gebühr 2023-07-13 11:33:55 +02:00
parent d47a63e331
commit b5bb6f8480
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon_blocklist_deploy/cli.py
View File

@ -65,6 +65,9 @@ def exporter(blocklist, output=None, format: str = "toml", private: bool = False
def merge(input_file, merge_target, format: str = "toml", private: bool = False, overwrite=False):
"""Shows a table in the CLI comparing the local and remote blocklist"""
from rich.table import Table
from rich.console import Console
input_blocklist = load_blocklist_file(input_file)
merge_target_blocklist = load_blocklist_file(merge_target)
for input_instance in input_blocklist:
@ -78,7 +81,7 @@ def merge(input_file, merge_target, format: str = "toml", private: bool = False,
key_input = ""
while key_input not in ("i", "O"):
print(f"Different settings for {input_instance.domain} detected.")
print(f"In the input blocklist the setting is\n{input_instance} whereas it's {merge_target_instance} in the merge target")
Instance.show_diff(input_instance, merge_target_instance)
key_input = input("Keep input (i) or original (o) [i/O]")
elif key_input == "i":
merge_target_blocklist.append(merge_target_instance)