return status code in MakeHTMLRequest

Extravi · May 15, 2024 · ac4a11e · ac4a11e
1 parent fcde7ea
commit ac4a11e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/__init__.py b/__init__.py
@@ -144,7 +144,7 @@ def wikipedia():
         query = request.args.get("q", "").strip()
     else:
         query = request.form.get("q", "").strip()
-    response = helpers.makeHTMLRequest(f"https://wikipedia.org/w/api.php?action=query&format=json&prop=pageimages&titles={quote(query)}&pithumbsize=500", is_wiki=True)
+    response, _ = helpers.makeHTMLRequest(f"https://wikipedia.org/w/api.php?action=query&format=json&prop=pageimages&titles={quote(query)}&pithumbsize=500", is_wiki=True)
     return json.loads(response.text)
 
 
@@ -166,6 +166,7 @@ def api():
         app.logger.error(e)
         return jsonify({"error": "An error occurred while processing the request"}), 500
 
+
 @app.route("/img_proxy")
 def img_proxy():
     # Get the URL of the image to proxy

diff --git a/src/helpers.py b/src/helpers.py
@@ -64,7 +64,7 @@ def makeHTMLRequest(url: str, is_google=False, is_wiki=False, is_piped=False):
     content = None if html.status_code != 200 else BeautifulSoup(html.text, "lxml")
 
     # Return the BeautifulSoup object
-    return (content, 200)
+    return (content, html.status_code)
 
 # search highlights
 def highlight_query_words(string, query):

diff --git a/src/torrent_sites/nyaa.py b/src/torrent_sites/nyaa.py
@@ -26,7 +26,7 @@ def search(query, catagory="all"):
     if catagory == "ignore":
         return []
 
-    soup = helpers.makeHTMLRequest(f"https://{NYAA_DOMAIN}/?f=0&q={quote(query)}{catagory}")
+    soup, response_code = helpers.makeHTMLRequest(f"https://{NYAA_DOMAIN}/?f=0&q={quote(query)}{catagory}")
     results = []
     for torrent in soup.select(".default, .success, .danger"):
         list_of_tds = torrent.find_all("td")

diff --git a/src/torrent_sites/rutor.py b/src/torrent_sites/rutor.py
@@ -35,7 +35,7 @@ def search(query, catagory="all"):
 
 
     url = f"https://{RUTOR_DOMAIN}/search/{quote(query)}{catagory}"
-    html = helpers.makeHTMLRequest(url)
+    html, response_code = helpers.makeHTMLRequest(url)
     results = []
 
     for torrent in html.select(".gai, .tum"):

diff --git a/src/torrent_sites/torrentgalaxy.py b/src/torrent_sites/torrentgalaxy.py
@@ -36,7 +36,7 @@ def search(query, catagory="all"):
     catagory = get_catagory_code(catagory)
     if catagory == "ignore":
         return []
-    soup = helpers.makeHTMLRequest(f"https://{TORRENTGALAXY_DOMAIN}/torrents.php?search={quote(query)}{catagory}#results")
+    soup, response_code = helpers.makeHTMLRequest(f"https://{TORRENTGALAXY_DOMAIN}/torrents.php?search={quote(query)}{catagory}#results")
 
     result_divs = soup.findAll("div", {"class": "tgxtablerow"})
     title = [div.find("div", {"id": "click"}) for div in result_divs]

diff --git a/src/video.py b/src/video.py
@@ -38,7 +38,7 @@ def videoResults(query) -> Response:
     api = args.get("api", "false")
 
     # grab & format webpage
-    soup = makeHTMLRequest(f"https://{PIPED_INSTANCE_API}/search?q={quote(query)}&filter=all", is_piped=True)
+    soup, response_code = makeHTMLRequest(f"https://{PIPED_INSTANCE_API}/search?q={quote(query)}&filter=all", is_piped=True)
     data = json.loads(soup.text)
 
     # retrieve links