From e36ed7230977758a64dc4cba7e7d1ac82ba9c222 Mon Sep 17 00:00:00 2001 From: Ada Werefox Date: Tue, 16 Apr 2024 15:41:49 -0500 Subject: [PATCH] Added some code so that the initial fetch of data from the django server will not produce a timeout if the user isn't running on the host machine. --- tunictracker/tracker/views.py | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/tunictracker/tracker/views.py b/tunictracker/tracker/views.py index cc7bbe2..d997043 100644 --- a/tunictracker/tracker/views.py +++ b/tunictracker/tracker/views.py @@ -34,34 +34,34 @@ def session_key(session, key): def index(request): listen_address = session_key(request.session, "listen_address") - try: - request_overview_data = requests.get( - f"{listen_address}overview", timeout=5, verify=True - ).text - request_items_data = requests.get( - f"{listen_address}items", timeout=5, verify=True - ).text - request_doors_data = requests.get( - f"{listen_address}doors", timeout=5, verify=True - ).text - request_hints_data = requests.get( - f"{listen_address}hints", timeout=5, verify=True - ).text - tracker_overview_data = loads(request_overview_data) - if "error" in tracker_overview_data.keys(): - raise ValueError - tracker_items_data = loads(request_items_data) - tracker_doors_data = loads(request_doors_data) - tracker_hints_data = loads(request_hints_data) - except: - with open("empty_overview.json", "r") as t: - tracker_overview_data = loads(t.read()) - with open("empty_items.json", "r") as t: - tracker_items_data = loads(t.read()) - with open("empty_doors.json", "r") as t: - tracker_doors_data = loads(t.read()) - with open("empty_hints.json", "r") as t: - tracker_hints_data = loads(t.read()) + # try: + # request_overview_data = requests.get( + # f"{listen_address}overview", timeout=5, verify=True + # ).text + # request_items_data = requests.get( + # f"{listen_address}items", timeout=5, verify=True + # ).text + # request_doors_data = requests.get( + # f"{listen_address}doors", timeout=5, verify=True + # ).text + # request_hints_data = requests.get( + # f"{listen_address}hints", timeout=5, verify=True + # ).text + # tracker_overview_data = loads(request_overview_data) + # if "error" in tracker_overview_data.keys(): + # raise ValueError + # tracker_items_data = loads(request_items_data) + # tracker_doors_data = loads(request_doors_data) + # tracker_hints_data = loads(request_hints_data) + # except: + with open("empty_overview.json", "r") as t: + tracker_overview_data = loads(t.read()) + with open("empty_items.json", "r") as t: + tracker_items_data = loads(t.read()) + with open("empty_doors.json", "r") as t: + tracker_doors_data = loads(t.read()) + with open("empty_hints.json", "r") as t: + tracker_hints_data = loads(t.read()) with open("tracker/static/tracker/data/holy_cross_codes.json", "r") as t: try: temp_codes = loads(t.read())