From 196ff3254e22a08d9dcee91cc24affbb23698bb5 Mon Sep 17 00:00:00 2001 From: DUO Labs Date: Tue, 26 Oct 2021 07:31:58 -0400 Subject: [PATCH] Removed bolden function from filters and made bolding search terms the default. --- app/routes.py | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/app/routes.py b/app/routes.py index 4d99c06..c18da81 100644 --- a/app/routes.py +++ b/app/routes.py @@ -14,6 +14,7 @@ from app.request import Request, TorError from app.utils.bangs import resolve_bang from app.utils.misc import read_config_bool from app.utils.results import add_ip_card +from app.utils.results import bold_search_terms from app.utils.search import * from app.utils.session import generate_user_key, valid_user_session from bs4 import BeautifulSoup as bsoup @@ -210,30 +211,7 @@ def autocomplete(): g.user_request.autocomplete(q) if not g.user_config.tor else [] ]) -def bolden_query_terms_in_response(response,query): - summary_class='BNeawe s3v9rd AP7Wnd' - summary_class_beginning=f'
' - summary_class_end=r'
' - results=bsoup(response, "html.parser") - summary = results.find_all("div", {"class": summary_class}) - summary = [str(_).replace(summary_class_beginning,'').replace(summary_class_end,'') for _ in summary if not r'
' in str(_)] - quotes=re.findall('"[^"]+"',query) - not_quotes=re.sub('"[^"]+"','',query) - not_quotes=list(filter(None,not_quotes.split(' '))) - search_terms=not_quotes+[_[1:-1] for _ in list(quotes)] - summary_bolded=[] - for sentence in summary: - sentence_temp=sentence - for term in search_terms: - sentence_temp=re.sub(fr"\b({term})\b",r"\1",sentence_temp,flags=re.I) - summary_bolded.append(sentence_temp) - response_return=response - - for i in range(len(summary)): - response_return=response_return.replace(summary[i],summary_bolded[i]) - - return response_return @app.route('/search', methods=['GET', 'POST']) @auth_required def search(): @@ -273,9 +251,8 @@ def search(): # Return 503 if temporarily blocked by captcha resp_code = 503 if has_captcha(str(response)) else 200 - - if str(os.getenv("WHOOGLE_BOLDEN_SEARCH_TERMS","0"))==1: - response=bolden_query_terms_in_response(response,query) + + response=bold_search_terms(response,query) # Feature to display IP address if search_util.check_kw_ip(): html_soup = bsoup(response, "html.parser")