From 8e8cb5c33e98e06f961b1674f17dbe03eb62c8a3 Mon Sep 17 00:00:00 2001 From: Luke Tainton Date: Sun, 22 Jun 2025 22:25:48 +0100 Subject: [PATCH] Formatting --- app/app.py | 20 +++++++++++--------- app/send_page.py | 24 +++++++++++------------- tests/__init__.py | 1 + tests/test_app.py | 4 ++-- tests/test_send_page.py | 8 ++------ 5 files changed, 27 insertions(+), 30 deletions(-) diff --git a/app/app.py b/app/app.py index 86287e6..23545ff 100644 --- a/app/app.py +++ b/app/app.py @@ -4,24 +4,26 @@ from flask import Flask, render_template, request from flask_wtf.csrf import CSRFProtect -from app.send_page import send_page +from app.send_page import send_page app = Flask(__name__) csrf = CSRFProtect(app) -@app.route("/", methods=['GET']) + +@app.route("/", methods=["GET"]) def index(): """Returns index template.""" - return render_template('index.html', status='') + return render_template("index.html", status="") -@app.route("/", methods=['POST']) + +@app.route("/", methods=["POST"]) def send(): """POST function""" result = send_page( - name=request.form.get('name'), - email=request.form.get('email'), - message=request.form.get('message') + name=request.form.get("name"), + email=request.form.get("email"), + message=request.form.get("message"), ) - status = 'success' if result[0] else 'fail' - return render_template('index.html', status=status) + status = "success" if result[0] else "fail" + return render_template("index.html", status=status) diff --git a/app/send_page.py b/app/send_page.py index ee41111..d9c21e9 100644 --- a/app/send_page.py +++ b/app/send_page.py @@ -3,33 +3,31 @@ """Send messages via the Pushover API.""" import os + import requests def send_page(name: str, email: str, message: str) -> tuple: """POST to the Pushover API.""" api_url = "https://api.pushover.net/1/messages.json" - api_token = os.getenv('PUSHOVER_API_TOKEN') - user_key = os.getenv('PUSHOVER_USER_KEY') + api_token = os.getenv("PUSHOVER_API_TOKEN") + user_key = os.getenv("PUSHOVER_USER_KEY") full_msg = f"Name: {name}\nEmail: {email}\n\nMessage: {message}" payload = { - 'token': api_token, - 'user': user_key, - 'title': f"ePage from {name}", - 'message': full_msg, - 'priority': "1", - 'sound': 'cosmic' + "token": api_token, + "user": user_key, + "title": f"ePage from {name}", + "message": full_msg, + "priority": "1", + "sound": "cosmic", } req = requests.post( - api_url, - json=payload, - headers={'Content-Type': 'application/json'}, - timeout=5 + api_url, json=payload, headers={"Content-Type": "application/json"}, timeout=5 ) - if req.status_code == 200 and req.json().get('status') == 1: + if req.status_code == 200 and req.json().get("status") == 1: return (True, None) return (False, req.json()) diff --git a/tests/__init__.py b/tests/__init__.py index eea7371..174c6fd 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -3,6 +3,7 @@ """PyTest unit tests.""" import os + import pytest from app.app import app, csrf diff --git a/tests/test_app.py b/tests/test_app.py index c5019e7..5e7dbd6 100644 --- a/tests/test_app.py +++ b/tests/test_app.py @@ -3,10 +3,10 @@ """Tests for app/app.py""" -from tests import client # pragma: no cover +from tests import client # pragma: no cover def test_index(client) -> None: """Ensure that the index page is loaded correctly.""" - req = client.get('/') + req = client.get("/") assert req.status_code == 200 and "ePage" in req.text diff --git a/tests/test_send_page.py b/tests/test_send_page.py index c07be0c..9599502 100644 --- a/tests/test_send_page.py +++ b/tests/test_send_page.py @@ -7,9 +7,5 @@ from app.send_page import send_page def test_send_page_no_env() -> None: """Ensure the API returns an error if no API key specified.""" - result = send_page( - name='Unit Test', - email='none@none.com', - message='Unit Test' - ) - assert not result[0] and result[1].get('token') == 'invalid' + result = send_page(name="Unit Test", email="none@none.com", message="Unit Test") + assert not result[0] and result[1].get("token") == "invalid"