moanos/fediverse-blocklist-tool
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects 1 Releases Wiki Activity

Merge branch 'merge-fix' into develop

Browse Source
This commit is contained in:
moanos [he/him] 2023-12-19 09:29:43 +01:00
commit 0b37e7a10c
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fediverse_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): 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) input_blocklist = load_blocklist_file(input_file)
merge_target_blocklist = load_blocklist_file(merge_target) merge_target_blocklist = load_blocklist_file(merge_target)
for input_instance in input_blocklist: for input_instance in input_blocklist:
@ -73,12 +76,12 @@ def merge(input_file, merge_target, format: str = "toml", private: bool = False,
continue continue
# Check if there is a domain in the merge target where the input domain is similar # Check if there is a domain in the merge target where the input domain is similar
try: try:
merge_target_instance = [merge_target_instance for merge_target_instance in merge_target if input_instance.domain == merge_target_instance.domain][0] merge_target_instance = [merge_target_instance for merge_target_instance in merge_target_blocklist if input_instance.domain == merge_target_instance.domain][0]
if not overwrite: if not overwrite:
key_input = "" key_input = ""
while key_input not in ("i", "O"): while key_input not in ("i", "O"):
print(f"Different settings for {input_instance.domain} detected.") 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]") key_input = input("Keep input (i) or original (o) [i/O]")
elif key_input == "i": elif key_input == "i":
merge_target_blocklist.append(merge_target_instance) merge_target_blocklist.append(merge_target_instance)
@ -117,12 +120,14 @@ def cli():
else: else:
token = os.getenv('MBD_TOKEN') token = os.getenv('MBD_TOKEN')
"""if there is a remote blocklist provided load this instead of fetching it from a server (for debugging reasons)""" """Get a remote blocklist only when necessary"""
if args.remote_blocklist: if args.action in ["diff", "deploy"]:
with open(args.remote_blocklist) as f: """if there is a remote blocklist provided load this instead of fetching it from a server (for debugging reasons)"""
remote_blocklist = blocklist_json_to_instances(json.load(f)) if args.remote_blocklist:
else: with open(args.remote_blocklist) as f:
remote_blocklist = load_blocklist_from_instance(server=args.server, token=token) remote_blocklist = blocklist_json_to_instances(json.load(f))
else:
remote_blocklist = load_blocklist_from_instance(server=args.server, token=token)
"""Load local blocklist only when needed""" """Load local blocklist only when needed"""
if args.action in ["diff", "deploy", "merge"]: if args.action in ["diff", "deploy", "merge"]:

15
fediverse_blocklist_deploy/models.py
View File

@ -145,3 +145,18 @@ class Instance:
table.add_row(diff["local"].domain, diff["local"].status_str(), diff["remote"].status_str()) table.add_row(diff["local"].domain, diff["local"].status_str(), diff["remote"].status_str())
console = Console() console = Console()
console.print(table) console.print(table)
@staticmethod
def show_diff(instanceA, instanceB, column_names=('Input', 'Original')):
from rich.table import Table
from rich.console import Console
table = Table(title="Differences", expand=True, show_lines=True)
table.add_column("Attribute", style="cyan")
table.add_column(column_names[0], style="green")
table.add_column(column_names[1], style="magenta")
compare_attributes = ["domain", "severity", "obfuscate", "private_comment", "public_comment", "reject_media", "reject_reports"]
for attr in compare_attributes:
table.add_row(attr, str(getattr(instanceA, attr)), str(getattr(instanceB, attr)))
console = Console()
console.print(table)