Linters 2

.github/workflows/linters.yaml

@@ -4,28 +4,10 @@ name: Linters
 on:
   workflow_dispatch:
   pull_request:
-    branches:
-      - main
   push:
-    branches:
-      - main
 
 jobs:
-  # TODO: Fix Bandit Vulns
-  "Bandit":
-    runs-on: ubuntu-latest
-    container: python:3.11
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Bandit check
-        uses: jpetrucciani/bandit-check@master
-        with:
-          path: "app.py"
-          bandit_flags: "-lll"
-
-  "Black":
+  Black:
     runs-on: ubuntu-latest
     container: python:3.11
 
@@ -35,5 +17,15 @@ jobs:
       - name: Install dependencies
         run: pip install black
 
-      - name: Run black check
-        run: black --check .
+      - name: Run Black diff and create detailed annotations
+        run: |
+          # Run black with --diff and capture the output
+          black --diff . | tee diff_output.txt
+
+          # Display the diff output directly in logs (helpful for debugging)
+          echo "::error::Black found code style issues. See the diff below:"
+          cat diff_output.txt
+
+      # Run black --check and fail the job if Black finds issues
+      - name: Run black check to enforce formatting
+        run: black --check .

app.py

@@ -446,55 +446,7 @@ def megaitemnames():
             )
         )
 
-
-@app.route("/petshoppinglist", methods=["GET", "POST"])
-def petshoppinglist():
-    return redirect("https://saddlebagexchange.com/wow/shopping-list")
-
-    # DEPRECIATED
-    if request.method == "GET":
-        return return_safe_html(render_template("petshoppinglist.html"))
-    elif request.method == "POST":
-        json_data = {
-            "region": request.form.get("region"),
-            "itemID": int(request.form.get("petID")),
-            "maxPurchasePrice": int(request.form.get("maxPurchasePrice")),
-            "connectedRealmIDs": {},
-        }
-
-        response = requests.post(
-            f"{api_url}/wow/shoppinglistx",
-            headers={"Accept": "application/json"},
-            json=json_data,
-        ).json()
-
-        if "data" not in response:
-            logger.error(
-                f"Error no matching data with given inputs {json_data} response {response}"
-            )
-            if NO_RATE_LIMIT:
-                return f"Error no matching data with given inputs {json_data} response {response}"
-            # send generic error message to remove XSS potential
-            return f"error no matching results found matching search inputs"
-
-        response = response["data"]
-
-        column_order = [
-            "realmID",
-            "price",
-            "quantity",
-            "realmName",
-            "realmNames",
-            "link",
-        ]
-        response = [{key: item.get(key) for key in column_order} for item in response]
-        fieldnames = list(response[0].keys())
-
-        return return_safe_html(
-            render_template(
-                "petshoppinglist.html", results=response, fieldnames=fieldnames, len=len
-            )
-        )
+
 
 
 @app.route("/petmarketshare", methods=["GET", "POST"])

routes/wow.py

@@ -90,4 +90,57 @@ def wow_outofstock_api():
                 fieldnames=fieldnames,
                 len=len,
             )
+        )
+
+@wow_bp.route("/petshoppinglist", methods=["GET", "POST"])
+def petshoppinglist():
+    # return redirect("https://saddlebagexchange.com/wow/shopping-list")
+
+    # DEPRECIATED
+    if request.method == "GET":
+        return return_safe_html(render_template("petshoppinglist.html"))
+    elif request.method == "POST":
+        json_data = {
+            "region": request.form.get("region"),
+            "itemID": int(request.form.get("petID")),
+            "maxPurchasePrice": int(request.form.get("maxPurchasePrice")),
+            "connectedRealmIDs": {},
+        }
+
+        print(json_data)
+
+        response = requests.post(
+            f"{api_url}/wow/shoppinglistx",
+            headers={"Accept": "application/json"},
+            json=json_data,
+        ).json()
+
+        print(response)
+
+        if "data" not in response:
+            print(
+                f"Error no matching data with given inputs {json_data} response {response}"
+            )
+            if NO_RATE_LIMIT:
+                return f"Error no matching data with given inputs {json_data} response {response}"
+            # send generic error message to remove XSS potential
+            return f"error no matching results found matching search inputs"
+
+        response = response["data"]
+
+        column_order = [
+            "realmID",
+            "price",
+            "quantity",
+            "realmName",
+            "realmNames",
+            "link",
+        ]
+        response = [{key: item.get(key) for key in column_order} for item in response]
+        fieldnames = list(response[0].keys())
+
+        return return_safe_html(
+            render_template(
+                "petshoppinglist.html", results=response, fieldnames=fieldnames, len=len
+            )
         )