open.source/whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed request.send return style

Browse Source
This commit is contained in:
Ben Busby 2020-06-02 12:51:52 -06:00
parent 7afb5ed4b2
commit af1ec882ec
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/request.py
View File

@ -1,6 +1,7 @@
from lxml import etree from lxml import etree
import random import random
import requests import requests
from requests import Response
import urllib.parse as urlparse import urllib.parse as urlparse
# Core Google search URLs # Core Google search URLs
@ -72,7 +73,7 @@ class Request:
def autocomplete(self, query): def autocomplete(self, query):
ac_query = dict(hl=self.language, q=query) ac_query = dict(hl=self.language, q=query)
response = self.send(base_url=AUTOCOMPLETE_URL, query=urlparse.urlencode(ac_query)) response = self.send(base_url=AUTOCOMPLETE_URL, query=urlparse.urlencode(ac_query)).text
if response: if response:
dom = etree.fromstring(response) dom = etree.fromstring(response)
@ -80,14 +81,9 @@ class Request:
return [] return []
def send(self, base_url=SEARCH_URL, query='', return_bytes=False): def send(self, base_url=SEARCH_URL, query='') -> Response:
headers = { headers = {
'User-Agent': self.modified_user_agent 'User-Agent': self.modified_user_agent
} }
response = requests.get(base_url + query, headers=headers) return requests.get(base_url + query, headers=headers)
if return_bytes:
return response.content
else:
return response.text

4
app/routes.py
View File

@ -201,7 +201,7 @@ def element():
src_type = request.args.get('type') src_type = request.args.get('type')
try: try:
file_data = g.user_request.send(base_url=src_url, return_bytes=True) file_data = g.user_request.send(base_url=src_url).content
app.user_elements[session['uuid']] -= 1 app.user_elements[session['uuid']] -= 1
tmp_mem = io.BytesIO() tmp_mem = io.BytesIO()
tmp_mem.write(file_data) tmp_mem.write(file_data)
@ -218,7 +218,7 @@ def element():
@app.route('/window') @app.route('/window')
@auth_required @auth_required
def window(): def window():
get_body = g.user_request.send(base_url=request.args.get('location')) get_body = g.user_request.send(base_url=request.args.get('location')).text
get_body = get_body.replace('src="/', 'src="' + request.args.get('location') + '"') get_body = get_body.replace('src="/', 'src="' + request.args.get('location') + '"')
get_body = get_body.replace('href="/', 'href="' + request.args.get('location') + '"') get_body = get_body.replace('href="/', 'href="' + request.args.get('location') + '"')

2
app/utils/routing_utils.py
View File

@ -57,7 +57,7 @@ class RoutingUtils:
content_filter = Filter(self.session['keys'], mobile=mobile, config=self.config) content_filter = Filter(self.session['keys'], mobile=mobile, config=self.config)
full_query = gen_query(self.query, self.request_params, self.config, content_filter.near) full_query = gen_query(self.query, self.request_params, self.config, content_filter.near)
get_body = g.user_request.send(query=full_query) get_body = g.user_request.send(query=full_query).text
# Produce cleanable html soup from response # Produce cleanable html soup from response
html_soup = BeautifulSoup(content_filter.reskin(get_body), 'html.parser') html_soup = BeautifulSoup(content_filter.reskin(get_body), 'html.parser')