Removed api key caching

Author: ScrappyCocco

howlongtobeatpy/howlongtobeatpy/HTMLRequests.py

@@ -25,7 +25,6 @@ class HTMLRequests:
     BASE_URL = 'https://howlongtobeat.com/'
     REFERER_HEADER = BASE_URL
     SEARCH_URL = BASE_URL + "api/search"
-    SEARCH_API_KEY = None
     GAME_URL = BASE_URL + "game"
 
     @staticmethod
@@ -96,8 +95,11 @@ def send_web_request(game_name: str, search_modifiers: SearchModifiers = SearchM
         """
         headers = HTMLRequests.get_search_request_headers()
         payload = HTMLRequests.get_search_request_data(game_name, search_modifiers, page)
+        api_key_result = HTMLRequests.send_website_request_getcode(False)
+        if api_key_result is None:
+            api_key_result = HTMLRequests.send_website_request_getcode(True)
         # Make the post request and return the result if is valid
-        search_url_with_key = HTMLRequests.SEARCH_URL + "/" + HTMLRequests.SEARCH_API_KEY
+        search_url_with_key = HTMLRequests.SEARCH_URL + "/" + api_key_result
         resp = requests.post(search_url_with_key, headers=headers, data=payload)
         if resp.status_code == 200:
             return resp.text
@@ -115,8 +117,11 @@ async def send_async_web_request(game_name: str, search_modifiers: SearchModifie
         """
         headers = HTMLRequests.get_search_request_headers()
         payload = HTMLRequests.get_search_request_data(game_name, search_modifiers, page)
+        api_key_result = await HTMLRequests.async_send_website_request_getcode(False)
+        if api_key_result is None:
+            api_key_result = await HTMLRequests.async_send_website_request_getcode(True)
         # Make the post request and return the result if is valid
-        search_url_with_key = HTMLRequests.SEARCH_URL + "/" + HTMLRequests.SEARCH_API_KEY
+        search_url_with_key = HTMLRequests.SEARCH_URL + "/" + api_key_result
         async with aiohttp.ClientSession() as session:
             async with session.post(search_url_with_key, headers=headers, data=payload) as resp:
                 if resp is not None and str(resp.status) == "200":

howlongtobeatpy/howlongtobeatpy/HowLongToBeat.py

@@ -44,18 +44,6 @@ async def async_search(self, game_name: str, search_modifiers: SearchModifiers =
         """
         if game_name is None or len(game_name) == 0:
             return None
-        # Fetch the API Key
-        api_key_result = HTMLRequests.SEARCH_API_KEY
-        if HTMLRequests.SEARCH_API_KEY is None:
-            api_key_result = await HTMLRequests.async_send_website_request_getcode(False)
-            if api_key_result is None:
-                api_key_result = await HTMLRequests.async_send_website_request_getcode(True)
-        if api_key_result is not None:
-            # Set it for Caching
-            HTMLRequests.SEARCH_API_KEY = api_key_result
-        else:
-            return None
-        # Fetch the other data
         html_result = await HTMLRequests.send_async_web_request(game_name, search_modifiers)
         if html_result is not None:
             return self.__parse_web_result(game_name, html_result, None, similarity_case_sensitive)
@@ -72,18 +60,6 @@ def search(self, game_name: str, search_modifiers: SearchModifiers = SearchModif
         """
         if game_name is None or len(game_name) == 0:
             return None
-        # Fetch the API Key
-        api_key_result = HTMLRequests.SEARCH_API_KEY
-        if HTMLRequests.SEARCH_API_KEY is None:
-            api_key_result = HTMLRequests.send_website_request_getcode(False)
-            if api_key_result is None:
-                api_key_result = HTMLRequests.send_website_request_getcode(True)
-        if api_key_result is not None:
-            # Set it for Caching
-            HTMLRequests.SEARCH_API_KEY = api_key_result
-        else:
-            return None
-        # Fetch the other data
         html_result = HTMLRequests.send_web_request(game_name, search_modifiers)
         if html_result is not None:
             return self.__parse_web_result(game_name, html_result, None, similarity_case_sensitive)
@@ -103,18 +79,6 @@ async def async_search_from_id(self, game_id: int):
         """
         if game_id is None or game_id == 0:
             return None
-        # Fetch the API Key
-        api_key_result = HTMLRequests.SEARCH_API_KEY
-        if HTMLRequests.SEARCH_API_KEY is None:
-            api_key_result = await HTMLRequests.async_send_website_request_getcode(False)
-            if api_key_result is None:
-                api_key_result = await HTMLRequests.async_send_website_request_getcode(True)
-        if api_key_result is not None:
-            # Set it for Caching
-            HTMLRequests.SEARCH_API_KEY = api_key_result
-        else:
-            return None
-        # Fetch the other data
         game_title = await HTMLRequests.async_get_game_title(game_id)
         if game_title is not None:
             html_result = await HTMLRequests.send_async_web_request(game_title)
@@ -135,18 +99,6 @@ def search_from_id(self, game_id: int):
         """
         if game_id is None or game_id == 0:
             return None
-        # Fetch the API Key
-        api_key_result = HTMLRequests.SEARCH_API_KEY
-        if HTMLRequests.SEARCH_API_KEY is None:
-            api_key_result = HTMLRequests.send_website_request_getcode(False)
-            if api_key_result is None:
-                api_key_result = HTMLRequests.send_website_request_getcode(True)
-        if api_key_result is not None:
-            # Set it for Caching
-            HTMLRequests.SEARCH_API_KEY = api_key_result
-        else:
-            return None
-        # Fetch the other data
         game_title = HTMLRequests.get_game_title(game_id)
         if game_title is not None:
             html_result = HTMLRequests.send_web_request(game_title)