Server returns JSON response

Author: SamP20

label_server/__init__.py

@@ -1,8 +1,9 @@
-from flask import Flask, request, redirect
+from flask import Flask, request, redirect, Response
+from werkzeug.exceptions import HTTPException
 from .label_print import print_label
-import requests
 import logging
 
+
 app = Flask(__name__, instance_relative_config=True)
 logger = logging.Logger(__name__)
 
@@ -12,21 +13,36 @@
 app.logger.handlers = gunicorn_logger.handlers
 app.logger.setLevel(gunicorn_logger.level)
 
-@app.route("/print")
+@app.errorhandler(Exception)
+def all_exception_handler(error):
+    if isinstance(error, HTTPException):
+        return error
+
+    res = {"error": str(error)}
+    return res, 500
+
+
+@app.route("/print", methods=["POST", "OPTIONS"])
 def _print():
-    label_id = request.args.get("id")
-    return_url = request.args.get("return_url")
+    if request.method == "OPTIONS":
+        return {}
+
+    label_data = request.get_json()
+    serial = label_data.get("id")
+    name = label_data.get("name", "")
+    expiry = label_data.get("expiry", "who knows?")
+    caption = label_data.get("caption", "Invalid")
+
+    cut = True
     try:
-        membership_url = app.config["MEMBERSHIP_URL"]
-        r = requests.get(f'{membership_url}/api/labels/label/{label_id}')
-        label_data = r.json()
-        serial = label_data.get("id")
-        name = label_data.get("name", "")
-        expiry = label_data.get("expiry", "who knows?")
-        caption = label_data.get("caption", "Invalid")
-
-        cut = True
         print_label(name, caption, expiry, serial, cut)
-    except Exception as ex:
-        logger.exception("Error printing label")
-    return redirect(return_url)
+    except FileNotFoundError:
+        return {"error": "Printer not switched on"}, 500
+
+    return {"success": True}
+
+@app.after_request
+def add_origin(response):
+    response.headers["Access-Control-Allow-Origin"] = "*"
+    response.headers["Access-Control-Allow-Headers"] = "origin, content-type, accept"
+    return response

label_server/label_print.py

@@ -72,10 +72,7 @@ def send_to_printer(image, cut=True):
             cut=cut
         )
 
-        try:
-            send(instructions=instructions, printer_identifier=PRINTER, backend_identifier=BACKEND, blocking=True)
-        except FileNotFoundError:
-            logger.warn("Tried printing with printer unplugged")
+        send(instructions=instructions, printer_identifier=PRINTER, backend_identifier=BACKEND, blocking=True)
     logger.info("printing done")
 
 def print_label(name, description, expiry, serial=None, cut=True):