refactor: Cleaner solution for exportable dict

As this wil not be the same id on other instances exporting it does not make sense

.drone.yml

@@ -0,0 +1,23 @@
+---
+kind: pipeline
+type: exec
+name: build
+
+platform:
+  os: linux
+  arch: arm64
+
+steps:
+- name: build
+  commands:
+    - docker build -t gcrkrause/mastodon-blocklist-deploy .
+- name: push
+  environment:
+    USERNAME:
+      from_secret: docker-hub-user
+    PASSWORD:
+      from_secret: docker-hub-pw
+  commands:
+    - docker login -u $USERNAME -p $PASSWORD
+    - docker push gcrkrause/mastodon-blocklist-deploy
+    - docker image prune -a -f

DEVELOPMENT.md

@@ -0,0 +1,17 @@
+# Development Guide
+
+## Docker
+
+In order to have a common development environment, its nice to use docker. Its quite easy. To build a new image, simply run 
+
+`docker build . -t mastodon_blocklist_deploy`
+
+Now you can execute any commands using
+
+`docker run --rm mastodon_blocklist_deploy --help`
+
+If you want to avoid building new containers for each change, simply mount your code into the container using
+
+`docker run --rm -v $(pwd):/app mastodon_blocklist_deploy`
+
+Please be aware that changes to the package itself require a rebuild anyways.

Dockerfile

@@ -0,0 +1,12 @@
+FROM python:3.11-slim
+
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+
+COPY pyproject.toml poetry.lock README.md /app/
+COPY mastodon_blocklist_deploy /app/mastodon_blocklist_deploy
+WORKDIR /app
+
+ENTRYPOINT ["mastodon_blocklist_deploy"]
+
+RUN pip install -e . 

mastodon_blocklist_deploy/cli.py

@@ -64,8 +64,6 @@ def cli():
     else:
         token = os.getenv('MBD_TOKEN')
 
-
-
     """if there is a remote blocklist provided load this instead of fetching it from a server (for debugging reasons)"""
     if args.remote_blocklist:
         with open(args.remote_blocklist) as f:
@@ -79,7 +77,11 @@ def cli():
             blocklist_filename = args.input_file
         else:
             blocklist_filename = "../blocklist.toml"
-        local_blocklist = load_blocklist_file(blocklist_filename)
+        try:
+            local_blocklist = load_blocklist_file(blocklist_filename)
+        except FileNotFoundError:
+            print("Local blocklist file was not found. Make sure to specify it's location via -i")
+            exit()
 
     if args.action == "diff":
         Instance.show_diffs(local_blocklist, remote_blocklist)
@@ -88,10 +90,10 @@ def cli():
         Instance.apply_blocks_from_diff(diffs, args.server, token, args.no_delete)
     elif args.action == "export":
         if not args.output:
-            print(toml.dumps({"instances": [b.__dict__ for b in remote_blocklist]}))
+            print(toml.dumps({"instances": [b.exportable_dict for b in remote_blocklist]}))
         else:
             with open(args.output, "w") as f:
-                toml.dump({"instances": [b.__dict__ for b in remote_blocklist]}, f)
+                toml.dump({"instances": [b.exportable_dict for b in remote_blocklist]}, f)
 
 
 if __name__ == "__main__":

mastodon_blocklist_deploy/models.py

@@ -27,6 +27,14 @@ class Instance:
     def status_str(self):
         return f"{self.severity}\nReject reports: {self.reject_reports}\nReject media: {self.reject_media}\nObfuscate: {self.obfuscate}"
 
+    @property
+    def exportable_dict(self):
+        keys = ["domain", "severity", "public_comment", "private_comment", "obfuscate", "reject_media", "reject_reports"]
+        exportable = {}
+        for key in keys:
+            exportable[key] = getattr(self, key)
+        return exportable
+
     def parse_remote_block(self, instance_dict):
         self.domain = instance_dict["domain"]
         self.id = instance_dict["id"]
@@ -38,7 +46,10 @@ class Instance:
         self.reject_reports = instance_dict["reject_reports"]
 
     def parse_local_block(self, instance_dict):
-        self.name = instance_dict["name"]
+        try:
+            self.name = instance_dict["name"]
+        except KeyError:
+            pass
         self.domain = instance_dict["domain"]
         self.severity = instance_dict["severity"]
         self.public_comment = instance_dict["public_comment"]