Small code rework - version 0.1.20

ScrappyCocco · May 22, 2022 · 053f91f · 053f91f
1 parent 1c87371
commit 053f91f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/howlongtobeatpy/howlongtobeatpy/HTMLRequests.py b/howlongtobeatpy/howlongtobeatpy/HTMLRequests.py
@@ -23,6 +23,8 @@ class SearchModifiers(Enum):
 
 class HTMLRequests:
     BASE_URL = 'https://howlongtobeat.com/'
+    ORIGIN_HEADER = 'https://howlongtobeat.com'
+    REFERER_HEADER = BASE_URL
     SEARCH_URL = BASE_URL + "search_results"
     GAME_URL = BASE_URL + "game?id="
 
@@ -43,8 +45,8 @@ def send_web_request(game_name: str, search_modifiers: SearchModifiers = SearchM
             'content-type': 'application/x-www-form-urlencoded',
             'accept': '*/*',
             'User-Agent': ua.random,
-            'origin': 'https://howlongtobeat.com',
-            'referer': 'https://howlongtobeat.com/'
+            'origin': HTMLRequests.ORIGIN_HEADER,
+            'referer': HTMLRequests.REFERER_HEADER
         }
         payload = {
             'queryString': game_name,
@@ -63,7 +65,7 @@ def send_web_request(game_name: str, search_modifiers: SearchModifiers = SearchM
         }
         # Make the post request and return the result if is valid
         resp = requests.post(HTMLRequests.SEARCH_URL, params=params, headers=headers, data=payload)
-        if resp is not None and resp.status_code == 200:
+        if resp.status_code == 200:
             return resp.text
         else:
             return None
@@ -85,8 +87,8 @@ async def send_async_web_request(game_name: str, search_modifiers: SearchModifie
             'content-type': 'application/x-www-form-urlencoded',
             'accept': '*/*',
             'User-Agent': ua.random,
-            'origin': 'https://howlongtobeat.com',
-            'referer': 'https://howlongtobeat.com/'
+            'origin': HTMLRequests.ORIGIN_HEADER,
+            'referer': HTMLRequests.REFERER_HEADER
         }
         payload = {
             'queryString': game_name,
@@ -124,7 +126,7 @@ def __cut_game_title(game_title: str):
         if game_title is None or len(game_title) == 0:
             return None
 
-        title = re.search("<title>([\w\W]*)<\/title>", game_title)
+        title = re.search("<title>(.*)<\/title>", game_title)
         # The position of start and end of this method may change if the website change
         cut_title = str(html.unescape(title.group(1)[12:-17]))
         return cut_title
@@ -143,7 +145,7 @@ def get_game_title(game_id: int):
         }
         headers = {
             'User-Agent': ua.random,
-            'referer': 'https://howlongtobeat.com/'
+            'referer': HTMLRequests.REFERER_HEADER
         }
 
         # Request and extract title
@@ -164,7 +166,7 @@ async def async_get_game_title(game_id: int):
         }
         headers = {
             'User-Agent': ua.random,
-            'referer': 'https://howlongtobeat.com/'
+            'referer': HTMLRequests.REFERER_HEADER
         }
 
         # Request and extract title

diff --git a/howlongtobeatpy/setup.py b/howlongtobeatpy/setup.py
@@ -4,7 +4,7 @@
     long_description = fh.read()
 
 setup(name='howlongtobeatpy',
-      version='0.1.19',
+      version='0.1.20',
       packages=find_packages(exclude=['tests']),
       description='A Python API for How Long to Beat',
       long_description=long_description,

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -2,7 +2,7 @@ sonar.organization=scrappycocco-github
 sonar.projectKey=ScrappyCocco_HowLongToBeat-PythonAPI
 
 sonar.projectName=HowLongToBeat-PythonAPI
-sonar.projectVersion=0.1.19
+sonar.projectVersion=0.1.20
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 # This property is optional if sonar.modules is set.