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

Merge pull request 'refactor: Avoid manually templating toml file entries' (#6) from toml-dump into develop

Browse Source 
Reviewed-on: https://git.gieszer.link/gcrkrause/mastodon-blocklist-deploy/pulls/6
This commit is contained in:
moanos 2023-01-13 08:08:26 +01:00
commit 5376af3e7e
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mastodon_blocklist_deploy/cli.py
View File

@ -19,23 +19,6 @@ def load_blocklist_file(filename: str) -> [Instance]:
return instances return instances
def export_blocklist_toml(blocklist: [Instance], filname: str):
toml_str = ""
for instance in blocklist:
toml_str += f'''
[[instances]]
name = "{instance.domain}"
domain = "{instance.domain}"
severity = "{instance.severity}"
reject_media = {str(instance.reject_media).lower()}
reject_reports = {str(instance.reject_reports).lower()}
public_comment = "{instance.public_comment}"
private_comment = "{instance.private_comment}"
'''
with open(filname, "w") as f:
f.write(toml_str)
def blocklist_json_to_instances(blocklist_json: str) -> [Instance]: def blocklist_json_to_instances(blocklist_json: str) -> [Instance]:
instances = [] instances = []
for i in blocklist_json: for i in blocklist_json:
@ -105,9 +88,10 @@ def cli():
Instance.apply_blocks_from_diff(diffs, args.server, token, args.no_delete) Instance.apply_blocks_from_diff(diffs, args.server, token, args.no_delete)
elif args.action == "export": elif args.action == "export":
if not args.output: if not args.output:
print("Export currently requires to pass --output as well") print(toml.dumps({"instances": [b.__dict__ for b in remote_blocklist]}))
else: else:
export_blocklist_toml(remote_blocklist, args.output) with open(args.output, "w") as f:
toml.dump({"instances": [b.__dict__ for b in remote_blocklist]}, f)
if __name__ == "__main__": if __name__ == "__main__":